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_dispaly

Browse Source
This commit is contained in:
joylink_cuiweidong 2022-12-13 14:01:04 +08:00
commit ef8fab3f7b
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/theme/xian_02/menus/menuSignal.vue
View File

@ -225,9 +225,9 @@ export default {
'$store.state.menuOperation.leftClickCount': function (val) { '$store.state.menuOperation.leftClickCount': function (val) {
// const control = MenuContextHandler.getStationControl(this.selected); // const control = MenuContextHandler.getStationControl(this.selected);
// const centralStation = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode); // const centralStation = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work); if (this.selected._type === 'Signal') {
if (this.selected._type === 'Signal' && status) { const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
this.arrangementRoute(); status && this.arrangementRoute();
} }
} }
}, },

2
src/views/newMap/display/terminals/index.vue
View File

@ -164,8 +164,6 @@ export default {
this.setCentralizedStationList(map); // 获取集中站列表 this.setCentralizedStationList(map); // 获取集中站列表
if (this.$route.query.client) { if (this.$route.query.client) {
this.pictureChange(this.$route.query.client); this.pictureChange(this.$route.query.client);
} else if (!this.$store.state.training.roles) {
this.pictureChange('dispatchWork');
} }
} }
} catch (error) { } catch (error) {

5
src/views/newMap/display/terminals/terminalMenu.vue
View File

@ -236,6 +236,11 @@ export default {
} }
} }
}, },
'$store.state.training.memberList': function (val) {
if (!this.$store.state.training.roles) {
this.changePictureShow('dispatchWork');
}
},
'$store.state.socket.simulationWorkParam': function (val) { '$store.state.socket.simulationWorkParam': function (val) {
if (val) { if (val) {
this.itemMap = val.itemMap || {}; this.itemMap = val.itemMap || {};

2
src/views/newMap/display/trainingList/trainingMenu.vue
View File

@ -227,7 +227,7 @@ export default {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 15px; left: 15px;
z-index: 10; z-index: 40;
} }
.elem-span{ .elem-span{

2
src/views/newMap/display/trainingList/trainingTip.vue
View File

@ -80,7 +80,7 @@ export default {
color: #000; color: #000;
line-height: 180%; line-height: 180%;
// z-index: 1501; // z-index: 1501;
z-index: 35; z-index: 39;
font-size: 14px; font-size: 14px;
} }
</style> </style>