From 6351d966a130e5932d18d0b2b88abd2b4e9b795b Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Fri, 18 Dec 2020 15:26:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4=E5=AE=A2?=
 =?UTF-8?q?=E6=B5=81=E8=BD=A6=E7=AB=99=E4=B9=98=E5=AE=A2=E4=B8=8A=E9=94=99?=
 =?UTF-8?q?=E7=AB=99=E5=8F=B0bug=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=89?=
 =?UTF-8?q?=E7=BB=B4=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jlmap3d/jl3dtrafficplan/connect/stationconnect.js | 9 ++++++++-
 src/jlmap3d/jl3dtrafficplan/jl3dtrafficplan.js        | 5 +++--
 src/jlmap3d/jl3dtrafficplan/model/passerhuman.js      | 8 ++++----
 src/jlmap3d/jl3dtrafficplan/passerai/passerai.js      | 4 +++-
 src/utils/baseUrl.js                                  | 4 ++--
 src/views/jlmap3d/edit/component/action.vue           | 5 ++++-
 src/views/jlmap3d/edit/component/assets.vue           | 5 ++++-
 7 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/jlmap3d/jl3dtrafficplan/connect/stationconnect.js b/src/jlmap3d/jl3dtrafficplan/connect/stationconnect.js
index 9a10d6c14..429994ab6 100644
--- a/src/jlmap3d/jl3dtrafficplan/connect/stationconnect.js
+++ b/src/jlmap3d/jl3dtrafficplan/connect/stationconnect.js
@@ -43,18 +43,23 @@ export function PassflowConnect(deviceaction,toptrain,downtrain,routegroup,passe
 		}
 		/** 站台客流当前人数信息 */
 		if(data.type == "STAND_PFI"){
-			// console.log(data);
+
 			let newStandData = data.body;
 			let count = 0;
 			for(let j=0;j<passerStation.stationlist.length;j++){
 				count = 0;
+
 				for(let i=0;i<newStandData.length;i++){
+
+
 					if(passerStation.stationlist[j].topstand == newStandData[i].standCode){
+
 						passerStation.stationlist[j].topspeed = newStandData[i].to;
 						passerStation.stationlist[j].toppassers = newStandData[i].num;
 						count++;
 					}
 					if(passerStation.stationlist[j].downstand == newStandData[i].standCode){
+
 						passerStation.stationlist[j].downspeed = newStandData[i].to;
 						passerStation.stationlist[j].downpassers = newStandData[i].num;
 						count++;
@@ -201,6 +206,8 @@ export function PassflowConnect(deviceaction,toptrain,downtrain,routegroup,passe
 
 		if(data.type == 'Device_Load_Destroy_3D'){
 			start = true;
+			toptrain.nowcode = null;
+			downtrain.nowcode = null;
 			console.log("仿真重开=====================");
 		}
 
diff --git a/src/jlmap3d/jl3dtrafficplan/jl3dtrafficplan.js b/src/jlmap3d/jl3dtrafficplan/jl3dtrafficplan.js
index 2aae806be..6201fc484 100644
--- a/src/jlmap3d/jl3dtrafficplan/jl3dtrafficplan.js
+++ b/src/jlmap3d/jl3dtrafficplan/jl3dtrafficplan.js
@@ -197,6 +197,7 @@ export function Jl3dTrafficPlan(dom,skinCode,routegroup,viewMap,initCode) {
 
 	this.changestation = function(stationname){
 		passerStation.changestation(stationname);
+		// console.log(passerStation.nowStation);
 		scope.humanWaitTop = passerStation.nowStation.toppassers;
 		scope.humanWaitDown = passerStation.nowStation.downpassers;
 		passerHuman.speed = passerStation.nowStation.topspeed + passerStation.nowStation.downspeed;
@@ -232,7 +233,7 @@ export function Jl3dTrafficPlan(dom,skinCode,routegroup,viewMap,initCode) {
 			for(let i=0;i<waitForCreatOutTop.length;i++){
 				for(let j=0;j<waitForCreatOutTop[i];j++){
 					setTimeout(function(){
-						console.log(passerZone.list["standtop"].doorpoints[i]);
+						// console.log(passerZone.list["standtop"].doorpoints[i]);
 						passerHuman.newHumanCreate(outStationPassers,passerZone.list["standtop"].doorpoints[i],5,"top",i);
 					}, Math.random()*1000*j);
 				}
@@ -242,7 +243,7 @@ export function Jl3dTrafficPlan(dom,skinCode,routegroup,viewMap,initCode) {
 			for(let i=0;i<waitForCreatOutDown.length;i++){
 				for(let j=0;j<waitForCreatOutDown[i];j++){
 					setTimeout(function(){
-						console.log(passerZone.list["standdown"].doorpoints[i]);
+						// console.log(passerZone.list["standdown"].doorpoints[i]);
 						passerHuman.newHumanCreate(outStationPassers,passerZone.list["standdown"].doorpoints[i],5,"down",i);
 					}, Math.random()*1000*j);
 				}
diff --git a/src/jlmap3d/jl3dtrafficplan/model/passerhuman.js b/src/jlmap3d/jl3dtrafficplan/model/passerhuman.js
index ba9ed3849..2550aac79 100644
--- a/src/jlmap3d/jl3dtrafficplan/model/passerhuman.js
+++ b/src/jlmap3d/jl3dtrafficplan/model/passerhuman.js
@@ -63,9 +63,7 @@ export function  PasserHuman() {
       newhuman.overGoal = overGoal;
     }
 
-    if(newhuman.direct == "top"){
-      newhuman.rotation.y = Math.PI;
-    }
+
     newhuman.status = 0;
 
     newhuman.stage = stage;
@@ -77,7 +75,9 @@ export function  PasserHuman() {
     }else{
       newhuman.direct = null;
     }
-
+    if(newhuman.direct == "top"){
+      newhuman.rotation.y = Math.PI;
+    }
     newhuman.doorstatus = null;
     if(door){
       newhuman.door = door;
diff --git a/src/jlmap3d/jl3dtrafficplan/passerai/passerai.js b/src/jlmap3d/jl3dtrafficplan/passerai/passerai.js
index 8b5709dd7..2563c84ac 100644
--- a/src/jlmap3d/jl3dtrafficplan/passerai/passerai.js
+++ b/src/jlmap3d/jl3dtrafficplan/passerai/passerai.js
@@ -232,7 +232,9 @@ export function  PasserAi(zone,finder) {
 
           //1--top
           //2-- down
-          if(humanlist.children[i].overGoal == "top"){
+          // console.log(humanlist.children[i].overGoal);
+          // console.log(humanlist.children[i].direct);
+          if(humanlist.children[i].direct == "top"){
             targetPosition = passerZone.getstandposition("standtop");
             path = pathFinder.find(points[0],targetPosition.point);
             humanlist.children[i].direct = "top";
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index c0569ef83..798608c73 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,11 +2,11 @@ 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.8.129:9000'; // 旭强
         // BASE_API = 'http://192.168.8.119:9000'; // 张赛
-        // BASE_API = 'http://192.168.8.110:9000'; // 杜康
+        BASE_API = 'http://192.168.8.110:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
diff --git a/src/views/jlmap3d/edit/component/action.vue b/src/views/jlmap3d/edit/component/action.vue
index febb4595a..f098c93f6 100644
--- a/src/views/jlmap3d/edit/component/action.vue
+++ b/src/views/jlmap3d/edit/component/action.vue
@@ -48,7 +48,7 @@
 
       </el-tab-pane>
 
-    
+
 
       <el-tab-pane label="驾驶场景配置" name="driveEdit">
         <div class= "editmodelconfig" :class="{active:index==isActive}" v-for="(asset,index) in driverAssetList" @click="assetSelect(driverAssetList[index],index)">
@@ -341,6 +341,9 @@ export default {
     updateEditSelectAsset(selsetAsset,selectData){
       console.log(selectData);
       if(this.nowSelect != null){
+        if(selsetAsset == "clear"){
+
+        }
         if(selectData.fileType == "model"){
           if(selsetAsset == "sceneEdit"){
             this.sceneAssetList[this.nowSelect].id =  selectData.id;
diff --git a/src/views/jlmap3d/edit/component/assets.vue b/src/views/jlmap3d/edit/component/assets.vue
index f5d7f2383..4bb3fac9e 100644
--- a/src/views/jlmap3d/edit/component/assets.vue
+++ b/src/views/jlmap3d/edit/component/assets.vue
@@ -20,7 +20,7 @@
                 </el-form>
             </el-scrollbar>
         </el-tab-pane>
-        <el-tab-pane  label="清空当前选项内容" name="delet">
+        <el-tab-pane  label="清空当前选项内容" name="delet" @click="clearModel()">
         </el-tab-pane>
 
       </el-tabs>
@@ -175,6 +175,9 @@ export default {
       // this.$emit('smodel',this.modelList[index]);
       updateEditSelectAsset(this.nowAssetName,this.nowAssetList[index]);
     },
+    clearModel(){
+      updateEditSelectAsset("clear");
+    },
     //刷新资源库显示
     updateAssetList(newdata,newtype){
       console.log(newdata);