From 8f4878c1914ad2b45da91a97264420da876f315c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 30 Jan 2024 10:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E7=AE=80=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/oss.js                                      |  1 +
 .../visit/crc-upload/components/uploadDicomFiles2.vue | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/utils/oss.js b/src/utils/oss.js
index c3222350..af203207 100644
--- a/src/utils/oss.js
+++ b/src/utils/oss.js
@@ -24,6 +24,7 @@ async function ossGenerateSTS() {
   switch (res.Result.ObjectStoreUse) {
     case 'AliyunOSS':
       Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+      Vue.prototype.OSSclientConfig.timeout = 10 * 60 * 1000
       let OSSclient = new OSS(Vue.prototype.OSSclientConfig)
       Vue.prototype.OSSclient = {
         put: function (objectName, object) {
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 b0fcf6e6..749bea05 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
@@ -290,7 +290,9 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <span v-if="!scope.row.dicomInfo.failedFileCount">{{$t('trials:uploadDicomList:table:status1')}}</span>
+          <span v-if="!scope.row.dicomInfo.failedFileCount">
+            {{$t('trials:uploadDicomList:table:status1')}}</span>
+          <span style="color:#409eff" v-else-if="!scope.row.dicomInfo.failedFileCount && scope.row.dicomInfo.isInit && btnLoading">{{$t('trials:uploadDicomList:table:status2')}}</span>
           <span style="color:#409eff" v-else-if="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && !scope.row.uploadState.record">{{$t('trials:uploadDicomList:table:status2')}}</span>
           <span style="color:#2cc368" v-else-if="scope.row.dicomInfo.failedFileCount === scope.row.dicomInfo.fileCount">{{$t('trials:uploadDicomList:table:status3')}}</span>
           <span style="color:#f66" v-else-if="scope.row.uploadState.record && scope.row.uploadState.record.fileCount === 0">{{$t('trials:uploadDicomList:table:status5')}}</span>
@@ -728,7 +730,7 @@ export default {
                 studyTime = time ? `${date} ${time}` : `${date} 00:00:00`
               }
               const patientNameElement = data.elements.x00100010;
-              const patientNameBytes = new Uint8Array(data.byteArray.buffer, patientNameElement.dataOffset, patientNameElement.length);
+              const patientNameBytes = new Uint8Array(data.byteArray.buffer, patientNameElement ? patientNameElement.dataOffset : 0, patientNameElement ? patientNameElement.length : 0);
               const patientNameStr = convertBytes(data.string('x00080005'), patientNameBytes);
               scope.uploadQueues.push({
                 studyIndex: studyIndex,
@@ -813,7 +815,7 @@ export default {
                 seriesTime = time ? `${date} ${time}` : `${date} 00:00:00`
               }
               const seriesDescriptionElement = data.elements.x0008103e;
-              const seriesDescriptionBytes = new Uint8Array(data.byteArray.buffer, seriesDescriptionElement.dataOffset, seriesDescriptionElement.length);
+              const seriesDescriptionBytes = new Uint8Array(data.byteArray.buffer, seriesDescriptionElement ? seriesDescriptionElement.dataOffset : 0, seriesDescriptionElement ? seriesDescriptionElement.length : 0);
               const seriesDescriptionStr = convertBytes(data.string('x00080005'), seriesDescriptionBytes);
               seriesItem = {
                 seriesUid: seriesUid,
@@ -1099,6 +1101,7 @@ export default {
             IsDicomReUpload: scope.uploadQueues[index].uploadState.AllowReUpload
           }).then(async res => {
             scope.uploadQueues[index].dicomInfo.failedFileCount = 0
+            scope.uploadQueues[index].isInit = true
             let dicomInfo = scope.uploadQueues[index].dicomInfo
             let seriesNum = scope.uploadQueues[index].seriesList.length
             let fileNum = scope.uploadQueues[index].fileList.length
@@ -1321,8 +1324,6 @@ export default {
               Uploaded: [],
               FileCount: 0
             }
-            // 删错了
-            let dicomInfo = scope.uploadQueues[index].dicomInfo
             let fileList = scope.uploadQueues[index].fileList
             fileList.forEach(v => {
               Record.Failed.push(v.webkitRelativePath)