Merge branch 'uat' of https://gitea.frp.extimaging.com/XCKJ/irc_web into uat

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`,

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -112,6 +112,8 @@
           <!--上传--->
           <el-button circle icon="el-icon-upload2" :title="$t('upload:nonedicom:button:upload')" v-if="!forbid"
             @click.native.prevent="handleUpload(scope.row)" :disabled="isReading && !isDownloaded" />
+          <!-- <el-button circle icon="el-icon-upload2" :title="$t('upload:nonedicom:button:upload')"
+            @click.native.prevent="handleUpload(scope.row)" /> -->
           <!--删除--->
           <el-button :disabled="scope.row.UploadedFileCount <= 0 ||
             scope.row.ReadingTaskState === 2
@@ -397,7 +399,7 @@ export default {
       }
     },
     // 扫描待上传文件
-    beginScanFiles(e) {
+    async beginScanFiles(e) {
       var files = [...e.target.files]
       var sameFiles = [], zipFiles = [], f = false
       files.forEach((file) => {
@@ -405,7 +407,7 @@ export default {
           .substring(file.name.lastIndexOf('.'))
           .toLocaleLowerCase()
         if (extendName === '.zip' && this.IsImageSegment) {
-          if (file.name.indexOf('筛选期') > -1 || file.name.indexOf('研究结束') > -1) f = true
+          if (file.name.indexOf(this.$t("trials:uploadNonDicoms:checkValue:SelectionPeriod")) > -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"

src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue

@@ -236,7 +236,7 @@
 </template>
 <script>
 import { saveTaskQuestion, submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials'
-import { resetReadingTask, getIVUSTemplate } from '@/api/reading'
+import { resetReadingTask, getIVUSTemplatesZip } from '@/api/reading'
 import { getToken } from '@/utils/auth'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -867,7 +867,7 @@ export default {
         const params = {
           visitTaskId: this.visitTaskId
         }
-        await getIVUSTemplate(params)
+        await getIVUSTemplatesZip(params)
       } catch (e) {
         console.log(e)
       }

src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue

@@ -235,7 +235,7 @@
 </template>
 <script>
 import { saveTaskQuestion, submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials'
-import { resetReadingTask, getOCTFCTTemplate, getOCTLipidAngleTemplate } from '@/api/reading'
+import { resetReadingTask, getOCTFCTTemplatesZip, getOCTLipidAngleTemplate } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
@@ -890,7 +890,7 @@ export default {
           visitTaskId: this.visitTaskId
         }
         if (lesionType === 104) {
-          await getOCTFCTTemplate(params)
+          await getOCTFCTTemplatesZip(params)
         } else {
           await getOCTLipidAngleTemplate(params)
         }