From d769e4ddd937d9e724fbff59a4f0db0068978551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 17 Jan 2024 15:01:20 +0800
Subject: [PATCH] 1

---
 .../trial-summary/upload-monitor/index.vue    | 29 +++++++++-
 .../components/uploadDicomFiles2.vue          | 54 ++++++++++---------
 2 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
index 653e11b0..c478cc06 100644
--- a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
@@ -289,8 +289,33 @@
       :close-on-click-modal="false"
       custom-class="base-dialog-wrapper"
     >
-      <div>
-        {{ lookText }}
+      <div style="max-height: 500px;overflow-y: auto;padding: 0 20px">
+        <div style="display: flex;justify-content: space-around;margin-bottom: 20px">
+          <span>{{$t('trials:uploadDicomList:table:FailedNumber')}}: {{lookText.Failed.length}}</span>
+          <span>{{$t('trials:uploadDicomList:table:ExistedNumber')}}: {{lookText.Existed.length}}</span>
+          <span>{{$t('trials:uploadDicomList:table:UploadedNumber')}}: {{lookText.Uploaded.length}}</span>
+        </div>
+        <div style="margin-bottom: 10px;font-size:12px">
+          <div style="font-size: 14px;margin-bottom: 5px">{{$t('trials:uploadDicomList:table:Failed')}}：</div>
+          <div v-if="lookText.Failed.length">
+            <div v-for="item of lookText.Failed">{{item}}</div>
+          </div>
+          <div v-else>无</div>
+        </div>
+        <div style="margin-bottom: 10px;font-size:12px">
+          <div style="font-size: 14px;margin-bottom: 5px">{{$t('trials:uploadDicomList:table:Existed')}}：</div>
+          <div v-if="lookText.Existed.length">
+            <div v-for="item of lookText.Existed">{{item}}</div>
+          </div>
+          <div v-else>无</div>
+        </div>
+        <div style="margin-bottom: 10px;font-size:12px">
+          <div style="font-size: 14px;margin-bottom: 5px">{{$t('trials:uploadDicomList:table:Uploaded')}}：</div>
+          <div v-if="lookText.Uploaded.length">
+            <div v-for="item of lookText.Uploaded">{{item}}</div>
+          </div>
+          <div v-else>无</div>
+        </div>
       </div>
       <div slot="footer" class="dialog-footer">
         <!-- 取消 -->
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 f1b4e363..1ce19358 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
@@ -136,6 +136,7 @@
           <input
             type="file"
             name="file"
+            ref="pathClear"
             :disabled="btnLoading"
             webkitdirectory
             multiple
@@ -277,27 +278,29 @@
         <template slot-scope="scope">
           <el-tooltip placement="top" v-if="scope.row.uploadState.record">
             <div slot="content">
-              {{$t('trials:uploadDicomList:table:Existed')}}
-              <div v-if="scope.row.uploadState.record.Existed.length">
-                <span v-for="item of scope.row.uploadState.record.Existed">{{item}}</span>
-              </div>
-              <div v-else>
-                无
-              </div>
-              {{$t('trials:uploadDicomList:table:Uploaded')}}
-              <div v-if="scope.row.uploadState.record.Uploaded.length">
-                <span v-for="item of scope.row.uploadState.record.Uploaded">{{item}}</span>
-              </div>
-              <div v-else>
-                无
-              </div>
-              <br>
-              {{$t('trials:uploadDicomList:table:Failed')}}
-              <div v-if="scope.row.uploadState.record.Failed.length">
-                <span v-for="item of scope.row.uploadState.record.Failed">{{item}}</span>
-              </div>
-              <div v-else>
-                无
+              <div style="max-height: 500px;overflow-y: auto">
+                {{$t('trials:uploadDicomList:table:Existed')}}
+                <div v-if="scope.row.uploadState.record.Existed.length">
+                  <span v-for="item of scope.row.uploadState.record.Existed">{{item}}</span>
+                </div>
+                <div v-else>
+                  无
+                </div>
+                {{$t('trials:uploadDicomList:table:Uploaded')}}
+                <div v-if="scope.row.uploadState.record.Uploaded.length">
+                  <span v-for="item of scope.row.uploadState.record.Uploaded">{{item}}</span>
+                </div>
+                <div v-else>
+                  无
+                </div>
+                <br>
+                {{$t('trials:uploadDicomList:table:Failed')}}
+                <div v-if="scope.row.uploadState.record.Failed.length">
+                  <span v-for="item of scope.row.uploadState.record.Failed">{{item}}</span>
+                </div>
+                <div v-else>
+                  无
+                </div>
               </div>
             </div>
             <div style="cursor: pointer">{{ scope.row.uploadState.record.Existed.length }}/{{ scope.row.uploadState.record.Uploaded.length }}/{{ scope.row.uploadState.record.Failed.length }}</div>
@@ -307,10 +310,11 @@
       <el-table-column v-show="isScan" :label="$t('common:action:action')" width="200">
         <template slot-scope="scope">
           <!-- 预览 -->
+<!--          :disabled="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && scope.row.dicomInfo.failedFileCount !== 0"-->
           <el-button
             icon="el-icon-view"
             circle
-            :disabled="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && scope.row.dicomInfo.failedFileCount !== 0"
+            :disabled="scope.row.uploadState.stateCode !== '' && (scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && !scope.row.uploadState.record)"
             :title="$t('trials:uploadedDicoms:action:preview')"
             size="small"
             @click="handlePreview(scope.row.dicomInfo.studyUid)"
@@ -321,7 +325,7 @@
             circle
             :title="$t('trials:uploadedDicoms:action:delete')"
             size="small"
-            :disabled="scope.row.uploadState.stateCode !== ''"
+            :disabled="scope.row.uploadState.stateCode !== '' && (scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && !scope.row.uploadState.record)"
             @click="handleDelete(scope.$index, scope.row)"
           />
         </template>
@@ -960,7 +964,7 @@ export default {
         this.uploadQueues = this.uploadQueues.filter(v => {
            return !!v.uploadState.record.Failed.length
         })
-        console.log(this.uploadQueues)
+        this.$refs.pathClear.value = ''
         this.btnLoading = false
       }).catch(_ => { this.btnLoading = false })
     },
@@ -1046,9 +1050,9 @@ export default {
           }, 5000)
           scope.myInterval.push(t)
           let Record = {
+            Failed: [],
             Existed: [],
             Uploaded: [],
-            Failed: [],
             FileCount: 0
           }
           let params = {