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 2020-07-10 10:00:51 +08:00
commit 0d5be61a17
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/shape/Train/index.js
View File

@ -400,4 +400,8 @@ export default class Train extends Group {
this.isShowShape = false;
}
}
screenShow() {
// this.text && this.text.hide();
this.setState(this.model);
}
}

1
src/router/index_HYD.js
View File

@ -371,7 +371,6 @@ export const asyncRouter = [
path: 'mapPreview/:mapId',
component: MapPreview,
hidden: true
},
{ // 新版地图预览
path: 'mapPreviewNew/:mapId',

5
src/views/iscs/iscsSystem/groupNav.vue
View File

@ -306,6 +306,9 @@ export default {
}
});
}
if (!this.$route.params.mode) {
this.selectChildren(this.navList[0].children[0], 0);
}
},
mounted() {
window.onbeforeunload = this.clearSubscribe;
@ -362,7 +365,7 @@ export default {
}
}
},
selectChildren(item, index) { // 选择子菜单
selectChildren(item, index) { // 选择菜单
this.selectChildIndex = index;
this.type = item.type;
const query = {currentSystem: this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id, group: this.group };

7
src/views/iscs/iscsSystem/nav.vue
View File

@ -303,6 +303,11 @@ export default {
};
},
watch: {},
created() {
if (!this.$route.params.mode) {
this.selectChildren(this.navList[0].children[0], 0);
}
},
mounted() {
this.navList.forEach((nav, navIndex)=>{
if (nav.children && nav.children.length > 0) {
@ -333,7 +338,7 @@ export default {
}
}
},
selectChildren(item, index) { // 选择子菜单
selectChildren(item, index) { // 选择菜单
this.selectChildIndex = index;
this.type = item.type;
this.$router.push({ path: `/iscs/system/config/${item.type}`, query: {currentSystem:this.currentSystem, stationName: this.stationList[this.selectStationIndex].name, stationId: this.stationList[this.selectStationIndex].id } });

5
src/views/newMap/jointTrainingNew/index.vue
View File

@ -406,6 +406,7 @@ export default {
}
},
async getUserRole() {
console.log("getUserRole");
const res = await getSimulationUserInfo(this.group);
const data = res.data || {};
this.userRole = data.type || 'AUDIENCE';
@ -468,6 +469,7 @@ export default {
},
// 设置prdType和role
setSimulationPrdType(swch) {
console.log("setSimulationPrdType");
// Admin 管理员 Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号 IBP:IBP盘
switch (this.userRole) {
// case 'ADMIN': this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'ADMIN'); this.hideIbp(); break;
@ -578,7 +580,8 @@ export default {
hideIbp() {
Message.closeAll();
this.drivingShow = false;
console.log("hideIbp");
// this.drivingShow = false;
this.panelShow = true;
this.ibpShow = false;
if (this.$refs && this.$refs.ibpPlate) {