From 2e442e6e8c9a355fe2dfffbff7b88caf51a5c560 Mon Sep 17 00:00:00 2001 From: sunleking Date: Sat, 13 Mar 2021 00:10:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B8=85=E9=99=A4chrome89=E7=89=88?= =?UTF-8?q?=E6=9C=AC=20windowopen=20=E7=9A=84noopener=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=89=93=E4=B8=8D=E5=BC=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/demon/selectIbp.vue | 2 +- src/views/newMap/displayNew/demonMenu.vue | 2 +- src/views/newMap/displayNew/lesson/index.vue | 2 +- src/views/newMap/displayNew/menuSchema.vue | 2 +- src/views/newMap/displayNew/practiceDisplay.vue | 4 ++-- src/views/newMap/jlmapNew/index.vue | 4 ++-- src/views/newMap/jointTrainingNew/index.vue | 8 ++++---- src/views/newMap/jointTrainingNew/menuDemon.vue | 12 ++++++------ src/views/newMap/jointTrainingNew/menuSchema.vue | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/views/newMap/displayNew/demon/selectIbp.vue b/src/views/newMap/displayNew/demon/selectIbp.vue index a6a0fc9d0..04fbf7a93 100644 --- a/src/views/newMap/displayNew/demon/selectIbp.vue +++ b/src/views/newMap/displayNew/demon/selectIbp.vue @@ -117,7 +117,7 @@ export default { // group: this.$route.query.group // } // }); - // window.open(routeData.href, '_blank', 'noopener noreferrer'); + // window.open(routeData.href, '_blank'); }, reloadTable() { diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue index 1ecd530ae..34fd13025 100644 --- a/src/views/newMap/displayNew/demonMenu.vue +++ b/src/views/newMap/displayNew/demonMenu.vue @@ -186,7 +186,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, jumpjl3dpassflow() { const routeData = this.$router.resolve({ diff --git a/src/views/newMap/displayNew/lesson/index.vue b/src/views/newMap/displayNew/lesson/index.vue index 5f456dee0..adba2d518 100644 --- a/src/views/newMap/displayNew/lesson/index.vue +++ b/src/views/newMap/displayNew/lesson/index.vue @@ -298,7 +298,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } } }; diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue index 158ab068c..1ece9e422 100644 --- a/src/views/newMap/displayNew/menuSchema.vue +++ b/src/views/newMap/displayNew/menuSchema.vue @@ -230,7 +230,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } } }; diff --git a/src/views/newMap/displayNew/practiceDisplay.vue b/src/views/newMap/displayNew/practiceDisplay.vue index f46cde214..03a208189 100644 --- a/src/views/newMap/displayNew/practiceDisplay.vue +++ b/src/views/newMap/displayNew/practiceDisplay.vue @@ -256,7 +256,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, contectUs() { this.$refs.contectUs.doShow(); @@ -273,7 +273,7 @@ export default { initTime: this.$store.state.training.initTime } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, dispatcherWorkStation() { if (this.openWindow) { diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index 9a29b6230..684201c8a 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -406,7 +406,7 @@ export default { deviceCode:em.deviceCode } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } else { } @@ -429,7 +429,7 @@ export default { deviceCode:em.deviceCode } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } else { } diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 44bd64e41..d01f1e086 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -444,7 +444,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, faultdevice() { const routeData = this.$router.resolve({ @@ -456,7 +456,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, showdriving() { this.panelShow = true; @@ -479,7 +479,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, hidepanel() { // 司机视角 if (this.$store.state.training.prdType == '04') { @@ -497,7 +497,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } }, diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index b918a9e85..85d2aa8d2 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -366,7 +366,7 @@ export default { lineCode:this.lineCode } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, jumpjl3dtraffictrain() { const routeData = this.$router.resolve({ @@ -379,7 +379,7 @@ export default { lineCode:this.lineCode } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, jumpjl3dfaultdevice() { this.$emit('faultdevice'); @@ -439,7 +439,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, handleTeach() { getPublishLessonListByMapId({mapId: this.mapId}).then(resp => { @@ -455,7 +455,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } else { this.$message.error('暂无教学系统数据！'); } @@ -472,7 +472,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } else { getPublishLessonListByMapId({mapId: this.mapId}).then(resp => { const lesson = resp.data.find(item => { @@ -487,7 +487,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } else { this.$message.error('暂无考试系统数据！'); } diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue index e6fa48239..806a91d56 100644 --- a/src/views/newMap/jointTrainingNew/menuSchema.vue +++ b/src/views/newMap/jointTrainingNew/menuSchema.vue @@ -208,7 +208,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, // 点击ibp预览 goIbp() { @@ -226,7 +226,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } else { this.$messageBox('本车站暂无IBP盘数据！'); } From 608d8b03f537a1fb134a81439d9aee0eaee2c5db Mon Sep 17 00:00:00 2001 From: sunleking Date: Sat, 13 Mar 2021 00:11:48 +0800 Subject: [PATCH 2/4] merge --- .../edit/testEditorModel/StationStandList.js | 20 +++++++++---------- src/utils/baseUrl.js | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/jlmap3d/edit/testEditorModel/StationStandList.js b/src/jlmap3d/edit/testEditorModel/StationStandList.js index fc68908e2..b10415873 100644 --- a/src/jlmap3d/edit/testEditorModel/StationStandList.js +++ b/src/jlmap3d/edit/testEditorModel/StationStandList.js @@ -95,16 +95,16 @@ export function StationStandList() { // jlmapstationdata.splice(0,1); console.log(standsdata); console.log(jlmapstationdata); - for(let i=0;i Date: Sat, 13 Mar 2021 00:15:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Revert=20"=E6=B8=85=E9=99=A4chrome89?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20windowopen=20=E7=9A=84noopener=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=89=93=E4=B8=8D=E5=BC=80=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2e442e6e8c9a355fe2dfffbff7b88caf51a5c560. # Conflicts: # src/views/newMap/displayNew/menuSchema.vue # src/views/newMap/jlmapNew/index.vue --- src/views/newMap/displayNew/demon/selectIbp.vue | 2 +- src/views/newMap/displayNew/demonMenu.vue | 2 +- src/views/newMap/displayNew/lesson/index.vue | 2 +- src/views/newMap/displayNew/practiceDisplay.vue | 4 ++-- src/views/newMap/jointTrainingNew/index.vue | 8 ++++---- src/views/newMap/jointTrainingNew/menuDemon.vue | 12 ++++++------ src/views/newMap/jointTrainingNew/menuSchema.vue | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/views/newMap/displayNew/demon/selectIbp.vue b/src/views/newMap/displayNew/demon/selectIbp.vue index 04fbf7a93..a6a0fc9d0 100644 --- a/src/views/newMap/displayNew/demon/selectIbp.vue +++ b/src/views/newMap/displayNew/demon/selectIbp.vue @@ -117,7 +117,7 @@ export default { // group: this.$route.query.group // } // }); - // window.open(routeData.href, '_blank'); + // window.open(routeData.href, '_blank', 'noopener noreferrer'); }, reloadTable() { diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue index 1eb38847b..53143e38d 100644 --- a/src/views/newMap/displayNew/demonMenu.vue +++ b/src/views/newMap/displayNew/demonMenu.vue @@ -200,7 +200,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); }, jumpjl3dpassflow() { const routeData = this.$router.resolve({ diff --git a/src/views/newMap/displayNew/lesson/index.vue b/src/views/newMap/displayNew/lesson/index.vue index 1bac01587..fe3588ddf 100644 --- a/src/views/newMap/displayNew/lesson/index.vue +++ b/src/views/newMap/displayNew/lesson/index.vue @@ -310,7 +310,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); } } }; diff --git a/src/views/newMap/displayNew/practiceDisplay.vue b/src/views/newMap/displayNew/practiceDisplay.vue index 2781760f2..cc15ec2e7 100644 --- a/src/views/newMap/displayNew/practiceDisplay.vue +++ b/src/views/newMap/displayNew/practiceDisplay.vue @@ -342,7 +342,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); }, contectUs() { this.$refs.contectUs.doShow(); @@ -359,7 +359,7 @@ export default { initTime: this.$store.state.training.initTime } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); }, dispatcherWorkStation() { if (this.openWindow) { diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 91e1a8e2a..d61510c01 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -446,7 +446,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); }, faultdevice() { const routeData = this.$router.resolve({ @@ -458,7 +458,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); }, showdriving() { this.panelShow = true; @@ -481,7 +481,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); }, hidepanel() { // 司机视角 if (this.$store.state.training.prdType == '04') { @@ -499,7 +499,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); } }, diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index 21e6b00ee..11bceca9e 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -386,7 +386,7 @@ export default { lineCode:this.lineCode } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); }, jumpjl3dtraffictrain() { const routeData = this.$router.resolve({ @@ -399,7 +399,7 @@ export default { lineCode:this.lineCode } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); }, jumpjl3dfaultdevice() { this.$emit('faultdevice'); @@ -459,7 +459,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); }, handleTeach() { getPublishLessonListByMapId({mapId: this.mapId}).then(resp => { @@ -475,7 +475,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); } else { this.$message.error('暂无教学系统数据！'); } @@ -495,7 +495,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); } else { getPublishLessonListByMapId({mapId: this.mapId}).then(resp => { const lesson = resp.data.find(item => { @@ -510,7 +510,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); } else { this.$message.error('暂无考试系统数据！'); } diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue index 536411230..8794af1d0 100644 --- a/src/views/newMap/jointTrainingNew/menuSchema.vue +++ b/src/views/newMap/jointTrainingNew/menuSchema.vue @@ -241,7 +241,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); }, goIscs() { const routeData = this.$router.resolve({ @@ -271,7 +271,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank'); + window.open(routeData.href, '_blank', 'noopener noreferrer'); } else { this.$messageBox('本车站暂无IBP盘数据！'); } From 37e98a7d5749f97216b64e52eada1df74d8e7e60 Mon Sep 17 00:00:00 2001 From: walker-sheng Date: Sat, 13 Mar 2021 00:20:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?89=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jlmap3d/edit/testEditorModel/StationStandList.js | 3 --- src/utils/baseUrl.js | 3 --- src/views/jlmap3d/simulation/jl3dsimulation.vue | 3 ++- src/views/messageBoard/manage.vue | 2 +- src/views/newMap/displayNew/demon/selectIbp.vue | 2 +- src/views/newMap/displayNew/demonMenu.vue | 10 +++++----- src/views/newMap/displayNew/lesson/index.vue | 2 +- src/views/newMap/displayNew/menuSchema.vue | 6 +----- src/views/newMap/displayNew/practiceDisplay.vue | 4 ++-- src/views/newMap/jlmapNew/index.vue | 12 ++---------- src/views/newMap/jointTrainingNew/index.vue | 8 ++++---- src/views/newMap/jointTrainingNew/menuDemon.vue | 12 ++++++------ src/views/newMap/jointTrainingNew/menuSchema.vue | 8 ++++---- 13 files changed, 29 insertions(+), 46 deletions(-) diff --git a/src/jlmap3d/edit/testEditorModel/StationStandList.js b/src/jlmap3d/edit/testEditorModel/StationStandList.js index 76cc771dc..13268eda9 100644 --- a/src/jlmap3d/edit/testEditorModel/StationStandList.js +++ b/src/jlmap3d/edit/testEditorModel/StationStandList.js @@ -92,7 +92,6 @@ export function StationStandList() { // console.log(jlmap3ddata); let jlmapstationdata = jlmapdata.stationList; let jlmapstanddata = jlmapdata.stationStandList; -<<<<<<< HEAD // jlmapstationdata.splice(0,1); console.log(standsdata); console.log(jlmapstationdata); @@ -109,7 +108,6 @@ export function StationStandList() { // console.log(jlmapstationdata); console.log(standsdata); -======= // // console.log(jlmapstationdata); // @@ -129,7 +127,6 @@ export function StationStandList() { // console.log(otherStation); // console.log(standsdata); // console.log(assetloader.modellist); ->>>>>>> a2103b0486cf23326ad0cba6d1488e6687de52e7 let stations = jlmap3ddata.stationstandlist.list; let num; let num2; diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index bf75c0528..9c4927a81 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -1,11 +1,8 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { -<<<<<<< HEAD // BASE_API = 'https://joylink.club/jlcloud'; -======= // BASE_API = 'https://api.joylink.club/jlcloud'; ->>>>>>> a2103b0486cf23326ad0cba6d1488e6687de52e7 BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 // BASE_API = 'http://192.168.8.129:9000'; // 旭强 diff --git a/src/views/jlmap3d/simulation/jl3dsimulation.vue b/src/views/jlmap3d/simulation/jl3dsimulation.vue index 3a4bcf503..cb9bd1c67 100644 --- a/src/views/jlmap3d/simulation/jl3dsimulation.vue +++ b/src/views/jlmap3d/simulation/jl3dsimulation.vue @@ -203,7 +203,8 @@ export default { lineCode:this.lineCode } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); + // window.open(routeData.href, '_blank'); }, back() { if (this.$route.query.projectDevice) { diff --git a/src/views/messageBoard/manage.vue b/src/views/messageBoard/manage.vue index ea0e9c9b5..f61b39b65 100644 --- a/src/views/messageBoard/manage.vue +++ b/src/views/messageBoard/manage.vue @@ -107,7 +107,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, handleUpdate(index, row) { this.$refs.createDraft.doShow(row); diff --git a/src/views/newMap/displayNew/demon/selectIbp.vue b/src/views/newMap/displayNew/demon/selectIbp.vue index a6a0fc9d0..04fbf7a93 100644 --- a/src/views/newMap/displayNew/demon/selectIbp.vue +++ b/src/views/newMap/displayNew/demon/selectIbp.vue @@ -117,7 +117,7 @@ export default { // group: this.$route.query.group // } // }); - // window.open(routeData.href, '_blank', 'noopener noreferrer'); + // window.open(routeData.href, '_blank'); }, reloadTable() { diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue index 53143e38d..6450d1c84 100644 --- a/src/views/newMap/displayNew/demonMenu.vue +++ b/src/views/newMap/displayNew/demonMenu.vue @@ -200,7 +200,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, jumpjl3dpassflow() { const routeData = this.$router.resolve({ @@ -213,7 +213,7 @@ export default { lineCode:this.lineCode } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, // jumpjl3dtrafficplan() { // const routeData = this.$router.resolve({ @@ -226,7 +226,7 @@ export default { // lineCode:this.lineCode // } // }); - // window.open(routeData.href, '_blank', 'noopener noreferrer'); + // window.open(routeData.href, '_blank'); // }, // jumpjl3dtraffictrain() { // const routeData = this.$router.resolve({ @@ -239,7 +239,7 @@ export default { // lineCode:this.lineCode // } // }); - // window.open(routeData.href, '_blank', 'noopener noreferrer'); + // window.open(routeData.href, '_blank'); // }, jumpjlmap3dFault() { const routeData = this.$router.resolve({ @@ -285,7 +285,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, contectUs() { this.$refs.contectUs.doShow(); diff --git a/src/views/newMap/displayNew/lesson/index.vue b/src/views/newMap/displayNew/lesson/index.vue index fe3588ddf..1bac01587 100644 --- a/src/views/newMap/displayNew/lesson/index.vue +++ b/src/views/newMap/displayNew/lesson/index.vue @@ -310,7 +310,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } } }; diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue index 0c4155f9d..20767219e 100644 --- a/src/views/newMap/displayNew/menuSchema.vue +++ b/src/views/newMap/displayNew/menuSchema.vue @@ -191,10 +191,7 @@ export default { noPreLogout: true } }); -<<<<<<< HEAD window.open(routeData.href, '_blank'); -======= - window.open(routeData.href, '_blank', 'noopener noreferrer'); }, goIbp() { const deviceCode = this.$refs.selectStation.showStation; @@ -211,7 +208,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } else { this.$messageBox('本车站暂无IBP盘数据！'); } @@ -223,7 +220,6 @@ export default { } }); ->>>>>>> a2103b0486cf23326ad0cba6d1488e6687de52e7 } } }; diff --git a/src/views/newMap/displayNew/practiceDisplay.vue b/src/views/newMap/displayNew/practiceDisplay.vue index cc15ec2e7..2781760f2 100644 --- a/src/views/newMap/displayNew/practiceDisplay.vue +++ b/src/views/newMap/displayNew/practiceDisplay.vue @@ -342,7 +342,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, contectUs() { this.$refs.contectUs.doShow(); @@ -359,7 +359,7 @@ export default { initTime: this.$store.state.training.initTime } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, dispatcherWorkStation() { if (this.openWindow) { diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index 5ec1a1679..cb2985d6b 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -407,13 +407,9 @@ export default { deviceCode:em.deviceCode } }); -<<<<<<< HEAD window.open(routeData.href, '_blank'); } else { - -======= - window.open(routeData.href, '_blank', 'noopener noreferrer'); ->>>>>>> a2103b0486cf23326ad0cba6d1488e6687de52e7 + window.open(routeData.href, '_blank'); } }); } @@ -432,13 +428,9 @@ export default { deviceCode:em.deviceCode } }); -<<<<<<< HEAD window.open(routeData.href, '_blank'); } else { - -======= - window.open(routeData.href, '_blank', 'noopener noreferrer'); ->>>>>>> a2103b0486cf23326ad0cba6d1488e6687de52e7 + window.open(routeData.href, '_blank'); } }); diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index d61510c01..91e1a8e2a 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -446,7 +446,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, faultdevice() { const routeData = this.$router.resolve({ @@ -458,7 +458,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, showdriving() { this.panelShow = true; @@ -481,7 +481,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, hidepanel() { // 司机视角 if (this.$store.state.training.prdType == '04') { @@ -499,7 +499,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } }, diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index 11bceca9e..21e6b00ee 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -386,7 +386,7 @@ export default { lineCode:this.lineCode } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, jumpjl3dtraffictrain() { const routeData = this.$router.resolve({ @@ -399,7 +399,7 @@ export default { lineCode:this.lineCode } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, jumpjl3dfaultdevice() { this.$emit('faultdevice'); @@ -459,7 +459,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, handleTeach() { getPublishLessonListByMapId({mapId: this.mapId}).then(resp => { @@ -475,7 +475,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } else { this.$message.error('暂无教学系统数据！'); } @@ -495,7 +495,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } else { getPublishLessonListByMapId({mapId: this.mapId}).then(resp => { const lesson = resp.data.find(item => { @@ -510,7 +510,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } else { this.$message.error('暂无考试系统数据！'); } diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue index 8794af1d0..c2bef3f70 100644 --- a/src/views/newMap/jointTrainingNew/menuSchema.vue +++ b/src/views/newMap/jointTrainingNew/menuSchema.vue @@ -219,7 +219,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } else { this.$refs.runPlanView.doShow(); } @@ -241,7 +241,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, goIscs() { const routeData = this.$router.resolve({ @@ -253,7 +253,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); }, // 点击ibp预览 goIbp() { @@ -271,7 +271,7 @@ export default { noPreLogout: true } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); + window.open(routeData.href, '_blank'); } else { this.$messageBox('本车站暂无IBP盘数据！'); }