diff --git a/src/utils/splitScreen.js b/src/utils/splitScreen.js index 1112c68a..c973bdd4 100644 --- a/src/utils/splitScreen.js +++ b/src/utils/splitScreen.js @@ -52,9 +52,13 @@ function getScreen() { }) } -export async function openWindow(url, name, Skip = false) { +export async function openWindow(url, name, Skip = false, Currently = false) { // 判断浏览器是否兼容 // 高版本的谷歌,edge不支持跨屏,需要降低浏览器版本86.0版 + if (Currently) { + let fulls = 'left=0,top=0,isPrimary=true,isInternal=true' + return window.open(url, name, fulls); + } if (!window.getScreens && !window.getScreenDetails) { console.log('你的浏览器版本不支持多屏展示功能!'); return window.open(url, name); diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue index b937df3d..bcc5c0ab 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue @@ -742,7 +742,7 @@ export default { this.openWindow = await openWindow(routeData.href, '', true) } } else { - this.openWindow = window.open(routeData.href, "_blank"); + this.openWindow = await openWindow(routeData.href, '', true, true) } // this.openWindow = window.open(routeData.href, '_blank') }, diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue index d732e1a1..9c740f1a 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/VolumeViewport.vue @@ -59,10 +59,10 @@
Location: {{ `${Number(imageInfo.location).toFixed(digitPlaces)} mm` - }}
+ }}
Slice Thickness: {{ `${Number(imageInfo.sliceThickness).toFixed(digitPlaces)} mm` - }}
+ }}
WW/WL: {{ imageInfo.wwwc }}
@@ -674,7 +674,6 @@ export default { setTimeout(() => { csUtils.jumpToSlice(viewport.element, { imageIndex: data.SliceIndex }); }) } }) - res.volume.dimensionGroupNumber = 2; viewport.render() if (this.series.Modality === 'PT' || this.series.Modality === 'NM') { setTimeout(() => { @@ -687,7 +686,6 @@ export default { } await renderSegmentation(this.series, this.series.TaskInfo, this.viewportId, this.SegmentConfig, this.renderingEngineId, data.segment, this.actionConfiguration) DicomEvent.$emit('SegmentationLoading', this.viewportId) - console.log(data.segment, 'data.segment') if (data.segment) return false if (this.series.hasOwnProperty('curIndex')) return this.setFullScreen(this.series.curIndex) this.setFullScreen(Math.ceil((res.volume._imageIds.length - 1) / 2) - 1) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue index 754d8218..cd506e56 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue @@ -873,7 +873,7 @@ export default { this.openWindow = await openWindow(routeData.href, '', true) } } else { - this.openWindow = window.open(routeData.href, "_blank"); + this.openWindow = await openWindow(routeData.href, '', true, true) } // this.openWindow = window.open(routeData.href, '_blank') },