diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue index ed72d860..560f4b80 100644 --- a/src/components/downloadDicomAndNonedicom/index.vue +++ b/src/components/downloadDicomAndNonedicom/index.vue @@ -31,6 +31,7 @@ {{ $t('download:button:downloadAll') }} @@ -257,9 +258,9 @@ export default { async getIRReadingDownloadStudyInfo(type, row) { try { let data = { - SubjectId: this.SubjectId, + SubjectId: this.SubjectId || this.list[0].SubjectId, TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId, - SubjectCode: this.SubjectCode, + SubjectCode: this.SubjectCode || this.list[0].SubjectCode, SubjectVisitTaskList: [], DicomStudyIdList: [], NoneDicomStudyIdList: [], diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index e64115f1..c9861d00 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -1090,6 +1090,7 @@ export default { this.btnLoading = true var studyList = [] this.selectArr.forEach((item) => { + item.dicomInfo.uploadFileSize = 0 if (!item.uploadState.selected) { studyList.push({ studyInstanceUid: item.dicomInfo.studyUid, diff --git a/src/utils/multipartUpload/oss.js b/src/utils/multipartUpload/oss.js index f7309db9..106071ae 100644 --- a/src/utils/multipartUpload/oss.js +++ b/src/utils/multipartUpload/oss.js @@ -92,10 +92,15 @@ async function multipartUpload(OSSclient, partSize, saveFileId, uploadFile, data // 重新去掉某个缓存进行设置 delete savaData[saveFileId]; saveFinishedData(savaData); + } else if (res.res.status === 404) { + delete savaData[saveFileId]; + saveFinishedData(savaData); } return res; } catch (e) { console.log(e); + delete savaData[saveFileId]; + saveFinishedData(savaData); // 捕获超时异常。 if (e.code === "ConnectionTimeoutError") { console.log("TimeoutError"); 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 6eedea47..828f9efc 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 @@ -406,7 +406,10 @@ /> {{ $t('trials:uploadDicomList:table:uploadNow') - }}{{ scope.row.dicomInfo.failedFileCount }}/{{ scope.row.dicomInfo.fileCount }} ({{ + }}{{ scope.row.dicomInfo.failedFileCount }}/{{ + scope.row.dicomInfo.fileCount + }} + ({{ (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2) }}MB/{{ (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2) @@ -1364,6 +1367,7 @@ export default { this.btnLoading = true var studyList = [] this.selectArr.forEach((item) => { + item.dicomInfo.uploadFileSize = 0 if (!item.uploadState.selected) { studyList.push({ studyInstanceUid: item.dicomInfo.studyUid,