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-03-13 18:19:27 +08:00
parent 5733101b2b
commit 553900df47
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/jmapNew/theme/chengdu_03/menus/menuButton.vue
View File

@ -333,26 +333,48 @@ export default {
this.routeList.forEach(item => {
if (item.startSignalCode === deviceList[0].code && item.endSignalCode === deviceList[1].code) {
const operate = this.handelOperate(item);
console.log(operate, item);
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {});
}
});
}
},
handelFunctionButton(model, subType) {
const operate = {
send: true,
operation: this.$store.state.menuOperation.buttonOperation,
cmdType: '',
param: {}
};
if (model._type === 'StationStand' && subType === 'StopJumpLamp') {
operate.cmdType = CMD.Stand.CMD_STAND_SET_JUMP_STOP;
operate.param = {standCode: model.code, trainGroupNumber: ''};
} else if (model._type === 'StationStand' && subType === 'CancelStopJumpLamp') {
operate.cmdType = CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP;
operate.param = {standCode: model.code, trainGroupNumber: ''};
} else if (model._type === 'MapCycleButtonVO' ) {
operate.cmdType = CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK;
operate.param = {cycleCode: model.cycleCode};
}
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {});
console.log(operate);
},
selectedChange() {
// 按钮按下时
if (this.$store.state.menuOperation.buttonOperation) {
const model = this.$store.state.menuOperation.selected; // 选择设备
const subType = this.$store.state.menuOperation.subType; // 选择设备的子元素
this.deviceList.push(model);
console.log(model, '=============');
if (model._type) {
if (this.Signal.arrangementRoute.button.operation === this.$store.state.menuOperation.buttonOperation) {
if (model._type !== 'Signal') {
return;
}
this.arrangementRouteOperation(this.deviceList);
} if (this.$store.state.menuOperation.buttonOperation === this.MixinCommand.functionButton.button.operation) {
this.handelFunctionButton(model, subType);
} else {
const operate = this.handelOperate(model);
console.log(operate);
if (this.cmdTypeList.indexOf(model._type) >= 0) {
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
if (valid) {

6
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -91,7 +91,11 @@ export default {
/** 取消联锁自动触发 */
CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER: {value:'Signal_Cancel_CI_Auto_Trigger', label: '取消联锁自动触发'},
/** 查询进路状态 */
CMD_SIGNAL_DETAIL: {value:'Signal_Detail', label: '查询进路状态'}
CMD_SIGNAL_DETAIL: {value:'Signal_Detail', label: '查询进路状态'},
/** 设置自动折返 */
CMD_SIGNAL_SET_AUTO_TURN_BACK: {value: 'Signal_Set_Auto_Turn_Back', label: '设置自动折返'},
/** 取消自动折返 */
CMD_SIGNAL_CANCEL_AUTO_TURN_BACK: {value: 'Signal_Cancel_Auto_Turn_Back', label: '取消自动折返'}
},
// 物理区段操作

1
src/views/newMap/jlmapNew/index.vue
View File

@ -346,7 +346,6 @@ export default {
},
// 切换现地行调显示界面（绘图和预览页面下）
setShowMode(showMode) {
console.log(Vue.prototype.$theme, '==================', this.$store.state.map);
if (this.showMode !== showMode) {
this.setShowStation('');
this.$refs.switchStation.inintShowStation();