Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

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 = ''
-        let fulls = 'left=0,top=0,isPrimary=true,isInternal=true'
+    if (noreferrer) {
-        return window.open(url, name, fulls);
+        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},`
     }

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') }}
-                        <span style="color:red">
+                        <span
+                          style="color:red"
+                        >
                           {{
                           $fd('ExistDisease', isExistDisease) }}
                         </span>
@@ -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)
+        this.openWindow = await openWindow(routeData.href, '', false, true)
-        if (!this.openWindow) {
+        if (this.openWindow === false) {
           let html = `<div><span>${this.$t(
             'trials:reading:tip:MultiScreen2'
           )}</span><a style="color:#409EFF"
@@ -988,12 +982,15 @@ export default {
             dangerouslyUseHTMLString: true,
           })
           if (!confirm) return false
-          this.openWindow = await openWindow(routeData.href, '', true)
-        }
-      } else {
           this.openWindow = await openWindow(routeData.href, '', true, true)
         }
-      // this.openWindow = window.open(routeData.href, '_blank')
+      } else {
+        this.openWindow = window.open(
+          routeData.href,
+          '_blank',
+          'noopener,noreferrer'
+        )
+      }
     },
     handleSave(isPrompt) {
       return new Promise(async (resolve, reject) => {

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)
+        this.openWindow = await openWindow(routeData.href, '', false, true)
-        if (!this.openWindow) {
+        if (this.openWindow === false) {
           let html = `<div><span>${this.$t(
             'trials:reading:tip:MultiScreen2'
           )}</span><a style="color:#409EFF"
@@ -1058,11 +1050,14 @@ export default {
             dangerouslyUseHTMLString: true,
           })
           if (!confirm) return false
-          this.openWindow = await openWindow(routeData.href, '', true)
+          this.openWindow = await openWindow(routeData.href, '', true, true)
         }
       } else {
-        // this.openWindow = await openWindow(routeData.href, '', true, true)
+        this.openWindow = window.open(
-        // this.openWindow = window.open(routeData.href, '_blank')
+          routeData.href,
+          '_blank',
+          'noopener,noreferrer'
+        )
       }
     },
     handleSave(isPrompt) {