上传添加时间戳

src/utils/oss.js

@@ -24,7 +24,28 @@ async function ossGenerateSTS() {
   switch (res.Result.ObjectStoreUse) {
     case 'AliyunOSS':
       Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
-      Vue.prototype.OSSclient = new OSS(Vue.prototype.OSSclientConfig)
+      let OSSclient = new OSS(Vue.prototype.OSSclientConfig)
+      Vue.prototype.OSSclient = {
+        put: function (objectName, object) {
+          return new Promise(async (resolve, reject) => {
+            try {
+              objectName = objectName + '_' + new Date().getTime()
+              let res = await OSSclient.put(objectName, object)
+              if (res && res.url) {
+                resolve({
+                  name: objectName,
+                  url: Vue.prototype.OSSclientConfig.viewEndpoint + objectName
+                })
+              } else {
+                reject()
+              }
+            } catch (e) {
+              console.log(e)
+              reject()
+            }
+          })
+        }
+      }
       break
     case 'MinIO':
       let minioClient = new Minio.Client(Vue.prototype.OSSclientConfig);

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

@@ -1021,6 +1021,7 @@ export default {
     archiveStudy(index, config) {
       var scope = this
       return new Promise(function(resolve, reject) {
+        try {
           preArchiveDicomStudy({
             trialId: scope.trialId,
             siteId: scope.data.SiteId,
@@ -1092,6 +1093,7 @@ export default {
               for (let ii = 0; ii < v.instanceList.length; ii++) {
                 arr.push((function (){
                   return new Promise(async resolve1 => {
+                    try {
                       let o = v.instanceList[ii]
                       let name = `${v.instanceList[ii].instanceUid}_${v.instanceList[ii].file.webkitRelativePath}`
                       if (o.isReUpload) {
@@ -1101,7 +1103,8 @@ export default {
                       } else {
                         let path = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}/${o.instanceUid}/${scope.getGuid(dicomInfo.studyUid + v.seriesUid + o.instanceUid + params.trialId)}`
                         let res = await dcmUpload(path, o.file, config)
-                    if (!res) {
+                        console.log('imageRes', res)
+                        if (!res || !res.url) {
                           params.failedFileCount++
                         } else {
                           dicomInfo.failedFileCount++
@@ -1113,6 +1116,7 @@ export default {
                             let thumbnailPath = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}/${v.seriesUid}.png`
                             let OSSclient = scope.OSSclient
                             let seriesRes = await OSSclient.put(thumbnailPath, blob)
+                            console.log('seriesRes', seriesRes)
                             if (seriesRes && seriesRes.url) {
                               ImageResizePath = scope.$getObjectName(seriesRes.url)
                             }
@@ -1145,6 +1149,10 @@ export default {
                         }
                       }
                       resolve1()
+                    } catch (e) {
+                      console.log(e)
+                      resolve1()
+                    }
                   })
                 })())
                 if (arr.length >= 66 || ii === v.instanceList.length - 1) {
@@ -1210,6 +1218,10 @@ export default {
               clearInterval(t)
             }
           })
+        } catch (e) {
+          console.log(e)
+          reject()
+        }
       })
     },
     generateTxtFile(text) {