From a9def7e6ae14363c95e8a2c4494da2c88fa26dcd Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 1 Jul 2024 17:04:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=85=E7=89=87=E5=AE=8C=E6=88=90=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E9=99=90=E5=88=B6=E5=B7=B2=E5=85=A5=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E6=A0=87=E6=B3=A8=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=81=9A=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/customize/CustomizeDicomCanvas.vue    | 9 +++++----
 .../reading/dicoms/tools/CircleRoi/CircleRoiTool.js      | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
index 4e754cae..312c853b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -777,7 +777,7 @@ export default {
             var uuid = toolState.data[i].uuid
             var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)
             if (idx > -1) {
-              var markName = this.measureData[idx].OrderMarkName
+              var markName = this.measureData[idx].MeasureData.data.remark
               if (this.disabledMarks.indexOf(markName) === -1 || !this.disabledMarks) {
                 measureData.ww = Math.round(viewport.voi.windowWidth)
                 measureData.wc = Math.round(viewport.voi.windowCenter)
@@ -988,10 +988,10 @@ export default {
         if (i > -1) {
           var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === toolState.data[i].uuid)
           if (idx > -1) {
-            console.log('mouseClick')
             DicomEvent.$emit('setCollapseActive', this.measureData[idx])
               const measureData = {}
-              var markName = this.measureData[idx].OrderMarkName
+              // var markName = this.measureData[idx].OrderMarkName
+              var markName = this.measureData[idx].MeasureData.data.remark
               if (this.activeToolName === 'Eraser' && this.disabledMarks.indexOf(markName) === -1) {
                 const questionInfo = this.measureData[idx]
                 this.$emit('moveMeasureData', { measureData, questionInfo })
@@ -1438,7 +1438,8 @@ export default {
       var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)
       if (idx > -1) {
         const measureData = {}
-        var markName = this.measureData[idx].OrderMarkName
+        // var markName = this.measureData[idx].OrderMarkName
+        var markName = this.measureData[idx].MeasureData.data.remark
         if (this.disabledMarks.indexOf(markName) === -1 || !this.disabledMarks) {
           var questionInfo = this.measureData[idx]
           const canvas = this.canvas.querySelector('canvas')
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/CircleRoi/CircleRoiTool.js b/src/views/trials/trials-panel/reading/dicoms/tools/CircleRoi/CircleRoiTool.js
index 10f7f01c..690cf7fa 100644
--- a/src/views/trials/trials-panel/reading/dicoms/tools/CircleRoi/CircleRoiTool.js
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/CircleRoi/CircleRoiTool.js
@@ -89,7 +89,6 @@ export default class CircleRoiTool extends cornerstoneTools.CircleRoiTool {
       renderDashed,
       centerPointRadius
     } = this.configuration
-    console.log(this.configuration)
     const newContext = getNewContext(canvasContext.canvas)
     const { rowPixelSpacing, colPixelSpacing } = getPixelSpacing(image)
     const lineDash = getModule('globalConfiguration').configuration.lineDash