From 21e2455472ad941852f8aad7d62d4cd99e18f461 Mon Sep 17 00:00:00 2001 From: fan <18706759286@163.com> Date: Tue, 12 Jan 2021 18:26:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=99=BB=E5=BD=95=E8=A1=8C?= =?UTF-8?q?=E8=B0=83=20=E8=BF=90=E8=A1=8C=E5=9B=BE=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 6 + .../displayNew/demon/runPlanViewWindow.vue | 564 ++++++++++++++++++ .../newMap/jointTrainingNew/menuSchema.vue | 16 +- src/views/system/deviceManage/index.vue | 2 +- 4 files changed, 586 insertions(+), 2 deletions(-) create mode 100644 src/views/newMap/displayNew/demon/runPlanViewWindow.vue diff --git a/src/router/index.js b/src/router/index.js index ed9cb433b..3cae3f850 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -140,6 +140,7 @@ const MessageBoard = () => import('@/views/messageBoard/index'); const BoardManage = () => import('@/views/messageBoard/manage'); const DraftLessonManage = () => import('@/views/teach/draftLessonManage'); const OrganizationManage = () => import('@/views/organization/index'); +const RunPlanViewWindow = () => import('@/views/newMap/displayNew/demon/runPlanViewWindow'); // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig'; // import { getSessionStorage } from '@/utils/auth'; @@ -232,6 +233,11 @@ export const constantRoutes = [ component: PlanMonitorEditAUSTool, hidden: true }, + { + path: '/runPlanViewWindow', + component: RunPlanViewWindow, + hidden: true + }, { path: '/jlmap3d/sandbox', component: Jlmap3dSandbox, diff --git a/src/views/newMap/displayNew/demon/runPlanViewWindow.vue b/src/views/newMap/displayNew/demon/runPlanViewWindow.vue new file mode 100644 index 000000000..6b7139952 --- /dev/null +++ b/src/views/newMap/displayNew/demon/runPlanViewWindow.vue @@ -0,0 +1,564 @@ + + + + diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue index a6d4a2607..e1135bceb 100644 --- a/src/views/newMap/jointTrainingNew/menuSchema.vue +++ b/src/views/newMap/jointTrainingNew/menuSchema.vue @@ -198,7 +198,21 @@ export default { this.$emit('runPlanLoadShow'); }, viewRunPlan() { - this.$refs.runPlanView.doShow(); + if (this.$route.query.type === 'CW') { + const routeData = this.$router.resolve({ + path:`/runPlanViewWindow`, + query:{ + lineCode: this.$route.query.lineCode, + mapId:this.$route.query.mapId, + group:this.$route.query.group, + initTime: this.$store.state.training.initTime, + noPreLogout: true + } + }); + window.open(routeData.href, '_blank', 'noopener noreferrer'); + } else { + this.$refs.runPlanView.doShow(); + } }, // 选择车站 switchStationMode(stationCode) { diff --git a/src/views/system/deviceManage/index.vue b/src/views/system/deviceManage/index.vue index 068756d2c..1b382f309 100644 --- a/src/views/system/deviceManage/index.vue +++ b/src/views/system/deviceManage/index.vue @@ -38,7 +38,7 @@ export default { pageIndex: 'pageNum' }, deviceTypeList:ConstConfig.ConstSelect.projectDeviceTypeList, - projectList: [{label:'西铁院', value: 'XTY'}, {label: '贵州装备', value:'GZB'}, {label: '哈尔滨', value:'HEB'}], + projectList: [{label:'西铁院', value: 'XTY'}, {label: '贵州装备', value:'GZB'}, {label: '哈尔滨', value:'HEB'}, {label: '苏电院', value:'SDY'}], projectMap: { designxty: 'XTY', designgzb: 'GZB',