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_nanjing

Browse Source
This commit is contained in:
fan 2021-10-28 17:02:58 +08:00
commit 95d2200907
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/newMap/displayNew/index.vue
View File

@ -207,6 +207,7 @@ export default {
this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); // 是否暂停判断 this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); // 是否暂停判断
this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`)); this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
// this.$store.dispatch('training/countTime'); // this.$store.dispatch('training/countTime');
this.$store.dispatch('training/setPrdType', resp.data.prodType);
this.$store.dispatch('runPlan/setRunPlanInfo', resp.data.runPlan); this.$store.dispatch('runPlan/setRunPlanInfo', resp.data.runPlan);
this.planRunning = resp.data.planRunning; this.planRunning = resp.data.planRunning;
if (resp.data.planRunning) { if (resp.data.planRunning) {

15
src/views/newMap/displayNew/lesson/index.vue
View File

@ -102,9 +102,6 @@ export default {
isShowLeftSlider() { isShowLeftSlider() {
return this.$route.query.lessonId != '0' && !this.isOther; return this.$route.query.lessonId != '0' && !this.isOther;
}, },
prdType() {
return this.$route.query.prdType;
},
project() { project() {
return getSessionStorage('project'); return getSessionStorage('project');
}, },
@ -127,6 +124,18 @@ export default {
'$store.state.training.operateErrMsg': function (val) { '$store.state.training.operateErrMsg': function (val) {
this.tipInfo({ color: val.color, message: val.errMsg }); this.tipInfo({ color: val.color, message: val.errMsg });
}, },
'$store.state.training.simulationUserList': function(val) {
const userInfo = this.$store.state.training.simulationUserList.find(user => user.userId == this.$store.state.user.id );
if (userInfo.type === 'STATION_SUPERVISOR') {
this.$store.dispatch('map/setShowCentralizedStationCode', userInfo.deviceCode);
const mapDevice = this.$store.state.map.mapDevice;
const list = [];
for (const key in mapDevice) {
list.push(mapDevice[key]);
}
this.$jlmap.updateShowStation(list, userInfo.deviceCode);
}
},
async $route() { async $route() {
loadTrainingInSimulation(this.group, this.$route.query.trainingId).then(resp => { loadTrainingInSimulation(this.group, this.$route.query.trainingId).then(resp => {
this.setTrainingData(resp); this.setTrainingData(resp);