From 3afa12711e701d795bc5f0a35a4ca33ce8349ab1 Mon Sep 17 00:00:00 2001 From: zyy <1787816799@qq.com> Date: Wed, 18 Mar 2020 18:47:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=93=88=E5=B0=94=E6=BB=A8?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=BA=95=E9=83=A8=E6=A0=8F=20=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/haerbin_01/menus/menuButton.vue | 317 +++++++++++++++++- .../theme/haerbin_01/menus/menuSignal.vue | 2 +- src/scripts/cmdPlugin/MenuContextHandler.js | 4 +- src/store/modules/menuoperation.js | 10 + src/views/newMap/displayNew/menuDemon.vue | 5 +- .../newMap/mapsystemNew/common/index.vue | 3 + src/views/planMonitor/editTool/index.vue | 2 +- .../editTool/menus/modifyingTask.vue | 7 +- 8 files changed, 336 insertions(+), 14 deletions(-) diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index ed1b72216..705823436 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -2,14 +2,241 @@
- + +
+ + + +
+ + +
+
+ 执行 + 取消 +
+
+ + + +
+
+ + +
+ 联锁 + 时刻表 + ATS +
+ +
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue index 609545c0b..6de9e9a6e 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue @@ -25,7 +25,7 @@ import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'; import { mapGetters } from 'vuex'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'; -import { querySignalStatus } from '@/api/simulation'; +// import { querySignalStatus } from '@/api/simulation'; export default { name: 'SignalMenu', diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js index 1c738b885..fc730f27a 100644 --- a/src/scripts/cmdPlugin/MenuContextHandler.js +++ b/src/scripts/cmdPlugin/MenuContextHandler.js @@ -94,8 +94,8 @@ class MenuContextHandler { if (control) { if (this.getPrdType() != '') { const type = State2SimulationMap[this.getPrdType()]; - // const status = State2ControlMap[control.controlMode]; // 判断当前模式 - const status = 'LocalStationControl'; + const status = State2ControlMap[control.controlMode]; // 判断当前模式 + // const status = 'LocalStationControl'; menu = [...menuList[type]]; // 特殊处理站台的右键操作( 因为小站台不允许有操作 ) if (selected._type == 'StationStand') { diff --git a/src/store/modules/menuoperation.js b/src/store/modules/menuoperation.js index 85be30852..b53cf5738 100644 --- a/src/store/modules/menuoperation.js +++ b/src/store/modules/menuoperation.js @@ -13,6 +13,7 @@ const menuOperation = { selected: {}, // 选中的地图对象 subType: '', // 选中的设备子元素类型 selectedCount: 0, // 选中对象变更标识 + setMenuChangeCount: 0, // 哈尔滨线路左键点击变更标识 menu: null, // 弹出菜单设备 menuPosition: {}, // 弹出菜单位置 menuCount: 0, // 弹出菜单变更标识 @@ -79,6 +80,11 @@ const menuOperation = { state.subType = selected.subType; state.selectedCount += 1; }, + setMenuChange: (state, selected) => { + state.selected = selected.device; + state.subType = selected.subType; + state.setMenuChangeCount += 1; + }, mbmpCountIncrement: (state) => { state.mbmpCount += 1; }, @@ -175,6 +181,10 @@ const menuOperation = { setSelected: ({ commit }, selected) => { commit('setSelected', selected); }, + // 改变哈尔滨底部菜单 + setMenuChange: ({ commit }, selected) => { + commit('setMenuChange', selected); + }, /** * 设置菜单 diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue index 948e2c5e0..6966ae6c7 100644 --- a/src/views/newMap/displayNew/menuDemon.vue +++ b/src/views/newMap/displayNew/menuDemon.vue @@ -5,7 +5,7 @@ {{ $t('display.demon.trialTime') }} {{ countTime }} -
+
{{ $t('display.demon.dispatchingPlan') }} {{ jl3dname }} @@ -275,4 +275,7 @@ export default { right: 20px; bottom: 15px; } + .display-type-hb{ + bottom: 105px; + } diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue index 3d80c57bb..61c462c0f 100644 --- a/src/views/newMap/mapsystemNew/common/index.vue +++ b/src/views/newMap/mapsystemNew/common/index.vue @@ -105,6 +105,9 @@ export default { } this.selected = device; this.$store.dispatch('menuOperation/setSelected', {device: device, subType: em.subType}); + if (this.$route.query.lineCode == '07') { + this.$store.dispatch('menuOperation/setMenuChange', {device: device, subType: em.subType}); + } this.$store.dispatch('training/emitTipFresh'); }, diff --git a/src/views/planMonitor/editTool/index.vue b/src/views/planMonitor/editTool/index.vue index 7ccb72e73..322b45e83 100644 --- a/src/views/planMonitor/editTool/index.vue +++ b/src/views/planMonitor/editTool/index.vue @@ -29,7 +29,7 @@ - + diff --git a/src/views/planMonitor/editTool/menus/modifyingTask.vue b/src/views/planMonitor/editTool/menus/modifyingTask.vue index 1ac699c64..44bb8184d 100644 --- a/src/views/planMonitor/editTool/menus/modifyingTask.vue +++ b/src/views/planMonitor/editTool/menus/modifyingTask.vue @@ -409,9 +409,10 @@ export default { } else { // 直接修改 updatePlanTrip(this.buildModel()).then(resp => { - this.$emit('dispatchOperate', { - dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query) - }); + // this.$emit('dispatchOperate', { + // dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query) + // }); + this.$emit('refresh'); this.$message.success(this.$t('planMonitor.modifying.modifyTaskSuccess')); }).catch(() => { this.$messageBox(this.$t('planMonitor.modifying.modifyTaskFailed'));