From 153869060436f005253ff7a947051e0843bdba12 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Mon, 9 Sep 2024 14:57:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=94=B9=E4=B8=BA=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/downloadDicomAndNonedicom/index.vue          | 5 +----
 src/components/uploadDicomAndNonedicom/dicomFile.vue        | 2 +-
 .../visit/crc-upload/components/uploadDicomFiles2.vue       | 6 ++++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 08d58635..933f435d 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/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') }}
@@ -126,7 +124,6 @@
           <!--下载--->
           <el-button
             circle
-            :loading="btnLoading"
             icon="el-icon-download"
             :title="$t('download:button:download')"
             @click.stop="getIRReadingDownloadStudyInfo('one', scope.row)"
diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 4b28754b..bb05d2a2 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -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)
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 991d3103..663427b7 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/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 +