diff --git a/src/api/reading.js b/src/api/reading.js index 0ac49b93..37300160 100644 --- a/src/api/reading.js +++ b/src/api/reading.js @@ -213,6 +213,14 @@ export function getIVUSTemplate(param) { data: param }) } +export function getIVUSTemplatesZip(param) { + return requestDownload({ + url: '/IVUSCalculate/getIVUSTemplatesZip', + method: 'post', + responseType: 'blob', + data: param + }) +} export function uploadIVUSTemplate(param) { return request({ url: `/IVUSCalculate/uploadIVUSTemplate`, @@ -229,7 +237,14 @@ export function getOCTFCTTemplate(param) { data: param }) } - +export function getOCTFCTTemplatesZip(param) { + return requestDownload({ + url: '/OCTCalculate/getOCTFCTTemplatesZip', + method: 'post', + responseType: 'blob', + data: param + }) +} export function uploadOCTFCTTemplate(param) { return request({ url: `/OCTCalculate/uploadOCTFCTTemplate`, diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue index bf2777ef..ac9260b5 100644 --- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue @@ -112,6 +112,8 @@ + -1 || file.name.indexOf("trials:uploadNonDicoms:checkValue:researchOver") > -1) f = true zipFiles.push(file) } if ( @@ -416,11 +418,13 @@ export default { } }) if (zipFiles.length > 0) { - zipFiles.forEach(async file => { + for (let i = 0; i < zipFiles.length; i++) { + let file = zipFiles[i] let list = await this.readZipFileListRaw(file) - if (!f) f = list.some(i => i.path.indexOf('筛选期') > -1 || i.path.indexOf('研究结束') > -1) + if (!f) f = list.some(i => i.path.indexOf(this.$t("trials:uploadNonDicoms:checkValue:SelectionPeriod")) > -1 || i.path.indexOf(this.$t("trials:uploadNonDicoms:checkValue:researchOver")) > -1) list = null - }) + if (f) break + } } if (f) return this.$confirm(this.$t("trials:uploadNonDicoms:confirm:zipNameNonCompliant"), '', { type: "warning" diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue index 4883bf46..eae6f145 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue @@ -236,7 +236,7 @@