From e024c6c0b1d454cb8296e48ef2e7d0f67015bf63 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Mon, 9 Sep 2024 13:39:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E3=80=81=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=A3=80=E6=9F=A5=E8=AF=A6=E6=83=85=E5=8F=97=E8=AF=95?= =?UTF-8?q?=E8=80=85id=E6=9C=AA=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/downloadDicomAndNonedicom/index.vue | 2 +- src/components/uploadDicomAndNonedicom/dicomFile.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue index 4d5f1f0a..d33f739d 100644 --- a/src/components/downloadDicomAndNonedicom/index.vue +++ b/src/components/downloadDicomAndNonedicom/index.vue @@ -362,7 +362,7 @@ export default { return { files, name } }, handleOpenDialog(item) { - this.model_cfg.title = `${item.SubejctCode || ''}>${item.TaskBlindName}` + this.model_cfg.title = `${item.SubjectCode || ''}>${item.TaskBlindName}` if (item.IsDicom) { this.modelList = item.DicomStudyList } else { diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index 0fc3c45a..779e767f 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -626,7 +626,7 @@ export default { }, // 打开弹窗 handleOpenDialog(item, list) { - this.model_cfg.title = `${item.SubejctCode || ''}>${item.TaskBlindName}` + this.model_cfg.title = `${item.SubjectCode || ''}>${item.TaskBlindName}` this.modelList = item[list] this.model_cfg.visible = true }, From e05986ac9fcd2b362f49553903c25d9c879c6844 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Mon, 9 Sep 2024 13:45:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=80=9F=E7=8E=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/uploadDicomAndNonedicom/dicomFile.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index 779e767f..a5ab7eb7 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -137,7 +137,7 @@ -
+
{{ $t('upload:dicom:uploadTitle') }} {{ $store.state.trials.uploadTip }}
From bfb1c03c639d831e4d6198c2e609b633c80969fc Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Mon, 9 Sep 2024 13:56:29 +0800 Subject: [PATCH 3/4] 1 --- src/components/downloadDicomAndNonedicom/index.vue | 3 ++- src/components/uploadDicomAndNonedicom/dicomFile.vue | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue index d33f739d..08d58635 100644 --- a/src/components/downloadDicomAndNonedicom/index.vue +++ b/src/components/downloadDicomAndNonedicom/index.vue @@ -126,6 +126,7 @@ ${item.TaskBlindName}` + this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}` if (item.IsDicom) { this.modelList = item.DicomStudyList } else { diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index a5ab7eb7..4b28754b 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -626,7 +626,7 @@ export default { }, // 打开弹窗 handleOpenDialog(item, list) { - this.model_cfg.title = `${item.SubjectCode || ''}>${item.TaskBlindName}` + this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}` this.modelList = item[list] this.model_cfg.visible = true }, From 153869060436f005253ff7a947051e0843bdba12 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Mon, 9 Sep 2024 14:57:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=85=A8=E5=B1=80loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/downloadDicomAndNonedicom/index.vue | 5 +---- src/components/uploadDicomAndNonedicom/dicomFile.vue | 2 +- .../visit/crc-upload/components/uploadDicomFiles2.vue | 6 ++++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue index 08d58635..933f435d 100644 --- a/src/components/downloadDicomAndNonedicom/index.vue +++ b/src/components/downloadDicomAndNonedicom/index.vue @@ -5,6 +5,7 @@ :close-on-click-modal="false" :before-close="beforeClose" :append-to-body="true" + v-loading="btnLoading" class="downloadDicomAndNonedicom" > {{ title }} @@ -14,7 +15,6 @@ @@ -23,7 +23,6 @@ @@ -32,7 +31,6 @@ {{ $t('download:button:downloadAll') }} @@ -126,7 +124,6 @@ {{ $t('trials:uploadDicomList:table:uploadNow') }}{{ scope.row.dicomInfo.failedFileCount }} / - {{ scope.row.dicomInfo.fileCount }}:[{{ + {{ scope.row.dicomInfo.fileCount }}: [{{ (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2) }}MB/{{ (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2) 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 991d3103..663427b7 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 @@ -407,7 +407,7 @@ {{ $t('trials:uploadDicomList:table:uploadNow') }}{{ scope.row.dicomInfo.failedFileCount }} / - {{ scope.row.dicomInfo.fileCount }}:[{{ + {{ scope.row.dicomInfo.fileCount }}: [{{ (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2) }}MB/{{ (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2) @@ -1679,7 +1679,9 @@ export default { dicomInfo.failedFileCount++ Record.FileCount++ } else { - let path = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${ + let path = `/${params.trialId}/Image/${ + params.subjectId + }/${params.subjectVisitId}/${ dicomInfo.studyUid }/${scope.getGuid( dicomInfo.studyUid +