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

Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev

Browse Source
This commit is contained in:
zyy 2020-03-19 18:39:32 +08:00
commit 912f0f206f
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,7 +326,9 @@ export default {
operate.cmdType = CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL; operate.cmdType = CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL;
operate.param = {signalCode: deviceList[0].code}; operate.param = {signalCode: deviceList[0].code};
this.deviceList = []; this.deviceList = [];
this.$store.dispatch('training/nextNew', newOperate).then(({ valid, response }) => {}); this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
});
} }
} else if (deviceList.length === 2) { } else if (deviceList.length === 2) {
this.routeList.forEach(item => { this.routeList.forEach(item => {
@ -334,7 +336,9 @@ export default {
operate.cmdType = CMD.Signal.CMD_SIGNAL_SET_ROUTE; operate.cmdType = CMD.Signal.CMD_SIGNAL_SET_ROUTE;
operate.param = {routeCode: item.code}; operate.param = {routeCode: item.code};
this.deviceList = []; this.deviceList = [];
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}); this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
});
} }
}); });
} }
@ -414,6 +418,8 @@ export default {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.password.doShow(operate); this.$refs.password.doShow(operate);
} }
}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
}); });
} else { } else {
const operate = { const operate = {
@ -429,6 +435,8 @@ export default {
operate['operateNext'] = this.Command.close.password.operation; operate['operateNext'] = this.Command.close.password.operation;
this.$refs.password.doShow(operate); this.$refs.password.doShow(operate);
} }
}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
}); });
} }
} else if (deviceList.length === 2) { } else if (deviceList.length === 2) {
@ -442,7 +450,9 @@ export default {
if (item.startSignalCode === deviceList[0].code && item.endSignalCode === deviceList[1].code) { if (item.startSignalCode === deviceList[0].code && item.endSignalCode === deviceList[1].code) {
operate.param = {routeCode: item.code}; operate.param = {routeCode: item.code};
this.deviceList = []; this.deviceList = [];
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}); this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
});
} }
}); });
} }
@ -555,7 +565,9 @@ export default {
const operate = this.handelOperate(model); const operate = this.handelOperate(model);
if (this.cmdTypeList.indexOf(model._type) >= 0) { if (this.cmdTypeList.indexOf(model._type) >= 0) {
this.deviceList = []; this.deviceList = [];
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}); this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch(() => {
this.$refs.noticeInfo.doShow(operate);
});
} else { } else {
Handler.clear(); // 清空操作组 Handler.clear(); // 清空操作组
this.$store.dispatch('menuOperation/setButtonOperation', null); this.$store.dispatch('menuOperation/setButtonOperation', null);