Compare commits
No commits in common. "642c708c74902dc34d9273d198a29286c4aae19d" and "aa8831ce547b7e18f1c723a8352cc81bd8150b35" have entirely different histories.
642c708c74
...
aa8831ce54
|
|
@ -263,7 +263,7 @@ export default {
|
|||
series: '',
|
||||
ToolStateManager: null,
|
||||
renderedMeasured: [],
|
||||
measuredTools: ['Length', 'Bidirectional', 'ArrowAnnotate', 'RectangleRoi', 'Probe'],
|
||||
measuredTools: ['Length', 'Bidirectional', 'ArrowAnnotate', 'RectangleRoi'],
|
||||
measureData: [],
|
||||
selectedLesion: null,
|
||||
activeTool: 0, // 0:enable 1:passive 2:active
|
||||
|
|
@ -607,11 +607,7 @@ 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) {
|
||||
|
|
@ -620,9 +616,6 @@ 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
|
||||
},
|
||||
|
|
@ -699,7 +692,7 @@ export default {
|
|||
} else if (criterionType === 2) {
|
||||
this.disabledMarks = this.getMergeMarks(this.visitTaskList[idx].MeasureData)
|
||||
} else {
|
||||
this.disabledMarks = this.getDisabledMarks(this.visitTaskList[idx].MeasureData)
|
||||
this.disabledMarks = []
|
||||
}
|
||||
return true
|
||||
},
|
||||
|
|
@ -908,9 +901,6 @@ 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 })
|
||||
}
|
||||
|
|
@ -929,9 +919,6 @@ export default {
|
|||
}
|
||||
}
|
||||
})
|
||||
if (this.readingTaskState >= 2 && this.activeToolName && this.isCurrentTask) {
|
||||
cornerstoneTools.setToolActiveForElement(element, this.activeToolName, { mouseButtonMask: 1 })
|
||||
}
|
||||
},
|
||||
setMeasureDataVisible() {
|
||||
if (this.readingTaskState >= 2) return
|
||||
|
|
@ -999,7 +986,6 @@ 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)
|
||||
|
|
@ -1087,8 +1073,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)
|
||||
this.disabledMarks = []
|
||||
}
|
||||
|
||||
this.maxVistNum = this.visitTaskList[this.visitTaskList.length - 1].VisitTaskNum
|
||||
|
|
|
|||
|
|
@ -416,7 +416,7 @@
|
|||
<dicom-canvas
|
||||
v-if="canvasW"
|
||||
:ref="`dicomCanvas${i-1}`"
|
||||
:style="{width: fullScreenIndex === i-1 ? fullScreenWidth : canvasW,height: fullScreenIndex === i-1 ? fullScreenHeight : canvasH}"
|
||||
:style="{width:canvasW,height: canvasH}"
|
||||
:canvas-index="i-1"
|
||||
:is-active="i-1===currentDicomCanvasIndex"
|
||||
:is-scroll-sync="isScrollSync"
|
||||
|
|
@ -989,10 +989,7 @@ export default {
|
|||
signVisible: false,
|
||||
signCode: null,
|
||||
currentUser: zzSessionStorage.getItem('userName'),
|
||||
tmpData: null,
|
||||
fullScreenIndex: -1,
|
||||
fullScreenWidth: window.innerWidth - 570 + 'px',
|
||||
fullScreenHeight: window.innerHeight - 130 + 'px'
|
||||
tmpData: null
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -1382,25 +1379,22 @@ 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: '67px',
|
||||
top: '72px',
|
||||
left: '0px',
|
||||
right: '350px',
|
||||
zIndex: 10,
|
||||
zIndex: 10
|
||||
}
|
||||
this.fullScreenIndex = this.currentDicomCanvasIndex
|
||||
this.canvasW = window.innerWidth - 570 + 'px'
|
||||
this.canvasH = window.innerHeight - 130 + 'px'
|
||||
}
|
||||
this.$nextTick(() => {
|
||||
// this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].reloadCanvas()
|
||||
for (var i = 0; i < this.maxCanvas; i++) {
|
||||
this.$refs[`dicomCanvas${i}`][0].reloadCanvas()
|
||||
}
|
||||
|
|
@ -1947,7 +1941,6 @@ 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(() => {
|
||||
|
|
@ -2050,17 +2043,14 @@ 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) {
|
||||
if (!isCurrentTask || readingTaskState >= 2) {
|
||||
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 if (isCurrentTask && readingTaskState >= 2) {
|
||||
this.measuredTools[i].isDisabled = false
|
||||
e.target.style.cursor = 'pointer'
|
||||
} else if (isCurrentTask && readingTaskState < 2) {
|
||||
} else {
|
||||
// var obj = this.$refs['measurementList'].isCanActiveTool(toolName, true)
|
||||
var obj = this.$refs['measurementList'].isCanActiveTool(toolName, true)
|
||||
this.measuredTools[i].disabledReason = obj.reason
|
||||
|
|
@ -2097,7 +2087,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) {
|
||||
if (dicomSeries.isCurrentTask && isMeasuredTool && dicomSeries.readingTaskState < 2) {
|
||||
if (this.activeTool) {
|
||||
this.measuredTools.forEach(item => {
|
||||
this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setToolPassive(item.toolName)
|
||||
|
|
@ -2258,14 +2248,13 @@ export default {
|
|||
this.customWwc.visible = false
|
||||
},
|
||||
toggleInvert() {
|
||||
// if (this.activeTool === 'reversecolor') {
|
||||
// this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].resetWwwc()
|
||||
// this.activeTool = ''
|
||||
// } else {
|
||||
// this.activeTool = 'reversecolor'
|
||||
// this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toggleInvert()
|
||||
// }
|
||||
this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toggleInvert()
|
||||
if (this.activeTool === 'reversecolor') {
|
||||
this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].resetWwwc()
|
||||
this.activeTool = ''
|
||||
} else {
|
||||
this.activeTool = 'reversecolor'
|
||||
this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toggleInvert()
|
||||
}
|
||||
},
|
||||
setImageIndexSync() {
|
||||
this.isScrollSync = !this.isScrollSync
|
||||
|
|
|
|||
|
|
@ -556,7 +556,7 @@
|
|||
<dicom-canvas
|
||||
v-if="canvasW"
|
||||
:ref="`dicomCanvas${i - 1}`"
|
||||
:style="{width: fullScreenIndex === i-1 ? fullScreenWidth : canvasW,height: fullScreenIndex === i-1 ? fullScreenHeight : canvasH}"
|
||||
:style="{ width: canvasW, height: canvasH }"
|
||||
:canvas-index="i - 1"
|
||||
:is-active="i - 1 === currentDicomCanvasIndex"
|
||||
:is-scroll-sync="isScrollSync"
|
||||
|
|
@ -895,9 +895,6 @@ export default {
|
|||
uploadTrialCriterion: {},
|
||||
uploadStatus: 'upload',
|
||||
taskId: '',
|
||||
fullScreenIndex: -1,
|
||||
fullScreenWidth: window.innerWidth - 570 + 'px',
|
||||
fullScreenHeight: window.innerHeight - 128 + 'px'
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -1317,25 +1314,22 @@ 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: '70px',
|
||||
top: '72px',
|
||||
left: '205px',
|
||||
right: '350px',
|
||||
zIndex: 10,
|
||||
}
|
||||
this.fullScreenIndex = this.currentDicomCanvasIndex
|
||||
this.canvasW = window.innerWidth - 570 + 'px'
|
||||
this.canvasH = window.innerHeight - 130 + 'px'
|
||||
}
|
||||
this.$nextTick(() => {
|
||||
// this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].reloadCanvas()
|
||||
for (var i = 0; i < this.maxCanvas; i++) {
|
||||
this.$refs[`dicomCanvas${i}`][0].reloadCanvas()
|
||||
}
|
||||
|
|
@ -1934,7 +1928,6 @@ export default {
|
|||
},
|
||||
// 切换布局
|
||||
changeLayout(name) {
|
||||
this.fullScreenIndex = -1
|
||||
if (this.activeTool) {
|
||||
if (
|
||||
this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0]
|
||||
|
|
@ -2308,16 +2301,15 @@ export default {
|
|||
this.customWwc.visible = false
|
||||
},
|
||||
toggleInvert() {
|
||||
// if (this.activeTool === 'reversecolor') {
|
||||
// this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].resetWwwc()
|
||||
// this.activeTool = ''
|
||||
// } else {
|
||||
// this.activeTool = 'reversecolor'
|
||||
// this.$refs[
|
||||
// `dicomCanvas${this.currentDicomCanvasIndex}`
|
||||
// ][0].toggleInvert()
|
||||
// }
|
||||
this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toggleInvert()
|
||||
if (this.activeTool === 'reversecolor') {
|
||||
this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].resetWwwc()
|
||||
this.activeTool = ''
|
||||
} else {
|
||||
this.activeTool = 'reversecolor'
|
||||
this.$refs[
|
||||
`dicomCanvas${this.currentDicomCanvasIndex}`
|
||||
][0].toggleInvert()
|
||||
}
|
||||
},
|
||||
setImageIndexSync() {
|
||||
this.isScrollSync = !this.isScrollSync
|
||||
|
|
|
|||
Loading…
Reference in New Issue