From fe5b1a805ba4187c17dd3233154d54106f459d3f Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 22 Apr 2026 15:08:09 +0800 Subject: [PATCH] 1 --- .../dicoms3D/components/ReportPage.vue | 25 ++++++++----------- .../components/customize/ReportPage.vue | 21 ++++++---------- 2 files changed, 19 insertions(+), 27 deletions(-) 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' )}