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

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) {

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

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() {

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

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

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) {

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详情 -->

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

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">
           <!-- 查看详情 -->

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