diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue index c72a5af..549ee4b 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue @@ -1302,7 +1302,7 @@ export default { // this.initWwc() this.imageId = instanceId } - + this.resetWwwc() this.stack.instanceId = instanceId var viewport = e.detail.viewport this.dicomInfo.wwwc = `${Math.round( 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 9dc33b9..bbb7df2 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -63,13 +63,8 @@
-
+
@@ -80,7 +75,8 @@
  • -
    +
    {{ item.label }}
    {{ `${item.ww} / ${item.wc}` }}
    @@ -94,7 +90,8 @@ > W/L {{ $t('trials:reading:title:preset') }}
    --> - {{ ` ${$t('trials:reading:title:preset') }` }} + {{ ` + ${$t('trials:reading:title:preset')}` }}
    • @@ -117,62 +114,12 @@
    区域调窗
    --> - -
    - -
    - -
    - - - -
    -     - - -
    -
    - -
    - -
    {{ $t('trials:reading:button:zoom') }}
    -
    -     - - -
    -
    - -
    - -
    {{ $t('trials:reading:button:move') }}
    -
    -
    -
    +
    @@ -189,31 +136,17 @@
    - +
    -
    - +
    +
    -
    {{ fitType===1?$t('trials:reading:button:fitWindow'):$t('trials:reading:button:fitImage') }}
    -
    - - - -
    -
    - - -
    - -
    {{ $t('trials:reading:button:imageIndexSync') }}
    +
    {{ fitType === 1 ? $t('trials:reading:button:fitWindow') : + $t('trials:reading:button:fitImage') + }}
     - -
    -
    - -
    - -
    {{ $t('trials:reading:button:screenShot') }}
    -
    -     -
    +
    @@ -253,14 +171,9 @@
    -
    +
    {{ tool.text }}
    @@ -280,12 +193,10 @@
    {{ tool.text }}
    -->
    - +
    -
    +
    @@ -306,7 +217,8 @@
    - +
    @@ -343,57 +255,94 @@
    -
    +
    {{ $t('trials:reading:button:reset') }}
    - +     +
    - {{ $t('trials:reading:button:handbooks') }} + - {{ $t('trials:reading:button:clinicalData') }} + - {{ $t('trials:reading:button:customCfg') }} +
    -
    -
    - +
    + + :current-dicom-canvas-index="currentDicomCanvasIndex" :custom-wwc-tpl="customWwcTpl" + :data-canvas-uid="`dicomCanvas${i - 1}`" @setCornerstoneStyle="setCornerstoneStyle(i - 1)" + @setMeasureData="setMeasureData" @modifyMeasureData="modifyMeasureData" @scrollSync="scrollSync" + @selectViewCanvas="selectViewCanvas" />
    @@ -403,72 +352,34 @@
    - - - - - - + + + + + +

    Developing...

    - + {{ $t('trials:readingReport:button:skip') }} - + {{ $t('common:button:submit') }} @@ -485,24 +396,13 @@
    -->
    - + - + @@ -520,19 +420,15 @@ - + {{ $t('trials:reading:button:handbooks') }} - + @@ -542,103 +438,55 @@ - +
    {{ $t('common:dialogTitle:sign') }} - {{ `(${$t('common:label:sign')}${ currentUser })` }} + {{ + `(${$t('common:label:sign')}${currentUser})` }}
    - + - - + + - - - + + + - -
    + +

    {{ $t('trials:lugano:fusionDialog:label:ctSeries') }}

    - + - - + + - + @@ -649,41 +497,20 @@

    {{ $t('trials:lugano:fusionDialog:label:ptSeries') }}

    - - - + + + - + @@ -694,11 +521,7 @@ {{ $t('common:button:cancel') }} - + {{ $t('common:button:confirm') }} @@ -896,7 +719,7 @@ export default { signVisible: false, signCode: null, currentUser: zzSessionStorage.getItem('userName'), - + fusionSeries: { visible: false }, fusionForm: { studyID: '', @@ -973,7 +796,7 @@ export default { }, imageQualityIssues: { immediate: true, - handler(v) {} + handler(v) { } }, currentDicomCanvasIndex: { immediate: true, @@ -1034,14 +857,14 @@ export default { } console.log('getMeasureData') }) - DicomEvent.$on('getScreenshots', async(measuredData, callback) => { + DicomEvent.$on('getScreenshots', async (measuredData, callback) => { if (this.currentDicomCanvasIndex > -1) { await this.imageLocation(measuredData) if (!measuredData.isMarked) { callback() return } - setTimeout(async() => { + setTimeout(async () => { // var base64Str = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getScreenshots() const divForDownloadViewport = document.querySelector( `div[data-canvas-uid="dicomCanvas${this.currentDicomCanvasIndex}"]` @@ -1053,7 +876,7 @@ export default { }, 50) } }) - DicomEvent.$on('imageLocation', async(measuredData) => { + DicomEvent.$on('imageLocation', async (measuredData) => { return new Promise(async resolve => { if (!measuredData) return await this.imageLocation(measuredData) @@ -1154,6 +977,13 @@ export default { window.onresize = null }, methods: { + showPanel(e, toolName) { + if (toolName === 'layout') return false + e.currentTarget.firstChild.lastChild.style.display = 'block' + }, + toolMouseout(e) { + e.currentTarget.firstChild.lastChild.style.display = 'none' + }, clickShow() { this.listShow = !this.listShow; this.changeLayout() @@ -1212,54 +1042,54 @@ export default { var shortcutKeyEnum = this.hotKeyList[idx].shortcutKeyEnum if (shortcutKeyEnum === 1) { - // 前一图像视口 + // 前一图像视口 this.selectViewCanvas(-1) } else if (shortcutKeyEnum === 2) { - // 后一图像视口 + // 后一图像视口 this.selectViewCanvas(1) } else if (shortcutKeyEnum === 3) { - // 上一个序列 + // 上一个序列 const series = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].series DicomEvent.$emit('selectSeries', { seriesId: series.seriesId, studyId: series.studyId, offset: -1 }) } else if (shortcutKeyEnum === 4) { - // 下一个序列 + // 下一个序列 const series = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].series DicomEvent.$emit('selectSeries', { seriesId: series.seriesId, studyId: series.studyId, offset: 1 }) } else if (shortcutKeyEnum === 5) { - // 上一张图像 + // 上一张图像 this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].scrollPage(-1) } else if (shortcutKeyEnum === 6) { - // 下一张图像 + // 下一张图像 this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].scrollPage(1) } else if (shortcutKeyEnum === 7) { - // 向左旋转 + // 向左旋转 this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setRotate(false, false, -90, 4) } else if (shortcutKeyEnum === 8) { - // 向右旋转 + // 向右旋转 this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setRotate(false, false, 90, 5) } else if (shortcutKeyEnum === 9) { - // 水平翻转 + // 水平翻转 this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setRotate(true, false, 0, 3) } else if (shortcutKeyEnum === 10) { - // 垂直翻转 + // 垂直翻转 this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setRotate(false, true, 0, 2) } else if (shortcutKeyEnum === 11) { - // 放大 + // 放大 this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setZoomScale(1) } else if (shortcutKeyEnum === 12) { - // 缩小 + // 缩小 this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setZoomScale(0) } else if (shortcutKeyEnum === 13) { - // 适应图像 + // 适应图像 this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].fitToImage() } else if (shortcutKeyEnum === 14) { - // 适应窗口 + // 适应窗口 this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].fitToWindow() } else if (shortcutKeyEnum === 15) { - // 截图 + // 截图 this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].saveImage() } else if (shortcutKeyEnum === 16) { - // 反色 + // 反色 this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toggleInvert() } else if (shortcutKeyEnum === 17) { // 窗宽/窗位 @@ -1530,7 +1360,7 @@ export default { var loadImagePromises = [] var isScrollSync = this.isScrollSync if (this.isScrollSync) { - // 取消滚动同步 + // 取消滚动同步 this.isScrollSync = false } @@ -1545,8 +1375,8 @@ export default { var firstAddSeries = null var currentAddSeries = null if (this.isReadingTaskViewInOrder === 1) { - // 有序 - // 获取病灶第一次出现的访视序列 + // 有序 + // 获取病灶第一次出现的访视序列 var firstAddVisitTaskId = null var idx = this.visitTaskList[index].MeasureData.findIndex(item => { @@ -1604,10 +1434,10 @@ export default { } } } else { - // 无序 + // 无序 currentAddSeries = this.getSeriesInfoByMark(activeCanvasTaskId, obj) if (!currentAddSeries) { - // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息 + // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息 currentAddSeries = this.$refs[`dicomCanvas${this.maxCanvas - 1}`][0].series } firstAddSeries = currentAddSeries @@ -2366,7 +2196,7 @@ export default { this.$confirm(this.$t('trials:lugano:fusionDialog:message:checkSeries'), this.$t('trials:lugano:fusionDialog:warning'), { showCancelButton: false, type: 'warning' - }).then(() => {}).catch(() => {}) + }).then(() => { }).catch(() => { }) return } var count = Math.abs(this.ctSeriesInfo.instanceCount - this.petSeriesInfo.instanceCount) @@ -2376,7 +2206,7 @@ export default { type: 'warning' }).then(() => { this.fusion() - }).catch(() => {}) + }).catch(() => { }) } else { this.fusion() } @@ -2402,11 +2232,64 @@ export default { }