From 1f6fdb53410c7f700f2b0767d5e07d6a005865c8 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 4 Aug 2020 16:27:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E7=8F=AD=E8=AE=A1=E5=88=92=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayNew/index.vue      | 8 ++++++++
 src/views/newMap/displayNew/menuDemon.vue  | 7 ++++---
 src/views/newMap/displayNew/menuSchema.vue | 5 +++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 1eda06e67..ddfcac5ca 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -20,6 +20,7 @@
         @devicemodel="devicemodel"
         @showScheduling="showScheduling"
         @schedulingView="schedulingView"
+        @hideScheduling="hideScheduling"
         @switchStationMode="switchStationMode"
       />
       <menu-lesson
@@ -498,6 +499,13 @@ export default {
         schedulingView() {
             this.$refs.schedulingView.doShow();
         },
+        hideScheduling(running) {
+            if (running) {
+                this.$refs.scheduling.doClose();
+            } else {
+                this.$refs.schedulingView.doClose();
+            }
+        },
         showdriving() {
             this.panelShow = true;
             this.drivingShow = false;
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index cbda2d2e7..3846959a8 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -156,9 +156,9 @@ export default {
         '$store.state.socket.simulationOver':function(val) {
             !this.isGoback && this.back();
         },
-        '$store.state.training.started': function (val) {
-            this.setRuning(val);
-        },
+        // '$store.state.training.started': function (val) {
+        //     this.setRuning(val);
+        // },
         '$store.state.socket.simulationStart':function(val) {
             if (val) {
                 this.setRuning(true);
@@ -262,6 +262,7 @@ export default {
         },
         setRuning(run) {
             this.runing = run;
+            this.$emit('hideScheduling', run);
         },
         end() {
             this.isDisable = false;
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index 35921eb29..139b0666c 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -202,6 +202,11 @@ export default {
         // },
         setRuning(run) {
             this.runing = run;
+            if (run) {
+                this.$refs.runPlanLoad.doClose();
+            } else {
+                this.$refs.runPlanView.doClose();
+            }
         },
         setFault() {
             this.$refs.faultChoose.doShow();