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:
sunzhenyu 2020-12-16 13:54:26 +08:00
commit d08be87108
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/newMap/displayNew/selectStation.vue
View File

@ -53,7 +53,6 @@ export default {
}); });
} }
}); });
console.log(this.showMemberId, 'ddddd');
this.switchStationMode( this.showMemberId); this.switchStationMode( this.showMemberId);
} }
}, },
@ -67,7 +66,6 @@ export default {
const station = this.$store.getters['map/getDeviceByCode'](member.deviceCode); const station = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
this.showStation = station.code; this.showStation = station.code;
const showStationCode = this.stationCentralizedMap[station.code]; const showStationCode = this.stationCentralizedMap[station.code];
console.log(station, member);
nameList.forEach(item => { nameList.forEach(item => {
if (this.$store.state.map.map[item] && this.$store.state.map.map[item].constructor === Array) { if (this.$store.state.map.map[item] && this.$store.state.map.map[item].constructor === Array) {
if (item === 'trainList') { if (item === 'trainList') {

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

@ -160,10 +160,10 @@ export default {
}, },
'$store.state.training.prdType': function (prdType) { '$store.state.training.prdType': function (prdType) {
this.setPosition(); this.setPosition();
if (prdType == '01' && this.$route.query.lineCode == '06') { if (prdType == '01') {
this.showSelectStation = true; this.showSelectStation = true;
this.cancelBigScreenMode(); this.cancelBigScreenMode();
} else if (prdType == '02' && this.$route.query.lineCode == '06') { } else if (prdType == '02') {
this.showSelectStation = false; this.showSelectStation = false;
this.cancelBigScreenMode(); this.cancelBigScreenMode();
} else if (prdType == '07') { // 大屏 } else if (prdType == '07') { // 大屏
@ -368,18 +368,14 @@ export default {
this.$store.dispatch('training/setRoles', 'DISPATCHER'); this.$store.dispatch('training/setRoles', 'DISPATCHER');
this.hideIbp(); this.hideIbp();
this.drivingShow = false; this.drivingShow = false;
if (this.lineCode === '07' || this.lineCode === '06') { this.mapViewLoadedOver && this.setShowStation('');
this.mapViewLoadedOver && this.setShowStation('');
}
this.jl3dmaintainershow = false; this.jl3dmaintainershow = false;
break; break;
case 'STATION_SUPERVISOR': case 'STATION_SUPERVISOR':
this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setPrdType', '01');
this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR'); this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR');
if (this.lineCode === '06' && deviceCode) { this.$refs.menuSchema.chiShowStation = deviceCode;
this.$refs.menuSchema.chiShowStation = deviceCode; this.mapViewLoadedOver && this.switchStationMode(deviceCode);
this.mapViewLoadedOver && this.switchStationMode(deviceCode);
}
this.jl3dmaintainershow = false; this.jl3dmaintainershow = false;
this.drivingShow = false; this.drivingShow = false;
break; break;

6
src/views/newMap/jointTrainingNew/menuSchema.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<div style="height:100%"> <div style="height:100%">
<div class="schema" :style="{top: offset+'px'}"> <div class="schema" :style="{top: offset+'px'}">
<el-select v-if="showSelectStation" v-model="chiShowStation" style="width: 100px;" size="small" @change="switchStationMode"> <!--<el-select v-if="showSelectStation" v-model="chiShowStation" style="width: 100px;" size="small" @change="switchStationMode">-->
<el-option v-for="item in stationList" :key="item.value" :label="item.name" :value="item.value" /> <!--<el-option v-for="item in stationList" :key="item.value" :label="item.name" :value="item.value" />-->
</el-select> <!--</el-select>-->
<el-button-group> <el-button-group>
<el-button v-if="userRole=== 'STATION_SUPERVISOR' && !$route.query.projectDevice" size="small" @click="goIbp">IBP盘</el-button> <el-button v-if="userRole=== 'STATION_SUPERVISOR' && !$route.query.projectDevice" size="small" @click="goIbp">IBP盘</el-button>
<el-button v-if="userRole=== 'DISPATCHER' && !$route.query.projectDevice" size="small" @click="goBigScreen">大屏</el-button> <el-button v-if="userRole=== 'DISPATCHER' && !$route.query.projectDevice" size="small" @click="goBigScreen">大屏</el-button>