diff --git a/src/jmapNew/painter.js b/src/jmapNew/painter.js index d20eacd1f..9ffd9be90 100644 --- a/src/jmapNew/painter.js +++ b/src/jmapNew/painter.js @@ -96,7 +96,7 @@ class Painter { const instance = device.instance; if (instance) { this.mapInstanceLevel[device._type].remove(instance); - device.instance = null; + // device.instance = null; } } diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js index c085f91fd..ca28c0d7f 100644 --- a/src/jmapNew/shape/graph/Train/index.js +++ b/src/jmapNew/shape/graph/Train/index.js @@ -344,7 +344,7 @@ export default class Train extends Group { // 设置状态 setState(model, object) { const flag = model && model.trainWindowModel ? model.trainWindowModel.reversal : false; - if (!this.model.sectionModel || !store.getters['map/checkDeviceShow'](this.model.sectionModel.code) || !store.state.training.started) { + if (!this.model.sectionModel || !store.getters['map/checkDeviceShow'](this.model.sectionModel.code)) { this.eachChild(item => { item.hide(); }); } else if (model) { this.recover(); diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue index b7cd67993..7297e3748 100644 --- a/src/views/newMap/jointTrainingNew/menuDemon.vue +++ b/src/views/newMap/jointTrainingNew/menuDemon.vue @@ -370,6 +370,7 @@ export default { }, end() { exitRunPlan(this.group).then(()=>{ + this.$store.dispatch('map/clearJlmapTrainView'); this.$store.dispatch('map/setTrainWindowShow', false); this.$store.dispatch('map/resetActiveTrainList', false); }).catch(() => {