From 08b8f8d107d2b90542005a4bdffe811b5952ae51 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Mon, 9 Sep 2024 16:31:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ir=E4=B8=8B=E8=BD=BD=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../downloadDicomAndNonedicom/index.vue | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue index 4bf2c294..a86bb72d 100644 --- a/src/components/downloadDicomAndNonedicom/index.vue +++ b/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: item.SourceSubjectVisitId, + TaskId: item.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: item.SourceSubjectVisitId, + TaskId: item.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}`, From c2aa83f4b88d424fb4aaaf4bdf7cba23e97741e0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Mon, 9 Sep 2024 16:55:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?ir=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/uploadDicomAndNonedicom/dicomFile.vue | 7 ++++--- src/utils/multipartUpload/oss.js | 4 ++-- src/utils/oss.js | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index 019b9570..83591d47 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -98,8 +98,8 @@ /> { - this.$refs[`pathClear_${item.Id}`].value = '' + this.$refs[`pathClear_${item.VisitTaskId}`].value = '' + console.log(this.$refs[`pathClear_${item.VisitTaskId}`]) }) this.btnLoading = false if (this.studyErrorList.length > 0) { diff --git a/src/utils/multipartUpload/oss.js b/src/utils/multipartUpload/oss.js index 16405723..f7309db9 100644 --- a/src/utils/multipartUpload/oss.js +++ b/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); diff --git a/src/utils/oss.js b/src/utils/oss.js index 51b4006f..6bf8f550 100644 --- a/src/utils/oss.js +++ b/src/utils/oss.js @@ -272,7 +272,7 @@ function getSTSToken(credentials) { } } else { - console.log("凭证未过期"); + // console.log("凭证未过期"); resolve(false) } From 3fc7d70b3f4fafe3d67dd2739096b8bd050431d6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Mon, 9 Sep 2024 17:15:04 +0800 Subject: [PATCH 3/4] 1 --- src/components/uploadDicomAndNonedicom/dicomFile.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index 83591d47..16a67c7d 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -1079,7 +1079,6 @@ export default { this.$refs.pathClear.value = '' this.list.forEach((item) => { this.$refs[`pathClear_${item.VisitTaskId}`].value = '' - console.log(this.$refs[`pathClear_${item.VisitTaskId}`]) }) this.btnLoading = false if (this.studyErrorList.length > 0) { @@ -1121,10 +1120,14 @@ export default { dicomInfo.subjectId = scope.SubjectId dicomInfo.subjectVisitId = scope.subjectVisitId let t = setInterval(() => { + console.log(11111111) 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 = { From 77c3f0244e19afb9c7a6e4cc84e3b9598b66aaf1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Mon, 9 Sep 2024 17:47:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/downloadDicomAndNonedicom/index.vue | 8 ++++---- src/components/uploadDicomAndNonedicom/dicomFile.vue | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue index a86bb72d..9850225d 100644 --- a/src/components/downloadDicomAndNonedicom/index.vue +++ b/src/components/downloadDicomAndNonedicom/index.vue @@ -286,8 +286,8 @@ export default { row.DicomStudyList.length > 0 ) { data.SubjectVisitTaskList.push({ - SubjectvisitId: item.SourceSubjectVisitId, - TaskId: item.VisitTaskId, + SubjectvisitId: row.SourceSubjectVisitId, + TaskId: row.VisitTaskId, }) let arr = row.DicomStudyList.map((d) => d.Id) data.DicomStudyIdList = [...data.DicomStudyIdList, ...arr] @@ -298,8 +298,8 @@ export default { row.NoneDicomStudyList.length > 0 ) { data.SubjectVisitTaskList.push({ - SubjectvisitId: item.SourceSubjectVisitId, - TaskId: item.VisitTaskId, + SubjectvisitId: row.SourceSubjectVisitId, + TaskId: row.VisitTaskId, }) let arr = row.NoneDicomStudyList.map((d) => d.Id) data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr] diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index 16a67c7d..dc26511f 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -1120,7 +1120,6 @@ export default { dicomInfo.subjectId = scope.SubjectId dicomInfo.subjectVisitId = scope.subjectVisitId let t = setInterval(() => { - console.log(11111111) dicomUploadInProgress({ trialId: scope.trialId, studyInstanceUid: dicomInfo.studyUid,