diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue index 62fe6abf4..9a29b6230 100644 --- a/src/views/newMap/jlmapNew/index.vue +++ b/src/views/newMap/jlmapNew/index.vue @@ -383,7 +383,7 @@ export default { this.$store.dispatch('training/emitTipFresh'); }, - unConnect3d(code){ + unConnect3d(code) { }, // 点击选择事件 @@ -391,52 +391,49 @@ export default { const path = window.location.href; if (path.includes('/practiceDisplay')) { - - - if (em.deviceType == 'StationStand') { - runPassenger(this.$route.query.group,em.deviceCode).then(netdata => { - console.log(netdata); - if(netdata.data){ - const routeData = this.$router.resolve({ - path:'/jlmap3d/trafficplan', - query:{ - mapid:this.$route.query.mapId, - group:this.$route.query.group, - project: this.$route.query.project, - noPreLogout: true, - lineCode:this.$route.query.lineCode, - deviceCode:em.deviceCode - } - }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); - }else{ + runPassenger(this.$route.query.group, em.deviceCode).then(netdata => { + console.log(netdata); + if (netdata.data) { + const routeData = this.$router.resolve({ + path:'/jlmap3d/trafficplan', + query:{ + mapid:this.$route.query.mapId, + group:this.$route.query.group, + project: this.$route.query.project, + noPreLogout: true, + lineCode:this.$route.query.lineCode, + deviceCode:em.deviceCode + } + }); + window.open(routeData.href, '_blank', 'noopener noreferrer'); + } else { - } - }); + } + }); } if (em.deviceType == 'Train') { - runPassenger(this.$route.query.group,em.deviceCode).then(netdata => { - console.log(netdata); - if(netdata.data){ - const routeData = this.$router.resolve({ - path:'/jlmap3d/traffictrain', - query:{ - mapid:this.$route.query.mapId, - group:this.$route.query.group, - project: this.$route.query.project, - noPreLogout: true, - lineCode:this.$route.query.lineCode, - deviceCode:em.deviceCode + runPassenger(this.$route.query.group, em.deviceCode).then(netdata => { + console.log(netdata); + if (netdata.data) { + const routeData = this.$router.resolve({ + path:'/jlmap3d/traffictrain', + query:{ + mapid:this.$route.query.mapId, + group:this.$route.query.group, + project: this.$route.query.project, + noPreLogout: true, + lineCode:this.$route.query.lineCode, + deviceCode:em.deviceCode + } + }); + window.open(routeData.href, '_blank', 'noopener noreferrer'); + } else { + } }); - window.open(routeData.href, '_blank', 'noopener noreferrer'); - }else{ - - } - }); } } else { @@ -559,6 +556,7 @@ export default { -ms-user-select: none; user-select: none; background: #000; + float: left; } .title{ text-align: right; diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/preview.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/preview.vue index 091d3b7c8..6e4a5d0e3 100644 --- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/preview.vue +++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/preview.vue @@ -1,7 +1,7 @@ - diff --git a/src/views/planMonitor/editTool/routingoperate/routeMap.vue b/src/views/planMonitor/editTool/routingoperate/routeMap.vue new file mode 100644 index 000000000..889b36b85 --- /dev/null +++ b/src/views/planMonitor/editTool/routingoperate/routeMap.vue @@ -0,0 +1,742 @@ + + + + + + diff --git a/src/views/planMonitor/editTool/routingoperate/routeOperate.vue b/src/views/planMonitor/editTool/routingoperate/routeOperate.vue new file mode 100644 index 000000000..ab8284024 --- /dev/null +++ b/src/views/planMonitor/editTool/routingoperate/routeOperate.vue @@ -0,0 +1,289 @@ + + +