From e96a4a4d7b4f08047ee8ffe38de3c2bbbe73d152 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 13 Mar 2024 11:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=9E=8D=E5=90=88=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=9A=84=E8=AE=BF=E8=A7=86=E5=8F=8A?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BF=A1=E6=81=AF=E4=B8=8E=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=E7=AA=97=E5=8F=A3=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomViewer.vue | 50 +++++++++++++++----
 .../trials-panel/reading/dicoms/index.vue     |  2 +-
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 9de839a6..92a5efe9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -462,11 +462,23 @@
       v-if="fusionSeries.visible"
       :visible.sync="fusionSeries.visible"
       :close-on-click-modal="false"
-      :title="$t('trials:lugano:dialogTitle:fusion')"
       width="850px"
     >
-
-      <el-form ref="fusionForm" :model="fusionForm">
+      <div slot="title">
+        <span>{{ $t('trials:lugano:dialogTitle:fusion') }}</span>
+      </div>
+      <el-form ref="fusionForm" :model="fusionForm" label-width="120px" label-position="left">
+        <!-- 任务名称 -->
+        <el-form-item
+          :label="$t('trials:lugano:fusionDialog:label:taskBlindName')"
+          prop="taskBlindName"
+        >
+          <el-input
+            v-model="fusionForm.taskBlindName"
+            :disabled="true"
+            style="width:200px"
+          />
+        </el-form-item>
         <!-- 检查 -->
         <el-form-item
           :label="$t('trials:lugano:fusionDialog:label:study')"
@@ -489,9 +501,7 @@
           </el-select>
         </el-form-item>
         <!-- 融合图像 -->
-        <el-form-item
-          :label="$t('trials:lugano:fusionDialog:label:fusionImages')"
-        />
+        <label style="color: #dfdfdf;line-height: 36px;vertical-align: middle;font-size: 14px;">{{ $t('trials:lugano:fusionDialog:label:fusionImages') }}</label>
         <div style="display: flex;flex-direction: row;justify-content: space-between;margin-bottom:10px;" class="series-table">
 
           <div style="border: 1px solid #5e5e5e;border-radius: 5px;padding: 0 10px;">
@@ -778,7 +788,8 @@ export default {
       studyList: [],
       digitPlaces: 2,
       activeCanvasWW: null,
-      activeCanvasWC: null
+      activeCanvasWC: null,
+      activeTaskInfo: {}
     }
   },
 
@@ -799,12 +810,30 @@ export default {
       }
     },
     lastCanvasTaskId: {
+      immediate: true,
+      handler(v) {
+        // if (v) {
+        //   console.log('lastCanvasTaskId')
+        //   const i = this.visitTaskList.findIndex(i => i.VisitTaskId === v)
+        //   if (i < 0) return
+        //   var studyList = this.visitTaskList[i].StudyList || []
+        //   studyList = studyList.filter(i => !i.IsCriticalSequence && i.Modalities.indexOf('CT') !== -1 && i.Modalities.indexOf('PT') !== -1)
+        //   if (studyList.length === 0) return
+        //   this.studyList = studyList
+        // } else {
+        //   this.studyList = []
+        // }
+      }
+    },
+    activeSeries: {
       immediate: true,
       handler(v) {
         if (v) {
-          console.log('lastCanvasTaskId')
-          const i = this.visitTaskList.findIndex(i => i.VisitTaskId === v)
+          this.activeTaskInfo.taskName = v.taskBlindName
+          this.activeTaskInfo.visitTaskId = v.visitTaskId
+          const i = this.visitTaskList.findIndex(i => i.VisitTaskId === v.visitTaskId)
           if (i < 0) return
+          this.activeTaskInfo.visitTaskIndex = i
           var studyList = this.visitTaskList[i].StudyList || []
           studyList = studyList.filter(i => !i.IsCriticalSequence && i.Modalities.indexOf('CT') !== -1 && i.Modalities.indexOf('PT') !== -1)
           if (studyList.length === 0) return
@@ -1667,7 +1696,6 @@ export default {
         if (!this.wwwcList[this.currentDicomCanvasIndex]) {
           this.wwwcList[this.currentDicomCanvasIndex] = '1'
         }
-        // var stack = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].stack
         this.$refs['container'].focus()
         // if (stack.studyId) {
         //   DicomEvent.$emit('toggleVisitList', stack)
@@ -1874,7 +1902,7 @@ export default {
         this.$alert(this.$t('components:uploadvideo:message:xf4'))
         return
       }
-      const i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
+      const i = this.activeTaskInfo.visitTaskIndex
       if (i < 0) return
       if (this.studyList.length > 0) {
         this.fusionForm.studyID = this.studyList[0].StudyId
diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue
index 6d97b47d..32c6a026 100644
--- a/src/views/trials/trials-panel/reading/dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/index.vue
@@ -568,7 +568,7 @@ export default {
     height:80%;
   }
   /deep/.el-dialog__body{
-      padding: 10px;
+      padding: 20px;
       height: calc(100% - 120px);
     }
   .el-dialog__header{