diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue index 9de839a6..92a5efe9 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -462,11 +462,23 @@ v-if="fusionSeries.visible" :visible.sync="fusionSeries.visible" :close-on-click-modal="false" - :title="$t('trials:lugano:dialogTitle:fusion')" width="850px" > - - +
+ {{ $t('trials:lugano:dialogTitle:fusion') }} +
+ + + + + - +
@@ -778,7 +788,8 @@ export default { studyList: [], digitPlaces: 2, activeCanvasWW: null, - activeCanvasWC: null + activeCanvasWC: null, + activeTaskInfo: {} } }, @@ -799,12 +810,30 @@ export default { } }, lastCanvasTaskId: { + immediate: true, + handler(v) { + // if (v) { + // console.log('lastCanvasTaskId') + // const i = this.visitTaskList.findIndex(i => i.VisitTaskId === v) + // if (i < 0) return + // var studyList = this.visitTaskList[i].StudyList || [] + // studyList = studyList.filter(i => !i.IsCriticalSequence && i.Modalities.indexOf('CT') !== -1 && i.Modalities.indexOf('PT') !== -1) + // if (studyList.length === 0) return + // this.studyList = studyList + // } else { + // this.studyList = [] + // } + } + }, + activeSeries: { immediate: true, handler(v) { if (v) { - console.log('lastCanvasTaskId') - const i = this.visitTaskList.findIndex(i => i.VisitTaskId === v) + this.activeTaskInfo.taskName = v.taskBlindName + this.activeTaskInfo.visitTaskId = v.visitTaskId + const i = this.visitTaskList.findIndex(i => i.VisitTaskId === v.visitTaskId) if (i < 0) return + this.activeTaskInfo.visitTaskIndex = i var studyList = this.visitTaskList[i].StudyList || [] studyList = studyList.filter(i => !i.IsCriticalSequence && i.Modalities.indexOf('CT') !== -1 && i.Modalities.indexOf('PT') !== -1) if (studyList.length === 0) return @@ -1667,7 +1696,6 @@ export default { if (!this.wwwcList[this.currentDicomCanvasIndex]) { this.wwwcList[this.currentDicomCanvasIndex] = '1' } - // var stack = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].stack this.$refs['container'].focus() // if (stack.studyId) { // DicomEvent.$emit('toggleVisitList', stack) @@ -1874,7 +1902,7 @@ export default { this.$alert(this.$t('components:uploadvideo:message:xf4')) return } - const i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId) + const i = this.activeTaskInfo.visitTaskIndex if (i < 0) return if (this.studyList.length > 0) { this.fusionForm.studyID = this.studyList[0].StudyId diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue index 6d97b47d..32c6a026 100644 --- a/src/views/trials/trials-panel/reading/dicoms/index.vue +++ b/src/views/trials/trials-panel/reading/dicoms/index.vue @@ -568,7 +568,7 @@ export default { height:80%; } /deep/.el-dialog__body{ - padding: 10px; + padding: 20px; height: calc(100% - 120px); } .el-dialog__header{ diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Bidirectional/renderToolData.js b/src/views/trials/trials-panel/reading/dicoms/tools/Bidirectional/renderToolData.js index 03925d59..1d209e8d 100644 --- a/src/views/trials/trials-panel/reading/dicoms/tools/Bidirectional/renderToolData.js +++ b/src/views/trials/trials-panel/reading/dicoms/tools/Bidirectional/renderToolData.js @@ -156,7 +156,7 @@ const getTextBoxText = (data, rowPixelSpacing, colPixelSpacing) => { } const lengthText = ` L ${data.longestDiameter}${suffix}` - const widthText = ` W ${data.shortestDiameter}${suffix}` + const widthText = ` S ${data.shortestDiameter}${suffix}` const { labels } = data