From 734a69751be25c41ab483c3ff25daef443f3d9a1 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Thu, 10 Jun 2021 18:07:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=BB=B4=E5=A4=A7=E9=93=81=E9=A9=BE?=
 =?UTF-8?q?=E9=A9=B6=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jl3drailwaydrive/jl3drailwaydrive.js      |   2 -
 src/utils/baseUrl.js                          |   4 +-
 .../component/uploadmodel.vue                 |   1 +
 .../jl3dassetmanager/component/uploadpic.vue  |   1 +
 .../railwaydrive/drivecontrol/centerpane.vue  |   6 +-
 .../drivecontrol/drivecontrol.vue             |   2 +-
 .../railwaydrive/drivecontrol/rightpane.vue   | 130 ++++++++++--------
 7 files changed, 84 insertions(+), 62 deletions(-)

diff --git a/src/jlmap3d/jl3drailwaydrive/jl3drailwaydrive.js b/src/jlmap3d/jl3drailwaydrive/jl3drailwaydrive.js
index 516063728..a8cb07696 100644
--- a/src/jlmap3d/jl3drailwaydrive/jl3drailwaydrive.js
+++ b/src/jlmap3d/jl3drailwaydrive/jl3drailwaydrive.js
@@ -135,8 +135,6 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
 	// 	sound.play();
 	// });
 
-
-
 	let controls3 = new MouseControls(camera, 1.6);
 	controls3.enabled = false;
 	// controls3.getObject().rotation.x = Math.PI/2;
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 11702c286..aa7bf7e1b 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,9 +2,9 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
-        // BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
+        BASE_API = 'http://192.168.3.83:9000'; // 旭强 有线
         // BASE_API = 'http://192.168.8.114:9000'; // 旭强 无线
         // BASE_API = 'http://192.168.3.120:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
diff --git a/src/views/jlmap3d/jl3dassetmanager/component/uploadmodel.vue b/src/views/jlmap3d/jl3dassetmanager/component/uploadmodel.vue
index f75d47452..148ef8e92 100644
--- a/src/views/jlmap3d/jl3dassetmanager/component/uploadmodel.vue
+++ b/src/views/jlmap3d/jl3dassetmanager/component/uploadmodel.vue
@@ -17,6 +17,7 @@
               <el-option label="VR模型" value="VrModel"></el-option>
               <el-option label="客流场景" value="客流模型"></el-option>
               <el-option label="三维课程" value="三维课程"></el-option>
+              <el-option label="小程序模型" value="WxModel"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="设备类型">
diff --git a/src/views/jlmap3d/jl3dassetmanager/component/uploadpic.vue b/src/views/jlmap3d/jl3dassetmanager/component/uploadpic.vue
index 104756891..a0a0f4e95 100644
--- a/src/views/jlmap3d/jl3dassetmanager/component/uploadpic.vue
+++ b/src/views/jlmap3d/jl3dassetmanager/component/uploadpic.vue
@@ -9,6 +9,7 @@
           <el-option label="站台列表名称贴图" value="textureStation"></el-option>
           <el-option label="信号机贴图" value="textureSignal"></el-option>
           <el-option label="单体设备贴图" value="textureDevice"></el-option>
+          <el-option label="小程序大铁贴图" value="textureRailwayWx"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="所属项目">
diff --git a/src/views/jlmap3d/railwaydrive/drivecontrol/centerpane.vue b/src/views/jlmap3d/railwaydrive/drivecontrol/centerpane.vue
index 8653c7ad8..75525e72c 100644
--- a/src/views/jlmap3d/railwaydrive/drivecontrol/centerpane.vue
+++ b/src/views/jlmap3d/railwaydrive/drivecontrol/centerpane.vue
@@ -4,12 +4,12 @@
 			<img class="buttonimg2" :src="start" />
 		</div> -->
 
-		<div id="direct" class="brakebutton" style="bottom:5%;left:110px;">
+		<!-- <div id="direct" class="brakebutton" style="bottom:5%;left:110px;">
 			<img class="brakeimg" :src="brakeallimgurl" />
 			<img id="directimgbrakeall" class="brakeimg" :src="brakeallimgurlt" :style="{transform:braketransall}" @mousedown="touchstartbrakeall"  />
-		</div>
+		</div> -->
 
-		<div id="direct" class="brakebutton" style="bottom:5%;left:440px;">
+		<div id="direct" class="brakebutton" style="bottom:5%;left:100px;">
 			<img class="brakeimg" :src="brakeimgurl" />
 			<img id="directimgbrake" class="brakeimg" :src="brakeimgurlt" :style="{transform:braketrans}" @mousedown="touchstartbrake"  />
 		</div>
diff --git a/src/views/jlmap3d/railwaydrive/drivecontrol/drivecontrol.vue b/src/views/jlmap3d/railwaydrive/drivecontrol/drivecontrol.vue
index 67f79304b..7fc7ac786 100644
--- a/src/views/jlmap3d/railwaydrive/drivecontrol/drivecontrol.vue
+++ b/src/views/jlmap3d/railwaydrive/drivecontrol/drivecontrol.vue
@@ -362,7 +362,7 @@ import axios from 'axios';
 
 <style>
 	.drivepane{
-		width:60%;
+		width:30%;
     height:333px;
 		right:0;
 		bottom:0;
diff --git a/src/views/jlmap3d/railwaydrive/drivecontrol/rightpane.vue b/src/views/jlmap3d/railwaydrive/drivecontrol/rightpane.vue
index b6653da07..d90bd73d5 100644
--- a/src/views/jlmap3d/railwaydrive/drivecontrol/rightpane.vue
+++ b/src/views/jlmap3d/railwaydrive/drivecontrol/rightpane.vue
@@ -17,19 +17,19 @@
 			<div class="buttontext">{{ $t('jlmap3d.emergencyBraking') }}</div>
 		</div> -->
 
-		<div id="stallpane" class="stalldiv" style="top:10%;left:0%;">
+		<!-- <div id="stallpane" class="stalldiv" style="top:10%;left:0%;">
 			<img id="nowstall" :style="{top:stalltop,left:stallleft}" class="nowstallimg" :src="nowstallimgurl" />
 			<img class="stallimg" :src="stallimgurl" />
-		</div>
+		</div> -->
 
-		<div id="directpane" class="directbutton" style="bottom:10%;left:0;">
+		<div id="directpane" class="directbutton" style="bottom:10%;right:5%;">
 			<img class="rightbuttonbcimg" :src="zuoimg" />
 			<img id="directimgdiv" class="rightbuttonbcimg" :src="niuimg" :style="{transform:doordirecttou}" @mousedown='doordirecttouchstart' />
 		</div>
 
-		<div id="clutch" class="directbutton" style="bottom:10%;left:150px;">
+		<!-- <div id="clutch" class="directbutton" style="bottom:10%;left:150px;">
 			<img class="rightbuttonbcimg" :src="liheimg" />
-		</div>
+		</div> -->
 
 	</div>
 </template>
@@ -199,55 +199,55 @@
 					this.oldDirectType = 2;
 				}
 
-				switch (data[3]) {
-					case -1:
-						this.stallh = 0;
-						this.stalll = 0;
-		        break;
-			    case 0:
-						this.stallh = 1;
-						this.stalll = 2;
-		        break;
-			    case 1:
-						this.stallh = 2;
-						this.stalll = 0;
-		        break;
-			    case 2:
-						this.stallh = 0;
-						this.stalll = 1;
-		        break;
-			    case 3:
-						this.stallh = 2;
-						this.stalll = 1;
-		        break;
-			    case 4:
-						this.stallh = 2;
-						this.stalll = 2;
-		        break;
-			    case 5:
-						this.stallh = 0;
-						this.stalll = 2;
-		        break;
-			    case 6:
-						this.stallh = 0;
-						this.stalll = 3;
-		        break;
-				  case 7:
-						this.stallh = 2;
-						this.stalll = 3;
-		        break;
-				  case 8:
-						this.stallh = 0;
-						this.stalll = 4;
-		        break;
-				  case 9:
-						this.stallh = 2;
-						this.stalll = 4;
-				}
-
-
-				this.stalltop = this.stalls[this.stallh][this.stalll].t +"px";
-				this.stallleft = this.stalls[this.stallh][this.stalll].l +"px";
+				// switch (data[3]) {
+				// 	case -1:
+				// 		this.stallh = 0;
+				// 		this.stalll = 0;
+		    //     break;
+			  //   case 0:
+				// 		this.stallh = 1;
+				// 		this.stalll = 2;
+		    //     break;
+			  //   case 1:
+				// 		this.stallh = 2;
+				// 		this.stalll = 0;
+		    //     break;
+			  //   case 2:
+				// 		this.stallh = 0;
+				// 		this.stalll = 1;
+		    //     break;
+			  //   case 3:
+				// 		this.stallh = 2;
+				// 		this.stalll = 1;
+		    //     break;
+			  //   case 4:
+				// 		this.stallh = 2;
+				// 		this.stalll = 2;
+		    //     break;
+			  //   case 5:
+				// 		this.stallh = 0;
+				// 		this.stalll = 2;
+		    //     break;
+			  //   case 6:
+				// 		this.stallh = 0;
+				// 		this.stalll = 3;
+		    //     break;
+				//   case 7:
+				// 		this.stallh = 2;
+				// 		this.stalll = 3;
+		    //     break;
+				//   case 8:
+				// 		this.stallh = 0;
+				// 		this.stalll = 4;
+		    //     break;
+				//   case 9:
+				// 		this.stallh = 2;
+				// 		this.stalll = 4;
+				// }
+				//
+				//
+				// this.stalltop = this.stalls[this.stallh][this.stalll].t +"px";
+				// this.stallleft = this.stalls[this.stallh][this.stalll].l +"px";
 			},
 			handleKeyup(event){
 				const e = event || window.event || arguments.callee.caller.arguments[0];
@@ -372,26 +372,42 @@
 				}
 
 				angle = angle + 180;
+
+				let paramGear = {
+					// id:this.groupNum,
+					id:"001",
+					pos:''
+				};
+
 				// console.log(angle);
 				if(angle<=356){
 
 					this.doordirecttou = "rotate("+320+"deg)";
 					this.directType = 1;
+					paramGear.pos = '4';
 				}
 				if(angle>356 && angle<372){
 					this.doordirecttou = "rotate("+360+"deg)";
 					this.directType = 0;
+					paramGear.pos = '0';
 				}
 
 				if(angle>372 && angle<421){
 					this.doordirecttou = "rotate("+399+"deg)";
 					this.directType = -1;
+					paramGear.pos = '4';
 				}
 
 				if(angle>421){
 					this.doordirecttou = "rotate("+442+"deg)";
 					this.directType = 2;
+					paramGear.pos = '4';
 				}
+
+
+
+
+
 				if(this.oldDirectType != this.directType){
 					this.oldDirectType = this.directType;
 					let param = {
@@ -401,6 +417,12 @@
 					};
 					const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id);
 
+					trainSimulationForce(this.group,userInfo.memberId,paramGear,"Train_Drive_Gear_Change").then(res => {
+							// console.log(res);
+					}).catch((error) => {
+							console.log(error);
+					});
+
 					trainSimulationForce(this.group,userInfo.memberId,param,"Train_Drive_Change_Over_Switch").then(res => {
 							// console.log(res);
 					}).catch((error) => {