diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue index f86772a27..f1729ee68 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue @@ -138,7 +138,7 @@ export default { commit() { this.$refs['form'].validate((valid) => { if (valid) { - this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: OperationEvent.StationStand.setStopTime.menu.operation}); + this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: '设置站台停站时间'}); } // if (valid) { // const operate = { diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue index 0e04bdc45..f3e925117 100644 --- a/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue +++ b/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue @@ -208,7 +208,7 @@ export default { commit() { this.$refs['form'].validate((valid) => { if (valid) { - this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, Operation: OperationEvent.Section.setSpeed.menu.operation}); + this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, Operation: '速度控制'}); } }); // this.$refs['form'].validate((valid) => { diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue index 74bf1069a..03abd8285 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue @@ -222,7 +222,7 @@ export default { this.$store.dispatch('training/nextNew', step).then(({valid}) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', {break: true}); - this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: OperationEvent.Section.lock.menu.operation}); + this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: '轨道封锁'}); } }); }, @@ -238,7 +238,7 @@ export default { this.$store.dispatch('training/nextNew', step).then(({valid}) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', {break: true}); - this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: OperationEvent.Section.unlock.menu.operation}); + this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: '轨道封锁解除'}); } }); }, diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue index 46bb82141..9a40cbbdf 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue @@ -315,7 +315,7 @@ export default { this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true}); - this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected.code, operation: OperationEvent.Signal.arrangementRoute.menu.operation}); + this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: '始端/终端选择'}); } }).catch(() => { this.$refs.noticeInfo.doShow(step); @@ -334,7 +334,7 @@ export default { this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: OperationEvent.Signal.guide.menu.operation}); + this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: '引导信号'}); } }); }, @@ -351,7 +351,7 @@ export default { this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: OperationEvent.Signal.cancelTrainRoute.menu.operation}); + this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: '取消进路'}); } }); }, @@ -368,7 +368,7 @@ export default { this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: OperationEvent.Signal.lock.menu.operation }); + this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: '终端信号机封锁' }); } }).catch(() => { this.$refs.noticeInfo.doShow(step); @@ -387,7 +387,7 @@ export default { this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: OperationEvent.Signal.unlock.menu.operation}); + this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: '终端信号机解封'}); } }); }, @@ -404,7 +404,7 @@ export default { this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: OperationEvent.Signal.humanControl.menu.operation}); + this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: '关闭自动进路'}); } }); }, @@ -421,7 +421,7 @@ export default { this.$store.dispatch('training/nextNew', step).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: OperationEvent.Signal.atsAutoControl.menu.operation}); + this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: '开放自动进路'}); } }); }, diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue index 2f545b37d..da9d1191b 100644 --- a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue +++ b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue @@ -213,7 +213,7 @@ export default { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: OperationEvent.Switch.lock.menu.operation } ); + this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: '道岔单锁' } ); // this.$refs.switchControl.doShow(operate, this.selected); } }); @@ -230,7 +230,7 @@ export default { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: OperationEvent.Switch.unlock.menu.operation }); + this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: '道岔单解' }); // this.$refs.switchControl.doShow(operate, this.selected); } }); @@ -247,7 +247,7 @@ export default { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: OperationEvent.Switch.locate.menu.operation}); + this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: '道岔定位'}); // this.$refs.switchControl.doShow(operate, this.selected); } }); @@ -264,7 +264,7 @@ export default { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); - this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: OperationEvent.Switch.reverse.menu.operation }); + this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: '道岔反位' }); // this.$refs.switchControl.doShow(operate, this.selected); } }); diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue index 09cdad72c..c6a34b206 100644 --- a/src/views/newMap/mapsystemNew/common/index.vue +++ b/src/views/newMap/mapsystemNew/common/index.vue @@ -114,7 +114,7 @@ export default { var device = null; this.point = { x: em.clientX, y: em.clientY }; - + const lineCode = this.$store.getters['map/lineCode']; if (em.subType === 'TrainWindow') { device = { _type: deviceType.Train, code: em.deviceCode }; this.$store.dispatch('map/setTrainWindowShow', true); @@ -137,6 +137,9 @@ export default { if (!this.checkShouldPop(device)) { this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: null }); } else { + if (em.deviceType === 'StationStand' && lineCode === '01') { + return; + } menu = getDeviceMenuByDeviceType(device._type); this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu }); }