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

src/components/downloadDicomAndNonedicom/index.vue

@@ -243,7 +243,7 @@ export default {
           SubjectId: this.SubjectId,
           TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId,
           SubjectCode: this.SubjectCode,
-          SubjectVisitIdList: [],
+          SubjectVisitTaskList: [],
           DicomStudyIdList: [],
           NoneDicomStudyIdList: [],
         }
@@ -254,7 +254,10 @@ export default {
               item.DicomStudyList &&
               item.DicomStudyList.length > 0
             ) {
-              data.SubjectVisitIdList.push(item.SourceSubjectVisitId)
+              data.SubjectVisitTaskList.push({
+                SubjectvisitId: item.SourceSubjectVisitId,
+                TaskId: item.VisitTaskId,
+              })
               let arr = item.DicomStudyList.map((d) => d.Id)
               data.DicomStudyIdList = [...data.DicomStudyIdList, ...arr]
             }
@@ -267,7 +270,10 @@ export default {
               item.NoneDicomStudyList &&
               item.NoneDicomStudyList.length > 0
             ) {
-              data.SubjectVisitIdList.push(item.SourceSubjectVisitId)
+              data.SubjectVisitTaskList.push({
+                SubjectvisitId: item.SourceSubjectVisitId,
+                TaskId: item.VisitTaskId,
+              })
               let arr = item.NoneDicomStudyList.map((d) => d.Id)
               data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr]
             }
@@ -279,7 +285,10 @@ export default {
             row.DicomStudyList &&
             row.DicomStudyList.length > 0
           ) {
-            data.SubjectVisitIdList.push(row.SourceSubjectVisitId)
+            data.SubjectVisitTaskList.push({
+              SubjectvisitId: row.SourceSubjectVisitId,
+              TaskId: row.VisitTaskId,
+            })
             let arr = row.DicomStudyList.map((d) => d.Id)
             data.DicomStudyIdList = [...data.DicomStudyIdList, ...arr]
           }
@@ -288,7 +297,10 @@ export default {
             row.NoneDicomStudyList &&
             row.NoneDicomStudyList.length > 0
           ) {
-            data.SubjectVisitIdList.push(row.SourceSubjectVisitId)
+            data.SubjectVisitTaskList.push({
+              SubjectvisitId: row.SourceSubjectVisitId,
+              TaskId: row.VisitTaskId,
+            })
             let arr = row.NoneDicomStudyList.map((d) => d.Id)
             data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr]
           }
@@ -327,7 +339,7 @@ export default {
                   series.InstancePathList.forEach((instance) => {
                     let fileName = instance.Path.split('/').pop()
                     let obj = {
-                      name: `${data.SubjectCode}/${data.VisitName}/${this.$fd(
+                      name: `${data.SubjectCode}/${data.TaskBlindName}/${this.$fd(
                         'IsDicom',
                         true
                       )}/${study.StudyCode}/${fileName}`,
@@ -347,7 +359,7 @@ export default {
             if (study.FileList.length > 0) {
               study.FileList.forEach((item) => {
                 let obj = {
-                  name: `${data.SubjectCode}/${data.VisitName}/${this.$fd(
+                  name: `${data.SubjectCode}/${data.TaskBlindName}/${this.$fd(
                     'IsDicom',
                     false
                   )}/${study.StudyCode}/${item.FileName}`,

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -98,8 +98,8 @@
                   />
                   <input
                     type="file"
-                    :name="`file_${scope.row.Id}`"
-                    :ref="`pathClear_${scope.row.Id}`"
+                    :name="`file_${scope.row.VisitTaskId}`"
+                    :ref="`pathClear_${scope.row.VisitTaskId}`"
                     :disabled="btnLoading"
                     webkitdirectory
                     multiple
@@ -1078,7 +1078,7 @@ export default {
         })
         this.$refs.pathClear.value = ''
         this.list.forEach((item) => {
-          this.$refs[`pathClear_${item.Id}`].value = ''
+          this.$refs[`pathClear_${item.VisitTaskId}`].value = ''
         })
         this.btnLoading = false
         if (this.studyErrorList.length > 0) {
@@ -1123,7 +1123,10 @@ export default {
                 dicomUploadInProgress({
                   trialId: scope.trialId,
                   studyInstanceUid: dicomInfo.studyUid,
-                }).then((res) => {})
+                  VisitTaskId: dicomInfo.visitTaskId,
+                }).then((res) => {
+                  console.log(dicomInfo.visitTaskId)
+                })
               }, 5000)
               scope.myInterval.push(t)
               let Record = {

src/utils/multipartUpload/oss.js

@@ -59,7 +59,7 @@ async function multipartUpload(OSSclient, partSize, saveFileId, uploadFile, data
                     if (bytesTime) {
                         bytesReceivedPerSecond[bytesTime] += data.file.size * (percentage - checkData[saveFileId]);
                     } else {
-                        console.log("未查询到时间")
+                        // console.log("未查询到时间")
                         if (timeList.length > 0) {
                             bytesReceivedPerSecond[timeList[timeList.length - 1]] += data.file.size * (percentage - checkData[saveFileId]);
                         } else {
@@ -136,7 +136,7 @@ function initPage() {
 function setTimer() {
     if (timer) return false;
     timer = setInterval(() => {
-        console.log(Object.assign({}, bytesReceivedPerSecond))
+        // console.log(Object.assign({}, bytesReceivedPerSecond))
         let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
         if (timeList.length > 0) {
             let totalBytes = timeList.reduce((sum, bytes) => sum + bytesReceivedPerSecond[bytes], 0) / (5 * 1024);

src/utils/oss.js

@@ -272,7 +272,7 @@ function getSTSToken(credentials) {
       }
 
     } else {
-      console.log("凭证未过期");
+      // console.log("凭证未过期");
       resolve(false)
     }