Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

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;
         }
       }

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;

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 subjectId = this.$router.currentRoute.query.subjectId
-      var trialId = this.trialId
+      var trialId = this.$router.currentRoute.query.trialId
-      var isReadingTaskViewInOrder = this.isReadingTaskViewInOrder
+      var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
-      var criterionType = this.criterionType
+      var criterionType = this.$router.currentRoute.query.criterionType
-      var readingTool = this.readingTool
+      var readingTool = this.$router.currentRoute.query.readingTool
-      var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
+      var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
-      var path = `/noneDicomReading?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) => {