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

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

Browse Source
This commit is contained in:
fan 2021-01-25 17:42:11 +08:00
commit b427f8a8e6
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jmapNew/theme/nanjing_02/menus/menuBar.vue
View File

@ -606,6 +606,7 @@ export default {
color: #8f8f8f !important; color: #8f8f8f !important;
background: #DDD im !important; background: #DDD im !important;
margin: 5px auto; margin: 5px auto;
cursor: not-allowed;
&:hover { &:hover {
color: #8f8f8f !important; color: #8f8f8f !important;
background: #DDD im !important; background: #DDD im !important;

7
src/jmapNew/theme/xian_02/menus/menuStation.vue
View File

@ -354,6 +354,13 @@ export default {
}); });
if (strategy) { if (strategy) {
commitOperate(menuOperate.StationControl.setBackStrategy, {stationCode: this.selected.code, id:strategy.id}, 3).then(({valid, operate})=>{ commitOperate(menuOperate.StationControl.setBackStrategy, {stationCode: this.selected.code, id:strategy.id}, 3).then(({valid, operate})=>{
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/pushRequestList', {
device: this.selected,
operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: type},
cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY,
param: {stationCodes:[this.selected.code]}
});
}).catch((error) => { }).catch((error) => {
console.error(error); console.error(error);
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();