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 25ec4043..45712caf 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,31 +114,25 @@
    区域调窗
    --> - +
    -
    +
    - - + +
    - +
    -
    +
    @@ -149,14 +140,11 @@
    - +
    -
    +
    @@ -168,11 +156,7 @@
    -
    +
    @@ -189,26 +173,24 @@
    - +
    -
    - +
    +
    -
    {{ fitType===1?$t('trials:reading:button:fitWindow'):$t('trials:reading:button:fitImage') }}
    +
    {{ fitType === 1 ? $t('trials:reading:button:fitWindow') : + $t('trials:reading:button:fitImage') + }}
    - +
    -
    +
    @@ -226,12 +208,10 @@
    适应图像
    --> - +
    -
    +
    @@ -239,10 +219,7 @@
    -
    +
    @@ -253,14 +230,9 @@
    -
    +
    {{ tool.text }}
    @@ -280,12 +252,10 @@
    {{ tool.text }}
    -->
    - +
    -
    +
    @@ -306,7 +276,8 @@
    - +
    @@ -343,23 +314,64 @@
    -
    +
    {{ $t('trials:reading:button:reset') }}
    - +     +
    @@ -367,22 +379,15 @@
    {{ $t('trials:reading:button:upload') }}
    - +
    @@ -393,9 +398,11 @@
    - {{ $t('trials:reading:button:handbooks') }} + {{ + $t('trials:reading:button:handbooks') }} - {{ $t('trials:reading:button:clinicalData') }} + {{ + $t('trials:reading:button:clinicalData') }} {{ $t('trials:reading:button:customCfg') }} @@ -404,132 +411,73 @@
    -
    -
    - +
    + + :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" />
    -
    -
    - - - - - - +
    +
    + +
    + +
    + + + + + + + + + + +

    + Developing... +

    +
    +
    + + + {{ $t('trials:readingReport:button:skip') }} + + + + {{ $t('common:button:submit') }} + +
    +     - - - -

    - Developing... -

    -
    -
    - - - {{ $t('trials:readingReport:button:skip') }} - - - - {{ $t('common:button:submit') }} - -
    @@ -542,24 +490,13 @@
    -->
    - + - + @@ -577,19 +514,15 @@ - + {{ $t('trials:reading:button:handbooks') }} - + @@ -598,90 +531,46 @@
    - + - - + + - - - + + + - -
    + +

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

    - + - - + + - + @@ -692,41 +581,20 @@

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

    - - - + + + - + @@ -737,43 +605,24 @@ {{ $t('common:button:cancel') }} - + {{ $t('common:button:confirm') }} - - + + - +
    {{ $t('common:dialogTitle:sign') }} - {{ `(${$t('common:label:sign')}${ currentUser })` }} + {{ + `(${$t('common:label:sign')}${currentUser})` }}
    @@ -881,6 +730,12 @@ export default { default() { return 0 } + }, + studyShow: { + type: Boolean, + default() { + return true + } } }, data() { @@ -999,6 +854,10 @@ export default { signCode: null, currentUser: zzSessionStorage.getItem('userName'), tmpData: null, + + AspectRatio: 1, + listShow: true, + fullScreenIndex: -1, fullScreenWidth: window.innerWidth - 570 + 'px', fullScreenHeight: window.innerHeight - 130 + 'px' @@ -1056,7 +915,7 @@ export default { }, imageQualityIssues: { immediate: true, - handler(v) {} + handler(v) { } }, currentDicomCanvasIndex: { immediate: true, @@ -1122,14 +981,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}"]` @@ -1141,7 +1000,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) @@ -1215,6 +1074,14 @@ export default { this.petctWindow.close() } }) + let windowWidth = document.documentElement.clientWidth; + let windowHeight = document.documentElement.clientHeight; + this.AspectRatio = windowWidth / windowHeight + window.onresize = () => { + let windowWidth = document.documentElement.clientWidth; + let windowHeight = document.documentElement.clientHeight; + this.AspectRatio = windowWidth / windowHeight + }; }, beforeDestroy() { DicomEvent.$off('updateImage') @@ -1238,6 +1105,17 @@ export default { }) }, 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() + }, getTrialCriterion() { getCriterionReadingInfo({ TrialId: this.trialId || this.$route.query.trialId, @@ -1246,7 +1124,7 @@ export default { .then((res) => { this.trialCriterion = res.Result }) - .catch(() => {}) + .catch(() => { }) }, openUploadImage(status) { const idx = this.visitTaskList.findIndex(i => i.IsCurrentTask) @@ -1313,54 +1191,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) { // 窗宽/窗位 @@ -1408,6 +1286,10 @@ export default { zIndex: 10, } this.fullScreenIndex = this.currentDicomCanvasIndex + let w = 570 + if (!this.studyShow) w -= 170 + if (!this.listShow) w -= 330 + this.fullScreenWidth = window.innerWidth - w + 'px' } this.$nextTick(() => { for (var i = 0; i < this.maxCanvas; i++) { @@ -1628,14 +1510,14 @@ export default { var loadImagePromises = [] var isScrollSync = this.isScrollSync if (this.isScrollSync) { - // 取消滚动同步 + // 取消滚动同步 this.isScrollSync = false } var activeCanvasTaskId = obj.visitTaskId var index = this.visitTaskList.findIndex(i => i.VisitTaskId === activeCanvasTaskId) - if (index === -1) { + if (index === -1) { resolve() return } @@ -1643,8 +1525,8 @@ export default { var firstAddSeries = null var currentAddSeries = null if (this.isReadingTaskViewInOrder === 1) { - // 有序 - // 获取病灶第一次出现的访视序列 + // 有序 + // 获取病灶第一次出现的访视序列 var firstAddVisitTaskId = null var idx = this.visitTaskList[index].MeasureData.findIndex(item => { @@ -1702,10 +1584,10 @@ export default { } } } else { - // 无序 + // 无序 currentAddSeries = this.getSeriesInfoByMark(activeCanvasTaskId, obj) if (!currentAddSeries) { - // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息 + // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息 currentAddSeries = this.$refs[`dicomCanvas${this.maxCanvas - 1}`][0].series } firstAddSeries = currentAddSeries @@ -1796,7 +1678,7 @@ export default { var series = studyList[studyIdx].SeriesList[seriesIdx] const frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame // const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}` - let n = series.instanceInfoList.findIndex(k=>k.Id === instanceId) + let n = series.instanceInfoList.findIndex(k => k.Id === instanceId) let filterStr = '' if (n > -1 && series.isExistMutiFrames) { if (series.instanceInfoList[n].NumberOfFrames > 0) { @@ -1951,12 +1833,16 @@ export default { // 设置画布大小 setCanvasStyle() { - this.canvasW = (window.innerWidth - 570) / this.layoutCol + 'px' - this.canvasH = (window.innerHeight - 130) / this.layoutRow + 'px' + let w = 570 + if (!this.studyShow) w -= 170 + if (!this.listShow) w -= 330 + this.canvasW = (window.innerWidth - w) / (this.AspectRatio < 1 ? this.layoutRow : this.layoutCol) + 'px' + this.canvasH = (window.innerHeight - 130) / (this.AspectRatio < 1 ? this.layoutCol : this.layoutRow) + 'px' }, // 切换布局 changeLayout(name) { this.fullScreenIndex = -1 + if (!name) name = this.layout ? this.layout : 'A' if (this.activeTool) { if (this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].isCurrentTask && this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].readingTaskState < 2) { this.$nextTick(() => { @@ -2217,7 +2103,7 @@ export default { this.$refs['measurementList'].modifyMeasuredData(data) } this.activeTool = '' - + }, async saveImage() { // this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].saveImage() @@ -2267,13 +2153,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() - // } + 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() }, setImageIndexSync() { @@ -2487,7 +2373,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) @@ -2497,7 +2383,7 @@ export default { type: 'warning' }).then(() => { this.fusion() - }).catch(() => {}) + }).catch(() => { }) } else { this.fusion() } @@ -2523,11 +2409,12 @@ export default { } diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue index 5016e2ea..78bd94bc 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue @@ -1,6 +1,6 @@