diff --git a/src/utils/splitScreen.js b/src/utils/splitScreen.js index c973bdd4..e185583b 100644 --- a/src/utils/splitScreen.js +++ b/src/utils/splitScreen.js @@ -52,22 +52,22 @@ function getScreen() { }) } -export async function openWindow(url, name, Skip = false, Currently = false) { +export async function openWindow(url, name, Skip = false, noreferrer = false) { // 判断浏览器是否兼容 // 高版本的谷歌,edge不支持跨屏,需要降低浏览器版本86.0版 - if (Currently) { - let fulls = 'left=0,top=0,isPrimary=true,isInternal=true' - return window.open(url, name, fulls); + let fulls = '' + if (noreferrer) { + fulls = 'noopener,noreferrer' } if (!window.getScreens && !window.getScreenDetails) { console.log('你的浏览器版本不支持多屏展示功能!'); - return window.open(url, name); + return window.open(url, name, fulls); } let permission = await getPermission() if (!permission) { // alert('使用多屏功能请先进行授权') if (Skip) { - return window.open(url, name); + return window.open(url, name, fulls); } return false } @@ -76,14 +76,13 @@ export async function openWindow(url, name, Skip = false, Currently = false) { // 判断是否2个屏幕 if (multiScreen.length < 2) { console.log('请接入多个显示屏!'); - return window.open(url, name); + return window.open(url, name, fulls); } console.log(screen, 'screen') // 获取当前屏幕availLeft信息和所有信息比对,取另一个屏幕数据 let currentAvailLeft = screen.availLeft ? screen.availLeft : '0' let newCurr = multiScreen.find((t) => t.availLeft != currentAvailLeft) console.log(newCurr, 'newCurr') - let fulls = '' for (let key in newCurr) { fulls += `${key}=${(newCurr[key] || newCurr[key] === 0) ? newCurr[key] : 0},` } 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 a5e9b79a..4594a05f 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue @@ -209,7 +209,9 @@ style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;" > {{ $t('trials:readingReport:title:sysEvaluationRes') }} - + {{ $fd('ExistDisease', isExistDisease) }} @@ -961,22 +963,14 @@ export default { var readingTool = this.$router.currentRoute.query.readingTool var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` const routeData = this.$router.resolve({ path }) - let a = document.createElement('a') - a.href = routeData.href - a.target = '_blank' - a.rel = 'noopener noreferrer' - document.body.appendChild(a) - a.click() - document.body.removeChild(a) - return false const res = await getAutoCutNextTask() let IsDoubleScreen = false if (res.IsSuccess) { IsDoubleScreen = res.Result.IsDoubleScreen } if (IsDoubleScreen) { - this.openWindow = await openWindow(routeData.href) - if (!this.openWindow) { + this.openWindow = await openWindow(routeData.href, '', false, true) + if (this.openWindow === false) { let html = `
${this.$t( 'trials:reading:tip:MultiScreen2' )} { 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 c4279c76..d6443d59 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 @@ -1031,22 +1031,14 @@ export default { var readingTool = this.$router.currentRoute.query.readingTool var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}` const routeData = this.$router.resolve({ path }) - let a = document.createElement('a') - a.href = routeData.href - a.target = '_blank' - a.rel = 'noopener noreferrer' - document.body.appendChild(a) - a.click() - document.body.removeChild(a) - return false const res = await getAutoCutNextTask() let IsDoubleScreen = false if (res.IsSuccess) { IsDoubleScreen = res.Result.IsDoubleScreen } if (IsDoubleScreen) { - this.openWindow = await openWindow(routeData.href) - if (!this.openWindow) { + this.openWindow = await openWindow(routeData.href, '', false, true) + if (this.openWindow === false) { let html = `
${this.$t( 'trials:reading:tip:MultiScreen2' )}