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

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

Browse Source
This commit is contained in:
zyy 2020-03-17 16:12:26 +08:00
commit a7baf76513
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/theme/beijing_01/menus/dialog/switchControl.vue
View File

@ -34,11 +34,11 @@
</el-row> </el-row>
<el-row v-if="isLock" style="margin-top: 10px;"> <el-row v-if="isLock" style="margin-top: 10px;">
<el-col :span="11"> <el-col :span="11">
<el-radio v-model="lockRadio" label="1" style="display: block; text-align: center;"> <el-radio v-model="lockRadio" label="1" disabled style="display: block; text-align: center;">
道岔单锁</el-radio> 道岔单锁</el-radio>
</el-col> </el-col>
<el-col :span="11" :offset="2"> <el-col :span="11" :offset="2">
<el-radio v-model="lockRadio" label="2" disabled style="display: block; text-align: center;"> <el-radio v-model="lockRadio" label="2" style="display: block; text-align: center;">
道岔解锁</el-radio> 道岔解锁</el-radio>
</el-col> </el-col>
</el-row> </el-row>

4
src/jmapNew/theme/haerbin_01/menus/menuBar.vue
View File

@ -149,7 +149,9 @@ export default {
} }
}); });
this.colsNum = 24 / this.centralizedStationList1.length; this.colsNum = 24 / this.centralizedStationList1.length;
centralizedStationList.length && this.switchShowStation(centralizedStationList[0].code); if (this.$store.state.training.prdType == '01') {
centralizedStationList.length && this.switchShowStation(centralizedStationList[0].code);
}
}, },
switchShowStation(stationCode) { switchShowStation(stationCode) {
this.stationCode = stationCode; this.stationCode = stationCode;