From 63a4a56feb446dd92bb261143aa88f4ae749020c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 8 Apr 2024 16:39:44 +0800
Subject: [PATCH] =?UTF-8?q?PetCt=E9=A1=B5=E9=9D=A2viewport=E5=9B=BE?=
 =?UTF-8?q?=E5=83=8F=E4=BB=A5=E6=9C=80=E5=A4=A7=E7=9A=84=E5=9B=BE=E5=83=8F?=
 =?UTF-8?q?=E5=BC=A0=E6=95=B0=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/PetCt.vue | 18 ++++++++++++------
 .../dicoms/components/Fusion/Viewport.vue      | 10 +++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index e1e5d6f2..8dea8a6d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -628,11 +628,7 @@ export default {
       const routeData = this.$router.resolve({ path })
       this.screenshotWindow = window.open(routeData.href, '_blank')
     })
-    window.addEventListener('beforeunload', () => {
-      if (this.screenshotWindow) {
-        this.screenshotWindow.close()
-      }
-    })
+    window.addEventListener('beforeunload', e => { this.beforeUnloadHandler(e) })
   },
   beforeDestroy() {
     if (this.screenshotWindow) {
@@ -649,7 +645,7 @@ export default {
     FusionEvent.$off('removeAnnotation')
     FusionEvent.$off('imageLocation')
     FusionEvent.$off('getScreenshots')
-    window.removeEventListener('beforeunload')
+    window.removeEventListener('beforeunload', e => { this.beforeUnloadHandler(e) })
   },
   methods: {
 
@@ -699,6 +695,11 @@ export default {
 
       var ptseriesId = this.$route.query.ptseriesId
       this.petSeries = await this.getSeriesInfo(ptseriesId)
+
+      const maxCount = Math.max(this.ctSeries.imageIds.length, this.petSeries.imageIds.length)
+      this.$set(this.ctSeries, 'imageMaxLength', maxCount)
+      this.$set(this.petSeries, 'imageMaxLength', maxCount)
+
       await this.getImages()
 
       // 设置viewport
@@ -2133,6 +2134,11 @@ export default {
     historyRecord() {
       this.fusion.visible = true
     },
+    beforeUnloadHandler() {
+      if (this.screenshotWindow) {
+        this.screenshotWindow.close()
+      }
+    },
     async receiveMsg(event) {
       if (event.data.type === 'readingPageUpdate') {
         // this.$refs['questions'].initList()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
index 93d92891..423eb519 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
@@ -17,7 +17,7 @@
       <div v-if="index === 1 || index === 2">
         Series: #{{ seriesInfo.seriesNumber }}
       </div>
-      <div v-if="index !== 4">Image: #{{ `${seriesInfo.imageIdIndex + 1} / ${seriesInfo.imageIds.length}` }}</div>
+      <div v-if="index !== 4">Image: #{{ `${seriesInfo.imageIdIndex + 1} / ${seriesInfo.imageMaxLength}` }}</div>
       <div v-if="index === 1 || index === 2">{{ seriesInfo.modality }}</div>
     </div>
     <!-- 描述信息 -->
@@ -247,7 +247,7 @@ export default {
           this.imageInfo.size = `${imagePlaneModule.columns}*${imagePlaneModule.rows}`
           this.imageInfo.location = imagePlaneModule.sliceLocation
           this.getOrientationMarker()
-          this.sliderBoxHeight = imageIndex * 100 / (this.seriesInfo.imageIds.length - 1)
+          this.sliderBoxHeight = imageIndex * 100 / (this.seriesInfo.imageMaxLength - 1)
         }
 
         var properties = viewport.getProperties()
@@ -376,7 +376,7 @@ export default {
     goViewer(e) {
       var height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight
       this.sliderBoxHeight = height
-      var index = Math.trunc(this.seriesInfo.imageIds.length * this.sliderBoxHeight / 100)
+      var index = Math.trunc(this.seriesInfo.imageMaxLength * this.sliderBoxHeight / 100)
       if (this.seriesInfo.imageIdIndex !== index) {
         this.scroll(index)
       }
@@ -399,8 +399,8 @@ export default {
       if (PX < 0) return
       if (PX > boxHeight) return
       const height = PX * 100 / boxHeight
-      var index = Math.trunc(this.seriesInfo.imageIds.length * height / 100)
-      index = index > this.seriesInfo.imageIds.length ? this.seriesInfo.imageIds.length : index < 0 ? 0 : index
+      var index = Math.trunc(this.seriesInfo.imageMaxLength * height / 100)
+      index = index > this.seriesInfo.imageMaxLength ? this.seriesInfo.imageMaxLength : index < 0 ? 0 : index
       this.sliderBoxHeight = height
       if (this.seriesInfo.imageIdIndex !== index) {
         this.scroll(index)