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-09 17:45:02 +08:00
commit 3061b83c6a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,6 +419,7 @@ export default {
this.scriptId = Number(resp.data.scriptId) || 0;
this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
this.planRunning = resp.data.planRunning;
this.$store.dispatch('map/setRunPlanStatus', this.planRunning);
if (!resp.data.planRunning) {
this.$store.dispatch('training/over');
}

2
src/views/scriptManage/display/tipScriptRecordNew.vue
View File

@ -102,6 +102,7 @@ export default {
},
beforeDestroy() {
// this.clearAutoSave();
this.$store.dispatch('map/resetActiveTrainList');
this.$store.dispatch('scriptRecord/updateBgSet', false);
this.$store.dispatch('scriptRecord/updateRole', null);
},
@ -111,7 +112,6 @@ export default {
this.backDisabled = response.data.bgSet;
this.mapLocation = response.data.mapLocation;
this.$store.dispatch('scriptRecord/updateBgSet', response.data.bgSet);
// if (response.data.bgSet) { this.$store.dispatch('map/setRunPlanStatus', true); }
});
},
methods:{