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-07-09 17:23:19 +08:00
commit 41a0ac6ebd
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/store/modules/map.js
View File

@ -749,8 +749,9 @@ const map = {
state.activeTrainListUpdate++; state.activeTrainListUpdate++;
}, },
resetActiveTrainList:(state) => { resetActiveTrainList:(state) => {
state.activeTrainListUpdate = 0;
state.activeTrainList = []; state.activeTrainList = [];
state.activeTrainListUpdate = 0;
state.activeTrainListChange = 0;
}, },
setDeleteCount: (state) => { setDeleteCount: (state) => {
state.deleteCount++; state.deleteCount++;

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

@ -177,6 +177,7 @@ export default {
this.$store.dispatch('training/setMapDefaultState').then(() => { this.$store.dispatch('training/setMapDefaultState').then(() => {
this.$store.dispatch('map/setRunPlanStatus', false); this.$store.dispatch('map/setRunPlanStatus', false);
this.$store.dispatch('map/clearJlmapTrainView'); this.$store.dispatch('map/clearJlmapTrainView');
this.$store.dispatch('map/resetActiveTrainList');
this.$store.dispatch('map/setTrainWindowShow', false); this.$store.dispatch('map/setTrainWindowShow', false);
}); });
}); });
@ -193,6 +194,7 @@ export default {
back() { back() {
this.$store.dispatch('training/over').then(() => { this.$store.dispatch('training/over').then(() => {
EventBus.$emit('runPlanStop'); EventBus.$emit('runPlanStop');
this.$store.dispatch('map/resetActiveTrainList');
EventBus.$emit('chatSubscribeStop'); EventBus.$emit('chatSubscribeStop');
history.go(-1); history.go(-1);
Notification.closeAll(); Notification.closeAll();

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

@ -301,6 +301,7 @@ export default {
this.memberId = ''; this.memberId = '';
this.$store.dispatch('map/setRunPlanStatus', false); this.$store.dispatch('map/setRunPlanStatus', false);
this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setPrdType', '01');
this.$store.dispatch('map/resetActiveTrainList');
// this.initAutoSaveScript(); // this.initAutoSaveScript();
this.$store.state.scriptRecord.bgSet; this.$store.state.scriptRecord.bgSet;
this.$store.dispatch('scriptRecord/updateBgSet', false); this.$store.dispatch('scriptRecord/updateBgSet', false);