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] =?UTF-8?q?=E9=9D=9E=E8=A1=A8=E6=A0=BC=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E7=97=85=E7=81=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E5=8F=8A=E7=A1=AE=E8=AE=A4=E6=8F=90=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) {