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

src/components/downloadDicomAndNonedicom/index.vue

@@ -5,6 +5,7 @@
     :close-on-click-modal="false"
     :before-close="beforeClose"
     :append-to-body="true"
+    v-loading="btnLoading"
     class="downloadDicomAndNonedicom"
   >
     <span slot="title">{{ title }}</span>
@@ -14,7 +15,6 @@
         <el-button
           type="primary"
           size="mini"
-          :loading="btnLoading"
           v-if="hasDicom"
           @click.stop="getIRReadingDownloadStudyInfo('dicom')"
         >
@@ -23,7 +23,6 @@
         <el-button
           type="primary"
           size="mini"
-          :loading="btnLoading"
           v-if="hasNonedicom"
           @click.stop="getIRReadingDownloadStudyInfo('noneDicom')"
         >
@@ -32,7 +31,6 @@
         <el-button
           type="primary"
           size="mini"
-          :loading="btnLoading"
           @click.stop="getIRReadingDownloadStudyInfo('all')"
         >
           {{ $t('download:button:downloadAll') }}
@@ -362,7 +360,7 @@ export default {
       return { files, name }
     },
     handleOpenDialog(item) {
-      this.model_cfg.title = `${item.SubejctCode || ''}>${item.TaskBlindName}`
+      this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
       if (item.IsDicom) {
         this.modelList = item.DicomStudyList
       } else {

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -137,7 +137,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <div class="top" style="margin: 10px 0">
+    <div style="margin: 10px 0">
       <span>{{ $t('upload:dicom:uploadTitle') }}</span>
       <span style="margin-left: 10px">{{ $store.state.trials.uploadTip }}</span>
     </div>
@@ -297,7 +297,7 @@
           <span>
             {{ $t('trials:uploadDicomList:table:uploadNow')
             }}{{ scope.row.dicomInfo.failedFileCount }} /
-            {{ scope.row.dicomInfo.fileCount }}:[{{
+            {{ scope.row.dicomInfo.fileCount }}: [{{
               (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2)
             }}MB/{{
               (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2)
@@ -626,7 +626,7 @@ export default {
     },
     // 打开弹窗
     handleOpenDialog(item, list) {
-      this.model_cfg.title = `${item.SubejctCode || ''}>${item.TaskBlindName}`
+      this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
       this.modelList = item[list]
       this.model_cfg.visible = true
     },

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -407,7 +407,7 @@
               <span>
                 {{ $t('trials:uploadDicomList:table:uploadNow')
                 }}{{ scope.row.dicomInfo.failedFileCount }} /
-                {{ scope.row.dicomInfo.fileCount }}:[{{
+                {{ scope.row.dicomInfo.fileCount }}: [{{
                   (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2)
                 }}MB/{{
                   (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2)
@@ -1679,7 +1679,9 @@ export default {
                             dicomInfo.failedFileCount++
                             Record.FileCount++
                           } else {
-                            let path = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${
+                            let path = `/${params.trialId}/Image/${
+                              params.subjectId
+                            }/${params.subjectVisitId}/${
                               dicomInfo.studyUid
                             }/${scope.getGuid(
                               dicomInfo.studyUid +