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

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

Browse Source
This commit is contained in:
fan 2022-12-29 14:43:07 +08:00
commit 7b0a043243
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,7 +234,6 @@ export default {
menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
this.menu.push(menuItem);
});
console.log('🚀 ~ file: menuBar.vue:224 ~ initMenu ~ menu', this.menu);
if (this.menu.length) {
this.menu[2].children = this.initStationList();
this.clickEvent();

5
src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
View File

@ -83,6 +83,11 @@ export default {
}
});
}
},
'$store.state.trainingNew.trainingSwitch': function (val) {
if (val && !this.unfold) {
this.unfold = true;
}
}
},
mounted() {

14
src/jmapNew/theme/chengdu_01/menus/passiveDialog/alarm.vue
View File

@ -130,13 +130,15 @@ export default {
if (elem.success) {
const operate = this.$store.state.training.operate;
const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
const newOperate = {
type: operate.type,
name: station.name
};
if (control && control.stationCode) {
const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
const newOperate = {
type: operate.type,
name: station.name
};
this.doShow(newOperate);
this.doShow(newOperate);
}
}
}
}

5
src/jmapNew/theme/xian_02/menus/menuRequest.vue
View File

@ -99,6 +99,11 @@ export default {
}
});
}
},
'$store.state.trainingNew.trainingSwitch': function (val) {
if (val && !this.unfold) {
this.unfold = true;
}
}
},
mounted() {