pt临床数据弹窗取消点击modal关闭Dialog

src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue

@@ -1223,7 +1223,7 @@ export default {
                 } else if (toolName === 'Probe' && (parseInt(localStorage.getItem('CriterionType')) === 21)) {
                   cornerstoneTools.addToolForElement(element, ProbeTool, { configuration: { fixedRadius: 5, handleRadius: true, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces } })
                 } else if (toolName === 'Probe' &&  parseInt(localStorage.getItem('CriterionType')) === 22) {
-                  cornerstoneTools.addToolForElement(element, ProbeTool, { configuration: { radius: 5, unit: 'mm', handleRadius: true, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces } })
+                  cornerstoneTools.addToolForElement(element, ProbeTool, { configuration: { fixedRadius: 5, unit: 'mm', handleRadius: true, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces } })
                 } else {
                   cornerstoneTools.addToolForElement(element, apiTool)
                 }

src/views/trials/trials-panel/reading/dicoms/components/MRIPDFFAdvance/QuestionForm.vue

@@ -385,13 +385,11 @@ export default {
     },
     setMeasureData(measureData, isInit = false) {
       return new Promise(resolve => {
-        console.log('setMeasureData', measureData)
         if (!measureData || (measureData && measureData.tableQuestionId !== this.activeQuestionId)) {
           resolve()
         }
         var data = {}
         // 创建标记
-        console.log('setMeasureData', measureData)
         if (!measureData.data.remark) {
           // 维护标记信息
           measureData.data.remark = this.getLesionName(this.orderMark, this.activeQuestionMark)

src/views/trials/trials-panel/reading/dicoms/components/MRIPDFFAdvance/QuestionList.vue

@@ -432,7 +432,6 @@ export default {
       }
     },
     modifyMeasuredData(measureObj) {
-      console.log('modifyMeasuredData')
       if (measureObj.questionInfo) {
         this.activeItem.activeCollapseId = measureObj.questionInfo.QuestionId
         this.activeItem.activeRowIndex = String(measureObj.questionInfo.RowIndex)
@@ -443,7 +442,6 @@ export default {
     },
     // 设置测量数据
     setMeasuredData(measureData) {
-      console.log('setMeasuredData')
       if (this.activeItem.activeCollapseId) {
         // 判断是否存在测量数据
         this.$nextTick(() => {

src/views/trials/trials-panel/reading/dicoms/tools/Probe/ProbeTool.js

@@ -1,4 +1,6 @@
 import * as cornerstoneTools from 'cornerstone-tools'
+const EVENTS = cornerstoneTools.EVENTS
+const triggerEvent = cornerstoneTools.import('util/triggerEvent')
 const external = cornerstoneTools.external
 // State
 const getToolState = cornerstoneTools.getToolState
@@ -87,7 +89,7 @@ export default class ProbeTool extends cornerstoneTools.ProbeTool {
     
     return {
       visible: true,
-      active: true,
+      active: false,
       color: undefined,
       invalidated: true,
       handles: {
@@ -100,8 +102,8 @@ export default class ProbeTool extends cornerstoneTools.ProbeTool {
         end: {
           x: eventData.currentPoints.image.x,
           y: eventData.currentPoints.image.y,
-          highlight: true,
-          active: true,
+          highlight: false,
+          active: false,
           radius: 0
         },
         // textBox: {
@@ -125,6 +127,41 @@ export default class ProbeTool extends cornerstoneTools.ProbeTool {
     };
   }
 
+  addNewMeasurement(evt, interactionType) {
+    const eventData = evt.detail
+    if (!eventData || !eventData.currentPoints || !eventData.currentPoints.image) {
+      return
+    }
+
+    const { element, image } = eventData
+    const measurementData = this.createNewMeasurement(eventData)
+
+    if (!measurementData) {
+      return
+    }
+
+    // Click-to-place and finish immediately; avoid default drag listeners.
+    measurementData.active = false
+    if (measurementData.handles && measurementData.handles.end) {
+      measurementData.handles.end.active = false
+      measurementData.handles.end.highlight = false
+    }
+
+    cornerstoneTools.addToolState(element, this.name, measurementData)
+
+    if (!measurementData.cachedStats && image) {
+      this.updateCachedStats(image, element, measurementData)
+    }
+
+    external.cornerstone.updateImage(element)
+
+    triggerEvent(element, EVENTS.MEASUREMENT_COMPLETED, {
+      toolName: this.name,
+      element,
+      measurementData
+    })
+  }
+
   /**
    *
    *

src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue

@@ -150,7 +150,7 @@
       </div>
     </el-dialog>
     <!--pet-ct临床数据上传-->
-    <el-dialog v-if="petVisible" :show-close="true" :visible.sync="petVisible" append-to-body>
+    <el-dialog v-if="petVisible" :close-on-click-modal="false" :show-close="true" :visible.sync="petVisible" append-to-body>
       <uploadPetClinicalData :subject-visit-id="data.Id" :data="data" :studyData="rowData" :allow-add-or-edit="(data.SubmitState * 1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload)) && hasPermi(['trials:trials-panel:visit:crc-upload:edit'])" /> 
     </el-dialog>
   </div>

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -423,7 +423,7 @@
       <DicomPreview :uid="uid" :studyList="uploadQueues" />
     </el-dialog>
     <!--pet-ct临床数据上传-->
-    <el-dialog v-if="petVisible" :show-close="true" :visible.sync="petVisible" append-to-body>
+    <el-dialog v-if="petVisible" :show-close="true" :close-on-click-modal="false" :visible.sync="petVisible" append-to-body>
       <uploadPetClinicalData :subject-visit-id="data.Id" :data="data" :studyData="studyData" :allow-add-or-edit="true"
         @getStudyInfo="getStudyInfo" />
     </el-dialog>

src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue

@@ -78,7 +78,7 @@
       </el-table-column>
     </el-table>
     <!--pet-ct临床数据预览-->
-    <el-dialog v-if="petVisible" :show-close="true" :visible.sync="petVisible" append-to-body>
+    <el-dialog v-if="petVisible" :close-on-click-modal="false" :show-close="true" :visible.sync="petVisible" append-to-body>
       <uploadPetClinicalData :subject-visit-id="data.Id" :data="data" :studyData="rowData" :allow-add-or-edit="false" />
     </el-dialog>
   </div>

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -920,7 +920,7 @@
       <!--      </el-button>-->
     </div>
     <!--petct临床数据预览-->
-    <el-dialog v-if="petVisible" :show-close="true" :visible.sync="petVisible" append-to-body>
+    <el-dialog v-if="petVisible" :close-on-click-modal="false" :show-close="true" :visible.sync="petVisible" append-to-body>
       <uploadPetClinicalData :subject-visit-id="data.Id" :data="data" :studyData="rowData" :allow-add-or-edit="false" :isPatientFormAllowEdit="!isAudit || SecondReviewState > 0 || isAuditToEdit" :isAudit="isAuditToEdit" @close="petVisible = false"/>
     </el-dialog>
   </div>