From 01f90f6a2d7b0c6ffcc9ec9bdf48e3c06fcb2da3 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Wed, 20 May 2020 10:50:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=89=E7=BB=B4=E7=AB=99?=
 =?UTF-8?q?=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connect/Jlmap3dSubscribeNew.js            |  1 +
 .../drive/drivecontrol/drivecontrol.vue       | 22 ++++++----------
 src/views/jlmap3d/drive/jl3ddrive.vue         | 25 +++++++++++++++++++
 src/views/newMap/displayNew/menuDemon.vue     |  2 +-
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
index 790191d3b..57285b9f7 100644
--- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
+++ b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
@@ -58,6 +58,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 			// 	// console.log(event.data);
 			//
 			// }
+			console.log(event.data);
 			if(event.data.type == "Device_Load_Destroy_3D"){
 				DeviceDestroy(event.data);
 				return;
diff --git a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
index ab1a69a8e..7392fc72b 100644
--- a/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
+++ b/src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
@@ -23,11 +23,7 @@
 
 
 <!--
-		<div class="msg" v-show ="msgshow">
-			<div class="msgtext">
-				{{controlmsg}}
-			</div>
-		</div>
+
 
 		<div class="switchpane" style="left:0;top:47.5%;transform: rotate(90deg);" v-show="switchleft" @tap="switchl">
 			<image class="switchimg" :src="jiantou" />
@@ -85,6 +81,7 @@ import axios from 'axios';
 				groupnum:"",
 				userrole:'',
 				drawWay:'',
+
 			}
 		},
 		watch: {
@@ -117,8 +114,11 @@ import axios from 'axios';
 					}
 				}
 
-				bindSimulationTrain(this.group,this.groupnum);
+				bindSimulationTrain(this.group,this.groupnum).then(netdata => {
+				}).catch(error => {
 
+					console.log(error);
+				});
 		 	},
 			clickselect(e){
 				if(e == true){
@@ -206,15 +206,7 @@ import axios from 'axios';
 		font-size: 4px;
 	}
 
-	.msgtext{
-		width:200px;
-		height:50px;
-		border-radius:5px;
-		background:#C0C0C0;
-		color:#FFFFFF;
-		font-size: 40px;
-		transform: rotate(90deg);
-	}
+
 
 	.switchpane{
 		width:30px;
diff --git a/src/views/jlmap3d/drive/jl3ddrive.vue b/src/views/jlmap3d/drive/jl3ddrive.vue
index f4cb8a55d..427ef654a 100644
--- a/src/views/jlmap3d/drive/jl3ddrive.vue
+++ b/src/views/jlmap3d/drive/jl3ddrive.vue
@@ -24,6 +24,12 @@
     <div id="jlcctv" v-show="cctvshow" class="jlmap3cctv">
     </div>
 
+    <div class="msg" v-show ="msgshow">
+      <div class="msgtext">
+        {{controlmsg}}
+      </div>
+    </div>
+
     <Drive-Mmi v-if="mmishow" ref="mmiui" />
 
     <Drive-Tms v-if="mmishow" />
@@ -80,6 +86,8 @@ export default {
 			trainnum: '',
 			stoptimes: '',
       dcontrolshow: false,
+      msgshow:false,
+      controlmsg:"不能选择其它列车",
 		};
 	},
 	watch: {
@@ -359,4 +367,21 @@ export default {
     left: 0;
     z-index: -12;
   }
+
+  .msg{
+    width:40%;
+    height:50px;
+    left:30%;
+    top:0;
+    text-align: center;
+    position:absolute;
+  }
+  .msgtext{
+    width:400px;
+    height:50px;
+    border-radius:5px;
+    background:#C0C0C0;
+    color:#FFFFFF;
+    font-size: 40px;
+  }
 </style>
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index b8f3287e9..8c877c830 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -10,7 +10,7 @@
       <el-button-group>
         <el-button v-if="isShowScheduling && !dataError" type="primary" @click="jumpScheduling">{{ $t('display.demon.dispatchingPlan') }}</el-button>
         <el-button v-if="!isShowScheduling && !dataError" type="jl3dpassflow" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
-        <el-button v-if="!isShowScheduling && !dataError" type="jl3dstation" @click="jumpjl3dstation">{{ jl3dstation }}</el-button>
+        <!-- <el-button v-if="!isShowScheduling && !dataError" type="jl3dstation" @click="jumpjl3dstation">{{ jl3dstation }}</el-button> -->
         <el-button v-if="!isShowScheduling && !dataError" type="jumpjlmap3d" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
         <el-button v-if="isShow3dmodel && !isShowScheduling && !dataError" type="jumpjlmap3dmodel" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
         <template v-if="isShowQuest">