diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue index c23a0ea..dbdc207 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue @@ -11,6 +11,13 @@ @mousemove="sliderMousemove" @mouseup="sliderMouseup" > + +
+ + + + +
-1 ? seriesInfo = seriesList[idx] : seriesInfo = seriesList[0] } if (seriesInfo) { - const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.instanceCount)) + const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.imageIds.length)) seriesInfo.imageIdIndex = index > 0 ? index - 1 : 0 obj.studyIndex = seriesInfo.studyIndex obj.seriesIndex = seriesInfo.seriesIndex diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue index b4d6b85..64cde56 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue @@ -11,6 +11,13 @@ @mousemove="sliderMousemove" @mouseup="sliderMouseup" > + +
+ + + + +
-1 ? seriesInfo = seriesList[idx] : seriesInfo = seriesList[0] } if (seriesInfo) { - let index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex+ 1) / baseObj.series.instanceCount)) + let index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex+ 1) / baseObj.series.imageIds.length)) seriesInfo.imageIdIndex = index > 0 ? index - 1 : 0 obj.studyIndex = seriesInfo.studyIndex obj.seriesIndex = seriesInfo.seriesIndex diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue index 178c6f9..478a49f 100644 --- a/src/views/trials/trials-panel/reading/dicoms/index.vue +++ b/src/views/trials/trials-panel/reading/dicoms/index.vue @@ -115,7 +115,7 @@ v-if="dialogVisible" :trial-id="trialId" :subject-id="subjectId" - :visit-task-id="visitTaskId" + :visit-task-id="cdVisitTaskId" />
@@ -315,6 +315,12 @@ export default { } this.getTaskInfo(1) }) + DicomEvent.$on('previewCD', (taskId) => { + this.closeCDVisible = true + this.isFullscreen = false + this.dialogVisible = true + this.cdVisitTaskId = taskId + }) this.activeName = this.$router.currentRoute.query.tabName ? this.$router.currentRoute.query.tabName : 'read' this.tabs.push(this.activeName) this.trialId = this.$router.currentRoute.query.trialId @@ -344,6 +350,7 @@ export default { beforeDestroy() { DicomEvent.$off('getNextTask') DicomEvent.$emit('resetOpenWindow') + DicomEvent.$off('previewCD') window.removeEventListener('beforeunload', this.handleWindowClose) }, methods: { @@ -566,6 +573,7 @@ export default { this.closeCDVisible = true this.isFullscreen = false this.dialogVisible = true + this.cdVisitTaskId = this.visitTaskId }, handleWindowClose() { DicomEvent.$emit('resetOpenWindow')