添加阅片完成支持添加临时标注（历史标注不允许更改）功能及阅片页面双击放大缺陷修复

2025-05-28 15:44:38 +08:00 · 2025-05-28 15:44:38 +08:00 · 049128b90e
parent 45e6a20988
commit 049128b90e
3 changed files with 50 additions and 18 deletions
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@ -263,7 +263,7 @@ export default {
      series: '',
      ToolStateManager: null,
      renderedMeasured: [],
-      measuredTools: ['Length', 'Bidirectional', 'ArrowAnnotate', 'RectangleRoi'],
+      measuredTools: ['Length', 'Bidirectional', 'ArrowAnnotate', 'RectangleRoi', 'Probe'],
      measureData: [],
      selectedLesion: null,
      activeTool: 0, // 0:enable  1:passive  2:active
@ -607,7 +607,11 @@ export default {
        if ((i.LesionType === 0 || i.LesionType === 1 || i.LesionType === 7) && i.IsFirstChangeTask) {
          arr.push(i.OrderMarkName)
        }
+        if (i.Id && this.readingTaskState >= 2) {
+          arr.push(i.OrderMarkName)
+        }
      })
+      console.log(arr)
      return arr
    },
    getMergeMarks(measureDatas) {
@ -616,6 +620,9 @@ export default {
        if ((i.LesionType === 0) && i.SplitOrMergeType === 1) {
          arr.push(i.OrderMarkName)
        }
+        if (i.Id && this.readingTaskState >= 2) {
+          arr.push(i.OrderMarkName)
+        }
      })
      return arr
    },
@ -692,7 +699,7 @@ export default {
      } else if (criterionType === 2) {
        this.disabledMarks = this.getMergeMarks(this.visitTaskList[idx].MeasureData)
      } else {
-        this.disabledMarks = []
+        this.disabledMarks = this.getDisabledMarks(this.visitTaskList[idx].MeasureData)
      }
      return true
    },
@ -901,6 +908,9 @@ export default {
            }
          } else if (this.activeTool === 1 && this.readingTaskState < 2) {
            cornerstoneTools.setToolPassiveForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
+          } else if (this.readingTaskState >= 2 && this.isCurrentTask) {
+            // setToolPassiveForElement
+            cornerstoneTools.setToolEnabledForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
          } else {
            cornerstoneTools.setToolEnabledForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
          }
@ -919,6 +929,9 @@ export default {
          }
        }
      })
+      if (this.readingTaskState >= 2 && this.activeToolName && this.isCurrentTask) {
+        cornerstoneTools.setToolActiveForElement(element, this.activeToolName, { mouseButtonMask: 1 })
+      }
    },
    setMeasureDataVisible() {
      if (this.readingTaskState >= 2) return
@ -986,6 +999,7 @@ export default {
      }
    },
    mouseClick(e) {
+      if (this.readingTaskState >= 2) return
      const { element, currentPoints, image, viewport } = e.detail
      var imageId = image.imageId
      const imageInfo = this.getInstanceInfo(imageId)
@ -1073,7 +1087,8 @@ export default {
        } else if (criterionType === 2) {
          this.disabledMarks = this.getMergeMarks(this.visitTaskList[idx].MeasureData)
        } else {
-          this.disabledMarks = []
+          // this.disabledMarks = []
+          this.disabledMarks = this.getDisabledMarks(this.visitTaskList[idx].MeasureData)
        }

        this.maxVistNum = this.visitTaskList[this.visitTaskList.length - 1].VisitTaskNum
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@ -416,7 +416,7 @@
            <dicom-canvas
              v-if="canvasW"
              :ref="`dicomCanvas${i-1}`"
-              :style="{width:canvasW,height: canvasH}"
+              :style="{width: fullScreenIndex === i-1 ? fullScreenWidth : canvasW,height: fullScreenIndex === i-1 ? fullScreenHeight : canvasH}"
              :canvas-index="i-1"
              :is-active="i-1===currentDicomCanvasIndex"
              :is-scroll-sync="isScrollSync"
@ -989,7 +989,10 @@ export default {
      signVisible: false,
      signCode: null,
      currentUser: zzSessionStorage.getItem('userName'),
-      tmpData: null
+      tmpData: null,
+      fullScreenIndex: -1,
+      fullScreenWidth: window.innerWidth - 570 + 'px',
+      fullScreenHeight: window.innerHeight - 130 + 'px'
    }
  },

@ -1379,22 +1382,25 @@ export default {
      this.personalConfigDialog.visible = true
    },
    setCornerstoneStyle(i) {
+      if (this.layoutCol === 1 && this.layoutRow === 1) {
+        this.fullScreenIndex = -1
+        return
+      }
      if (this.cornerstoneStyle.position) {
        this.cornerstoneStyle = {}
        this.setCanvasStyle()
+        this.fullScreenIndex = -1
      } else {
        this.cornerstoneStyle = {
          position: 'absolute',
-          top: '72px',
+          top: '67px',
          left: '0px',
          right: '350px',
-          zIndex: 10
+          zIndex: 10,
        }
-        this.canvasW = window.innerWidth - 570 + 'px'
-        this.canvasH = window.innerHeight - 130 + 'px'
+        this.fullScreenIndex = this.currentDicomCanvasIndex
      }
      this.$nextTick(() => {
-        // this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].reloadCanvas()
        for (var i = 0; i < this.maxCanvas; i++) {
          this.$refs[`dicomCanvas${i}`][0].reloadCanvas()
        }
@ -1941,6 +1947,7 @@ export default {
    },
    // 切换布局
    changeLayout(name) {
+      this.fullScreenIndex = -1
      if (this.activeTool) {
        if (this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].isCurrentTask && this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].readingTaskState < 2) {
          this.$nextTick(() => {
@ -2043,14 +2050,17 @@ export default {
      if (i === -1) return
      var isCurrentTask = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].isCurrentTask
      var readingTaskState = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].readingTaskState
-      if (!isCurrentTask || readingTaskState >= 2) {
+      if (!isCurrentTask) {
        this.measuredTools[i].isDisabled = true
        e.target.style.cursor = 'not-allowed'
        if (this.activeTool) {
          this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setToolEnabled(toolName)
          this.activeTool = ''
        }
-      } else {
+      } else if (isCurrentTask && readingTaskState >= 2) {
+        this.measuredTools[i].isDisabled = false
+        e.target.style.cursor = 'pointer'
+      } else if (isCurrentTask && readingTaskState < 2) {
        // var obj = this.$refs['measurementList'].isCanActiveTool(toolName, true)
        var obj = this.$refs['measurementList'].isCanActiveTool(toolName, true)
        this.measuredTools[i].disabledReason = obj.reason
@ -2087,7 +2097,7 @@ export default {
        var toolObj = this.measuredTools.find(i => i.toolName === toolName)
        if (!toolObj || toolObj.isDisabled) return
        var dicomSeries = this.canvasObj[this.currentDicomCanvasIndex]
-        if (dicomSeries.isCurrentTask && isMeasuredTool && dicomSeries.readingTaskState < 2) {
+        if (dicomSeries.isCurrentTask && isMeasuredTool) {
          if (this.activeTool) {
            this.measuredTools.forEach(item => {
              this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setToolPassive(item.toolName)
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@ -556,7 +556,7 @@
            <dicom-canvas
              v-if="canvasW"
              :ref="`dicomCanvas${i - 1}`"
-              :style="{ width: canvasW, height: canvasH }"
+              :style="{width: fullScreenIndex === i-1 ? fullScreenWidth : canvasW,height: fullScreenIndex === i-1 ? fullScreenHeight : canvasH}"
              :canvas-index="i - 1"
              :is-active="i - 1 === currentDicomCanvasIndex"
              :is-scroll-sync="isScrollSync"
@ -895,6 +895,9 @@ export default {
      uploadTrialCriterion: {},
      uploadStatus: 'upload',
      taskId: '',
+      fullScreenIndex: -1,
+      fullScreenWidth: window.innerWidth - 570 + 'px',
+      fullScreenHeight: window.innerHeight - 128 + 'px'
    }
  },

@ -1314,22 +1317,25 @@ export default {
      this.personalConfigDialog.visible = true
    },
    setCornerstoneStyle(i) {
+      if (this.layoutCol === 1 && this.layoutRow === 1) {
+        this.fullScreenIndex = -1
+        return
+      }
      if (this.cornerstoneStyle.position) {
        this.cornerstoneStyle = {}
        this.setCanvasStyle()
+        this.fullScreenIndex = -1
      } else {
        this.cornerstoneStyle = {
          position: 'absolute',
-          top: '72px',
+          top: '70px',
          left: '205px',
          right: '350px',
          zIndex: 10,
        }
-        this.canvasW = window.innerWidth - 570 + 'px'
-        this.canvasH = window.innerHeight - 130 + 'px'
+        this.fullScreenIndex = this.currentDicomCanvasIndex
      }
      this.$nextTick(() => {
-        // this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].reloadCanvas()
        for (var i = 0; i < this.maxCanvas; i++) {
          this.$refs[`dicomCanvas${i}`][0].reloadCanvas()
        }
@ -1928,6 +1934,7 @@ export default {
    },
    // 切换布局
    changeLayout(name) {
+      this.fullScreenIndex = -1
      if (this.activeTool) {
        if (
          this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0]