From d0e67f6937aa808a4e23c0cea04fc0c27fbb9999 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 11 Mar 2024 14:05:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?suv=E6=B5=8B=E9=87=8F=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=BF=80=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/TableQuestions.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
index 5db80056..0d8c28c6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
@@ -571,7 +571,7 @@ export default {
           const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
           if (this.$refs[refName][0].questionForm.IsDicomReading !== false) {
             var markTool = 'CircleROI'
-            var isMarked = !!this.$refs[refName][0].questionForm.OtherMeasureData || this.$refs[refName][0].questionForm.saveTypeEnum === 2
+            var isMarked = !!this.$refs[refName][0].questionForm.OtherMeasureData
           }
           FusionEvent.$emit('imageLocation', { otherMeasureData: this.$refs[refName][0].questionForm.OtherMeasureData, markTool, isMarked })
         })

From 2a4ddaf6f25c8e1ec0092cf0013b1c317f58e606 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 11 Mar 2024 14:51:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=9D=9E=E8=A1=A8=E6=A0=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=B8=85=E9=99=A4=E7=97=85=E7=81=B6=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=9A=E4=BD=8D=E5=8F=8A=E7=A1=AE=E8=AE=A4=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        |  1 +
 .../dicoms/components/Fusion/QuestionItem.vue | 20 ++++++++++++------
 .../dicoms/components/Fusion/Questions.vue    | 15 ++++++++++---
 .../dicoms/components/QuestionItem.vue        | 21 ++++++++++++-------
 .../reading/dicoms/components/Questions.vue   | 15 ++++++++++---
 5 files changed, 53 insertions(+), 19 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 f9317df0..8fd4f03d 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
@@ -803,6 +803,7 @@ export default {
     },
     removeAnnotation(obj) {
       const { otherMeasureData, type } = obj
+      if(!otherMeasureData || !otherMeasureData.data) return
       const { data } = otherMeasureData
       const i = this.measureDatas.findIndex(item => item.OtherMeasureData && item.OtherMeasureData.data.remark === data.remark)
       if (i > -1) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
index 088e03e4..2d55e452 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@@ -229,15 +229,13 @@
         :liver-is-inside-volume="liverIsInsideVolume"
         @setFormItemData="setFormItemData"
         @resetFormItemData="resetFormItemData"
-        @addAnnotation="addAnnotation"
-        @removeAnnotation="removeAnnotation"
-        @locateAnnotation="locateAnnotation"
       />
     </template>
   </div>
 </template>
 <script>
 // import { uploadReadingAnswerImage } from '@/api/trials'
+import FusionEvent from './FusionEvent'
 import { mapGetters } from 'vuex'
 export default {
   name: 'QuestionItem',
@@ -328,13 +326,23 @@ export default {
       this.$emit('setFormItemData', obj)
     },
     addAnnotation(question) {
-      this.$emit('addAnnotation', question)
+      FusionEvent.$emit('addAnnotation', question)
     },
     removeAnnotation(question) {
-      this.$emit('removeAnnotation', question)
+      FusionEvent.$emit('locateAnnotation', question)
+      // 是否确认清除标记？
+      this.$confirm(this.$t('trials:reading:warnning:msg47'), {
+        type: 'warning',
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          FusionEvent.$emit('removeAnnotation', question)
+        })
+        .catch(() => {})
+      
     },
     locateAnnotation(question) {
-      this.$emit('locateAnnotation', question)
+      FusionEvent.$emit('locateAnnotation', question)
     },
     async uploadScreenshot(param) {
       if (!this.visitTaskId) return
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 38393016..25828b31 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -18,9 +18,6 @@
           :liver-is-inside-volume="liverIsInsideVolume"
           @setFormItemData="setFormItemData"
           @resetFormItemData="resetFormItemData"
-          @addAnnotation="addAnnotation"
-          @removeAnnotation="removeAnnotation"
-          @locateAnnotation="locateAnnotation"
         />
       </template>
       <el-form-item v-if="readingTaskState < 2">
@@ -105,10 +102,22 @@ export default {
       console.log('resetSuvQuestions')
       this.resetSuvQuestions()
     })
+    FusionEvent.$on('addAnnotation', obj => {
+      this.addAnnotation(obj)
+    })
+    FusionEvent.$on('removeAnnotation', obj => {
+      this.removeAnnotation(obj)
+    })
+    FusionEvent.$on('locateAnnotation', obj => {
+      this.locateAnnotation(obj)
+    })
   },
   beforeDestroy() {
     FusionEvent.$off('refreshQuestions')
     FusionEvent.$off('resetSuvQuestions')
+    FusionEvent.$off('addAnnotation')
+    FusionEvent.$off('removeAnnotation')
+    FusionEvent.$off('locateAnnotation')
   },
   methods: {
     getQuestions1() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index d767269c..aefe4d32 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -271,14 +271,12 @@
       :visit-task-id="visitTaskId"
       @setFormItemData="setFormItemData"
       @resetFormItemData="resetFormItemData"
-      @addAnnotation="addAnnotation"
-      @removeAnnotation="removeAnnotation"
-      @locateAnnotation="locateAnnotation"
     />
   </div>
 </template>
 <script>
-import { uploadReadingAnswerImage } from '@/api/trials'
+// import { uploadReadingAnswerImage } from '@/api/trials'
+import DicomEvent from './DicomEvent'
 import { mapGetters } from 'vuex'
 export default {
   name: 'QuestionItem',
@@ -368,13 +366,22 @@ export default {
       this.$emit('setFormItemData', obj)
     },
     addAnnotation(question) {
-      this.$emit('addAnnotation', question)
+      DicomEvent.$emit('addAnnotation', question)
     },
     removeAnnotation(question) {
-      this.$emit('removeAnnotation', question)
+      DicomEvent.$emit('locateAnnotation', question)
+      // 是否确认清除标记？
+      this.$confirm(this.$t('trials:reading:warnning:msg47'), {
+        type: 'warning',
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          DicomEvent.$emit('removeAnnotation', question)
+        })
+        .catch(() => {})
     },
     locateAnnotation(question) {
-      this.$emit('locateAnnotation', question)
+      DicomEvent.$emit('locateAnnotation', question)
     },
     async uploadScreenshot(param) {
       if (!this.visitTaskId) return
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index af74c9a6..a28ff948 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -16,9 +16,6 @@
         :visit-task-id="visitTaskId"
         @setFormItemData="setFormItemData"
         @resetFormItemData="resetFormItemData"
-        @addAnnotation="addAnnotation"
-        @removeAnnotation="removeAnnotation"
-        @locateAnnotation="locateAnnotation"
       />
 
       <el-form-item v-if="readingTaskState < 2 && !isFirstChangeTask">
@@ -113,9 +110,21 @@ export default {
     DicomEvent.$on('handleSaveQuestions', readingTaskState => {
       this.handleSave()
     })
+    DicomEvent.$on('addAnnotation', obj => {
+      this.addAnnotation(obj)
+    })
+    DicomEvent.$on('removeAnnotation', obj => {
+      this.removeAnnotation(obj)
+    })
+    DicomEvent.$on('locateAnnotation', obj => {
+      this.locateAnnotation(obj)
+    })
   },
   beforeDestroy() {
     DicomEvent.$off('setReadingState')
+    DicomEvent.$off('addAnnotation')
+    DicomEvent.$off('removeAnnotation')
+    DicomEvent.$off('locateAnnotation')
   },
   methods: {
     async getQuestions(visitTaskId) {

From c23e9fb0817a9899c5d2217a37fe330167c27a46 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 11 Mar 2024 15:52:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/AdReview.vue       | 1 +
 .../reading/mim-medical-audit/components/GlobalReview.vue   | 6 ++++--
 .../reading/mim-medical-audit/components/OncologyReview.vue | 3 ++-
 .../reading/mim-medical-audit/components/VisitReview.vue    | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
index f5b393e9..b0774885 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
@@ -66,6 +66,7 @@
       <el-table-column
         :label="$t('trials:adReview:table:view')"
         width="200"
+        fixed="right"
       >
         <template slot-scope="scope">
           <!-- 查看R1详情 -->
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
index 7bccdc62..d669b34d 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
@@ -103,7 +103,8 @@
 
       <el-table-column
         :label="$t('common:action:action')"
-        width="200"
+        width="100"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
@@ -204,7 +205,8 @@
 
       <el-table-column
         :label="$t('common:action:action')"
-        width="200"
+        width="120"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
index 5f66ba89..a83da997 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
@@ -136,7 +136,8 @@
       <el-table-column
         v-if="oncologyInfo.IsShowDetail"
         :label="$t('common:action:action')"
-        width="100"
+        width="120"
+        fixed="right"
       >
         <template slot-scope="scope">
           <!-- 查看详情 -->
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
index 5d48ab8c..4b878160 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
@@ -63,7 +63,8 @@
       prop="ArmEnum"
       :label="$t('trials:medicalFeedback:title:currentReader')"
       show-overflow-tooltip
-      width="100"
+      width="120"
+      fixed="right"
     >
       <template slot-scope="scope">
         <el-button