From 1896c58b50eae80e09adcdf26df349a7eca110c4 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 28 Apr 2025 16:11:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=98=85=E7=89=87bu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/ReadPage.vue  |  5 +++--
 .../dicoms3D/components/VisitReview.vue       |  2 +-
 .../components/customize/ReportPage.vue       | 19 +++++++++++--------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
index 1b28a858..0b33b747 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -358,7 +358,7 @@
               v-for="s in visitTaskList"
               v-show="lastViewportTaskId === s.VisitTaskId"
               :key="s.VisitTaskId"
-              style="height:100%;"
+              style="height: 100%;"
             >
               <mRecisit
                 v-if="lastViewportTaskId && criterionType === 7 && lastViewportTaskIds.includes(s.VisitTaskId)"
@@ -2705,6 +2705,7 @@ export default {
         }
         .content-wrapper {
           flex: 1;
+          height: calc(100% - 50px);
           display: flex;
           flex-direction: row;
         }
@@ -2733,8 +2734,8 @@ export default {
         }
         .form-wrapper {
           width: 400px;
+          height: 100%;
           border: 1px solid #727272;
-          overflow-y: auto;
           user-select: none;
         }
       }
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/VisitReview.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/VisitReview.vue
index cab09675..395aa20e 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/VisitReview.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/VisitReview.vue
@@ -62,7 +62,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .visit-review-container {
-  height: 100vh;
+  height: 100%;
   display: flex;
   flex-direction: column;
   background-color: #000;
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
index 8eadd6e1..3b25d3d4 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
@@ -669,18 +669,21 @@ export default {
       }
     },
     previewDicoms(task) {
+      if (this.openWindow) {
+        this.openWindow.close()
+      }
       var token = getToken()
+      var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       // var subjectCode = this.$router.currentRoute.query.subjectCode
       var subjectCode = localStorage.getItem('subjectCode')
-      var subjectId = this.subjectId
-      var trialId = this.trialId
-      var isReadingTaskViewInOrder = this.isReadingTaskViewInOrder
-      var criterionType = this.criterionType
-      var readingTool = this.readingTool
-      var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
-      var path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+      var subjectId = this.$router.currentRoute.query.subjectId
+      var trialId = this.$router.currentRoute.query.trialId
+      var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
+      var criterionType = this.$router.currentRoute.query.criterionType
+      var readingTool = this.$router.currentRoute.query.readingTool
+      var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       const routeData = this.$router.resolve({ path })
-      window.open(routeData.href, '_blank')
+      this.openWindow = window.open(routeData.href, '_blank')
     },
     handleSave(isPrompt) {
       return new Promise((resolve, reject) => {