From 196ed7f993c419e7874a3b148b69e3246310b273 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 10 Jul 2026 16:53:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=85=A8=E9=9A=8F=E6=9C=BAir=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E4=B8=8B=E8=BD=BD=E9=A1=B5=E9=9D=A2=E5=8F=8A=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E9=A1=B5=E5=B1=8F=E8=94=BD=E5=8F=97=E8=AF=95=E8=80=85?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=92=8C=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dicom/DicomCanvas.vue | 8 ++++++-- src/components/downloadDicomAndNonedicom/index.vue | 14 +++++++++----- .../uploadDicomAndNonedicom/dicomFile.vue | 6 ++++-- src/components/uploadDicomAndNonedicom/index.vue | 3 ++- .../uploadDicomAndNonedicom/nonedicomFile.vue | 9 +++++++-- .../uploadDicomAndNonedicom/study-view.vue | 7 ++++--- src/views/dicom-show/dicom-visit.vue | 6 +++--- src/views/none-dicom-show/index.vue | 6 +++++- .../reading/dicoms3D/components/ReadPage.vue | 2 +- 9 files changed, 41 insertions(+), 20 deletions(-) diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue index 596c4507..3bb6c434 100644 --- a/src/components/Dicom/DicomCanvas.vue +++ b/src/components/Dicom/DicomCanvas.vue @@ -34,7 +34,7 @@
-
{{ series.subjectCode }}
+
{{ series.subjectCode }}
{{ series.visitName }}
{{ stack.description }}
@@ -174,7 +174,8 @@ export default { orientationMarkers: [], originalMarkers: [], dcmTag: { visible: false, title: this.$t('trials:dicom-tag:title') }, - tip: '' + tip: '', + IsReadingTaskViewInOrder: 2 } }, @@ -182,6 +183,9 @@ export default { this.type = this.$router.currentRoute.query.type ? this.$router.currentRoute.query.type : '' + if (this.$router.currentRoute.query.IsReadingTaskViewInOrder) { + this.IsReadingTaskViewInOrder = Number(this.$router.currentRoute.query.IsReadingTaskViewInOrder) + } this.canvas = this.$refs.canvas this.canvas.addEventListener('cornerstonenewimage', this.onNewImage) this.canvas.addEventListener( diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue index 7f08671f..8dfb0f1f 100644 --- a/src/components/downloadDicomAndNonedicom/index.vue +++ b/src/components/downloadDicomAndNonedicom/index.vue @@ -33,7 +33,7 @@ + show-overflow-tooltip v-if="isReadingTaskViewInOrder !== 0" /> @@ -136,7 +136,11 @@ export default { IsImageSegment: { type: Boolean, default: false, - } + }, + isReadingTaskViewInOrder: { + type: Number, + default: 2, + }, }, data() { return { @@ -488,11 +492,11 @@ export default { let routeData = null if (!this.IsImageSegment && (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20)) { routeData = this.$router.resolve({ - path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`, + path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`, }) } else { routeData = this.$router.resolve({ - path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`, + path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`, }) } this.open = window.open(routeData.href, '_blank') @@ -505,7 +509,7 @@ export default { var token = getToken() let trialId = this.$route.query.trialId const routeData = this.$router.resolve({ - path: `/showvisitdicoms?page=download&trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`, + path: `/showvisitdicoms?page=download&trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`, }) this.open = window.open(routeData.href, '_blank') }, diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index 34b5d37e..d0cee4c1 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -10,7 +10,8 @@ - + @@ -553,6 +554,7 @@ export default { this.openVisitTaskId = item.VisitTaskId this.model_cfg.title = `${item.SubjectCode || ''} > ${this.IsImageSegment ? item.VisitName : item.TaskBlindName }` + if (this.isReadingTaskViewInOrder === 0) this.model_cfg.title = '' this.modelList = item[list] this.model_cfg.visible = true }, @@ -1642,7 +1644,7 @@ export default { const routeData = this.$router.resolve({ path: `/showvisitdicoms?page=upload&trialId=${trialId}&visitTaskId=${this.IsImageSegment ? 'undefined' : row.VisitTaskId }&subjectVisitId=${row.SourceSubjectVisitId - }&isReading=1&TokenKey=${token}&IsReadingTaskViewInOrder=${this.IsReadingTaskViewInOrder}`, + }&isReading=1&TokenKey=${token}&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`, }) this.open = window.open(routeData.href, '_blank') }, diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue index 1f3d6d61..ffac97ad 100644 --- a/src/components/uploadDicomAndNonedicom/index.vue +++ b/src/components/uploadDicomAndNonedicom/index.vue @@ -11,7 +11,7 @@ + :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :forbid="forbid" /> @@ -70,6 +70,7 @@ export default { mounted() { this.title = `Upload Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）` if (this.IsImageSegment) this.title = `Upload Images：${this.SubjectCode}` + if (this.isReadingTaskViewInOrder === 0) this.title = '' store.dispatch('trials/setUnLock', true) }, methods: { diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue index 7bf20246..002f3ff9 100644 --- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue @@ -14,7 +14,8 @@ - + @@ -265,6 +266,10 @@ export default { type: Boolean, default: false, }, + isReadingTaskViewInOrder: { + type: Number, + default: 0, + }, }, data() { return { @@ -475,7 +480,7 @@ export default { let trialId = this.$route.query.trialId var token = getToken() const routeData = this.$router.resolve({ - path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&visitTaskId=${row.VisitTaskId}&TokenKey=${token}`, + path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&visitTaskId=${row.VisitTaskId}&TokenKey=${token}&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`, }) this.open = window.open(routeData.href, '_blank') }, diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue index f19084ae..fde5fbce 100644 --- a/src/components/uploadDicomAndNonedicom/study-view.vue +++ b/src/components/uploadDicomAndNonedicom/study-view.vue @@ -7,7 +7,8 @@ - + @@ -187,11 +188,11 @@ export default { var token = getToken() if (!this.IsImageSegment && (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20)) { routeData = this.$router.resolve({ - path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true`, + path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true&IsReadingTaskViewInOrder=${this.IsReadingTaskViewInOrder}`, }) } else { routeData = this.$router.resolve({ - path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true`, + path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true&IsReadingTaskViewInOrder=${this.IsReadingTaskViewInOrder}`, }) } diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue index ee81abb6..7856d3b6 100644 --- a/src/views/dicom-show/dicom-visit.vue +++ b/src/views/dicom-show/dicom-visit.vue @@ -20,7 +20,7 @@ :name="`${study.StudyId}`">