joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

成都一号线菜单调整

Browse Source
This commit is contained in:
fan 2020-01-09 18:21:04 +08:00
parent 68180d0c83
commit e8b616b705
6 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue
View File

@ -138,7 +138,7 @@ export default {
commit() { commit() {
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if (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) { // if (valid) {
// const operate = { // const operate = {

2
src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue
View File

@ -208,7 +208,7 @@ export default {
commit() { commit() {
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if (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) => { // this.$refs['form'].validate((valid) => {

4
src/jmapNew/theme/chengdu_01/menus/menuSection.vue
View File

@ -222,7 +222,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({valid}) => { this.$store.dispatch('training/nextNew', step).then(({valid}) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', {break: true}); 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}) => { this.$store.dispatch('training/nextNew', step).then(({valid}) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', {break: true}); 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: '轨道封锁解除'});
} }
}); });
}, },

14
src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
View File

@ -315,7 +315,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true}); 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(() => { }).catch(() => {
this.$refs.noticeInfo.doShow(step); this.$refs.noticeInfo.doShow(step);
@ -334,7 +334,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => { this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); 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 }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); 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 }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); 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(() => { }).catch(() => {
this.$refs.noticeInfo.doShow(step); this.$refs.noticeInfo.doShow(step);
@ -387,7 +387,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); 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 }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); 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 }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); 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: '开放自动进路'});
} }
}); });
}, },

8
src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
View File

@ -213,7 +213,7 @@ export default {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); 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); // this.$refs.switchControl.doShow(operate, this.selected);
} }
}); });
@ -230,7 +230,7 @@ export default {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); 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); // this.$refs.switchControl.doShow(operate, this.selected);
} }
}); });
@ -247,7 +247,7 @@ export default {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); 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); // this.$refs.switchControl.doShow(operate, this.selected);
} }
}); });
@ -264,7 +264,7 @@ export default {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); 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); // this.$refs.switchControl.doShow(operate, this.selected);
} }
}); });

5
src/views/newMap/mapsystemNew/common/index.vue
View File

@ -114,7 +114,7 @@ export default {
var device = null; var device = null;
this.point = { x: em.clientX, y: em.clientY }; this.point = { x: em.clientX, y: em.clientY };
const lineCode = this.$store.getters['map/lineCode'];
if (em.subType === 'TrainWindow') { if (em.subType === 'TrainWindow') {
device = { _type: deviceType.Train, code: em.deviceCode }; device = { _type: deviceType.Train, code: em.deviceCode };
this.$store.dispatch('map/setTrainWindowShow', true); this.$store.dispatch('map/setTrainWindowShow', true);
@ -137,6 +137,9 @@ export default {
if (!this.checkShouldPop(device)) { if (!this.checkShouldPop(device)) {
this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: null }); this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: null });
} else { } else {
if (em.deviceType === 'StationStand' && lineCode === '01') {
return;
}
menu = getDeviceMenuByDeviceType(device._type); menu = getDeviceMenuByDeviceType(device._type);
this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu }); this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
} }