From b2b669df66dac9c1eb3adc66e58167ae749403df Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Mon, 15 Mar 2021 10:56:37 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?=
 =?UTF-8?q?=E5=AE=A2=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../connect/stationConnect.js                 |  29 +-
 .../jl3dstationmanager/jl3dstationmanager.js  |  44 +-
 .../loader/stationconfig.js                   |   2 +-
 .../jl3dstationmanager/model/passerhuman.js   |  39 +-
 .../jl3dstationmanager/model/passerstation.js | 143 ++++---
 .../model/region/checkRegion.js               |   3 +-
 .../model/region/standRegion.js               |   7 +-
 .../model/region/startRegion.js               |   6 +-
 .../jl3dstationmanager/model/regionManager.js |   2 +
 .../jl3dstationmanager/passerai/passerai.js   | 400 ++++++++++--------
 .../stationmanager/component/property.vue     |   3 +
 .../stationmanager/jl3dstationmanager.vue     |   4 +-
 src/views/newMap/jlmapNew/index.vue           |   2 +-
 13 files changed, 391 insertions(+), 293 deletions(-)

diff --git a/src/jlmap3d/jl3dstationmanager/connect/stationConnect.js b/src/jlmap3d/jl3dstationmanager/connect/stationConnect.js
index 105805b49..acf4a075e 100644
--- a/src/jlmap3d/jl3dstationmanager/connect/stationConnect.js
+++ b/src/jlmap3d/jl3dstationmanager/connect/stationConnect.js
@@ -47,6 +47,7 @@ export function stationConnect(deviceaction,toptrain,downtrain,routegroup,passer
 
 			let newStandData = data.body;
 			let count = 0;
+
 			for(let j=0;j<passerStation.stationlist.length;j++){
 				count = 0;
 
@@ -54,7 +55,8 @@ export function stationConnect(deviceaction,toptrain,downtrain,routegroup,passer
 
 
 					if(passerStation.stationlist[j].topstand == newStandData[i].standCode){
-
+			
+						// console.log(passerStation.stationlist[j]);
 						passerStation.stationlist[j].topspeed = newStandData[i].to;
 						passerStation.stationlist[j].toppassers = newStandData[i].num;
 						count++;
@@ -67,6 +69,7 @@ export function stationConnect(deviceaction,toptrain,downtrain,routegroup,passer
 					}
 
 					if(count == 2){
+						// console.log(passerStation.stationlist[j]);
 						i = newStandData.length;
 					}
 				}
@@ -86,20 +89,20 @@ export function stationConnect(deviceaction,toptrain,downtrain,routegroup,passer
 
 			if(toptrain.nowcode == data.body.code && scope.topswitch == true){
 
-				//根据上下车人数创建人
-				jl3d.updateNowLeaveData("top",data.body.out);
-				setTimeout(function(){
-					passerAi.passerout("top","start",data.body.in)
-				}, 5000);
+				// //根据上下车人数创建人
+				// jl3d.updateNowLeaveData("top",data.body.out);
+				// setTimeout(function(){
+				// 	passerAi.passerout("top","start",data.body.in)
+				// }, 5000);
 
 			}
-			if(downtrain.nowcode == data.body.code && scope.downswitch == true){
-				//根据上下车人数创建人
-				jl3d.updateNowLeaveData("down",data.body.out);
-				setTimeout(function(){
-					passerAi.passerout("down","start",data.body.in);
-				}, 5000);
-			}
+			// if(downtrain.nowcode == data.body.code && scope.downswitch == true){
+			// 	//根据上下车人数创建人
+			// 	jl3d.updateNowLeaveData("down",data.body.out);
+			// 	setTimeout(function(){
+			// 		passerAi.passerout("down","start",data.body.in);
+			// 	}, 5000);
+			// }
 		}
 
     //
diff --git a/src/jlmap3d/jl3dstationmanager/jl3dstationmanager.js b/src/jlmap3d/jl3dstationmanager/jl3dstationmanager.js
index e74d7410d..205b7b514 100644
--- a/src/jlmap3d/jl3dstationmanager/jl3dstationmanager.js
+++ b/src/jlmap3d/jl3dstationmanager/jl3dstationmanager.js
@@ -162,7 +162,7 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 
 	let passerHuman = new PasserHuman();
 
-	let passerAi = new PasserAi(sceneRegion,pathFinder);
+	let passerAi = new PasserAi(sceneRegion,pathFinder,sceneRegion);
 
 	this.anime = null;
 
@@ -230,7 +230,7 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 		scope.humanInSpeed = 0;
 		scope.humanOutSpeed = 0;
 		passerHuman.speed = scope.humanInSpeed;
-		passerAi.initPasser(humanlist,topWaitPassers,downWaitPassers,passerHuman,scope);
+		// passerAi.initPasser(humanlist,topWaitPassers,downWaitPassers,passerHuman,scope);
 
 		updatePasserData(humanlist.children.length,topWaitPassers.children.length,downWaitPassers.children.length,outStationPassers.children.length,passerHuman.speed);
 		scope.resetscene();
@@ -248,20 +248,20 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 	}
 
 	this.updateNowStationData = function(){
+		// console.log(passerStation.nowStation);
 		for(let i=0;i<passerStation.nowStation.topspeed;i++){
 			let newIn = {
-				overGoal:"top",
+				overGoal:"topStand",
 			};
 			waitForCreatIn.push(newIn);
 		}
 		for(let i=0;i<passerStation.nowStation.downspeed;i++){
 			let newIn = {
-				overGoal:"down",
+				overGoal:"downStand",
 			};
 			waitForCreatIn.push(newIn);
 		}
 
-
 		scope.humanInSpeed = passerStation.nowStation.topspeed+passerStation.nowStation.downspeed;
 		passerHuman.speed = scope.humanInSpeed;
 		passerWebWork.postMessage(["changespeed",scope.humanInSpeed/30]);
@@ -364,7 +364,7 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 		// 	actions[an].play();
 		// }
 		setTimeout(function(){
-			passerAi.initPasser(humanlist,topWaitPassers,downWaitPassers,passerHuman,scope);
+			// passerAi.initPasser(humanlist,topWaitPassers,downWaitPassers,passerHuman,scope);
 			aiswitch = 0;
 		}, 2000);
 
@@ -415,19 +415,28 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 		passerWebWork.onmessage = function (event) {
 			if(aiswitch == 0){
 				// console.log(humanlist.children.length);
-
+				// console.log(sceneRegion.startRegion.group.children);
 				this.allStationData = [];
+				// console.log(Math.random());
+
+				// console.log(waitForCreatIn);
 				if(waitForCreatIn.length>0){
-					let direct = Math.floor(Math.random()*(3-1+1))+1;
-					//1--top
-					//2-- down
-					if(direct == 1){
-						passerHuman.newHumanCreate(humanlist,sceneRegion.getzoneposition("enter1"),0,waitForCreatIn[0].overGoal);
-					}else{
-						passerHuman.newHumanCreate(humanlist,sceneRegion.getzoneposition("enter2"),0,waitForCreatIn[0].overGoal);
+					let randomNum = Math.random();
+					let startNum = 0;
+
+					for(let i=0;i<sceneRegion.startRegion.group.children.length;i++){
+						startNum = startNum + sceneRegion.startRegion.group.children[i].startWeight;
+
+						if(randomNum<startNum){
+
+							passerHuman.newHumanCreate(humanlist,sceneRegion.startRegion.group.children[i],0,waitForCreatIn[0].overGoal);
+							waitForCreatIn.shift();
+							i = sceneRegion.startRegion.group.children.length;
+						}
 					}
-					waitForCreatIn.shift();
 				}
+
+
 			}
 		};
 	}
@@ -498,18 +507,19 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 			controls.controlMode = "Orbit";
 			camerass.position.set(oldCameraPosition.x,oldCameraPosition.y,oldCameraPosition.z);
 			controls.target.set( oldCameraTarget.x,oldCameraTarget.y,oldCameraTarget.z);
-			passerStation.resetPosition(controls.drawGroup);
+			passerStation.resetPosition(controls.drawGroup,scope.modelmanager.zhajiin.mesh,scope.modelmanager.zhajiout.mesh);
 		}else if(controlMode == true){
 			controls.controlMode = "Draw";
 			oldCameraPosition.copy(camerass.position);
 			oldCameraTarget.copy(controls.target);
 			// camerass.position.set(0,300,0);
 			// controls.target.set( 1, 0, 0 );
-			passerStation.apartPosition(controls.drawGroup);
+			passerStation.apartPosition(controls.drawGroup,scope.modelmanager.zhajiin.mesh,scope.modelmanager.zhajiout.mesh);
 			controls.initPlaneMesh(passerStation);
 		}
 	}
 
+
 	this.deleteRegion = function(){
 		controls.deleteRegion();
 	}
diff --git a/src/jlmap3d/jl3dstationmanager/loader/stationconfig.js b/src/jlmap3d/jl3dstationmanager/loader/stationconfig.js
index 5ee76ff2b..be60172ab 100644
--- a/src/jlmap3d/jl3dstationmanager/loader/stationconfig.js
+++ b/src/jlmap3d/jl3dstationmanager/loader/stationconfig.js
@@ -17,7 +17,7 @@ var Staticmodel = [
 		name: "车站",
 		deviceType: "cctvStation",
 		type: "cctvStation",
-		url: BASE_ASSET_API + "/MODEL/2021-03-11/1344-16880.FBX"
+		url: BASE_ASSET_API + "/MODEL/2021-03-12/1346-64858.FBX"
 		//2021.3.11/MODEL/2021-02-20/1296-89217.FBX
 		//最早模型  /MODEL/2020-11-23/79-95086.FBX
 	},{
diff --git a/src/jlmap3d/jl3dstationmanager/model/passerhuman.js b/src/jlmap3d/jl3dstationmanager/model/passerhuman.js
index a405650bd..0f0e99bf9 100644
--- a/src/jlmap3d/jl3dstationmanager/model/passerhuman.js
+++ b/src/jlmap3d/jl3dstationmanager/model/passerhuman.js
@@ -44,7 +44,7 @@ export function  PasserHuman() {
 		var v2 = new THREE.Vector3(-0.3,-0.6,0);
 		var v3 = new THREE.Vector3(0,-1.3,0);
 
-		
+
 		geom.vertices.push(v1);
 		geom.vertices.push(v2);
 		geom.vertices.push(v3);
@@ -80,12 +80,12 @@ export function  PasserHuman() {
  }
 
   //创建新的乘客
-  this.newHumanCreate = function(humanlist,position,stage,direct,door,overGoal){
+  this.newHumanCreate = function(humanlist,region,stage,overGoal){
     let newhuman;
-    createHumanModel(newhuman,humanlist,position,stage,direct,door,overGoal);
+    createHumanModel(newhuman,humanlist,region,stage,overGoal);
   }
 
-  function createHumanModel(newhuman,humanlist,position,stage,direct,door,overGoal){
+  function createHumanModel(newhuman,humanlist,region,stage,overGoal){
     let mantype = Math.floor(Math.random()*(3-1+1))+1;
 
     if(mantype == 1){
@@ -101,7 +101,7 @@ export function  PasserHuman() {
     }
 
     // let mixer = new THREE.AnimationMixer( newhuman );
-    newhuman.position.copy(position);
+    newhuman.position.copy(region.position);
 
     if(overGoal){
       newhuman.overGoal = overGoal;
@@ -110,24 +110,21 @@ export function  PasserHuman() {
 
     newhuman.status = 0;
 
-    newhuman.stage = stage;
-    if(direct){
-      if(direct == "top"){
-        newhuman.rotation.y = Math.PI;
-      }
-      newhuman.direct = direct;
+    let goalRandom = Math.random();
+    if(goalRandom<region.targetWeight){
+      newhuman.nowGoal = "ticketRegion";
     }else{
-      newhuman.direct = null;
-    }
-    if(newhuman.direct == "top"){
-      newhuman.rotation.y = Math.PI;
-    }
-    newhuman.doorstatus = null;
-    if(door){
-      newhuman.door = door;
-    }else{
-      newhuman.door = null;
+      newhuman.nowGoal = "securityRegion";
     }
+
+    //年龄
+    newhuman.age = null;
+    //性别
+    newhuman.gender = "";
+    //身体状态
+    newhuman.bodyStatus = "";
+
+
     // newhuman.action = mixer.clipAction( newhuman.animations[ 0 ] );
     // newhuman.mixer = mixer;
     newhuman.runrail = null;
diff --git a/src/jlmap3d/jl3dstationmanager/model/passerstation.js b/src/jlmap3d/jl3dstationmanager/model/passerstation.js
index a095282ff..768ec1ce3 100644
--- a/src/jlmap3d/jl3dstationmanager/model/passerstation.js
+++ b/src/jlmap3d/jl3dstationmanager/model/passerstation.js
@@ -107,74 +107,85 @@ export function  PasserStation() {
 
   }
 	//初始化车站名称数据
-  this.initStationList = function(stationdata,standdata,psddata){
-    let list = [];
-    if(psddata){
-      for(let i=0,leni = standdata.length;i<leni;i++){
-        for(let j=0,lenj = psddata.length;j<lenj;j++){
-          if(standdata[i].code == psddata[j].standCode){
-            standdata[i].name = psddata[j].code;
-          }
-        }
-      }
-      for(let i=0,leni = stationdata.length;i<leni;i++){
-        if(stationdata[i].depot == false){
-          list[stationdata[i].name] = [];
-          for(let j=0,lenj = standdata.length;j<lenj;j++){
-            if(standdata[j].stationCode == stationdata[i].code){
-              list[stationdata[i].name].push(standdata[j]);
-            }
-          }
-        }
-      }
-      for(let k in list){
-        if(list[k].length>0){
-          let stationobject = {
-            code : list[k][0].stationCode,
-            name : k,
-            toppsd:null,
-            downpsd:null,
-            topsection:null,
-            downsection:null,
-          };
-          if(list[k][0].position.y<list[k][1].position.y){
-            stationobject.toppsd = list[k][0].name;
-            stationobject.downpsd = list[k][1].name;
-            stationobject.topsection = list[k][0].standTrackCode;
-            stationobject.downsection = list[k][1].standTrackCode;
-          }else{
-            stationobject.toppsd = list[k][1].name;
-            stationobject.downpsd = list[k][0].name;
-            stationobject.topsection = list[k][1].standTrackCode;
-            stationobject.downsection = list[k][0].standTrackCode;
-          }
-          scope.stationlist.push(stationobject);
-        }
+	this.initStationList = function(stationdata,standdata,psddata){
+		let list = [];
+		if(psddata){
+			for(let i=0,leni = standdata.length;i<leni;i++){
+				for(let j=0,lenj = psddata.length;j<lenj;j++){
+					if(standdata[i].code == psddata[j].standCode){
+						standdata[i].name = psddata[j].code;
+					}
+				}
+			}
+			for(let i=0,leni = stationdata.length;i<leni;i++){
+				if(stationdata[i].depot == false){
+					list[stationdata[i].name] = [];
+					for(let j=0,lenj = standdata.length;j<lenj;j++){
+						if(standdata[j].stationCode == stationdata[i].code){
+							list[stationdata[i].name].push(standdata[j]);
+						}
+					}
+				}
+			}
+			for(let k in list){
+				if(list[k].length>0){
+					let stationobject = {
+						code : list[k][0].stationCode,
+						name : k,
+						topspeed:0,
+						downspeed:0,
+						toppassers:0,
+						downpassers:0,
+						toppsd:null,
+						downpsd:null,
+						topsection:null,
+						downsection:null,
+						topstand:null,
+						downstand:null
+					};
+					if(list[k][0].position.y<list[k][1].position.y){
+						stationobject.toppsd = list[k][0].name;
+						stationobject.downpsd = list[k][1].name;
+						stationobject.topsection = list[k][0].standTrackCode;
+						stationobject.downsection = list[k][1].standTrackCode;
+						stationobject.topstand = list[k][0].code;
+						stationobject.downstand = list[k][1].code;
+					}else{
+						stationobject.toppsd = list[k][1].name;
+						stationobject.downpsd = list[k][0].name;
+						stationobject.topsection = list[k][1].standTrackCode;
+						stationobject.downsection = list[k][0].standTrackCode;
+						stationobject.topstand = list[k][1].code;
+						stationobject.downstand = list[k][0].code;
+					}
+					scope.stationlist.push(stationobject);
+				}
 
-      }
+			}
 
-      scope.nowStation = scope.stationlist[0];
-      if(scope.stationtexture["stationlist"]){
-        scope.stationMesh.getObjectByName("zhantailiebiao").material.map =scope.stationtexture["stationlist"];
-        scope.stationMesh.getObjectByName("zhantailiebiao").material.map.needsUpdate = true;
-        if(scope.stationMesh.getObjectByName("menkuangyanse")){
-          scope.stationMesh.getObjectByName("menkuangyanse").material.map =scope.stationtexture["pingbimen"];
-          scope.stationMesh.getObjectByName("menkuangyanse").material.map.needsUpdate = true;
-        }
-        scope.stationMesh.getObjectByName("zhantaiming").material.map = scope.stationtexture[scope.nowStation.code];
-        scope.stationMesh.getObjectByName("zhantaiming").material.map.needsUpdate = true;
-      }
-      updatestationlist(scope.stationlist);
-    }else{
-      olddataai = true;
-    }
-  }
+			scope.nowStation = scope.stationlist[0];
+			if(scope.stationtexture["stationlist"]){
+				scope.stationMesh.getObjectByName("zhantailiebiao").material.map =scope.stationtexture["stationlist"];
+				scope.stationMesh.getObjectByName("zhantailiebiao").material.map.needsUpdate = true;
+				if(scope.stationMesh.getObjectByName("menkuangyanse")){
+					scope.stationMesh.getObjectByName("menkuangyanse").material.map =scope.stationtexture["pingbimen"];
+					scope.stationMesh.getObjectByName("menkuangyanse").material.map.needsUpdate = true;
+				}
+				scope.stationMesh.getObjectByName("zhantaiming").material.map = scope.stationtexture[scope.nowStation.code];
+				scope.stationMesh.getObjectByName("zhantaiming").material.map.needsUpdate = true;
+			}
+			// updatestationlist(scope.stationlist);
+		}else{
+			olddataai = true;
+		}
+	}
 	//加载线路车站名贴图
 	this.loadMaterial = function(netdata3d){
 		Materialload(scope,JSON.parse(netdata3d.data.assets).stationTextureList[0]);
 	};
 
 	this.initCodeStation = function(initCode){
+		console.log(scope.stationlist);
 		for(let i=0,leni=scope.stationlist.length;i<leni;i++){
 			// console.log(scope.stationlist[i]);
       if(scope.stationlist[i].downstand == initCode || scope.stationlist[i].topstand == initCode){
@@ -190,10 +201,14 @@ export function  PasserStation() {
     }
 	};
 
-	this.apartPosition = function(drawGroup){
+	this.apartPosition = function(drawGroup,zhajiin,zhajiout){
 		// scope.down.position.y = scope.top.position.y;
+		console.log(zhajiin);
+		console.log(zhajiout);
 		scope.top.position.z += 75;
 		scope.down.position.z -= 75;
+		zhajiin.position.z -= 75;
+		zhajiout.position.z -= 75;
 		if(drawGroup.children.length>0){
 			for(let i=0;i<drawGroup.children.length;i++){
 				for(let j=0;j<drawGroup.children[i].children.length;j++){
@@ -202,15 +217,18 @@ export function  PasserStation() {
 					}
 					if(drawGroup.children[i].children[j].underFloor == "2floor"){
 						drawGroup.children[i].children[j].position.z -= 75;
+
 					}
 				}
 			}
 		}
 	}
 
-	this.resetPosition = function(drawGroup){
+	this.resetPosition = function(drawGroup,zhajiin,zhajiout){
 		scope.top.position.copy(originTopPosition);
 		scope.down.position.copy(originDownPosition);
+		zhajiin.position.z += 75;
+		zhajiout.position.z += 75;
 		if(drawGroup.children.length>0){
 			for(let i=0;i<drawGroup.children.length;i++){
 
@@ -221,6 +239,7 @@ export function  PasserStation() {
 					}
 					if(drawGroup.children[i].children[j].underFloor == "2floor"){
 						drawGroup.children[i].children[j].position.z += 75;
+
 						// drawGroup.children[i].position.y = scope.down.position.y;
 					}
 				}
diff --git a/src/jlmap3d/jl3dstationmanager/model/region/checkRegion.js b/src/jlmap3d/jl3dstationmanager/model/region/checkRegion.js
index 3fb31e034..61f1432a4 100644
--- a/src/jlmap3d/jl3dstationmanager/model/region/checkRegion.js
+++ b/src/jlmap3d/jl3dstationmanager/model/region/checkRegion.js
@@ -8,6 +8,7 @@ export function  checkRegion(data) {
     newRegion.regionType = regionType;
     newRegion.deviceType = "region";
 		newRegion.status = "1";
+		newRegion.checkDirection = "in";
     //连接设备
     newRegion.connectDevice = "*";
     newRegion.position.set(
@@ -31,7 +32,7 @@ export function  checkRegion(data) {
 				newRegion.connectDevice = regionData[i].connectDevice;
 				newRegion.status = regionData[i].status;
         newRegion.underFloor = regionData[i].underFloor;
-
+				newRegion.checkDirection = regionData[i].checkDirection;
 				newRegion.position.set(
 					regionData[i].pos.x,
 					regionData[i].pos.y,
diff --git a/src/jlmap3d/jl3dstationmanager/model/region/standRegion.js b/src/jlmap3d/jl3dstationmanager/model/region/standRegion.js
index 729cc29e1..db3034957 100644
--- a/src/jlmap3d/jl3dstationmanager/model/region/standRegion.js
+++ b/src/jlmap3d/jl3dstationmanager/model/region/standRegion.js
@@ -14,7 +14,12 @@ export function standRegion() {
     //连接设备
     newRegion.connectDevice = "*";
     //区域方向
-    newRegion.direction = "1";
+    if(pos.z < 87.85){
+      newRegion.direction = "top";
+    }else{
+      newRegion.direction = "down";
+    }
+
 
     newRegion.position.set(
       pos.x,
diff --git a/src/jlmap3d/jl3dstationmanager/model/region/startRegion.js b/src/jlmap3d/jl3dstationmanager/model/region/startRegion.js
index e4a0089f4..e14f27ef2 100644
--- a/src/jlmap3d/jl3dstationmanager/model/region/startRegion.js
+++ b/src/jlmap3d/jl3dstationmanager/model/region/startRegion.js
@@ -38,11 +38,11 @@ export function startRegion() {
         newRegion.deviceType = "region";
         newRegion.name = regionData[i].name;
         //入口乘客比例
-        newRegion.startWeight = regionData[i].startWeight;
+        newRegion.startWeight = parseFloat(regionData[i].startWeight);
         //出口乘客比例
-        newRegion.endWeight = regionData[i].endWeight;
+        newRegion.endWeight = parseFloat(regionData[i].endWeight);
         //目标权重
-        newRegion.targetWeight = regionData[i].targetWeight;
+        newRegion.targetWeight = parseFloat(regionData[i].targetWeight);
         //区域状态
         newRegion.status = regionData[i].status;
         newRegion.underFloor = regionData[i].underFloor;
diff --git a/src/jlmap3d/jl3dstationmanager/model/regionManager.js b/src/jlmap3d/jl3dstationmanager/model/regionManager.js
index 3ec63a197..549c570e8 100644
--- a/src/jlmap3d/jl3dstationmanager/model/regionManager.js
+++ b/src/jlmap3d/jl3dstationmanager/model/regionManager.js
@@ -135,6 +135,8 @@ export function regionManager() {
 					status:scope.checkRegion.group.children[i].status,
 					connectDevice:scope.checkRegion.group.children[i].connectDevice,
 					underFloor:scope.checkRegion.group.children[i].underFloor,
+					checkDirection:scope.checkRegion.group.children[i].checkDirection,
+
 					pos:{
 						x:scope.checkRegion.group.children[i].position.x,
 						y:scope.checkRegion.group.children[i].position.y,
diff --git a/src/jlmap3d/jl3dstationmanager/passerai/passerai.js b/src/jlmap3d/jl3dstationmanager/passerai/passerai.js
index c89ac546c..fcc83aa21 100644
--- a/src/jlmap3d/jl3dstationmanager/passerai/passerai.js
+++ b/src/jlmap3d/jl3dstationmanager/passerai/passerai.js
@@ -1,6 +1,6 @@
 
 
-export function  PasserAi(zone,finder) {
+export function  PasserAi(zone,finder,region) {
   let scope = this;
 
   //下车控制开关
@@ -68,188 +68,246 @@ export function  PasserAi(zone,finder) {
 		}
   }
 
+  function shortDistanceRegion(startPos,endRegion){
+    let shortDistancePos = "";
+    let distanceArray = [];
+    for(let i=0;i<endRegion.length;i++){
+      var pos1 = startPos;
+      var pos2 = endRegion[i].position;
+      var distance = pos1.distanceTo(pos2);
+      distanceArray.push(
+        {
+          pos:endRegion[i].position,
+          distance:distance
+        }
+      );
+    }
+    distanceArray.sort(function(a, b){
+
+      return a.distance - b.distance;
+    });
+
+    return distanceArray[0].pos;
+  }
   //人物站台阶段更新
-  this.aiUpdate = function(humanlist,passerHuman,passerCheckDoor,deviceaction){
+  this.aiUpdate = function(humanlist,topWaitPassers,downWaitPassers,outStationPassers,passerHuman,passerCheckDoor,deviceaction){
+    console.log(humanlist.children);
     for(let i=0;i<humanlist.children.length;i++){
       // console.log(humans[i]);
+      if(humanlist.children[i].overGoal == "topStand" || humanlist.children[i].overGoal == "downStand"){
+        console.log(humanlist.children[i]);
+        if(humanlist.children[i].status == 0){
+          if(humanlist.children[i].nowGoal == "ticketRegion"){
+              let points = [];
+              points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
 
-      if(humanlist.children[i].status == 0){
-        //stage = 0 进入车站
-        if(humanlist.children[i].stage == 0){
-          let points = [];
-          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-
-          targetPosition = passerZone.getzoneposition("security");
-
-          path = pathFinder.find(points[0],targetPosition);
-
-          for(let i=0;i<path.length;i++){
-            points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-          }
-          passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-          // console.log(path);
-        }
-
-        //stage = 1 前往进站闸机
-        if(humanlist.children[i].stage == 1){
-          let points = [];
-          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-
-            targetPosition = passerZone.getgateposition("entergate");
-
-            path = pathFinder.find(points[0],targetPosition.point);
-
-            humanlist.children[i].door = targetPosition.door;
-            for(let i=0;i<path.length;i++){
-              points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-            }
-            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-        }
-
-        //stage = 2 过闸机
-        if(humanlist.children[i].stage == 2){
-            let points = [];
-            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z-5));
-
-            passerCheckDoor.checkDoorControl("in",humanlist.children[i].door,deviceaction)
-            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-        }
-
-        //stage = 3 前往站台
-        if(humanlist.children[i].stage == 3){
-
-          let direct = Math.floor(Math.random()*(2))+1;
-          // console.log(direct);
-          let points = [];
-          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-          // points.push(new THREE.Vector3(11.81,9.8,13.11));
-
-          //1--top
-          //2-- down
-          if(direct == 1){
-            targetPosition = passerZone.getstandposition("standtop");
-            path = pathFinder.find(points[0],targetPosition.point);
-            humanlist.children[i].direct = "top";
-          }else{
-            targetPosition = passerZone.getstandposition("standdown");
-            path = pathFinder.find(points[0],targetPosition.point);
-            humanlist.children[i].direct = "down";
-          }
-          if(path[0].y<9.84){
-            points.push(new THREE.Vector3(11.81,9.8,13.11));
-            points.push(new THREE.Vector3(29.5,1.77,13.16));
-
-          }
-          for(let i=0;i<path.length;i++){
-            points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-          }
-          humanlist.children[i].door = targetPosition.door;
-          passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-        }
-
-        //stage = 4 上车
-        if(humanlist.children[i].stage == 4){
-          if(scope.toppasserin && humanlist.children[i].direct == "top"){
-
-
-            let points = [];
-            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-
-            points.push(passerZone.list["standtop"].doorpoints[humanlist.children[i].door]);
-
-            if(points[1] == undefined){
-
-            }else{
+              //寻找最近售票机点
+              targetPosition = shortDistanceRegion(humanlist.children[i].position,region.ticketRegion.group.children);
+              console.log(targetPosition);
+              //寻路售票机
+              path = pathFinder.find(points[0],targetPosition);
+          //
+              for(let i=0;i<path.length;i++){
+                points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+              }
               passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+
             }
-          }
-
-
-
-          if(scope.downpasserin && humanlist.children[i].direct == "down"){
-            let points = [];
-            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-
-            points.push(passerZone.list["standdown"].doorpoints[humanlist.children[i].door]);
-
-            if(points[1] == undefined){
-
-            }else{
-              passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-            }
-            // console.log(points);
-          }
-
         }
-
-        //stage = 5 下车
-        if(humanlist.children[i].stage == 5){
-          let points = [];
-          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-          if(humanlist.children[i].direct == "top"){
-            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z+5));
-          }
-          if(humanlist.children[i].direct == "down"){
-            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z-5));
-          }
-          targetPosition = passerZone.getgateposition("exitgate");
-          path = pathFinder.find(points[1],targetPosition.point);
-          humanlist.children[i].door = targetPosition.door;
-          for(let i=0;i<path.length;i++){
-            points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-          }
-          passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-        }
-
-        //stage = 6 前往出站闸机
-        // if(humanlist.children[i].stage == 6){
-        // 	let points = [];
-        // 	points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+        if(humanlist.children[i].nowGoal == "securityRegion"){
+        //     let points = [];
+        //     points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
         //
-        // 		groupID = pathfinder.getGroup( ZONE, 	points[0] );
-        // 		targetPosition = passerZone.getgateposition("exitgate");
-        // 		path = pathfinder.findPath( points[0], targetPosition, ZONE, groupID );
+        //     targetPosition = passerZone.getzoneposition("security");
         //
-        // 		for(let i=0;i<path.length;i++){
-        // 			points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-        // 		}
-        // 		passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-        // }
-
-        //stage = 7 出闸机
-        if(humanlist.children[i].stage == 7){
-            let points = [];
-            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-            points.push(new THREE.Vector3(humanlist.children[i].position.x+5,humanlist.children[i].position.y,humanlist.children[i].position.z));
-
-            passerCheckDoor.checkDoorControl("out",humanlist.children[i].door,deviceaction)
-            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+        //     path = pathFinder.find(points[0],targetPosition);
+        //
+        //     for(let i=0;i<path.length;i++){
+        //       points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+        //     }
+        //     passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+        //     // console.log(path);
+        //   }
         }
 
-        //stage = 8 出站
-        if(humanlist.children[i].stage == 8){
-          let direct = Math.floor(Math.random()*(3-1+1))+1;
-          let points = [];
-          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-
-          //1--top
-          //2-- down
-          if(direct == 1){
-            targetPosition = passerZone.getzoneposition("exit1");
-            path = pathFinder.find(points[0],targetPosition);
-          }else{
-            targetPosition = passerZone.getzoneposition("exit2");
-            path = pathFinder.find(points[0],targetPosition);
-          }
-
-          for(let i=0;i<path.length;i++){
-            points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-          }
-          passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-
-        }
       }
+      // if(humanlist.children[i].status == 0){
+      //   //stage = 0 进入车站
+      //   if(humanlist.children[i].stage == 0){
+      //     let points = [];
+      //     points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+      //
+      //     targetPosition = passerZone.getzoneposition("security");
+      //
+      //     path = pathFinder.find(points[0],targetPosition);
+      //
+      //     for(let i=0;i<path.length;i++){
+      //       points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+      //     }
+      //     passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+      //     // console.log(path);
+      //   }
+      //
+      //   //stage = 1 前往进站闸机
+      //   if(humanlist.children[i].stage == 1){
+      //     let points = [];
+      //     points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+      //
+      //       targetPosition = passerZone.getgateposition("entergate");
+      //
+      //       path = pathFinder.find(points[0],targetPosition.point);
+      //
+      //       humanlist.children[i].door = targetPosition.door;
+      //       for(let i=0;i<path.length;i++){
+      //         points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+      //       }
+      //       passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+      //   }
+      //
+      //   //stage = 2 过闸机
+      //   if(humanlist.children[i].stage == 2){
+      //       let points = [];
+      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z-5));
+      //
+      //       passerCheckDoor.checkDoorControl("in",humanlist.children[i].door,deviceaction)
+      //       passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+      //   }
+      //
+      //   //stage = 3 前往站台
+      //   if(humanlist.children[i].stage == 3){
+      //
+      //     let direct = Math.floor(Math.random()*(2))+1;
+      //     // console.log(direct);
+      //     let points = [];
+      //     points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+      //     // points.push(new THREE.Vector3(11.81,9.8,13.11));
+      //
+      //     //1--top
+      //     //2-- down
+      //     if(direct == 1){
+      //       targetPosition = passerZone.getstandposition("standtop");
+      //       path = pathFinder.find(points[0],targetPosition.point);
+      //       humanlist.children[i].direct = "top";
+      //     }else{
+      //       targetPosition = passerZone.getstandposition("standdown");
+      //       path = pathFinder.find(points[0],targetPosition.point);
+      //       humanlist.children[i].direct = "down";
+      //     }
+      //     if(path[0].y<9.84){
+      //       points.push(new THREE.Vector3(11.81,9.8,13.11));
+      //       points.push(new THREE.Vector3(29.5,1.77,13.16));
+      //
+      //     }
+      //     for(let i=0;i<path.length;i++){
+      //       points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+      //     }
+      //     humanlist.children[i].door = targetPosition.door;
+      //     passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+      //   }
+      //
+      //   //stage = 4 上车
+      //   if(humanlist.children[i].stage == 4){
+      //     if(scope.toppasserin && humanlist.children[i].direct == "top"){
+      //
+      //
+      //       let points = [];
+      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+      //
+      //       points.push(passerZone.list["standtop"].doorpoints[humanlist.children[i].door]);
+      //
+      //       if(points[1] == undefined){
+      //
+      //       }else{
+      //         passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+      //       }
+      //     }
+      //
+      //
+      //
+      //     if(scope.downpasserin && humanlist.children[i].direct == "down"){
+      //       let points = [];
+      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+      //
+      //       points.push(passerZone.list["standdown"].doorpoints[humanlist.children[i].door]);
+      //
+      //       if(points[1] == undefined){
+      //
+      //       }else{
+      //         passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+      //       }
+      //       // console.log(points);
+      //     }
+      //
+      //   }
+      //
+      //   //stage = 5 下车
+      //   if(humanlist.children[i].stage == 5){
+      //     let points = [];
+      //     points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+      //     if(humanlist.children[i].direct == "top"){
+      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z+5));
+      //     }
+      //     if(humanlist.children[i].direct == "down"){
+      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z-5));
+      //     }
+      //     targetPosition = passerZone.getgateposition("exitgate");
+      //     path = pathFinder.find(points[1],targetPosition.point);
+      //     humanlist.children[i].door = targetPosition.door;
+      //     for(let i=0;i<path.length;i++){
+      //       points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+      //     }
+      //     passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+      //   }
+      //
+      //   //stage = 6 前往出站闸机
+      //   // if(humanlist.children[i].stage == 6){
+      //   // 	let points = [];
+      //   // 	points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+      //   //
+      //   // 		groupID = pathfinder.getGroup( ZONE, 	points[0] );
+      //   // 		targetPosition = passerZone.getgateposition("exitgate");
+      //   // 		path = pathfinder.findPath( points[0], targetPosition, ZONE, groupID );
+      //   //
+      //   // 		for(let i=0;i<path.length;i++){
+      //   // 			points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+      //   // 		}
+      //   // 		passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+      //   // }
+      //
+      //   //stage = 7 出闸机
+      //   if(humanlist.children[i].stage == 7){
+      //       let points = [];
+      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+      //       points.push(new THREE.Vector3(humanlist.children[i].position.x+5,humanlist.children[i].position.y,humanlist.children[i].position.z));
+      //
+      //       passerCheckDoor.checkDoorControl("out",humanlist.children[i].door,deviceaction)
+      //       passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+      //   }
+      //
+      //   //stage = 8 出站
+      //   if(humanlist.children[i].stage == 8){
+      //     let direct = Math.floor(Math.random()*(3-1+1))+1;
+      //     let points = [];
+      //     points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+      //
+      //     //1--top
+      //     //2-- down
+      //     if(direct == 1){
+      //       targetPosition = passerZone.getzoneposition("exit1");
+      //       path = pathFinder.find(points[0],targetPosition);
+      //     }else{
+      //       targetPosition = passerZone.getzoneposition("exit2");
+      //       path = pathFinder.find(points[0],targetPosition);
+      //     }
+      //
+      //     for(let i=0;i<path.length;i++){
+      //       points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+      //     }
+      //     passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+      //
+      //   }
+      // }
     }
 
   }
diff --git a/src/views/jlmap3d/stationmanager/component/property.vue b/src/views/jlmap3d/stationmanager/component/property.vue
index eff2cb584..6c7e1ef82 100644
--- a/src/views/jlmap3d/stationmanager/component/property.vue
+++ b/src/views/jlmap3d/stationmanager/component/property.vue
@@ -48,6 +48,9 @@
                 <el-input v-model="selectModel.connectDevice"></el-input>
             </el-form-item>
 
+            <el-form-item label="检票机作用:"  v-if="selectModel.checkDirection" disabled="true">
+                <el-input v-model="selectModel.checkDirection"></el-input>
+            </el-form-item>
 
 
             <!-- <el-button v-if="selectModel.meshtype == 'section'" @click="leftAlignment">区段左对齐</el-button>
diff --git a/src/views/jlmap3d/stationmanager/jl3dstationmanager.vue b/src/views/jlmap3d/stationmanager/jl3dstationmanager.vue
index e567d30c9..73f7fa74e 100644
--- a/src/views/jlmap3d/stationmanager/jl3dstationmanager.vue
+++ b/src/views/jlmap3d/stationmanager/jl3dstationmanager.vue
@@ -236,14 +236,14 @@
 		height: 100%;
 	}
 	.jl3dstationmanagerdraw {
-		z-index: 3001;
+		/* z-index: 3001; */
 		position: absolute;
 		float: right;
     	/* top:25%; */
 		/* left: 0; */
 		width: 100%;
 		height: 100%;
-		/* z-index: 9; */
+		z-index: 9;
 	}
 	.dataLoadDiv{
 		position: absolute;
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index 0d4c3ead3..2242b6a0b 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -397,7 +397,7 @@ export default {
                             const routeData = this.$router.resolve({
                                 //  /jlmap3d/trafficplan
                                 //  /design/jlmap3d/jl3dstationmanager
-                                path:'/jlmap3d/trafficplan',
+                                path:'/design/jlmap3d/jl3dstationmanager',
                                 query:{
                                     mapid:this.$route.query.mapId,
                                     group:this.$route.query.group,

From f3aed3f16e52cbe2915514372d38d66d93f66f98 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 19 Mar 2021 17:20:22 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/ruleManage/createRule.vue    | 39 ++++++++++++-------
 .../organization/ruleManage/totalGrade.vue    |  3 +-
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/views/organization/ruleManage/createRule.vue b/src/views/organization/ruleManage/createRule.vue
index 738dd799c..ad7193c15 100644
--- a/src/views/organization/ruleManage/createRule.vue
+++ b/src/views/organization/ruleManage/createRule.vue
@@ -417,12 +417,16 @@ export default {
         initData(data) {
             this.form = { orgId: data.orgId + '', schoolYear: data.schoolYear, term: data.term };
             this.classChange(data.orgId);
-            this.examsData = data.usualScoringRule.exams || [];
-            this.learningTimeData = data.usualScoringRule.learningTimeList || [];
-            if (data.usualScoringRule.attendance) {
-                this.attendanceData = [data.usualScoringRule.attendance];
+            if (data.usualScoringRule) {
+                this.examsData = data.usualScoringRule.exams || [];
+                this.learningTimeData = data.usualScoringRule.learningTimeList || [];
+                if (data.usualScoringRule.attendance) {
+                    this.attendanceData = [data.usualScoringRule.attendance];
+                }
+            }
+            if (data.finalScoringRule) {
+                this.finalScoringData = data.finalScoringRule.exams || [];
             }
-            this.finalScoringData = data.finalScoringRule.exams || [];
         },
         generateUsual() {
             this.$refs.usualScoringForm.validate((valid) => {
@@ -561,16 +565,23 @@ export default {
                     const model = {
                         orgId: this.form.orgId,
                         schoolYear: this.form.schoolYear,
-                        term: this.form.term,
-                        usualScoringRule: {
-                            attendance: this.attendanceData[0] || {},
-                            learningTimeList: this.learningTimeData,
-                            exams: this.examsData
-                        },
-                        finalScoringRule: {
-                            exams: this.finalScoringData
-                        }
+                        term: this.form.term
                     };
+                    if (this.finalScoringData && this.finalScoringData.length) {
+                        model.finalScoringRule = { exams: this.finalScoringData };
+                    }
+                    if ((this.attendanceData && this.attendanceData.length) || (this.learningTimeData && this.learningTimeData.length) || (this.examsData && this.examsData.length)) {
+                        model.usualScoringRule = {};
+                        if (this.attendanceData && this.attendanceData.length) {
+                            model.usualScoringRule.attendance = this.attendanceData[0];
+                        }
+                        if (this.learningTimeData && this.learningTimeData.length) {
+                            model.usualScoringRule.learningTimeList = this.learningTimeData;
+                        }
+                        if (this.examsData && this.examsData.length) {
+                            model.usualScoringRule.learningTimeList = this.learningTimeData;
+                        }
+                    }
                     if (this.$route.query.type === 'update') {
                         model.id = this.$route.query.ruleId;
                         updateRule(model).then(resp => {
diff --git a/src/views/organization/ruleManage/totalGrade.vue b/src/views/organization/ruleManage/totalGrade.vue
index 0eaafa14a..54114b237 100644
--- a/src/views/organization/ruleManage/totalGrade.vue
+++ b/src/views/organization/ruleManage/totalGrade.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="title_content">评价结果</div>
-    <el-card class="box-card">
+    <el-card class="box-card" style="padding:  22px 10px 0 10px;">
       <el-form ref="form" :model="form" :rules="rules">
         <el-row>
           <el-col :span="6">
@@ -179,6 +179,5 @@ export default {
 	.box-card{
 		width: 80%;
 		margin: 0 auto;
-		padding:  22px 10px 0 10px;
 	}
 </style>

From 82fe1f3dc9baf8acca7835acfb4efd103c8d798f Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 19 Mar 2021 17:34:37 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E6=9D=83=E9=87=8D=E8=97=90=E8=A7=86?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/ruleManage/createRule.vue     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/organization/ruleManage/createRule.vue b/src/views/organization/ruleManage/createRule.vue
index ad7193c15..3ae05e021 100644
--- a/src/views/organization/ruleManage/createRule.vue
+++ b/src/views/organization/ruleManage/createRule.vue
@@ -63,7 +63,7 @@
               <el-table-column prop="startDate" label="开始日期" />
               <el-table-column prop="endDate" label="截止日期" />
               <el-table-column prop="days4FullMarks" label="考勤天数" />
-              <el-table-column prop="weight" label="权重占比(%)" />
+              <el-table-column prop="weight" label="权重" />
               <el-table-column label="操作" width="100">
                 <template slot-scope="scope">
                   <el-button :disabled="isDetail" type="text" size="small" @click="editUsual(scope.row,scope.$index, 'attendance')">编辑</el-button>
@@ -80,7 +80,7 @@
                   <el-tag>{{ getExamName(scope.row.examId) }}</el-tag>
                 </template>
               </el-table-column>
-              <el-table-column prop="weight" label="权重占比(%)" />
+              <el-table-column prop="weight" label="权重" />
               <el-table-column label="操作" width="100">
                 <template slot-scope="scope">
                   <el-button :disabled="isDetail" type="text" size="small" @click="editUsual(scope.row,scope.$index, 'exam')">编辑</el-button>
@@ -102,7 +102,7 @@
               <el-table-column prop="startTime" label="开始时间" />
               <el-table-column prop="endTime" label="截止时间" />
               <el-table-column prop="duration4FullMarks" label="学习时长" />
-              <el-table-column prop="weight" label="权重占比(%)" width="100" />
+              <el-table-column prop="weight" label="权重" width="100" />
               <el-table-column label="操作" width="100">
                 <template slot-scope="scope">
                   <el-button :disabled="isDetail" type="text" size="small" @click="editUsual(scope.row,scope.$index, 'learningTime')">编辑</el-button>
@@ -189,7 +189,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item v-if="usualScoringForm.type === 'attendance' || usualScoringForm.type === 'exam'" label="权重(%)" prop="weight">
+                <el-form-item v-if="usualScoringForm.type === 'attendance' || usualScoringForm.type === 'exam'" label="权重" prop="weight">
                   <el-input-number v-model="usualScoringForm.weight" :precision="0" :step="1" :min="1" :max="100" controls-position="right" />
                 </el-form-item>
               </el-col>
@@ -214,7 +214,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-form-item v-if="usualScoringForm.type === 'learningTime'" label="权重(%)" prop="weight">
+              <el-form-item v-if="usualScoringForm.type === 'learningTime'" label="权重" prop="weight">
                 <el-input-number v-model="usualScoringForm.weight" :precision="0" :step="1" :min="1" :max="100" controls-position="right" />
               </el-form-item>
             </el-row>
@@ -235,7 +235,7 @@
                 <el-tag>{{ getExamName(scope.row.examId) }}</el-tag>
               </template>
             </el-table-column>
-            <el-table-column prop="weight" label="权重占比(%)" />
+            <el-table-column prop="weight" label="权重" />
             <el-table-column label="操作" width="100">
               <template slot-scope="scope">
                 <el-button :disabled="isDetail" type="text" size="small" @click="editFinal(scope.row, scope.$index)">编辑</el-button>
@@ -268,7 +268,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="权重(%)" prop="weight">
+                <el-form-item label="权重" prop="weight">
                   <el-input-number v-model="finalScoringForm.weight" :precision="0" :step="1" :min="1" :max="100" controls-position="right" />
                 </el-form-item>
               </el-col>
@@ -359,7 +359,7 @@ export default {
                     { required: true, message: '请选择测试试卷', trigger: 'blur' }
                 ],
                 weight: [
-                    { required: true, message: '请填写权重占比', trigger: 'blur' }
+                    { required: true, message: '请填写权重', trigger: 'blur' }
                 ]
             },
             finalScoringForm: {
@@ -371,7 +371,7 @@ export default {
                     { required: true, message: '请选择测试试卷', trigger: 'blur' }
                 ],
                 weight: [
-                    { required: true, message: '请填写权重占比', trigger: 'blur' }
+                    { required: true, message: '请填写权重', trigger: 'blur' }
                 ]
             },
             attendanceData:[],

From d22f9d62de3a8a2be94a056a6416c62d82c403f9 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Fri, 19 Mar 2021 18:14:21 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E6=96=B0=E4=B8=89=E7=BB=B4=E5=AE=A2?=
 =?UTF-8?q?=E6=B5=81=E9=80=BB=E8=BE=91=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?(=E6=9C=AA=E5=AE=9E=E8=A3=85)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/jl3dactionmanager.js            |  438 -----
 .../connect/silumationConnect.js              |   85 +-
 .../connect/stationConnect.js                 |  180 +-
 .../controls/stationManagerControls.js        |   19 +-
 .../jl3dstationmanager/jl3dstationmanager.js  |  155 +-
 .../jl3dstationmanager/loader/loader.js       |    6 +-
 .../jl3dstationmanager/model/passerhuman.js   |  197 +-
 .../jl3dstationmanager/model/passerstation.js |    3 +-
 .../model/region/checkRegion.js               |  229 +--
 .../model/region/elevatorRegion.js            |    1 +
 .../model/region/escalatorRegion.js           |    1 +
 .../model/region/securityRegion.js            |    1 +
 .../model/region/stairsRegion.js              |    1 +
 .../model/region/standRegion.js               |   21 +-
 .../model/region/startRegion.js               |   31 +-
 .../model/region/ticketRegion.js              |   16 +-
 .../model/region/unaccessRegion.js            |    1 +
 .../jl3dstationmanager/model/regionManager.js |   54 +-
 .../jl3dstationmanager/passerai/passerai.js   |  568 +++---
 src/utils/baseUrl.js                          |    4 +-
 .../stationmanager/component/property.vue     |   71 +-
 .../component/stationmanagerdata.vue          |  164 ++
 .../stationmanager/jl3dstationmanager.vue     |  151 +-
 src/views/newMap/jlmapNew/index.vue           |    2 +-
 static/jl3d/path/stationmanager.obj           |  672 ++++---
 static/jl3d/path/stationmanagerold.obj        | 1710 +++++++++++++++++
 26 files changed, 3222 insertions(+), 1559 deletions(-)
 delete mode 100644 src/jlmap3d/jl3dstationmanager/component/jl3dactionmanager.js
 create mode 100644 src/views/jlmap3d/stationmanager/component/stationmanagerdata.vue
 create mode 100644 static/jl3d/path/stationmanagerold.obj

diff --git a/src/jlmap3d/jl3dstationmanager/component/jl3dactionmanager.js b/src/jlmap3d/jl3dstationmanager/component/jl3dactionmanager.js
deleted file mode 100644
index c85646d4e..000000000
--- a/src/jlmap3d/jl3dstationmanager/component/jl3dactionmanager.js
+++ /dev/null
@@ -1,438 +0,0 @@
-import { Staticmodel } from '@/jlmap3d/jl3dtrafficplan/loader/stationconfig.js';
-//静态资源文件路劲
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
-//loader
-import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
-//轨道视角控制
-import { StationManagerControls } from '@/jlmap3d/jl3dstationmanager/controls/stationManagerControls';
-//模型管理器
-import { ModelManager } from '@/jlmap3d/jl3dstationmanager/loader/loader.js';
-//骨骼动画模型辅助工具
-import { SkeletonUtils } from '@/jlmap3d/main/utils/SkeletonUtils.js';
-//获取信息接口
-import { getPublishMapVersion, getPublishMapDetail,getPublish3dMapDetail} from '@/api/jlmap3d/load3ddata';
-//cctv站台对象
-import { PasserStation } from '@/jlmap3d/jl3dtrafficplan/model/passerstation.js';
-//cctv检票机对象
-import { PasserCheckDoor } from '@/jlmap3d/jl3dtrafficplan/model/passercheckdoor.js';
-//cctv列车对象
-import { PasserTrain } from '@/jlmap3d/jl3dtrafficplan/model/passertrain.js';
-//cctv行人对象
-import { PasserHuman } from '@/jlmap3d/jl3dtrafficplan/model/passerhuman.js';
-//cctv渲染器
-import { PasserRender } from '@/jlmap3d/jl3dpassflow/passerrender/passerrender.js';
-//cctv行人ai
-import { PasserAi } from '@/jlmap3d/jl3dtrafficplan/passerai/passerai.js';
-//行人寻路相关工具
-import { ZoneManager } from '@/jlmap3d/jl3dtrafficplan/model/zonemanager.js';
-import { PathFinder } from '@/jlmap3d/jl3dtrafficplan/passerai/pathfinder.js';
-//cctv通信工具
-import { PassflowConnect } from '@/jlmap3d/jl3dtrafficplan/connect/stationconnect.js';
-
-import StompClient from '@/utils/sock';
-import store from '@/store/index';
-// import { Loading } from 'element-ui';
-import {Stats} from '@/jlmap3d/main/lib/stats.min.js';
-
-//动画播放相关
-let clock = new THREE.Clock();
-let delta;
-
-let scene,camerass,renderer;
-
-let aiswitch = 0;
-//动画组
-let mixers = [];
-//车站摄像机模型
-let monitor;
-
-//寻路相关对象
-let passerZone = new ZoneManager();
-let pathFinder = new PathFinder();
-let path;
-
-//设备动画action组
-let deviceaction = [];
-//控制帧率的webworker线程
-let passerWebWork = new Worker(JL3D_LOCAL_STATIC+"/workertest/trafficplan/trafficstation.js");
-
-//老版本临时ai控制
-let olddataai = false;
-
-export function Jl3dStationManager(dom,skinCode,routegroup,viewMap,initCode) {
-
-	// let stats = new Stats();
-	// dom.appendChild( stats.dom );
-
-	let scope = this;
-
-	this.dom = dom;
-	this.nowcode = null;
-	this.animateswitch = false;
-	this.signallights = [];
-	this.mixers = [];
-	this.showmodel = null;
-
-	this.allStationData = [];
-	this.humanWaitTop = 0;
-	this.humanWaitDown = 0;
-	this.humanInSpeed = 0;
-	this.humanOutSpeed = 0;
-	let waitForCreatIn = [];
-	let waitForCreatOutTop = [];
-	let waitForCreatOutDown = [];
-	//定义相机
-	camerass = new THREE.PerspectiveCamera(70, dom.offsetWidth / dom.offsetHeight, 0.01, 10000);
-	camerass.position.set(0,200,0);
-	camerass.aspect = dom.offsetWidth / dom.offsetHeight;
-	camerass.updateProjectionMatrix();
-
-	//定义场景(渲染容器)
-	scene = new THREE.Scene();
-	// scene.background = new THREE.Color(0xa0a0a0);
-
-
-	var mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 1000, 1000 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
-	mesh.rotation.x = - Math.PI / 2;
-	mesh.receiveShadow = true;
-	scene.add( mesh );
-
-	var grid = new THREE.GridHelper( 1000, 100, 0x000000, 0x000000 );
-	grid.material.opacity = 0.2;
-	grid.material.transparent = true;
-	scene.add( grid );
-
-	let passerRender = new PasserRender(viewMap);
-	passerRender.initView(dom,scene,camerass);
-	passerRender.reSize(scope.dom.offsetWidth,scope.dom.offsetHeight);
-	//定义全局光
-	let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
-	scene.add(ambientLight);
-	var light = new THREE.HemisphereLight( 0xffffff, 0x444444 );
-	light.position.set( 0, 4000, 0 );
-	scene.add( light );
-
-	let controls = new THREE.StationManagerControls(camerass, dom,camerass,scene,mesh);
-	// controls.maxPolarAngle = Math.PI / 2;
-	// controls.minPolarangle = Math.PI / 5;
-	// controls.maxDistance = 800;
-	controls.screenSpacePanning = true;
-
-	controls.target.set( 1, 0, 0 );
-	controls.controlMode = "Draw";
-	controls.update();
-	this.selectmodel = null;
-
-	// let mouse = new THREE.Vector2();
-	let raycaster = new THREE.Raycaster();
-
-	//进站运动中乘客
-	let humanlist = new THREE.Group();
-	//上行等待上车乘客
-	let topWaitPassers = new THREE.Group();
-	//下行等待上车乘客
-	let downWaitPassers = new THREE.Group();
-	//出站乘客
-	let outStationPassers = new THREE.Group();
-
-	let passerHuman = new PasserHuman();
-
-	let passerAi = new PasserAi(passerZone,pathFinder);
-
-	this.anime = null;
-
-	this.modelmanager = new ModelManager();
-  // let loadingInstance = Loading.service({ fullscreen: true });
-
-	let stationlist = [];
-	let socktest = null;
-	let passerStation = new PasserStation();
-	let passerCheckDoor = new PasserCheckDoor();
-	let passerTrain = new PasserTrain();
-
-	// document.addEventListener( "mousedown", onselect, false );
-
-		this.modelmanager.loadpromise(Staticmodel, scope.mixers,"2").then(function (data) {
-			// console.log(scope.modelmanager.station.mesh.getObjectByName("top"));
-			// let testtop = scope.modelmanager.station.mesh.getObjectByName("down");
-			// for(let i=0;i<testtop.children.length;i++){
-			// 	console.log(testtop.children[i].matrixWorld.elements[12]);
-			// 	console.log(testtop.children[i].matrixWorld.elements);
-			// }
-			// console.log(scope.modelmanager.station.mesh.getObjectByName("down"));
-			passerStation.initStationAnimation(scope.modelmanager.station.mesh,mixers,deviceaction,scene);
-			passerCheckDoor.initCheckDoorInAnimation(scope.modelmanager.zhajiin.mesh,mixers,deviceaction,scene);
-			passerCheckDoor.initCheckDoorOutAnimation(scope.modelmanager.zhajiout.mesh,mixers,deviceaction,scene);
-
-			passerTrain.initTrain(scope.modelmanager.train.mesh,mixers,deviceaction,scene);
-
-			scene.add(scope.modelmanager.section.mesh);
-
-			monitor = scope.modelmanager.monitor.mesh;
-			scene.add(monitor);
-			console.log("animate");
-			animate();
-		})
-
-	this.initTrafficStart = function(){
-		passerStation.initCodeStation(initCode);
-		scope.humanWaitTop = passerStation.nowStation.toppassers;
-		scope.humanWaitDown = passerStation.nowStation.downpassers;
-		scope.humanInSpeed = 0;
-		scope.humanOutSpeed = 0;
-		passerHuman.speed = scope.humanInSpeed;
-		passerAi.initPasser(humanlist,topWaitPassers,downWaitPassers,passerHuman,scope);
-
-		updatePasserData(humanlist.children.length,topWaitPassers.children.length,downWaitPassers.children.length,outStationPassers.children.length,passerHuman.speed);
-		scope.resetscene();
-	}
-
-	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;
-		updatePasserData(humanlist.children.length,topWaitPassers.children.length,downWaitPassers.children.length,outStationPassers.children.length,passerHuman.speed);
-
-		scope.resetscene();
-	}
-
-	this.updateNowStationData = function(){
-		for(let i=0;i<passerStation.nowStation.topspeed;i++){
-			let newIn = {
-				overGoal:"top",
-			};
-			waitForCreatIn.push(newIn);
-		}
-		for(let i=0;i<passerStation.nowStation.downspeed;i++){
-			let newIn = {
-				overGoal:"down",
-			};
-			waitForCreatIn.push(newIn);
-		}
-
-
-		scope.humanInSpeed = passerStation.nowStation.topspeed+passerStation.nowStation.downspeed;
-		passerHuman.speed = scope.humanInSpeed;
-		passerWebWork.postMessage(["changespeed",scope.humanInSpeed/30]);
-	}
-
-	this.updateNowLeaveData = function(direct,outNum){
-		if(direct == "top"){
-			waitForCreatOutTop = getnum(outNum,17);
-			// console.log(waitForCreatOutTop);
-			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]);
-						passerHuman.newHumanCreate(outStationPassers,passerZone.list["standtop"].doorpoints[i],5,"top",i);
-					}, Math.random()*1000*j);
-				}
-			}
-		}else{
-			waitForCreatOutDown = getnum(outNum,17);
-			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]);
-						passerHuman.newHumanCreate(outStationPassers,passerZone.list["standdown"].doorpoints[i],5,"down",i);
-					}, Math.random()*1000*j);
-				}
-			}
-		}
-	}
-
-	this.resetscene = function(){
-		aiswitch = 1;
-		passerAi.toppasserin = false;
-		passerAi.downpasserin = false;
-		//下车控制开关
-		passerAi.toppasseron = false;
-		passerAi.downpasseron = false;
-		passerAi.toppasserinNum = 0;
-		passerAi.downpasserinNum = 0;
-
-		passerTrain.toptrain.nowcode = null;
-		passerTrain.downtrain.nowcode = null;
-		// humanlist = new THREE.Group();
-		for(let j=0; j<humanlist.children.length;j++){
-
-			humanlist.remove(humanlist.children[j]);
-			j--;
-			// j--;
-		}
-
-		for(let j=0; j<topWaitPassers.children.length;j++){
-
-			topWaitPassers.remove(topWaitPassers.children[j]);
-			j--;
-			// j--;
-		}
-		for(let j=0; j<downWaitPassers.children.length;j++){
-
-			downWaitPassers.remove(downWaitPassers.children[j]);
-			j--;
-			// j--;
-		}
-		for(let j=0; j<outStationPassers.children.length;j++){
-
-			outStationPassers.remove(outStationPassers.children[j]);
-			j--;
-			// j--;
-		}
-
-
-
-		passerTrain.toptrain.position.y = -20000;
-		passerTrain.downtrain.position.y = -20000;
-
-		deviceaction.down.action.reset();
-		deviceaction.down.action.time = deviceaction.down.action._clip.duration;
-		deviceaction.down.action.timeScale = -1;
-		deviceaction.down.action.play();
-
-		deviceaction.top.action.reset();
-		deviceaction.top.action.time = deviceaction.down.action._clip.duration;
-		deviceaction.top.action.timeScale = -1;
-		deviceaction.top.action.play();
-		for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
-			passerTrain.toptrain.action.top[an].reset();
-			passerTrain.toptrain.action.top[an].time = passerTrain.toptrain.action.top[an]._clip.duration;
-			passerTrain.toptrain.action.top[an].timeScale = -1;
-			passerTrain.toptrain.action.top[an].play();
-		}
-		for(let an=passerTrain.toptrain.action.down.length-1;an>=0;an--){
-			passerTrain.toptrain.action.down[an].reset();
-			passerTrain.toptrain.action.down[an].time = passerTrain.toptrain.action.down[an]._clip.duration;
-			passerTrain.toptrain.action.down[an].timeScale = -1;
-			passerTrain.toptrain.action.down[an].play();
-		}
-		// for(let an=actions.length-1;an>=0;an--){
-		// 	actions[an].reset();
-		// 	actions[an].time = actions[an]._clip.duration;
-		// 	actions[an].timeScale = -1;
-		// 	actions[an].play();
-		// }
-		setTimeout(function(){
-			passerAi.initPasser(humanlist,topWaitPassers,downWaitPassers,passerHuman,scope);
-			aiswitch = 0;
-		}, 2000);
-
-	}
-
-	function startWorker(){
-
-		let updateaianimate = setInterval(
-			function(){
-				// console.log("?");
-				if(aiswitch == 0){
-					updatePasserData(humanlist.children.length,topWaitPassers.children.length,downWaitPassers.children.length,outStationPassers.children.length,passerHuman.speed);
-
-					passerHuman.moveAnimateUpdate(humanlist,topWaitPassers,downWaitPassers,outStationPassers,passerHuman);
-					passerAi.aiUpdate(humanlist,topWaitPassers,downWaitPassers,outStationPassers,passerHuman,passerCheckDoor,deviceaction);
-					// passerZone.zoneActionCheck(humanlist,passerHuman,passerCheckDoor,deviceaction);
-					delta = clock.getDelta();
-
-					for(let i=mixers.length-1;i>=0;i--){
-					 if(mixers[i]._actions[0].isRunning()){
-						 mixers[i].update( delta );
-					 }
-					}
-					// for(let i=topWaitPassers.children.length-1;i>=0;i--){
-					//  if(topWaitPassers.children[i].mixer._actions[0].isRunning()){
-					// 	 topWaitPassers.children[i].mixer.update( delta );
-					//  }
-					// }
-					// for(let i=downWaitPassers.children.length-1;i>=0;i--){
-					//  if(downWaitPassers.children[i].mixer._actions[0].isRunning()){
-					// 	 downWaitPassers.children[i].mixer.update( delta );
-					//  }
-					// }
-					// for(let i=outStationPassers.children.length-1;i>=0;i--){
-					//  if(outStationPassers.children[i].mixer._actions[0].isRunning()){
-					// 	 outStationPassers.children[i].mixer.update( delta );
-					//  }
-					// }
-					// for(let i=humanlist.children.length-1;i>=0;i--){
-					//  if(humanlist.children[i].mixer._actions[0].isRunning()){
-					// 	 humanlist.children[i].mixer.update( delta );
-					//  }
-					// }
-				}
-			}
-		, 100);
-
-		passerWebWork.onmessage = function (event) {
-			if(aiswitch == 0){
-				// console.log(humanlist.children.length);
-
-				this.allStationData = [];
-				if(waitForCreatIn.length>0){
-					let direct = Math.floor(Math.random()*(3-1+1))+1;
-					//1--top
-					//2-- down
-					if(direct == 1){
-						passerHuman.newHumanCreate(humanlist,passerZone.getzoneposition("enter1"),0,waitForCreatIn[0].overGoal);
-					}else{
-						passerHuman.newHumanCreate(humanlist,passerZone.getzoneposition("enter2"),0,waitForCreatIn[0].overGoal);
-					}
-					waitForCreatIn.shift();
-				}
-			}
-		};
-	}
-	//
-	// function onselect(event){
-	// 	if(event.button == '0'){
-	//
-	// 			//定义光线
-	// 			let raycaster = new THREE.Raycaster();
-	// 			//定义平面鼠标点击坐标
-	// 			let mouse = new THREE.Vector2();
-	// 			mouse.x = (event.clientX /  scope.dom.offsetWidth) * 2 - 1;
-	// 			mouse.y = -(event.clientY / scope.dom.offsetHeight) * 2 + 1;
-	//
-	// 			raycaster.setFromCamera( mouse, camerass );
-	//
-	// 			let intersects = raycaster.intersectObject(scope.modelmanager.station.mesh,true);
-	// 			console.log(intersects[0].point);
-	// 	}
-	// }
-
-
-	//循环渲染函数
-	function animate() {
-		passerRender.update();
-		// console.log(passerRender);
-		// console.log("ss");
-		// if(passerRender.state == "freeview"){
-		controls.update();
-		// }
-		// delta = clock.getDelta();
-
-		requestAnimationFrame(animate);
-
-	}
-
-	window.onresize = function () {
-		passerRender.reSize(scope.dom.offsetWidth,scope.dom.offsetHeight);
-	}
-
-	this.switchviews = function(viewmode){
-		passerRender.changeRenderMode(viewmode);
-	}
-
-
-	function getnum(num,pnum){
-		let re = [];
-		let base = Math.floor(num/pnum);
-		let reset = num%pnum;
-		for(let i=0;i<pnum;i++){
-			let nownum = base+(i<reset?1:0);
-			re.push(nownum);
-		}
-		return re;
-	}
-
-}
diff --git a/src/jlmap3d/jl3dstationmanager/connect/silumationConnect.js b/src/jlmap3d/jl3dstationmanager/connect/silumationConnect.js
index 41b4d424c..905013a71 100644
--- a/src/jlmap3d/jl3dstationmanager/connect/silumationConnect.js
+++ b/src/jlmap3d/jl3dstationmanager/connect/silumationConnect.js
@@ -10,10 +10,11 @@ export function silumationConnect(deviceaction,toptrain,downtrain,routegroup,pas
 	let start = true;
 	let topic = '/user/queue/simulation/jl3d/'+routegroup;
 	let header = {'X-Token': getToken() };
-	socketon(topic);
+	// scope.socketon(topic);
 
-	function socketon(topic) {
+	this.socketon = function() {
 		try {
+			start = true;
 			scope.teststomp.subscribe(topic, callback, header);
 		} catch (error) {
 			console.error('websocket订阅失败');
@@ -21,83 +22,15 @@ export function silumationConnect(deviceaction,toptrain,downtrain,routegroup,pas
 
 	};
 
-	this.socketoff = function(topic) {
+	this.socketoff = function() {
+		start = false;
 		scope.teststomp.unsubscribe(topic);
 	};
 
 	// 仿真socket接口回调函数
 	function callback(Response) {
-		const data = JSON.parse(Response.body);
-		if(data.type == "PFV"){
-
-			for(let i=0;i<passerStation.stationlist.length;i++){
-				if(passerStation.stationlist[i].code == data.body){
-					jl3d.changestation(passerStation.stationlist[i].name);
-					updateValue(passerStation.stationlist[i].name);
-					i = passerStation.stationlist.length;
-				}
-			}
-
-		}
-		// /** 站台客流当前人数信息 */
-		// if(data.type == "STAND_PFI"){
-		//
-		// 	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++;
-		// 			}
-		//
-		// 			if(count == 2){
-		// 				i = newStandData.length;
-		// 			}
-		// 		}
-		// 	}
-		//
-		// 	jl3d.updateNowStationData();
-		//
-		// 	if(start){
-		// 		start = false;
-		// 		jl3d.initTrafficStart();
-		// 	}
-		//
-		// 	// jl3d.allStationData = data.body;
-		// }
-
-		// if(data.type == "TRAIN_PFI_BL"){
-		//
-		// 	if(toptrain.nowcode == data.body.code && topswitch == true){
-		//
-		// 		//根据上下车人数创建人
-		// 		jl3d.updateNowLeaveData("top",data.body.out);
-		// 		setTimeout(function(){
-		// 			passerAi.passerout("top","start",data.body.in)
-		// 		}, 5000);
-		//
-		// 	}
-		// 	if(downtrain.nowcode == data.body.code && downswitch == true){
-		// 		//根据上下车人数创建人
-		// 		jl3d.updateNowLeaveData("down",data.body.out);
-		// 		setTimeout(function(){
-		// 			passerAi.passerout("down","start",data.body.in);
-		// 		}, 5000);
-		// 	}
-		// }
+		let data = JSON.parse(Response.body);
+		
 
 
 		if(data.type == "DeviceCtrl_3D"){
@@ -172,15 +105,15 @@ export function silumationConnect(deviceaction,toptrain,downtrain,routegroup,pas
 
 			for(let i=0,leni = data.body.length;i<leni;i++){
 				if(data.body[i].section == passerStation.nowStation.topsection){
+
 					if(toptrain.nowcode != data.body[i].code){
 						toptrain.nowcode = data.body[i].code;
 						sockStationPass.topswitch = true;
 					}
 					toptrain.position.copy(toptrain.curve.getPointAt(data.body[i].offset));
 
-
 				}else{
-					if(downtrain.nowcode == data.body[i].code){
+					if(toptrain.nowcode == data.body[i].code){
 						sockStationPass.topswitch = false
 						toptrain.position.x -= 1;
 					}
diff --git a/src/jlmap3d/jl3dstationmanager/connect/stationConnect.js b/src/jlmap3d/jl3dstationmanager/connect/stationConnect.js
index acf4a075e..1fb2530f6 100644
--- a/src/jlmap3d/jl3dstationmanager/connect/stationConnect.js
+++ b/src/jlmap3d/jl3dstationmanager/connect/stationConnect.js
@@ -10,11 +10,13 @@ export function stationConnect(deviceaction,toptrain,downtrain,routegroup,passer
 	let start = true;
 	let topic = '/user/queue/simulation/passenger/'+routegroup;
 	let header = {'X-Token': getToken() };
+
 	this.topswitch = false;
 	this.downswitch = false;
-	socketon(topic);
+	// scope.socketon(topic);
 
-	function socketon(topic) {
+	this.socketon = function() {
+		start = true;
 		try {
 			scope.teststomp.subscribe(topic, callback, header);
 		} catch (error) {
@@ -23,25 +25,25 @@ export function stationConnect(deviceaction,toptrain,downtrain,routegroup,passer
 
 	};
 
-	this.socketoff = function(topic) {
+	this.socketoff = function() {
+		start = false;
 		scope.teststomp.unsubscribe(topic);
 	};
 
 	// 仿真socket接口回调函数
 	function callback(Response) {
-		const data = JSON.parse(Response.body);
+		let data = JSON.parse(Response.body);
+		if(data.type == "PFV"){
+			for(let i=0;i<passerStation.stationlist.length;i++){
+				if(passerStation.stationlist[i].code == data.body){
 
-		// if(data.type == "PFV"){
-    //
-		// 	for(let i=0;i<passerStation.stationlist.length;i++){
-		// 		if(passerStation.stationlist[i].code == data.body){
-		// 			jl3d.changestation(passerStation.stationlist[i].name);
-		// 			updateValue(passerStation.stationlist[i].name);
-		// 			i = passerStation.stationlist.length;
-		// 		}
-		// 	}
-    //
-		// }
+					jl3d.changestation(passerStation.stationlist[i].name);
+					updateValue(passerStation.stationlist[i].name);
+					i = passerStation.stationlist.length;
+				}
+			}
+
+		}
 		/** 站台客流当前人数信息 */
 		if(data.type == "STAND_PFI"){
 
@@ -55,7 +57,7 @@ export function stationConnect(deviceaction,toptrain,downtrain,routegroup,passer
 
 
 					if(passerStation.stationlist[j].topstand == newStandData[i].standCode){
-			
+
 						// console.log(passerStation.stationlist[j]);
 						passerStation.stationlist[j].topspeed = newStandData[i].to;
 						passerStation.stationlist[j].toppassers = newStandData[i].num;
@@ -89,140 +91,26 @@ export function stationConnect(deviceaction,toptrain,downtrain,routegroup,passer
 
 			if(toptrain.nowcode == data.body.code && scope.topswitch == true){
 
-				// //根据上下车人数创建人
-				// jl3d.updateNowLeaveData("top",data.body.out);
-				// setTimeout(function(){
-				// 	passerAi.passerout("top","start",data.body.in)
-				// }, 5000);
+				//根据上下车人数创建人
+				jl3d.updateNowLeaveData("top",data.body.out);
+				setTimeout(function(){
+					passerAi.passerout("top","start",data.body.in)
+				}, 5000);
 
 			}
-			// if(downtrain.nowcode == data.body.code && scope.downswitch == true){
-			// 	//根据上下车人数创建人
-			// 	jl3d.updateNowLeaveData("down",data.body.out);
-			// 	setTimeout(function(){
-			// 		passerAi.passerout("down","start",data.body.in);
-			// 	}, 5000);
-			// }
+			if(downtrain.nowcode == data.body.code && scope.downswitch == true){
+				//根据上下车人数创建人
+				jl3d.updateNowLeaveData("down",data.body.out);
+				setTimeout(function(){
+					passerAi.passerout("down","start",data.body.in);
+				}, 5000);
+			}
+
+    }
+		if(data.type == "Simulation_Reset"){
+			start = true;
 		}
 
-    //
-		// if(data.type == "DeviceCtrl_3D"){
-		// 	if(data.body.type == "PSD"){
-    //
-		// 		if(data.body.code == passerStation.nowStation.toppsd){
-		// 			if(data.body.open == 0){
-    //
-		// 				passerAi.passerout("top","end");
-		// 				deviceaction.top.action.reset();
-		// 				deviceaction.top.action.time =deviceaction.top.action._clip.duration;
-		// 				deviceaction.top.action.timeScale = -1;
-		// 				deviceaction.top.action.play();
-    //
-		// 			}else{
-    //
-		// 				deviceaction.top.action.reset();
-		// 				deviceaction.top.action.time = 0;
-		// 				deviceaction.top.action.timeScale = 1;
-		// 				deviceaction.top.action.play();
-		// 			}
-		// 		}
-		// 		if(data.body.code == passerStation.nowStation.downpsd){
-		// 			if(data.body.open == 0){
-    //
-		// 				deviceaction.down.action.reset();
-		// 				deviceaction.down.action.time = deviceaction.down.action._clip.duration;
-		// 				deviceaction.down.action.timeScale = -1;
-		// 				deviceaction.down.action.play();
-		// 				passerAi.passerout("down","end");
-		// 			}else{
-    //
-		// 				deviceaction.down.action.reset();
-		// 				deviceaction.down.action.time = 0;
-		// 				deviceaction.down.action.timeScale = 1;
-		// 				deviceaction.down.action.play();
-		// 			}
-    //
-		// 		}
-		// 	}
-    //
-		// 	if(data.body.type == "TRAIN_DOOR"){
-    //
-		// 		if(toptrain.nowcode == data.body.code){
-    //
-		// 			if(data.body.open == "0"){
-		// 				closetraindoor(toptrain,data.body.doorCode,"top");
-    //
-		// 			}else{
-		// 				opentraindoor(toptrain,data.body.doorCode,"top");
-    //
-		// 			}
-    //
-		// 		}
-    //
-		// 		if(downtrain.nowcode == data.body.code){
-    //
-		// 			if(data.body.open == "0"){
-		// 				closetraindoor(downtrain,data.body.doorCode,"down");
-    //
-		// 			}else{
-		// 				opentraindoor(downtrain,data.body.doorCode,"down");
-    //
-		// 			}
-    //
-		// 		}
-    //
-		// 	}
-		// }
-    //
-		// if(data.type == "TrainRun_3D"){
-    //
-		// 	for(let i=0,leni = data.body.length;i<leni;i++){
-		// 		if(data.body[i].section == passerStation.nowStation.topsection){
-		// 			if(toptrain.nowcode != data.body[i].code){
-		// 				toptrain.nowcode = data.body[i].code;
-		// 				topswitch = true;
-		// 			}
-		// 			toptrain.position.copy(toptrain.curve.getPointAt(data.body[i].offset));
-    //
-    //
-		// 		}else{
-		// 			if(downtrain.nowcode == data.body[i].code){
-		// 				topswitch = false
-		// 				toptrain.position.x -= 1;
-		// 			}
-    //
-		// 		}
-    //
-		// 		if(data.body[i].section == passerStation.nowStation.downsection){
-		// 			if(downtrain.nowcode != data.body[i].code){
-		// 				downtrain.nowcode = data.body[i].code;
-		// 				downswitch = true;
-		// 			}
-		// 			downtrain.position.copy(downtrain.curve.getPointAt(data.body[i].offset));
-    //
-		// 		}else{
-		// 			if(downtrain.nowcode == data.body[i].code){
-		// 				downswitch = false;
-		// 				downtrain.position.x += 1;
-		// 			}
-    //
-		// 		}
-		// 	}
-		// }
-
-		// if(data.type == 'Device_Load_Destroy_3D'){
-		// 	start = true;
-		// 	toptrain.nowcode = null;
-		// 	downtrain.nowcode = null;
-		// 	console.log("仿真重开=====================");
-		// }
-    //
-    //
-		// if(data.type == 'Simulation_Over') {
-		// 	store.dispatch('LogOut').then(() => {
-		// 		location.reload();
-		// 	});
-		// }
 
 	}
 
diff --git a/src/jlmap3d/jl3dstationmanager/controls/stationManagerControls.js b/src/jlmap3d/jl3dstationmanager/controls/stationManagerControls.js
index aadd7e019..192c3b9da 100644
--- a/src/jlmap3d/jl3dstationmanager/controls/stationManagerControls.js
+++ b/src/jlmap3d/jl3dstationmanager/controls/stationManagerControls.js
@@ -754,7 +754,20 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen
 		// prevents the browser from setting it automatically.
 
 		scope.domElement.focus ? scope.domElement.focus() : window.focus();
-		if(scope.controlMode == "Orbit"){
+		if(scope.controlMode == "Orbit" || scope.controlMode == "Draw"){
+			// if(scope.controlMode == "Orbit"){
+			// 	mouse.x = ( event.clientX / window.innerWidth ) * 2 - 1;
+			// 	mouse.y = - ( event.clientY / window.innerHeight ) * 2 + 1;
+			// 	raycaster.setFromCamera( mouse, camera );
+			// 	intersects = raycaster.intersectObjects( scene.children,true);
+			// 	if(intersects[0]){
+			//
+			// 	}
+			// 	jl3dStationManagerEquipSelect(intersects[0]);
+			// 	console.log(intersects);
+			// }
+
+
 			switch ( event.button ) {
 
 				case scope.mouseButtons.RIGHT:
@@ -837,7 +850,7 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen
 					transformControl.attach(scope.selectRegion.parent);
 					jl3dStationManagerUpdateSelectModel(scope.selectRegion.parent);
 				}else{
-
+					transformControl.detach(scope.selectRegion);
 				}
 			}
 		}
@@ -859,7 +872,7 @@ THREE.StationManagerControls = function ( object, domElement ,regionManager,scen
 		event.preventDefault();
 		scope.animateswitch = true;
 
-		if(scope.controlMode == "Orbit"){
+		if(scope.controlMode == "Orbit" || scope.controlMode == "Draw"){
 			switch ( state ) {
 
 				case STATE.ROTATE:
diff --git a/src/jlmap3d/jl3dstationmanager/jl3dstationmanager.js b/src/jlmap3d/jl3dstationmanager/jl3dstationmanager.js
index 205b7b514..1fa6129c8 100644
--- a/src/jlmap3d/jl3dstationmanager/jl3dstationmanager.js
+++ b/src/jlmap3d/jl3dstationmanager/jl3dstationmanager.js
@@ -79,9 +79,9 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 	this.humanWaitDown = 0;
 	this.humanInSpeed = 0;
 	this.humanOutSpeed = 0;
+
 	let waitForCreatIn = [];
-	let waitForCreatOutTop = [];
-	let waitForCreatOutDown = [];
+
 	//定义相机
 	camerass = new THREE.PerspectiveCamera(70, dom.offsetWidth / dom.offsetHeight, 0.1, 10000);
 	camerass.position.set(0,300,0);
@@ -162,7 +162,7 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 
 	let passerHuman = new PasserHuman();
 
-	let passerAi = new PasserAi(sceneRegion,pathFinder,sceneRegion);
+	let passerAi = new PasserAi(pathFinder,sceneRegion);
 
 	this.anime = null;
 
@@ -177,12 +177,10 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 	let passerTrain = new PasserTrain();
 
 	// document.addEventListener( "mousedown", onselect, false );
-	console.log(skinCode);
+
 	getPublish3dMapDetail(skinCode).then(netdata3d => {
-		console.log("1");
 		passerStation.loadMaterial(netdata3d);
 		this.modelmanager.loadpromise(Staticmodel, scope.mixers,"2").then(function (data) {
-			console.log("2");
 			passerStation.initStationAnimation(scope.modelmanager.station.mesh,mixers,deviceaction,scene);
 			passerCheckDoor.initCheckDoorInAnimation(scope.modelmanager.zhajiin.mesh,mixers,deviceaction,scene);
 			passerCheckDoor.initCheckDoorOutAnimation(scope.modelmanager.zhajiout.mesh,mixers,deviceaction,scene);
@@ -194,25 +192,20 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 			monitor = scope.modelmanager.monitor.mesh;
 			scene.add(monitor);
 
-			getPublishMapDetail(skinCode).then(netdata => {
-				console.log("3");
-				passerHuman.initHumans(scope.modelmanager.man1.mesh,scope.modelmanager.man2.mesh);
-				scene.add(humanlist);
-				scene.add(topWaitPassers);
-				scene.add(downWaitPassers);
-				scene.add(outStationPassers);
 
+			getPublishMapDetail(skinCode).then(netdata => {
+				passerHuman.initHumans(scope.modelmanager.man1.mesh,scope.modelmanager.man2.mesh);
+				// scene.add(humanlist);
 				passerStation.initStationList(netdata.data.stationList,netdata.data.stationStandList,netdata.data.psdList);
 				sockStationPass = new stationConnect(deviceaction,passerTrain.toptrain,passerTrain.downtrain,routegroup,passerStation,passerAi,scope);
 				sockStation = new silumationConnect(deviceaction,passerTrain.toptrain,passerTrain.downtrain,routegroup,passerStation,passerAi,sockStationPass,scope);
 
-
-
 				store.dispatch('app/animationsClose');
 
 				let checkobject = setInterval(function(){
 
 					clearInterval(checkobject);
+					switchStationManagerViews();
 					//进站控制
 					startWorker();
 					passerWebWork.postMessage(["on"]);
@@ -224,6 +217,7 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 	});
 
 	this.initTrafficStart = function(){
+		console.log("initTrafficStart");
 		passerStation.initCodeStation(initCode);
 		scope.humanWaitTop = passerStation.nowStation.toppassers;
 		scope.humanWaitDown = passerStation.nowStation.downpassers;
@@ -233,7 +227,7 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 		// passerAi.initPasser(humanlist,topWaitPassers,downWaitPassers,passerHuman,scope);
 
 		updatePasserData(humanlist.children.length,topWaitPassers.children.length,downWaitPassers.children.length,outStationPassers.children.length,passerHuman.speed);
-		scope.resetscene();
+
 	}
 
 	this.changestation = function(stationname){
@@ -242,6 +236,7 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 		scope.humanWaitTop = passerStation.nowStation.toppassers;
 		scope.humanWaitDown = passerStation.nowStation.downpassers;
 		passerHuman.speed = passerStation.nowStation.topspeed + passerStation.nowStation.downspeed;
+
 		updatePasserData(humanlist.children.length,topWaitPassers.children.length,downWaitPassers.children.length,outStationPassers.children.length,passerHuman.speed);
 
 		scope.resetscene();
@@ -251,13 +246,13 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 		// console.log(passerStation.nowStation);
 		for(let i=0;i<passerStation.nowStation.topspeed;i++){
 			let newIn = {
-				overGoal:"topStand",
+				overGoal:"top",
 			};
 			waitForCreatIn.push(newIn);
 		}
 		for(let i=0;i<passerStation.nowStation.downspeed;i++){
 			let newIn = {
-				overGoal:"downStand",
+				overGoal:"down",
 			};
 			waitForCreatIn.push(newIn);
 		}
@@ -268,28 +263,8 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 	};
 
 	this.updateNowLeaveData = function(direct,outNum){
-		if(direct == "top"){
-			waitForCreatOutTop = getnum(outNum,17);
-			// console.log(waitForCreatOutTop);
-			for(let i=0;i<waitForCreatOutTop.length;i++){
-				for(let j=0;j<waitForCreatOutTop[i];j++){
-					setTimeout(function(){
-						// console.log(sceneRegion.list["standtop"].doorpoints[i]);
-						passerHuman.newHumanCreate(outStationPassers,sceneRegion.list["standtop"].doorpoints[i],5,"top",i);
-					}, Math.random()*1000*j);
-				}
-			}
-		}else{
-			waitForCreatOutDown = getnum(outNum,17);
-			for(let i=0;i<waitForCreatOutDown.length;i++){
-				for(let j=0;j<waitForCreatOutDown[i];j++){
-					setTimeout(function(){
-						// console.log(sceneRegion.list["standdown"].doorpoints[i]);
-						passerHuman.newHumanCreate(outStationPassers,sceneRegion.list["standdown"].doorpoints[i],5,"down",i);
-					}, Math.random()*1000*j);
-				}
-			}
-		}
+
+		passerHuman.leaveHumanCreate(direct,outNum,outStationPassers,sceneRegion.startRegion,sceneRegion.checkRegion,sceneRegion.standRegion);
 	}
 
 	this.resetscene = function(){
@@ -331,8 +306,6 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 			// j--;
 		}
 
-
-
 		passerTrain.toptrain.position.y = -20000;
 		passerTrain.downtrain.position.y = -20000;
 
@@ -364,15 +337,17 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 		// 	actions[an].play();
 		// }
 		setTimeout(function(){
-			// passerAi.initPasser(humanlist,topWaitPassers,downWaitPassers,passerHuman,scope);
+
+			passerAi.initPasser(humanlist,topWaitPassers,downWaitPassers,passerHuman,scope);
 			aiswitch = 0;
 		}, 2000);
 
 	}
 
+	let updateaianimate;
 	function startWorker(){
 
-		let updateaianimate = setInterval(
+		updateaianimate = setInterval(
 			function(){
 				// console.log("?");
 				if(aiswitch == 0){
@@ -412,34 +387,41 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 			}
 		, 100);
 
-		passerWebWork.onmessage = function (event) {
-			if(aiswitch == 0){
-				// console.log(humanlist.children.length);
-				// console.log(sceneRegion.startRegion.group.children);
-				this.allStationData = [];
-				// console.log(Math.random());
 
-				// console.log(waitForCreatIn);
-				if(waitForCreatIn.length>0){
-					let randomNum = Math.random();
-					let startNum = 0;
+	}
 
-					for(let i=0;i<sceneRegion.startRegion.group.children.length;i++){
-						startNum = startNum + sceneRegion.startRegion.group.children[i].startWeight;
+	passerWebWork.onmessage = function (event) {
+		if(aiswitch == 0){
+			// console.log(humanlist.children.length);
+			// console.log(sceneRegion.startRegion.group.children);
+			this.allStationData = [];
+			// console.log(Math.random());
 
-						if(randomNum<startNum){
+			// console.log(waitForCreatIn);
+			if(waitForCreatIn.length>0){
+				let randomNum = Math.random();
+				let startNum = 0;
 
-							passerHuman.newHumanCreate(humanlist,sceneRegion.startRegion.group.children[i],0,waitForCreatIn[0].overGoal);
-							waitForCreatIn.shift();
-							i = sceneRegion.startRegion.group.children.length;
-						}
+				for(let i=0;i<sceneRegion.startRegion.group.children.length;i++){
+					startNum = startNum + sceneRegion.startRegion.group.children[i].startWeight;
+
+					if(randomNum<startNum){
+
+						passerHuman.newHumanCreate(humanlist,sceneRegion.startRegion.group.children[i],0,waitForCreatIn[0].overGoal);
+						waitForCreatIn.shift();
+						i = sceneRegion.startRegion.group.children.length;
 					}
 				}
-
-
 			}
-		};
+
+
+		}
+	};
+
+	function closeStartWorker(){
+		clearInterval(updateaianimate);
 	}
+
 	//
 	// function onselect(event){
 	// 	if(event.button == '0'){
@@ -459,7 +441,7 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 	// }
 
 	this.changeDrawType = function(drawType){
-		console.log(drawType);
+
 		controls.drawSwitch = true;
 		if(drawType == "startRegion"){
 			controls.drawColor = 0x2894FF;
@@ -504,11 +486,28 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 	this.changeControlMode = function(controlMode){
 
 		if(controlMode == false){
+			scope.resetscene();
 			controls.controlMode = "Orbit";
 			camerass.position.set(oldCameraPosition.x,oldCameraPosition.y,oldCameraPosition.z);
 			controls.target.set( oldCameraTarget.x,oldCameraTarget.y,oldCameraTarget.z);
 			passerStation.resetPosition(controls.drawGroup,scope.modelmanager.zhajiin.mesh,scope.modelmanager.zhajiout.mesh);
+
+			sockStationPass.socketon();
+			sockStation.socketon();
+			scene.add(humanlist);
+			scene.add(topWaitPassers);
+			scene.add(downWaitPassers);
+			scene.add(outStationPassers);
+			// startWorker();
+			// passerWebWork.postMessage(["on"]);
+			sceneRegion.resetRegionData();
+			aiswitch = 0;
+			transformControl.detach(controls.selectRegion);
+
+			// scene.remove(controls.drawGroup);
 		}else if(controlMode == true){
+
+			aiswitch = 1;
 			controls.controlMode = "Draw";
 			oldCameraPosition.copy(camerass.position);
 			oldCameraTarget.copy(controls.target);
@@ -516,6 +515,16 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 			// controls.target.set( 1, 0, 0 );
 			passerStation.apartPosition(controls.drawGroup,scope.modelmanager.zhajiin.mesh,scope.modelmanager.zhajiout.mesh);
 			controls.initPlaneMesh(passerStation);
+
+			sockStationPass.socketoff();
+			sockStation.socketoff();
+			scene.remove(humanlist);
+			scene.remove(topWaitPassers);
+			scene.remove(downWaitPassers);
+			scene.remove(outStationPassers);
+			// closeStartWorker();
+			// passerWebWork.postMessage(["off"]);
+			// scene.add(controls.drawGroup);
 		}
 	}
 
@@ -532,8 +541,6 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
         sceneConfig:JSON.stringify([]),
         simulationConfig:JSON.stringify([]),
 		};
-		console.log(newSaveData);
-		// newSaveData.regionData.push();
 
 		return newSaveData;
 
@@ -541,18 +548,16 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 
 	this.loadData = function(data){
 		let regionData = JSON.parse(data.regionData);
-		sceneRegion.loadRegionData(regionData);
+		sceneRegion.loadRegionData(regionData,controls);
 	};
 
 	//循环渲染函数
 	function animate() {
 		render();
 		// console.log(passerRender);
-		// console.log("ss");
 		// if(passerRender.state == "freeview"){
 		controls.update();
 		// }
-		// delta = clock.getDelta();
 
 		requestAnimationFrame(animate);
 
@@ -568,15 +573,5 @@ export function Jl3dStationManager(dom,skinCode,routegroup,initCode) {
 	}
 
 
-	function getnum(num,pnum){
-		let re = [];
-		let base = Math.floor(num/pnum);
-		let reset = num%pnum;
-		for(let i=0;i<pnum;i++){
-			let nownum = base+(i<reset?1:0);
-			re.push(nownum);
-		}
-		return re;
-	}
 
 }
diff --git a/src/jlmap3d/jl3dstationmanager/loader/loader.js b/src/jlmap3d/jl3dstationmanager/loader/loader.js
index beb655496..8e32191a9 100644
--- a/src/jlmap3d/jl3dstationmanager/loader/loader.js
+++ b/src/jlmap3d/jl3dstationmanager/loader/loader.js
@@ -124,7 +124,7 @@ export function ModelManager(){
     return new Promise(function(resolve, reject){
 
       Promise.all(initlist).then((result) => {
-        console.log("success");
+        // console.log("success");
         store.dispatch('app/animationsClose');
         resolve("success");             //['成功了', 'success']
       }).catch((error) => {
@@ -142,8 +142,8 @@ function fbxpromise(asset,mixers,model){
     if(  mode == "2"){
       loader.load( asset.url, function ( object ) {
         model.mesh = object;
-        console.log(asset.type);
-        console.log(object);
+        // console.log(asset.type);
+        // console.log(object);
         resolve(asset.deviceType);
       } );
 
diff --git a/src/jlmap3d/jl3dstationmanager/model/passerhuman.js b/src/jlmap3d/jl3dstationmanager/model/passerhuman.js
index 0f0e99bf9..5dce76c08 100644
--- a/src/jlmap3d/jl3dstationmanager/model/passerhuman.js
+++ b/src/jlmap3d/jl3dstationmanager/model/passerhuman.js
@@ -11,6 +11,7 @@ export function  PasserHuman() {
     originhuman1.progress = 1;
     // scene.add(originhuman1);
     originhuman2 =  creatHuman();
+    originhuman2.progress = 1;
     //
     // let mixer1 = new THREE.AnimationMixer( originhuman1 );
     // let mixer2 = new THREE.AnimationMixer( originhuman2 );
@@ -80,12 +81,105 @@ export function  PasserHuman() {
  }
 
   //创建新的乘客
-  this.newHumanCreate = function(humanlist,region,stage,overGoal){
+  this.newHumanCreate = function(humanlist,region,stage,overGoal,nowGoal){
     let newhuman;
-    createHumanModel(newhuman,humanlist,region,stage,overGoal);
+    createHumanModel(newhuman,humanlist,region,stage,overGoal,nowGoal);
   }
 
-  function createHumanModel(newhuman,humanlist,region,stage,overGoal){
+  this.newInitHumanCreate = function(humanlist,pos,overGoal,nowGoal,standDoorNum){
+
+    let newhuman;
+    newhuman = originhuman1.clone();
+    newhuman.position.copy(pos);
+
+    if(overGoal){
+      if(overGoal == "top"){
+        newhuman.rotation.y = Math.PI;
+      }
+      newhuman.overGoal = overGoal;
+    }
+
+    newhuman.standDoorNum = standDoorNum;
+    newhuman.status = "0";
+    if(nowGoal){
+      newhuman.nowGoal = nowGoal;
+    }
+
+    //年龄
+    newhuman.age = null;
+    //性别
+    newhuman.gender = "";
+    //身体状态
+    newhuman.bodyStatus = "";
+
+    newhuman.runrail = null;
+    newhuman.speed = 0;
+    humanlist.add(newhuman);
+  };
+
+  let waitForCreatOutTop = [];
+	let waitForCreatOutDown = [];
+  this.leaveHumanCreate = function(direct,outNum,outStationPassers,startRegion,checkRegion,standRegion){
+
+    if(direct == "top"){
+			waitForCreatOutTop = getnum(outNum,standRegion.belongList["top"].length-1);
+
+			// console.log(waitForCreatOutTop);
+			for(let i=0;i<waitForCreatOutTop.length;i++){
+				for(let j=0;j<waitForCreatOutTop[i];j++){
+					setTimeout(function(){
+						// console.log(sceneRegion.list["standtop"].doorpoints[i]);
+
+						createLeaveHumanModel(outStationPassers,standRegion.belongList["top"][i].position,startRegion);
+					}, Math.random()*1000*j);
+				}
+			}
+		}else{
+			waitForCreatOutDown = getnum(outNum,standRegion.belongList["down"].length-1);
+			for(let i=0;i<waitForCreatOutDown.length;i++){
+				for(let j=0;j<waitForCreatOutDown[i];j++){
+					setTimeout(function(){
+						// console.log(sceneRegion.list["standdown"].doorpoints[i]);
+					createLeaveHumanModel(outStationPassers,standRegion.belongList["down"][i].position,startRegion);
+					}, Math.random()*1000*j);
+				}
+			}
+		}
+
+  };
+
+  function createLeaveHumanModel(humanlist,pos,startRegion){
+    let newhuman;
+    newhuman = originhuman1.clone();
+    newhuman.position.copy(pos);
+
+    newhuman.status = "0";
+
+    //年龄
+    newhuman.age = null;
+    //性别
+    newhuman.gender = "";
+    //身体状态
+    newhuman.bodyStatus = "";
+
+    newhuman.runrail = null;
+    newhuman.speed = 0;
+
+    let randomNum = Math.random();
+    let endNum = 0;
+    for(let i=0;i<startRegion.group.children.length;i++){
+      endNum = endNum + startRegion.group.children[i].endWeight;
+      if(randomNum<endNum){
+        newhuman.overGoal = i;
+        newhuman.nowGoal = "findeCheck";
+        newhuman.connectCheckRegion = startRegion.group.children[i].connectCheckRegion;
+        i = startRegion.group.children.length;
+      }
+    }
+    humanlist.add(newhuman);
+  }
+
+  function createHumanModel(newhuman,humanlist,region,stage,overGoal,nowGoal){
     let mantype = Math.floor(Math.random()*(3-1+1))+1;
 
     if(mantype == 1){
@@ -107,16 +201,20 @@ export function  PasserHuman() {
       newhuman.overGoal = overGoal;
     }
 
-
-    newhuman.status = 0;
-
-    let goalRandom = Math.random();
-    if(goalRandom<region.targetWeight){
-      newhuman.nowGoal = "ticketRegion";
+    newhuman.standDoorNum = "";
+    newhuman.status = "0";
+    if(nowGoal){
+      newhuman.nowGoal = nowGoal;
     }else{
-      newhuman.nowGoal = "securityRegion";
+      let goalRandom = Math.random();
+      if(goalRandom<region.targetWeight){
+        newhuman.nowGoal = "ticketRegion";
+      }else{
+        newhuman.nowGoal = "securityRegion";
+      }
     }
 
+
     //年龄
     newhuman.age = null;
     //性别
@@ -134,7 +232,7 @@ export function  PasserHuman() {
   }
   //定义新模型走路动画
   this.initMoveAnimate = function(model,name,points,index){
-    model.status = 1;
+    model.status = "1";
     let curve =  new THREE.CatmullRomCurve3(points);
     curve.curvrtype = "catmullrom";
     // curve.getLength();
@@ -158,23 +256,20 @@ export function  PasserHuman() {
           // outStationPassers.children[i].action.stop();
           outStationPassers.children[i].status = 0;
 
-					if(outStationPassers.children[i].stage == 8){
+					if(outStationPassers.children[i].nowGoal == "outStation"){
 						passerHuman.uncache(outStationPassers.children[i]);
 						outStationPassers.remove(outStationPassers.children[i]);
 						i--;
-					}else if(outStationPassers.children[i].stage == 7){
-						outStationPassers.children[i].stage = 8;
+					}else if(outStationPassers.children[i].nowGoal == "outCheck"){
+						outStationPassers.children[i].nowGoal = "outStation";
 					}
-					else if(outStationPassers.children[i].stage == 5){
+					else if(outStationPassers.children[i].nowGoal == "findeCheck"){
 
-						outStationPassers.children[i].stage = 7;
+						outStationPassers.children[i].nowGoal = "outCheck";
 
 					}
         }else{
-		//根据动画进度获取动画轨迹上点
-					// console.log(i);
-					// console.log(humanlist.children[i].runrail);
-					// console.log(humanlist.children[i].progress);
+
 					let point = outStationPassers.children[i].runrail.getPointAt(outStationPassers.children[i].progress);
 
 					//更新模型坐标
@@ -194,13 +289,14 @@ export function  PasserHuman() {
     }
 
     for(let i=0;i<topWaitPassers.children.length;i++){
-      if(topWaitPassers.children[i].status == 1){
+
+      if(topWaitPassers.children[i].status == "1"){
         if(topWaitPassers.children[i].progress>=1){
           topWaitPassers.children[i].progress = 1;
           // topWaitPassers.children[i].action.stop();
-          topWaitPassers.children[i].status = 0;
+          topWaitPassers.children[i].status = "0";
 
-          if(topWaitPassers.children[i].stage == 4){
+          if(topWaitPassers.children[i].nowGoal == "waitingTrain"){
             passerHuman.uncache(topWaitPassers.children[i]);
             topWaitPassers.remove(topWaitPassers.children[i]);
             i--;
@@ -229,12 +325,13 @@ export function  PasserHuman() {
     }
 
     for(let i=0;i<downWaitPassers.children.length;i++){
-      if(downWaitPassers.children[i].status == 1){
+
+      if(downWaitPassers.children[i].status == "1"){
         if(downWaitPassers.children[i].progress>=1){
           downWaitPassers.children[i].progress = 1;
           // downWaitPassers.children[i].action.stop();
-          downWaitPassers.children[i].status = 0;
-          if(downWaitPassers.children[i].stage == 4){
+          downWaitPassers.children[i].status = "0";
+          if(downWaitPassers.children[i].nowGoal == "waitingTrain"){
             passerHuman.uncache(downWaitPassers.children[i]);
             downWaitPassers.remove(downWaitPassers.children[i]);
             i--;
@@ -263,42 +360,42 @@ export function  PasserHuman() {
     }
 
     for(let i=0;i<humanlist.children.length;i++){
-			if(humanlist.children[i].status == 1){
+			if(humanlist.children[i].status == "1"){
 				if(humanlist.children[i].progress>=1){
-					//更新模型坐标
-					if(humanlist.children[i].status == 1){
+
+            humanlist.children[i].progress = 1;
+            // humanlist.children[i].action.stop();
+            humanlist.children[i].status = "0";
 
 
-						humanlist.children[i].progress = 1;
-						// humanlist.children[i].action.stop();
-						humanlist.children[i].status = 0;
-            if(humanlist.children[i].stage == 3){
+            if(humanlist.children[i].nowGoal == "standRegion"){
 
-							humanlist.children[i].stage = 4;
-              if(humanlist.children[i].direct == "top"){
+							humanlist.children[i].nowGoal = "waitingTrain";
+              if(humanlist.children[i].overGoal == "top"){
                 topWaitPassers.add(humanlist.children[i]);
                 i--;
-              }else if(humanlist.children[i].direct == "down"){
+              }else if(humanlist.children[i].overGoal == "down"){
                 downWaitPassers.add(humanlist.children[i]);
                 i--;
               }
 
-						}else if(humanlist.children[i].stage == 2){
-							humanlist.children[i].stage = 3;
+						}else if(humanlist.children[i].nowGoal == "inCheck"){
+							humanlist.children[i].nowGoal = "standRegion";
 
-						}else if(humanlist.children[i].stage == 1){
+						}else if(humanlist.children[i].nowGoal == "checkRegion"){
+							humanlist.children[i].nowGoal = "inCheck";
+
+						}else if(humanlist.children[i].nowGoal == "securityRegion"){
 
 
-							humanlist.children[i].stage = 2;
+							humanlist.children[i].nowGoal = "checkRegion";
 
-						}else if(humanlist.children[i].stage == 0){
+						}else if(humanlist.children[i].nowGoal == "ticketRegion"){
 							// // console.log(humans[i].doors);
 							// zhajiin[humanlist.children[i].doors].waiting = 0;
-							humanlist.children[i].stage = 1;
+							humanlist.children[i].nowGoal = "securityRegion";
 						}
 
-					}
-
 				}else{
 		//根据动画进度获取动画轨迹上点
 					// console.log(i);
@@ -334,4 +431,16 @@ export function  PasserHuman() {
 			} );
 		}
   }
+
+  function getnum(num,pnum){
+		let re = [];
+		let base = Math.floor(num/pnum);
+		let reset = num%pnum;
+		for(let i=0;i<pnum;i++){
+			let nownum = base+(i<reset?1:0);
+			re.push(nownum);
+		}
+		return re;
+	}
+
 }
diff --git a/src/jlmap3d/jl3dstationmanager/model/passerstation.js b/src/jlmap3d/jl3dstationmanager/model/passerstation.js
index 768ec1ce3..340a559df 100644
--- a/src/jlmap3d/jl3dstationmanager/model/passerstation.js
+++ b/src/jlmap3d/jl3dstationmanager/model/passerstation.js
@@ -203,8 +203,7 @@ export function  PasserStation() {
 
 	this.apartPosition = function(drawGroup,zhajiin,zhajiout){
 		// scope.down.position.y = scope.top.position.y;
-		console.log(zhajiin);
-		console.log(zhajiout);
+	
 		scope.top.position.z += 75;
 		scope.down.position.z -= 75;
 		zhajiin.position.z -= 75;
diff --git a/src/jlmap3d/jl3dstationmanager/model/region/checkRegion.js b/src/jlmap3d/jl3dstationmanager/model/region/checkRegion.js
index 61f1432a4..30ae21459 100644
--- a/src/jlmap3d/jl3dstationmanager/model/region/checkRegion.js
+++ b/src/jlmap3d/jl3dstationmanager/model/region/checkRegion.js
@@ -2,15 +2,17 @@ export function  checkRegion(data) {
 	var scope = this;
 
 	this.group = new THREE.Group();
-
+	this.belongList = [];
 	this.creatCheckRegion = function(regionType,regionColor,pos,underFloor){
     let newRegion = creatRegion(regionColor);
     newRegion.regionType = regionType;
     newRegion.deviceType = "region";
 		newRegion.status = "1";
 		newRegion.checkDirection = "in";
+		newRegion.checkBelong = "1";
     //连接设备
     newRegion.connectDevice = "*";
+		newRegion.inCheckPoints = [];
     newRegion.position.set(
       pos.x,
       pos.y+0.1,
@@ -22,6 +24,7 @@ export function  checkRegion(data) {
   };
 
 	this.loadRegionData = function(regionData){
+		scope.group = new THREE.Group();
 		if(regionData.length>0){
 			for(let i=0;i<regionData.length;i++){
 				let newRegion = creatRegion(0x9F35FF);
@@ -33,6 +36,8 @@ export function  checkRegion(data) {
 				newRegion.status = regionData[i].status;
         newRegion.underFloor = regionData[i].underFloor;
 				newRegion.checkDirection = regionData[i].checkDirection;
+				newRegion.checkBelong = regionData[i].checkBelong;
+				newRegion.inCheckPoints = [];
 				newRegion.position.set(
 					regionData[i].pos.x,
 					regionData[i].pos.y,
@@ -49,19 +54,51 @@ export function  checkRegion(data) {
 		}
 	}
 
+	this.resetRegionData = function(){
+		scope.belongList = [];
+		scope.belongList["in"] = [];
+		scope.belongList["out"] = [];
+		for(let i=0;i<scope.group.children.length;i++){
+
+
+			scope.group.children[i].actionIndex = i;
+			if(scope.group.children[i].checkDirection == "in"){
+				if(!scope.belongList["in"].hasOwnProperty(scope.group.children[i].checkBelong)){
+					scope.belongList["in"][scope.group.children[i].checkBelong] = [];
+				}
+			}
+
+			if(scope.group.children[i].checkDirection == "out"){
+				if(!scope.belongList["out"].hasOwnProperty(scope.group.children[i].checkBelong)){
+					scope.belongList["out"][scope.group.children[i].checkBelong] = [];
+				}
+			}
+		}
+
+		for(let i=0;i<scope.group.children.length;i++){
+			if(scope.group.children[i].checkDirection == "in"){
+					scope.belongList["in"][scope.group.children[i].checkBelong].push(scope.group.children[i]);
+			}
+			if(scope.group.children[i].checkDirection == "out"){
+				scope.belongList["out"][scope.group.children[i].checkBelong].push(scope.group.children[i]);
+			}
+		}
+	}
+
 	function creatRegion(color){
 		let region = new THREE.Group();
 		var geometry = new THREE.PlaneBufferGeometry( 2, 2, 4 );
 		var material = new THREE.MeshBasicMaterial( { color: color } );
 		let regionHead = new THREE.Mesh( geometry, material );
+		regionHead.name = "regionHead";
 		regionHead.rotation.x = -Math.PI/2;
 		regionHead.position.y = 0.01;
 		region.add(regionHead);
 
 		var geom = new THREE.Geometry();
-		var v1 = new THREE.Vector3(1,-1,0);
-		var v2 = new THREE.Vector3(-1,-1,0);
-		var v3 = new THREE.Vector3(0,-2,0);
+		var v1 = new THREE.Vector3(1,0,0);
+		var v2 = new THREE.Vector3(-1,0,0);
+		var v3 = new THREE.Vector3(0,-1,0);
 
 
 		geom.vertices.push(v1);
@@ -73,8 +110,11 @@ export function  checkRegion(data) {
 
 		var material = new THREE.MeshBasicMaterial( { color: color } );
 		var regionDirect= new THREE.Mesh(geom, material);
+		regionDirect.name = "regionDirect";
 		regionDirect.rotation.x = -Math.PI/2;
 		regionDirect.position.y = 0.01;
+
+		regionDirect.position.z = 5;
 		region.add(regionDirect);
 		return region;
 
@@ -85,29 +125,16 @@ export function  checkRegion(data) {
 	//出口闸机组
 	this.zhajiout = [];
 	//定义闸机状态
-	for(let i=0;i<5;i++){
-		let zhaji = {
-			id:"in0"+(i+1),
-			status:0,
-			waiting:0
-		}
-		scope.zhajiin.push(zhaji);
-	}
-	for(let i=0;i<5;i++){
-		let zhaji = {
-			id:"out0"+(i+1),
-			status:0,
-			waiting:0
-		}
-		scope.zhajiout.push(zhaji);
-	}
+
 	//初始化闸机动画
 	this.initCheckDoorInAnimation = function(object,mixers ,deviceaction ,scene){
 		let mixer = new THREE.AnimationMixer(  object );
 		let newclip = object.animations[ 0 ];
 		let newzhaji = object;
+
 		for(let i=0;i<newzhaji.children.length;i++){
-			if(newzhaji.children[i].name == "in01"){
+			if(newzhaji.children[i].children.length>0){
+
 				newzhaji.children[i].animations = [];
 				newzhaji.children[i].animations.push(newclip.clone());
 
@@ -123,77 +150,17 @@ export function  checkRegion(data) {
 					mixer:mixer,
 				};
 				deviceaction[object.children[i].name] = device;
-			}
-			if(newzhaji.children[i].name == "in02"){
-				newzhaji.children[i].animations = [];
-				newzhaji.children[i].animations.push(newclip.clone());
 
-				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-				action.setLoop(THREE.LoopOnce);
-				action.clampWhenFinished = true;
-
-				mixers.push(mixer);
-				let device = {
-					action:action,
-					mixer:mixer,
-				};
-				deviceaction[object.children[i].name] = device;
-			}
-			if(newzhaji.children[i].name == "in03"){
-				newzhaji.children[i].animations = [];
-				newzhaji.children[i].animations.push(newclip.clone());
-
-				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-				action.setLoop(THREE.LoopOnce);
-				action.clampWhenFinished = true;
-
-				mixers.push(mixer);
-				let device = {
-					action:action,
-					mixer:mixer,
-				};
-				deviceaction[object.children[i].name] = device;
-			}
-			if(newzhaji.children[i].name == "in04"){
-				newzhaji.children[i].animations = [];
-				newzhaji.children[i].animations.push(newclip.clone());
-
-				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-				action.setLoop(THREE.LoopOnce);
-				action.clampWhenFinished = true;
-
-				mixers.push(mixer);
-				let device = {
-					action:action,
-					mixer:mixer,
-				};
-				deviceaction[object.children[i].name] = device;
-			}
-			if(newzhaji.children[i].name == "in05"){
-				newzhaji.children[i].animations = [];
-				newzhaji.children[i].animations.push(newclip.clone());
-
-				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-				action.setLoop(THREE.LoopOnce);
-				action.clampWhenFinished = true;
-
-				mixers.push(mixer);
-				let device = {
-					action:action,
-					mixer:mixer,
-				};
-				deviceaction[object.children[i].name] = device;
+				let zhaji = {
+					id:newzhaji.children[i].name,
+					status:0,
+					waiting:0
+				}
+				scope.zhajiin.push(zhaji);
 			}
 
 		}
+
 		scene.add(newzhaji);
 
 	}
@@ -202,22 +169,10 @@ export function  checkRegion(data) {
 		let mixer = new THREE.AnimationMixer(  object );
 		let newclip = object.animations[ 0 ];
 		let newzhaji = object;
+
 		for(let i=0;i<newzhaji.children.length;i++){
-			if(newzhaji.children[i].name == "out01"){
-				newzhaji.children[i].animations = [];
-				newzhaji.children[i].animations.push(newclip.clone());
-				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-				action.setLoop(THREE.LoopOnce);
-				action.clampWhenFinished = true;
-				mixers.push(mixer);
-				let device = {
-					action:action,
-					mixer:mixer,
-				};
-				deviceaction[object.children[i].name] = device;
-			}
-			if(newzhaji.children[i].name == "out02"){
+			if(newzhaji.children[i].children.length>0){
+				
 				newzhaji.children[i].animations = [];
 				newzhaji.children[i].animations.push(newclip.clone());
 
@@ -233,74 +188,30 @@ export function  checkRegion(data) {
 					mixer:mixer,
 				};
 				deviceaction[object.children[i].name] = device;
+
+				let zhaji = {
+					id:newzhaji.children[i].name,
+					status:0,
+					waiting:0
+				}
+				scope.zhajiout.push(zhaji);
 			}
-			if(newzhaji.children[i].name == "out03"){
-				newzhaji.children[i].animations = [];
-				newzhaji.children[i].animations.push(newclip.clone());
-
-				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-				action.setLoop(THREE.LoopOnce);
-				action.clampWhenFinished = true;
-
-				mixers.push(mixer);
-				let device = {
-					action:action,
-					mixer:mixer,
-				};
-				deviceaction[object.children[i].name] = device;
-			}
-			if(newzhaji.children[i].name == "out04"){
-				newzhaji.children[i].animations = [];
-				newzhaji.children[i].animations.push(newclip.clone());
-
-				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-				action.setLoop(THREE.LoopOnce);
-				action.clampWhenFinished = true;
-
-				mixers.push(mixer);
-				let device = {
-					action:action,
-					mixer:mixer,
-				};
-				deviceaction[object.children[i].name] = device;
-			}
-			if(newzhaji.children[i].name == "out05"){
-				newzhaji.children[i].animations = [];
-				newzhaji.children[i].animations.push(newclip.clone());
-
-				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
-
-				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
-				action.setLoop(THREE.LoopOnce);
-				action.clampWhenFinished = true;
-
-				mixers.push(mixer);
-				let device = {
-					action:action,
-					mixer:mixer,
-				};
-				deviceaction[object.children[i].name] = device;
-			}
-
 		}
+
 		scene.add(newzhaji);
 	}
 	//闸机动画控制
 	this.checkDoorControl = function(type,door,deviceaction){
-		let devicenum = door;
-
+		let checkDoorId = door;
+		console.log();
 		if(type == "in"){
-			let checkDoorId = scope.zhajiin[devicenum].id;
+			// let checkDoorId = scope.zhajiin[devicenum].id;
 			deviceaction[checkDoorId].action.reset();
 			deviceaction[checkDoorId].action.time = 0;
 			deviceaction[checkDoorId].action.timeScale = 1;
 			deviceaction[checkDoorId].action.play();
 		}else if(type == "out"){
-			let checkDoorId = scope.zhajiout[devicenum].id;
+			// let checkDoorId = scope.zhajiout[devicenum].id;
 			deviceaction[checkDoorId].action.reset();
 			deviceaction[checkDoorId].action.time = 0;
 			deviceaction[checkDoorId].action.timeScale = 1;
diff --git a/src/jlmap3d/jl3dstationmanager/model/region/elevatorRegion.js b/src/jlmap3d/jl3dstationmanager/model/region/elevatorRegion.js
index 7af3c634d..03b08c5e7 100644
--- a/src/jlmap3d/jl3dstationmanager/model/region/elevatorRegion.js
+++ b/src/jlmap3d/jl3dstationmanager/model/region/elevatorRegion.js
@@ -23,6 +23,7 @@ export function elevatorRegion() {
   };
 
   this.loadRegionData = function(regionData){
+    scope.group = new THREE.Group();
     if(regionData.length>0){
       for(let i=0;i<regionData.length;i++){
         let newRegion = creatRegion(0xFFFF37);
diff --git a/src/jlmap3d/jl3dstationmanager/model/region/escalatorRegion.js b/src/jlmap3d/jl3dstationmanager/model/region/escalatorRegion.js
index d0ae3450b..d409d5478 100644
--- a/src/jlmap3d/jl3dstationmanager/model/region/escalatorRegion.js
+++ b/src/jlmap3d/jl3dstationmanager/model/region/escalatorRegion.js
@@ -23,6 +23,7 @@ export function escalatorRegion() {
   };
 
   this.loadRegionData = function(regionData){
+    scope.group = new THREE.Group();
     if(regionData.length>0){
       for(let i=0;i<regionData.length;i++){
         let newRegion = creatRegion(0x5CADAD);
diff --git a/src/jlmap3d/jl3dstationmanager/model/region/securityRegion.js b/src/jlmap3d/jl3dstationmanager/model/region/securityRegion.js
index 1782f091d..965c7cea6 100644
--- a/src/jlmap3d/jl3dstationmanager/model/region/securityRegion.js
+++ b/src/jlmap3d/jl3dstationmanager/model/region/securityRegion.js
@@ -28,6 +28,7 @@ export function securityRegion() {
   };
 
   this.loadRegionData = function(regionData){
+    scope.group = new THREE.Group();
     if(regionData.length>0){
       for(let i=0;i<regionData.length;i++){
         let newRegion = creatRegion(0xFF0000);
diff --git a/src/jlmap3d/jl3dstationmanager/model/region/stairsRegion.js b/src/jlmap3d/jl3dstationmanager/model/region/stairsRegion.js
index b8a397999..4a4b5ef80 100644
--- a/src/jlmap3d/jl3dstationmanager/model/region/stairsRegion.js
+++ b/src/jlmap3d/jl3dstationmanager/model/region/stairsRegion.js
@@ -23,6 +23,7 @@ export function stairsRegion() {
   };
 
   this.loadRegionData = function(regionData){
+    scope.group = new THREE.Group();
     if(regionData.length>0){
       for(let i=0;i<regionData.length;i++){
         let newRegion = creatRegion(0xFF5809);
diff --git a/src/jlmap3d/jl3dstationmanager/model/region/standRegion.js b/src/jlmap3d/jl3dstationmanager/model/region/standRegion.js
index db3034957..4044be462 100644
--- a/src/jlmap3d/jl3dstationmanager/model/region/standRegion.js
+++ b/src/jlmap3d/jl3dstationmanager/model/region/standRegion.js
@@ -4,6 +4,7 @@ export function standRegion() {
   this.list = [];
 
   this.group = new THREE.Group();
+  this.belongList = [];
 
   this.creatStandRegion = function(regionType,regionColor,pos,underFloor){
     let newRegion = creatRegion(regionColor);
@@ -13,6 +14,8 @@ export function standRegion() {
     newRegion.status = "1";
     //连接设备
     newRegion.connectDevice = "*";
+
+    newRegion.standBelong = "1";
     //区域方向
     if(pos.z < 87.85){
       newRegion.direction = "top";
@@ -32,6 +35,7 @@ export function standRegion() {
   };
 
   this.loadRegionData = function(regionData){
+    scope.group = new THREE.Group();
 		if(regionData.length>0){
 			for(let i=0;i<regionData.length;i++){
 				let newRegion = creatRegion(0x00EC00);
@@ -42,7 +46,7 @@ export function standRegion() {
 				newRegion.direction = regionData[i].direction;
 				newRegion.status = regionData[i].status;
         newRegion.underFloor = regionData[i].underFloor;
-
+        newRegion.standBelong = regionData[i].standBelong;
 				newRegion.position.set(
 					regionData[i].pos.x,
 					regionData[i].pos.y,
@@ -59,6 +63,21 @@ export function standRegion() {
 		}
 	}
 
+  this.resetRegionData = function(){
+    scope.belongList = [];
+    scope.belongList["top"] = [];
+    scope.belongList["down"] = [];
+
+    for(let i=0;i<scope.group.children.length;i++){
+      if(scope.group.children[i].direction == "top"){
+        scope.belongList["top"].push(scope.group.children[i]);
+      }
+      if(scope.group.children[i].direction == "down"){
+        scope.belongList["down"].push(scope.group.children[i]);
+      }
+    }
+  }
+
   function creatRegion(color){
     let region = new THREE.Group();
     var geometry = new THREE.PlaneBufferGeometry( 2, 2, 4 );
diff --git a/src/jlmap3d/jl3dstationmanager/model/region/startRegion.js b/src/jlmap3d/jl3dstationmanager/model/region/startRegion.js
index e14f27ef2..594914802 100644
--- a/src/jlmap3d/jl3dstationmanager/model/region/startRegion.js
+++ b/src/jlmap3d/jl3dstationmanager/model/region/startRegion.js
@@ -19,7 +19,7 @@ export function startRegion() {
     newRegion.targetWeight = "%";
     //区域状态
     newRegion.status = "1";
-
+    newRegion.connectCheckRegion = "";
     newRegion.position.set(
       pos.x,
       pos.y+0.1,
@@ -30,7 +30,32 @@ export function startRegion() {
     scope.group.add(newRegion);
   };
 
+  this.connectCheckRegion = function(checkRegion){
+
+    for(let i=0;i<scope.group.children.length;i++){
+
+      let distanceArray = [];
+      for(let k in checkRegion.belongList["out"]){
+        var pos1 = scope.group.children[i].position;
+        var pos2 = checkRegion.belongList["out"][k][0].position;
+        var distance = pos1.distanceTo(pos2);
+        distanceArray.push(
+          {
+            index:k,
+            distance:distance
+          }
+        );
+      }
+      distanceArray.sort(function(a, b){
+        return a.distance - b.distance;
+      });
+
+      scope.group.children[i].connectCheckRegion = distanceArray[0].index;
+    }
+  };
+
   this.loadRegionData = function(regionData){
+    scope.group = new THREE.Group();
     if(regionData.length>0){
       for(let i=0;i<regionData.length;i++){
         let newRegion = creatRegion(0x2894FF);
@@ -46,7 +71,7 @@ export function startRegion() {
         //区域状态
         newRegion.status = regionData[i].status;
         newRegion.underFloor = regionData[i].underFloor;
-
+        newRegion.connectCheckRegion = "";
         newRegion.position.set(
           regionData[i].pos.x,
           regionData[i].pos.y,
@@ -61,7 +86,7 @@ export function startRegion() {
         scope.group.add(newRegion);
       }
     }
-  }
+  };
 
   function creatRegion(color){
   	let region = new THREE.Group();
diff --git a/src/jlmap3d/jl3dstationmanager/model/region/ticketRegion.js b/src/jlmap3d/jl3dstationmanager/model/region/ticketRegion.js
index 30cefa0dd..80099d28c 100644
--- a/src/jlmap3d/jl3dstationmanager/model/region/ticketRegion.js
+++ b/src/jlmap3d/jl3dstationmanager/model/region/ticketRegion.js
@@ -4,8 +4,9 @@ export function ticketRegion() {
   this.list = [];
 
   this.group = new THREE.Group();
-
+  this.belongList = [];
   this.creatTicketRegion = function(regionType,regionColor,pos,underFloor){
+
     let newRegion = creatRegion(regionColor);
     newRegion.regionType = regionType;
     newRegion.deviceType = "region";
@@ -18,6 +19,7 @@ export function ticketRegion() {
     newRegion.connectDevice = "*";
     //运行状态
     newRegion.runType = "auto";
+    newRegion.ticketBelong = "1";
     newRegion.position.set(
       pos.x,
       pos.y+0.1,
@@ -29,6 +31,7 @@ export function ticketRegion() {
   };
 
   this.loadRegionData = function(regionData){
+    scope.group = new THREE.Group();
     if(regionData.length>0){
       for(let i=0;i<regionData.length;i++){
         let newRegion = creatRegion(0x00FFFF);
@@ -41,6 +44,7 @@ export function ticketRegion() {
         newRegion.stayTime = regionData[i].stayTime;
         newRegion.status = regionData[i].status;
         newRegion.underFloor = regionData[i].underFloor;
+        newRegion.ticketBelong = regionData[i].ticketBelong;
 
         newRegion.position.set(
           regionData[i].pos.x,
@@ -58,6 +62,16 @@ export function ticketRegion() {
     }
   }
 
+  this.resetRegionData = function(){
+    scope.belongList = [];
+    for(let i=0;i<scope.group.children.length;i++){
+          scope.belongList[scope.group.children[i].ticketBelong] = [];
+    }
+    for(let i=0;i<scope.group.children.length;i++){
+        scope.belongList[scope.group.children[i].ticketBelong].push(scope.group.children[i]);
+    }
+	}
+
   function creatRegion(color){
     let region = new THREE.Group();
     var geometry = new THREE.PlaneBufferGeometry( 2, 2, 4 );
diff --git a/src/jlmap3d/jl3dstationmanager/model/region/unaccessRegion.js b/src/jlmap3d/jl3dstationmanager/model/region/unaccessRegion.js
index 7718aa382..2eafc819c 100644
--- a/src/jlmap3d/jl3dstationmanager/model/region/unaccessRegion.js
+++ b/src/jlmap3d/jl3dstationmanager/model/region/unaccessRegion.js
@@ -21,6 +21,7 @@ export function unaccessRegion() {
   };
 
   this.loadRegionData = function(regionData){
+    scope.group = new THREE.Group();
     if(regionData.length>0){
       for(let i=0;i<regionData.length;i++){
         let newRegion = creatRegion(0x272727);
diff --git a/src/jlmap3d/jl3dstationmanager/model/regionManager.js b/src/jlmap3d/jl3dstationmanager/model/regionManager.js
index 549c570e8..da3b129db 100644
--- a/src/jlmap3d/jl3dstationmanager/model/regionManager.js
+++ b/src/jlmap3d/jl3dstationmanager/model/regionManager.js
@@ -41,6 +41,29 @@ export function regionManager() {
     control.drawGroup.add(scope.unaccessRegion.group);
   }
 
+	this.getstandposition = function(name){
+
+		let n =  Math.floor(Math.random() * (scope.standRegion.belongList[name].length-1));
+
+		let randompoint = new THREE.Vector3(0,scope.standRegion.belongList[name][n].position.y+0.1,0);
+
+		if(name == "top"){
+			randompoint.x = scope.standRegion.belongList[name][n].position.x +  Math.random()*3;
+			randompoint.z = scope.standRegion.belongList[name][n].position.z +4+Math.random()*5;
+		}
+		if(name == "down"){
+			randompoint.x = scope.standRegion.belongList[name][n].position.x +  Math.random()*3;
+			randompoint.z = scope.standRegion.belongList[name][n].position.z -4-Math.random()*5;
+		}
+
+		let standdata = {
+			standDoorNum:n,
+			point:randompoint
+		};
+		return standdata;
+	}
+
+
   this.creatRegion = function(regionType,regionColor,pos,underFloor){
     switch(regionType){
       case "startRegion":
@@ -136,6 +159,7 @@ export function regionManager() {
 					connectDevice:scope.checkRegion.group.children[i].connectDevice,
 					underFloor:scope.checkRegion.group.children[i].underFloor,
 					checkDirection:scope.checkRegion.group.children[i].checkDirection,
+					checkBelong:scope.checkRegion.group.children[i].checkBelong,
 
 					pos:{
 						x:scope.checkRegion.group.children[i].position.x,
@@ -155,6 +179,7 @@ export function regionManager() {
 					status:scope.standRegion.group.children[i].status,
 					direction:scope.standRegion.group.children[i].direction,
 					underFloor:scope.standRegion.group.children[i].underFloor,
+					standBelong:scope.standRegion.group.children[i].standBelong,
 					pos:{
 						x:scope.standRegion.group.children[i].position.x,
 						y:scope.standRegion.group.children[i].position.y,
@@ -175,6 +200,7 @@ export function regionManager() {
 					runType:scope.ticketRegion.group.children[i].runType,
 					connectDevice:scope.ticketRegion.group.children[i].connectDevice,
 					underFloor:scope.ticketRegion.group.children[i].underFloor,
+					ticketBelong:scope.ticketRegion.group.children[i].ticketBelong,
 					pos:{
 						x:scope.ticketRegion.group.children[i].position.x,
 						y:scope.ticketRegion.group.children[i].position.y,
@@ -263,8 +289,16 @@ export function regionManager() {
   };
 
   //读取区域数据
-  this.loadRegionData = function(data){
-		console.log(data);
+  this.loadRegionData = function(data,control){
+		control.drawGroup.remove(scope.startRegion.group);
+		control.drawGroup.remove(scope.securityRegion.group);
+		control.drawGroup.remove(scope.checkRegion.group);
+		control.drawGroup.remove(scope.standRegion.group);
+		control.drawGroup.remove(scope.ticketRegion.group);
+		control.drawGroup.remove(scope.elevatorRegion.group);
+		control.drawGroup.remove(scope.stairsRegion.group);
+		control.drawGroup.remove(scope.escalatorRegion.group);
+		control.drawGroup.remove(scope.unaccessRegion.group);
 		scope.startRegion.loadRegionData(data.startRegion);
 		scope.securityRegion.loadRegionData(data.securityRegion);
 		scope.checkRegion.loadRegionData(data.checkRegion);
@@ -274,8 +308,24 @@ export function regionManager() {
 		scope.stairsRegion.loadRegionData(data.stairsRegion);
 		scope.escalatorRegion.loadRegionData(data.escalatorRegion);
 		scope.unaccessRegion.loadRegionData(data.unaccessRegion);
+		control.drawGroup.add(scope.startRegion.group);
+		control.drawGroup.add(scope.securityRegion.group);
+		control.drawGroup.add(scope.checkRegion.group);
+		control.drawGroup.add(scope.standRegion.group);
+		control.drawGroup.add(scope.ticketRegion.group);
+		control.drawGroup.add(scope.elevatorRegion.group);
+		control.drawGroup.add(scope.stairsRegion.group);
+		control.drawGroup.add(scope.escalatorRegion.group);
+		control.drawGroup.add(scope.unaccessRegion.group);
   };
 
+	this.resetRegionData = function(){
+		scope.checkRegion.resetRegionData();
+		scope.standRegion.resetRegionData();
+		scope.ticketRegion.resetRegionData();
+		scope.startRegion.connectCheckRegion(scope.checkRegion);
+
+	}
 
   //获取区域范围内点
   this.getInitPos = function(name){
diff --git a/src/jlmap3d/jl3dstationmanager/passerai/passerai.js b/src/jlmap3d/jl3dstationmanager/passerai/passerai.js
index fcc83aa21..424e07208 100644
--- a/src/jlmap3d/jl3dstationmanager/passerai/passerai.js
+++ b/src/jlmap3d/jl3dstationmanager/passerai/passerai.js
@@ -1,6 +1,6 @@
 
 
-export function  PasserAi(zone,finder,region) {
+export function  PasserAi(finder,region) {
   let scope = this;
 
   //下车控制开关
@@ -9,67 +9,62 @@ export function  PasserAi(zone,finder,region) {
   //上车控制开关
   this.toppasserin = false;
   this.downpasserin = false;
-  let passerZone = zone;
+
+  this.toppasserinNum = 0;
+  this.downpasserinNum = 0;
+
+  let passerZone = region;
   let pathFinder = finder;
 
 	let path;
 	let playerPosition = new THREE.Vector3( -3.5, 0.5, 5.5 );
 	let targetPosition = new THREE.Vector3();
+  let target= null;
   //生成下车出站人物
-  this.passerout = function(direct){
-    // console.log(direct);
+  this.passerout = function(direct,mode,inNum){
+
     if(direct == "top"){
       // console.log("toppasser");
-      scope.toppasseron = true;
-      setTimeout(function(){
-        scope.toppasseron = false
+      if(mode == "start"){
+        scope.toppasseron = true;
         scope.toppasserin = true;
+        scope.toppasserinNum = inNum;
+      }
+      if(mode == "end"){
+        scope.toppasseron = false
+        scope.toppasserin = false;
+      }
 
-        setTimeout(function(){
-          scope.toppasserin = false;
-        }, 20000);
-      }, 5000);
     }
     if(direct == "down"){
-      // console.log("downpasser");
-      scope.downpasseron = true;
-      setTimeout(function(){
-        scope.downpasseron = false;
+      if(mode == "start"){
+        scope.downpasseron = true;
         scope.downpasserin = true;
-        setTimeout(function(){
-          scope.downpasserin = false;
-        }, 20000);
-      }, 5000);
+        scope.downpasserinNum = inNum;
+      }
+      if(mode == "end"){
+        scope.downpasseron = false;
+        scope.downpasserin = false;
+      }
+
     }
   }
 
-  //初始化加载人物
-  this.initPasser = function(humanlist,passerHuman){
-    for(let i=0;i<3;i++){
 
-			passerHuman.newHumanCreate(humanlist,passerZone.getinitposition("enter1"),0);
-		}
-		for(let i=0;i<3;i++){
-			passerHuman.newHumanCreate(humanlist,passerZone.getinitposition("enter2"),0);
-		}
-		for(let i=0;i<3;i++){
-			passerHuman.newHumanCreate(humanlist,passerZone.getinitposition("security"),1);
-		}
-		// for(let i=0;i<2;i++){
-		// 	// passerHuman.newHumanCreate(humanlist,passerZone.getinitposition("entergate"),3);
-		// }
-		for(let i=0;i<6;i++){
-			let standdata = passerZone.getstandposition("standtop");
-			passerHuman.newHumanCreate(humanlist,standdata.point,4,"top",standdata.door);
-		}
-		for(let i=0;i<6;i++){
-			let standdata = passerZone.getstandposition("standdown");
-			passerHuman.newHumanCreate(humanlist,standdata.point,4,"down",standdata.door);
-		}
+  //初始化加载人物
+  this.initPasser = function(humanlist,topWaitPassers,downWaitPassers,passerHuman,jl3d){
+
+    for(let i=0;i<jl3d.humanWaitTop;i++){
+      let standdata = passerZone.getstandposition("top");
+      passerHuman.newInitHumanCreate(topWaitPassers,standdata.point,"top","waitingTrain",standdata.standDoorNum);
+    }
+    for(let i=0;i<jl3d.humanWaitDown;i++){
+      let standdata = passerZone.getstandposition("down");
+      passerHuman.newInitHumanCreate(downWaitPassers,standdata.point,"down","waitingTrain",standdata.standDoorNum);
+    }
   }
 
   function shortDistanceRegion(startPos,endRegion){
-    let shortDistancePos = "";
     let distanceArray = [];
     for(let i=0;i<endRegion.length;i++){
       var pos1 = startPos;
@@ -83,231 +78,296 @@ export function  PasserAi(zone,finder,region) {
       );
     }
     distanceArray.sort(function(a, b){
+      return a.distance - b.distance;
+    });
+    return distanceArray[0].pos;
+  }
 
+  function shortTicketRegion(startPos,endRegion){
+    let distanceArray = [];
+
+    for(let k in endRegion.belongList){
+      var pos1 = startPos;
+      var pos2 = endRegion.belongList[k][0].position;
+      var distance = pos1.distanceTo(pos2);
+      distanceArray.push(
+        {
+          ticketBelong:k,
+          distance:distance
+        }
+      );
+    }
+    distanceArray.sort(function(a, b){
       return a.distance - b.distance;
     });
 
-    return distanceArray[0].pos;
+    let index = Math.floor(Math.random() * (endRegion.belongList[distanceArray[0].ticketBelong].length-1));
+
+
+    return endRegion.belongList[distanceArray[0].ticketBelong][index].position;
+  }
+
+  // let outCheckNum = 0;
+  // if(checkType == "out"){
+  //
+  //   for(let i=0;i<endRegion.length;i++){
+  //     if(endRegion[i].checkDirection == "out"){
+  //       var pos1 = startPos;
+  //       var pos2 = endRegion[i].position;
+  //       var distance = pos1.distanceTo(pos2);
+  //       distanceArray.push(
+  //         {
+  //           pos:endRegion[i].position,
+  //           distance:distance
+  //         }
+  //       );
+  //     }
+  //   }
+  // }
+
+  function selectInCheckRegion(startPos,endRegion,checkType){
+    let shortDistancePos = "";
+    let distanceArray = [];
+
+    for(let k in endRegion.belongList[checkType]){
+      var pos1 = startPos;
+      var pos2 = endRegion.belongList[checkType][k][0].position;
+      var distance = pos1.distanceTo(pos2);
+      distanceArray.push(
+        {
+          checkBelong:k,
+          distance:distance
+        }
+      );
+    }
+
+    distanceArray.sort(function(a, b){
+      return a.distance - b.distance;
+    });
+
+    let index = Math.floor(Math.random() * (endRegion.belongList[checkType][distanceArray[0].checkBelong].length-1));
+
+    return {
+      pos:endRegion.belongList[checkType][distanceArray[0].checkBelong][index].position,
+      checkDoorNum:endRegion.belongList[checkType][distanceArray[0].checkBelong][index].actionIndex,
+    };
+  }
+
+  function shortStandRegion(startPos,endRegion,standType){
+    let shortDistancePos = "";
+    // console.log(standType);
+    // console.log(endRegion.belongList);
+    let index = Math.floor(Math.random() * (endRegion.belongList[standType].length-1));
+
+    return {
+      pos:endRegion.belongList[standType][index].position,
+      standDoorNum:index,
+    };
   }
   //人物站台阶段更新
   this.aiUpdate = function(humanlist,topWaitPassers,downWaitPassers,outStationPassers,passerHuman,passerCheckDoor,deviceaction){
-    console.log(humanlist.children);
-    for(let i=0;i<humanlist.children.length;i++){
-      // console.log(humans[i]);
-      if(humanlist.children[i].overGoal == "topStand" || humanlist.children[i].overGoal == "downStand"){
-        console.log(humanlist.children[i]);
-        if(humanlist.children[i].status == 0){
-          if(humanlist.children[i].nowGoal == "ticketRegion"){
-              let points = [];
-              points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+    for(let i=0;i<outStationPassers.children.length;i++){
+      if(outStationPassers.children[i].status == 0){
+        //stage = 5 下车
+        if(outStationPassers.children[i].nowGoal == "findeCheck"){
+          let points = [];
+          points.push(new THREE.Vector3(outStationPassers.children[i].position.x,outStationPassers.children[i].position.y,outStationPassers.children[i].position.z));
 
-              //寻找最近售票机点
-              targetPosition = shortDistanceRegion(humanlist.children[i].position,region.ticketRegion.group.children);
-              console.log(targetPosition);
-              //寻路售票机
-              path = pathFinder.find(points[0],targetPosition);
-          //
-              for(let i=0;i<path.length;i++){
-                points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-              }
-              passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
 
-            }
+          let index = Math.floor(Math.random() * (region.checkRegion.belongList["out"][outStationPassers.children[i].connectCheckRegion].length-1));
+
+          //寻找最近售票机点
+          targetPosition = region.checkRegion.belongList["out"][outStationPassers.children[i].connectCheckRegion][index].position;
+          outStationPassers.children[i].checkDoor = region.checkRegion.belongList["out"][outStationPassers.children[i].connectCheckRegion][index].actionIndex;
+          //寻路售票机
+          path = pathFinder.find(points[0],targetPosition);
+      //
+          for(let i=0;i<path.length;i++){
+            points.push(new THREE.Vector3(path[i].x,path[i].y+0.1,path[i].z));
+          }
+          passerHuman.initMoveAnimate(outStationPassers.children[i],i,points,i);
         }
-        if(humanlist.children[i].nowGoal == "securityRegion"){
-        //     let points = [];
-        //     points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-        //
-        //     targetPosition = passerZone.getzoneposition("security");
-        //
-        //     path = pathFinder.find(points[0],targetPosition);
-        //
-        //     for(let i=0;i<path.length;i++){
-        //       points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-        //     }
-        //     passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-        //     // console.log(path);
-        //   }
+
+        //stage = 7 出闸机
+        if(outStationPassers.children[i].nowGoal == "outCheck"){
+          let points = [];
+          points.push(region.checkRegion.group.children[outStationPassers.children[i].checkDoor].getObjectByName("regionHead").getWorldPosition(new THREE.Vector3()));
+          points.push(region.checkRegion.group.children[outStationPassers.children[i].checkDoor].getObjectByName("regionDirect").getWorldPosition(new THREE.Vector3()));
+
+          passerCheckDoor.checkDoorControl("out",region.checkRegion.group.children[outStationPassers.children[i].checkDoor].connectDevice,deviceaction);
+
+          passerHuman.initMoveAnimate(outStationPassers.children[i],i,points,i);
+        }
+
+        //stage = 8 出站
+        if(outStationPassers.children[i].nowGoal == "outStation"){
+          let points = [];
+          points.push(new THREE.Vector3(outStationPassers.children[i].position.x,outStationPassers.children[i].position.y,outStationPassers.children[i].position.z));
+
+          //寻找最近售票机点
+          targetPosition = region.startRegion.group.children[outStationPassers.children[i].overGoal].position;
+
+          //寻路售票机
+          path = pathFinder.find(points[0],targetPosition);
+      //
+          for(let i=0;i<path.length;i++){
+            points.push(new THREE.Vector3(path[i].x,path[i].y+0.1,path[i].z));
+          }
+          passerHuman.initMoveAnimate(outStationPassers.children[i],i,points,i);
+
+        }
+      }
+    }
+
+    // console.log(humanlist.children);
+    if(scope.toppasserinNum >0){
+      for(let i=0;i<topWaitPassers.children.length;i++){
+
+        if(topWaitPassers.children[i].status == "0"){
+          //stage = 4 上车
+          if(topWaitPassers.children[i].nowGoal == "waitingTrain"){
+            if(scope.toppasserin && topWaitPassers.children[i].overGoal == "top"){
+
+
+              let points = [];
+              points.push(new THREE.Vector3(topWaitPassers.children[i].position.x,topWaitPassers.children[i].position.y,topWaitPassers.children[i].position.z));
+              let doorPos = region.standRegion.belongList["top"][topWaitPassers.children[i].standDoorNum].position;
+              // doorPos.z += 3;
+              // doorPos.y += 0.1;
+              points.push(new THREE.Vector3(doorPos.x,doorPos.y+0.1,doorPos.z-3));
+
+              if(points[1] == undefined){
+
+              }else{
+
+                scope.toppasserinNum -= 1;
+                passerHuman.initMoveAnimate(topWaitPassers.children[i],i,points,i);
+              }
+            }
+          }
+        }
+      }
+
+    }
+    if(scope.downpasserinNum >0){
+      for(let i=0;i<downWaitPassers.children.length;i++){
+        if(downWaitPassers.children[i].status == "0"){
+          //stage = 4 上车
+          if(downWaitPassers.children[i].nowGoal == "waitingTrain"){
+
+            if(scope.downpasserin && downWaitPassers.children[i].overGoal == "down"){
+              let points = [];
+              points.push(new THREE.Vector3(downWaitPassers.children[i].position.x,downWaitPassers.children[i].position.y,downWaitPassers.children[i].position.z));
+
+              let doorPos = region.standRegion.belongList["down"][downWaitPassers.children[i].standDoorNum].position;
+              points.push(new THREE.Vector3(doorPos.x,doorPos.y+0.1,doorPos.z+3));
+              if(points[1] == undefined){
+
+              }else{
+                scope.downpasserinNum -= 1;
+                passerHuman.initMoveAnimate(downWaitPassers.children[i],i,points,i);
+              }
+            }
+          }
         }
 
       }
-      // if(humanlist.children[i].status == 0){
-      //   //stage = 0 进入车站
-      //   if(humanlist.children[i].stage == 0){
-      //     let points = [];
-      //     points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-      //
-      //     targetPosition = passerZone.getzoneposition("security");
-      //
-      //     path = pathFinder.find(points[0],targetPosition);
-      //
-      //     for(let i=0;i<path.length;i++){
-      //       points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-      //     }
-      //     passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-      //     // console.log(path);
-      //   }
-      //
-      //   //stage = 1 前往进站闸机
-      //   if(humanlist.children[i].stage == 1){
-      //     let points = [];
-      //     points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-      //
-      //       targetPosition = passerZone.getgateposition("entergate");
-      //
-      //       path = pathFinder.find(points[0],targetPosition.point);
-      //
-      //       humanlist.children[i].door = targetPosition.door;
-      //       for(let i=0;i<path.length;i++){
-      //         points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-      //       }
-      //       passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-      //   }
-      //
-      //   //stage = 2 过闸机
-      //   if(humanlist.children[i].stage == 2){
-      //       let points = [];
-      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z-5));
-      //
-      //       passerCheckDoor.checkDoorControl("in",humanlist.children[i].door,deviceaction)
-      //       passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-      //   }
-      //
-      //   //stage = 3 前往站台
-      //   if(humanlist.children[i].stage == 3){
-      //
-      //     let direct = Math.floor(Math.random()*(2))+1;
-      //     // console.log(direct);
-      //     let points = [];
-      //     points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-      //     // points.push(new THREE.Vector3(11.81,9.8,13.11));
-      //
-      //     //1--top
-      //     //2-- down
-      //     if(direct == 1){
-      //       targetPosition = passerZone.getstandposition("standtop");
-      //       path = pathFinder.find(points[0],targetPosition.point);
-      //       humanlist.children[i].direct = "top";
-      //     }else{
-      //       targetPosition = passerZone.getstandposition("standdown");
-      //       path = pathFinder.find(points[0],targetPosition.point);
-      //       humanlist.children[i].direct = "down";
-      //     }
-      //     if(path[0].y<9.84){
-      //       points.push(new THREE.Vector3(11.81,9.8,13.11));
-      //       points.push(new THREE.Vector3(29.5,1.77,13.16));
-      //
-      //     }
-      //     for(let i=0;i<path.length;i++){
-      //       points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-      //     }
-      //     humanlist.children[i].door = targetPosition.door;
-      //     passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-      //   }
-      //
-      //   //stage = 4 上车
-      //   if(humanlist.children[i].stage == 4){
-      //     if(scope.toppasserin && humanlist.children[i].direct == "top"){
-      //
-      //
-      //       let points = [];
-      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-      //
-      //       points.push(passerZone.list["standtop"].doorpoints[humanlist.children[i].door]);
-      //
-      //       if(points[1] == undefined){
-      //
-      //       }else{
-      //         passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-      //       }
-      //     }
-      //
-      //
-      //
-      //     if(scope.downpasserin && humanlist.children[i].direct == "down"){
-      //       let points = [];
-      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-      //
-      //       points.push(passerZone.list["standdown"].doorpoints[humanlist.children[i].door]);
-      //
-      //       if(points[1] == undefined){
-      //
-      //       }else{
-      //         passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-      //       }
-      //       // console.log(points);
-      //     }
-      //
-      //   }
-      //
-      //   //stage = 5 下车
-      //   if(humanlist.children[i].stage == 5){
-      //     let points = [];
-      //     points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-      //     if(humanlist.children[i].direct == "top"){
-      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z+5));
-      //     }
-      //     if(humanlist.children[i].direct == "down"){
-      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z-5));
-      //     }
-      //     targetPosition = passerZone.getgateposition("exitgate");
-      //     path = pathFinder.find(points[1],targetPosition.point);
-      //     humanlist.children[i].door = targetPosition.door;
-      //     for(let i=0;i<path.length;i++){
-      //       points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-      //     }
-      //     passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-      //   }
-      //
-      //   //stage = 6 前往出站闸机
-      //   // if(humanlist.children[i].stage == 6){
-      //   // 	let points = [];
-      //   // 	points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-      //   //
-      //   // 		groupID = pathfinder.getGroup( ZONE, 	points[0] );
-      //   // 		targetPosition = passerZone.getgateposition("exitgate");
-      //   // 		path = pathfinder.findPath( points[0], targetPosition, ZONE, groupID );
-      //   //
-      //   // 		for(let i=0;i<path.length;i++){
-      //   // 			points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-      //   // 		}
-      //   // 		passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-      //   // }
-      //
-      //   //stage = 7 出闸机
-      //   if(humanlist.children[i].stage == 7){
-      //       let points = [];
-      //       points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-      //       points.push(new THREE.Vector3(humanlist.children[i].position.x+5,humanlist.children[i].position.y,humanlist.children[i].position.z));
-      //
-      //       passerCheckDoor.checkDoorControl("out",humanlist.children[i].door,deviceaction)
-      //       passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-      //   }
-      //
-      //   //stage = 8 出站
-      //   if(humanlist.children[i].stage == 8){
-      //     let direct = Math.floor(Math.random()*(3-1+1))+1;
-      //     let points = [];
-      //     points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
-      //
-      //     //1--top
-      //     //2-- down
-      //     if(direct == 1){
-      //       targetPosition = passerZone.getzoneposition("exit1");
-      //       path = pathFinder.find(points[0],targetPosition);
-      //     }else{
-      //       targetPosition = passerZone.getzoneposition("exit2");
-      //       path = pathFinder.find(points[0],targetPosition);
-      //     }
-      //
-      //     for(let i=0;i<path.length;i++){
-      //       points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
-      //     }
-      //     passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
-      //
-      //   }
-      // }
+
+    }
+
+
+    for(let i=0;i<humanlist.children.length;i++){
+      // console.log(humans[i]);
+      if(humanlist.children[i].overGoal == "top" || humanlist.children[i].overGoal == "down"){
+
+        if(humanlist.children[i].status == "0"){
+          // console.log(humanlist.children[0].status);
+          // console.log(humanlist.children[0].nowGoal);
+          if(humanlist.children[i].nowGoal == "ticketRegion"){
+            let points = [];
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+
+            //寻找最近售票机点
+            targetPosition = shortTicketRegion(humanlist.children[i].position,region.ticketRegion);
+
+            //寻路售票机
+            path = pathFinder.find(points[0],targetPosition);
+        //
+            for(let i=0;i<path.length;i++){
+              points.push(new THREE.Vector3(path[i].x,path[i].y+0.1,path[i].z));
+            }
+            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+
+          }
+          if(humanlist.children[i].nowGoal == "securityRegion"){
+            let points = [];
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+
+            //寻找最近售票机点
+            targetPosition = shortDistanceRegion(humanlist.children[i].position,region.securityRegion.group.children);
+
+            //寻路售票机
+            path = pathFinder.find(points[0],targetPosition);
+        //
+            for(let i=0;i<path.length;i++){
+              points.push(new THREE.Vector3(path[i].x,path[i].y+0.1,path[i].z));
+            }
+            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+          }
+
+          if(humanlist.children[i].nowGoal == "checkRegion"){
+            let points = [];
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+
+            //寻找最近售票机点
+            target = selectInCheckRegion(humanlist.children[i].position,region.checkRegion,"in");
+
+            humanlist.children[i].checkDoor = target.checkDoorNum;
+            //寻路售票机
+            path = pathFinder.find(points[0],target.pos);
+            for(let i=0;i<path.length;i++){
+              points.push(new THREE.Vector3(path[i].x,path[i].y+0.1,path[i].z));
+            }
+            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+          }
+
+          if(humanlist.children[i].nowGoal == "inCheck"){
+            let points = [];
+            // console.log();
+            // console.log(region.checkRegion.group.children[humanlist.children[i].checkDoor].position);
+            // console.log(region.checkRegion.group.children[humanlist.children[i].checkDoor].getObjectByName("regionHead").getWorldPosition(new THREE.Vector3()));
+            // console.log(region.checkRegion.group.children[humanlist.children[i].checkDoor].getObjectByName("regionDirect").getWorldPosition(new THREE.Vector3()));
+            // console.log("================");
+            points.push(region.checkRegion.group.children[humanlist.children[i].checkDoor].getObjectByName("regionHead").getWorldPosition(new THREE.Vector3()));
+            points.push(region.checkRegion.group.children[humanlist.children[i].checkDoor].getObjectByName("regionDirect").getWorldPosition(new THREE.Vector3()));
+
+            passerCheckDoor.checkDoorControl("in",region.checkRegion.group.children[humanlist.children[i].checkDoor].connectDevice,deviceaction);
+            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+          }
+
+
+          if(humanlist.children[i].nowGoal == "standRegion"){
+            let points = [];
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+
+            //寻找最近售票机点
+            target = shortStandRegion(humanlist.children[i].position,region.standRegion,humanlist.children[i].overGoal);
+
+            humanlist.children[i].standDoorNum = target.standDoorNum;
+            //寻路售票机
+            path = pathFinder.find(points[0],target.pos);
+        //
+            for(let i=0;i<path.length;i++){
+              points.push(new THREE.Vector3(path[i].x,path[i].y+0.5,path[i].z));
+            }
+            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+          }
+
+        }
+
+
+      }
+
     }
 
   }
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 6f908f097..9c4927a81 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,11 +3,11 @@ export function getBaseUrl() {
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
         // BASE_API = 'https://api.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.140:9000'; // 杜康
+        // BASE_API = 'http://192.168.8.140: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/stationmanager/component/property.vue b/src/views/jlmap3d/stationmanager/component/property.vue
index 6c7e1ef82..41927e125 100644
--- a/src/views/jlmap3d/stationmanager/component/property.vue
+++ b/src/views/jlmap3d/stationmanager/component/property.vue
@@ -10,15 +10,15 @@
 
 
             <el-form-item label="uuid:"  v-if="selectModel.uuid" disabled="true">
-                <el-input v-model="selectModel.uuid" ></el-input>
+                <el-input v-model="selectModel.uuid" disabled></el-input>
             </el-form-item>
 
             <el-form-item label="区域类型:"  v-if="selectModel.regionType" disabled="true">
-                <el-input v-model="selectModel.regionType"></el-input>
+                <el-input v-model="selectModel.regionType" disabled></el-input>
             </el-form-item>
 
             <el-form-item label="区域状态:"  v-if="selectModel.status" disabled="true">
-                <el-input v-model="selectModel.status"></el-input>
+                <el-input v-model="selectModel.status" disabled></el-input>
             </el-form-item>
 
 
@@ -38,18 +38,53 @@
             </el-form-item>
 
             <el-form-item label="售票处状态:"  v-if="selectModel.runType" disabled="true">
-                <el-input v-model="selectModel.runType"></el-input>
+                <el-select v-model="selectModel.runType" placeholder="请选择">
+                  <el-option
+                    v-for="item in runTypeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
             </el-form-item>
 
             <el-form-item label="站台方向:"  v-if="selectModel.direction" disabled="true">
-                <el-input v-model="selectModel.direction"></el-input>
+                <!-- <el-input v-model="selectModel.direction"></el-input> -->
+                <el-select v-model="selectModel.direction" placeholder="请选择">
+                  <el-option
+                    v-for="item in directionOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
             </el-form-item>
             <el-form-item label="连接设备:"  v-if="selectModel.connectDevice" disabled="true">
                 <el-input v-model="selectModel.connectDevice"></el-input>
             </el-form-item>
 
             <el-form-item label="检票机作用:"  v-if="selectModel.checkDirection" disabled="true">
-                <el-input v-model="selectModel.checkDirection"></el-input>
+                <!-- <el-input v-model="selectModel.checkDirection"></el-input> -->
+                <el-select v-model="selectModel.checkDirection" placeholder="请选择">
+                  <el-option
+                    v-for="item in checkOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="闸机组:"  v-if="selectModel.checkBelong" disabled="true">
+                <el-input v-model="selectModel.checkBelong"></el-input>
+            </el-form-item>
+
+            <el-form-item label="售票机组:"  v-if="selectModel.ticketBelong" disabled="true">
+                <el-input v-model="selectModel.ticketBelong"></el-input>
+            </el-form-item>
+
+            <el-form-item label="站台组:"  v-if="selectModel.standBelong" disabled="true">
+                <el-input v-model="selectModel.standBelong"></el-input>
             </el-form-item>
 
 
@@ -89,6 +124,30 @@ export default {
       size:'medium',
       isActive:-1,
       selectModel:null,
+      directionOptions:[{
+        value:"top",
+        label:"上行",
+      },
+      {
+        value:"down",
+        label:"下行",
+      }],
+      checkOptions:[{
+        value:"in",
+        label:"进站",
+      },
+      {
+        value:"out",
+        label:"出站",
+      }],
+      runTypeOptions:[{
+        value:"auto",
+        label:"自动",
+      },
+      {
+        value:"manual",
+        label:"人工",
+      }],
     }
   },
   beforeDestroy() {
diff --git a/src/views/jlmap3d/stationmanager/component/stationmanagerdata.vue b/src/views/jlmap3d/stationmanager/component/stationmanagerdata.vue
new file mode 100644
index 000000000..78b70431a
--- /dev/null
+++ b/src/views/jlmap3d/stationmanager/component/stationmanagerdata.vue
@@ -0,0 +1,164 @@
+<template>
+
+
+    <el-tabs class="StationData" :style="{'background-image': 'url('+localStatic+'/texture/devicemsgpane.png)'}"
+    :tab-position="tabPosition" v-model="activeName" type="card" @tab-click="handleClick" >
+
+
+      <el-tab-pane label="仿真信息" name="regionEditor" >
+
+        <el-form ref="form"   label-width="130px" size="mini" v-if="selectModel">
+
+
+            <el-form-item label="uuid:"  v-if="selectModel.uuid" disabled="true">
+                <el-input v-model="selectModel.uuid" disabled></el-input>
+            </el-form-item>
+
+            <el-form-item label="区域类型:"  v-if="selectModel.regionType" disabled="true">
+                <el-input v-model="selectModel.regionType" disabled></el-input>
+            </el-form-item>
+
+            <el-form-item label="区域状态:"  v-if="selectModel.status" disabled="true">
+                <el-input v-model="selectModel.status" disabled></el-input>
+            </el-form-item>
+
+
+            <el-form-item label="入口乘客比例:"  v-if="selectModel.startWeight" disabled="true">
+                <el-input v-model="selectModel.startWeight"></el-input>
+            </el-form-item>
+            <el-form-item label="出口乘客比例:"  v-if="selectModel.endWeight" disabled="true">
+                <el-input v-model="selectModel.endWeight"></el-input>
+            </el-form-item>
+
+
+
+        </el-form>
+      </el-tab-pane>
+
+    </el-tabs>
+
+
+</template>
+
+<script>
+
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+
+export default {
+  name: 'StationmanagerData',
+  components: {
+
+  },
+  data() {
+    return {
+      localStatic:JL3D_LOCAL_STATIC,
+      activeName: '',
+      tabPosition:'top',
+      size:'medium',
+      isActive:-1,
+      selectModel:null,
+      directionOptions:[{
+        value:"top",
+        label:"上行",
+      },
+      {
+        value:"down",
+        label:"下行",
+      }],
+      checkOptions:[{
+        value:"in",
+        label:"进站",
+      },
+      {
+        value:"out",
+        label:"出站",
+      }],
+      runTypeOptions:[{
+        value:"auto",
+        label:"自动",
+      },
+      {
+        value:"manual",
+        label:"人工",
+      }],
+    }
+  },
+  beforeDestroy() {
+
+
+  },
+  mounted() {
+    window.jl3dStationManagerEquipSelect = this.jl3dStationManagerEquipSelect;
+	},
+  methods: {
+
+    init: function() {
+
+    },
+    back: function() {
+
+    },
+    handleClick: function(tab, event) {
+
+      this.isActive = -1;
+      if(tab.name == "trackedit"){
+
+      }
+      if(tab.name == "switchedit"){
+
+      }
+
+      if(tab.name == "signaledit"){
+
+      }
+      if(tab.name == "stationedit"){
+
+      }
+
+    },
+    jl3dStationManagerEquipSelect: function(selected){
+
+      this.selectModel = selected;
+      this.activeName = "regionEditor";
+      console.log(selected);
+    },
+
+
+  }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  @import "src/styles/mixin.scss";
+
+  .StationData {
+    position:absolute;
+    float: right;
+    right:0;
+    width: 18%;
+    height:70%;
+    // background:#fff;
+    overflow-y:auto;
+    z-index: 10;
+    // border-radius:30px 0 0 30px;
+    // border:1px solid #000;
+    background-size: 100% 100%;
+    // border-radius:5px;
+    // text-align: center;
+  }
+  .editmodelconfig{
+    left:0;
+    margin-top:5px;
+    width:98%;
+    border-radius:5px;
+    border:solid 2px #000
+  }
+  .active{
+    background-color:blue;
+  }
+  .editbutton{
+    padding: 1cm
+  }
+
+</style>
diff --git a/src/views/jlmap3d/stationmanager/jl3dstationmanager.vue b/src/views/jlmap3d/stationmanager/jl3dstationmanager.vue
index 73f7fa74e..af5c07a85 100644
--- a/src/views/jlmap3d/stationmanager/jl3dstationmanager.vue
+++ b/src/views/jlmap3d/stationmanager/jl3dstationmanager.vue
@@ -1,37 +1,40 @@
 <template>
 	<div class="jl3dstationmanager">
 		<el-row class="managerbutton">
-		  <el-button @click="switchViews" round>{{switchButtonName}}</el-button>
+		  <el-button @click="switchStationManagerViews" round>{{switchButtonName}}</el-button>
 			<!-- 仿真操作按钮 -->
-			<el-button v-show="!viewStatus" round @click="startSimulation">开始仿真</el-button>
-			<el-button v-show="!viewStatus" round >显示隐藏区域</el-button>
-			<el-button v-show="!viewStatus" round >显示隐藏热力图</el-button>
+			<!-- <el-button v-show="!viewStatus" round @click="startSimulation">开始仿真</el-button> -->
+			<!-- <el-button v-show="!viewStatus" round >显示隐藏区域</el-button>
+			<el-button v-show="!viewStatus" round >显示隐藏热力图</el-button> -->
 			<!-- 绘图操作按钮 -->
 			<el-button v-show="viewStatus" round @click="deleteRegion">删除区域</el-button>
 			<el-button v-show="viewStatus" round @click="saveData">保存方案</el-button>
 			<el-button v-show="viewStatus" round @click="loadData">加载方案</el-button>
 			<!-- 其他 -->
-			<el-button round>退出</el-button>
+			<el-button round @click="back">退出</el-button>
 		</el-row>
 
-		<div class="dataLoadDiv" v-show="showSaveList">
-			<el-input v-model="saveDataName"></el-input>
-			<div class="modelname" @click="saveNewData(saveDataName)">存新方案</div>
-			<div class="modelname" @click="updateSaveData(saveDataName)">更新方案</div>
+		<div class="dataSaveDiv" v-show="showSaveList">
+			<div class="dataPaneExit" :style="{'background-image': 'url('+localStatic+'/texture/xx.png)'}" @click="closePane"></div>
+			<el-input style="width:80%;"v-model="saveDataName"></el-input>
+			<div class="modelname1" @click="saveNewData(saveDataName)">存新方案</div>
+			<div class="modelname2" @click="updateSaveData(saveDataName)">更新方案</div>
 		</div>
+
+
+
 		<div class="dataLoadDiv" v-show="showLoadList">
 			<div class="dataLoadTittle">已存储方案列表:</div>
+			<div class="dataPaneExit" :style="{'background-image': 'url('+localStatic+'/texture/xx.png)'}" @click="closePane"></div>
 			<el-scrollbar  style="margin-bottom:1px">
 					<el-form ref="form"   label-width="130px" size="mini">
 
-						<div class="dataListDiv" v-for="(asset,index) in nowDataList"  >
-
-							<div >
+						<div class="dataListDiv" v-for="(asset,index) in nowDataList"><div >
 								<div class="modelname">方案名称:{{asset.name }}</div>
 								<div class="modelname">方案修改日期:{{asset.updateTime }}</div>
 
-								<div class="modelname" @click="modelSelect(asset.id)">加载方案</div>
-								<div class="modelname" @click="deletSelect(asset.id)">删除方案</div>
+								<div class="modelname1" @click="modelSelect(asset.id)">加载方案</div>
+								<div class="modelname2" @click="deletSelect(asset.id)">删除方案</div>
 							</div>
 						</div>
 					</el-form>
@@ -51,9 +54,12 @@
         />
       </el-select>
     </div>
+
 		<Station-Data v-show="!viewStatus"></Station-Data>
-		<Draw-Type v-show="viewStatus" @changeDrawType=changeDrawType ></Draw-Type>
-		<Pro-Perty></Pro-Perty>
+		<Draw-Type v-show="viewStatus" @changeDrawType="changeDrawType" ></Draw-Type>
+		<Pro-Perty v-show="viewStatus" ></Pro-Perty>
+		<Stationmanager-Data v-show="!viewStatus" ></Stationmanager-Data>
+
 		<div id="jl3d" class="jl3dstationmanagerdraw" />
 	</div>
 </template>
@@ -66,13 +72,16 @@
 	import StationData from '@/views/jlmap3d/trafficplan/component/stationdata';
   import DrawType from '@/views/jlmap3d/stationmanager/component/drawtype';
 	import ProPerty from '@/views/jlmap3d/stationmanager/component/property';
+	import StationmanagerData from '@/views/jlmap3d/stationmanager/component/stationmanagerdata';
 
+	import { deletePassenger } from '@/api/jlmap3d/assets3d';
 	import { saveStationManagerData,updateStationManagerData,getStationManagerDataList,getStationManagerData,deleteStationManagerData} from '@/api/jlmap3d/load3ddata';
 
 	export default {
 		name: 'jl3devacuation',
 		components: {
 			StationData,
+			StationmanagerData,
 			DrawType,
 			ProPerty,
 		},
@@ -98,6 +107,8 @@
 				showSaveList:false,
 				dataId:null,
 				saveDataName:"",
+				showMsgData:true,
+				paneMsg:"存储成功！",
 			}
 		},
 		watch: {
@@ -109,7 +120,8 @@
 		},
 		mounted() {
 			window.updatestationlist = this.updatestationlist;
-
+			window.switchStationManagerViews = this.switchStationManagerViews;
+			window.updateValue = this.updateValue;
 	    this.group = this.$route.query.group;
 	    this.mapid = this.$route.query.mapid;
 	    this.lineCode = this.$route.query.lineCode;
@@ -122,12 +134,13 @@
 			initnewdata: function (group,header){
 				let dom = document.getElementById('jl3d');
 				this.jl3d = new Jl3dStationManager(dom,this.mapid,this.group,this.initCode);
+
 			},
 			changeDrawType(drawTypeName){
-				// console.log(drawTypeName);
+				console.log(drawTypeName);
 				this.jl3d.changeDrawType(drawTypeName);
 			},
-			switchViews(){
+			switchStationManagerViews(){
 
 				if(this.viewStatus == false){
 					this.switchButtonName = '绘制视角',
@@ -151,6 +164,9 @@
 	      // let oldgroupnum = this.groupnum;
 	      this.value = selVal;
 	    },
+			updateValue(newValue){
+				this.value = newValue;
+			},
 			saveData(){
 				this.showSaveList = true;
 			},
@@ -163,8 +179,10 @@
 	          console.log(data);
 						this.dataId = data.data;
 						this.showSaveList = false;
+						this.msgBox("数据存储成功！");
 	        }
 	      }).catch(error => {
+					this.msgBox(error.message);
 	        console.log(error);
 	      });
 			},
@@ -176,10 +194,11 @@
 		        if(data.code == "200"){
 		          //console.log("创建三维数据成功");
 		          console.log(data);
-								this.showSaveList = false;
-
+							this.showSaveList = false;
+							this.msgBox("数据更新成功！");
 		        }
 		      }).catch(error => {
+						this.msgBox(error.message);
 		        console.log(error);
 		      });
 				}else{
@@ -190,25 +209,19 @@
 			loadData(){
 				this.showLoadList = true;
 				getStationManagerDataList().then(netdata => {
-					console.log(netdata);
 					this.nowDataList = netdata.data;
-
 				});
 			},
 			deletSelect(deleteId){
-				deleteStationManagerData(deleteId).then(netdata => {
-					console.log(netdata);
-				});
-				this.showLoadList = false;
+				this.deleteBox(deleteId);
 			},
 			modelSelect(loadId){
-	      console.log(loadId);
 				getStationManagerData(loadId).then(netdata => {
-					console.log(netdata);
 
 					this.dataId = loadId;
 					this.saveDataName = netdata.data.name;
-						this.jl3d.loadData(netdata.data);
+					this.jl3d.loadData(netdata.data);
+					this.msgBox("加载数据成功");
 				});
 				this.showLoadList = false;
 	    },
@@ -225,6 +238,40 @@
 				this.stationlist = list;
 			},
 
+			msgBox(text){
+				this.$alert(text, {
+          confirmButtonText: '确定',
+          callback: action => {
+
+          }
+        });
+			},
+			deleteBox(deleteId){
+				this.$confirm('此操作将永久删除该数据！', '警告', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					deleteStationManagerData(deleteId).then(netdata => {
+					// console.log(netdata);
+					this.msgBox("删除数据成功！");
+				});
+					this.showLoadList = false;
+				}).catch(() => {
+
+				});
+			},
+			closePane(){
+				this.showLoadList = false;
+				this.showSaveList = false;
+			},
+			back() {
+				deletePassenger(this.$route.query.group,this.$route.query.deviceCode).then(netdata => {
+					// console.log(netdata);
+					window.close();
+				});
+
+			}
 		}
 	}
 </script>
@@ -245,11 +292,25 @@
 		height: 100%;
 		z-index: 9;
 	}
+
+	.dataSaveDiv{
+		position: absolute;
+		z-index: 10;
+		width:40%;
+		height:70px;
+		top:20%;
+		left:30%;
+		background-color: #fff;
+
+		border-radius:5px;
+		border:solid 2px #000;
+	}
+
 	.dataLoadDiv{
 		position: absolute;
 		z-index: 10;
 		width:40%;
-		height:60;
+		/* height:60px; */
 		top:20%;
 		left:30%;
 		background-color: #fff;
@@ -261,11 +322,19 @@
 		text-align:center;
 		font-size: 20px;
 	}
+	.dataPaneExit{
+		width: 20px;
+		height:20px;
+		position: absolute;
+		right:0;
+		top:0;
+		background-size: 100% 100%;
+	}
 	.dataListDiv {
 		float:left;
 		position: relative;
 		width:100%;
-		height:100px;
+		height:70px;
 		border-radius:5px;
 		border:solid 2px #000;
 	}
@@ -283,6 +352,24 @@
 		z-index: 10;
 	}
 
+	.modelname1{
+		width:48%;
+		left:0;
+		position: absolute;
+		border-radius:10px;
+		border:solid 2px #000;
+		text-align: center;
+	}
+
+	.modelname2{
+		width:48%;
+		right:0;
+		position: absolute;
+		border-radius:10px;
+		border:solid 2px #000;
+		text-align: center;
+	}
+
 	.managerbutton{
 		width:50%;
 		left:25%;
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index 484cf1c62..cb2985d6b 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -397,7 +397,7 @@ export default {
                             const routeData = this.$router.resolve({
                                 //  /jlmap3d/trafficplan
                                 //  /design/jlmap3d/jl3dstationmanager
-                                path:'/design/jlmap3d/jl3dstationmanager',
+                                path:'/jlmap3d/trafficplan',
                                 query:{
                                     mapid:this.$route.query.mapId,
                                     group:this.$route.query.group,
diff --git a/static/jl3d/path/stationmanager.obj b/static/jl3d/path/stationmanager.obj
index 69f963b85..efe72db78 100644
--- a/static/jl3d/path/stationmanager.obj
+++ b/static/jl3d/path/stationmanager.obj
@@ -1,7 +1,7 @@
 # 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
-# File Created: 04.03.2021 16:20:24
+# File Created: 17.03.2021 14:24:17
 
-mtllib path.mtl
+mtllib path315.mtl
 
 #
 # object Object003
@@ -279,15 +279,14 @@ v  30.7197 9.8454 10.4284
 v  21.7861 9.8454 -1.5328
 v  27.4298 9.8454 -5.0178
 v  21.7861 9.8454 -5.0156
+v  -34.4179 9.8454 21.4375
+v  -22.8801 9.8454 21.4375
+v  -22.8985 9.8454 15.8912
 v  -22.9049 9.8454 14.1364
 v  -33.7472 9.8454 14.1364
-v  -33.1634 9.8454 25.6925
-v  -22.8640 9.8454 25.6925
-v  -22.8985 9.8454 15.8912
-v  -33.1634 9.8454 -5.0156
-v  -33.7472 9.8454 8.5854
-v  -24.1194 9.8454 8.5854
-v  -24.1194 9.8454 -5.0156
+v  -24.1194 9.8454 8.4892
+v  -31.8828 9.8454 6.1905
+v  -31.9661 9.8454 8.5676
 v  -8.5704 9.8454 17.2820
 v  -10.7366 9.8454 17.2731
 v  -10.7357 9.8454 21.4374
@@ -297,6 +296,9 @@ v  -40.4129 9.8454 14.0505
 v  -41.8927 9.8454 11.8541
 v  -43.7034 9.8454 11.8542
 v  -39.0867 9.8454 25.7142
+v  -33.1634 9.8454 25.6925
+v  -34.3734 9.8454 21.9937
+v  -39.6039 9.8454 21.9935
 v  -41.8927 9.8454 10.5376
 v  -40.4129 9.8454 8.5854
 v  -43.0999 9.8454 8.5854
@@ -332,21 +334,20 @@ v  -33.7472 9.8454 14.0505
 v  -33.7472 9.8454 11.2184
 v  -49.0307 9.8454 11.2184
 v  -49.0307 9.8454 14.0505
-v  -8.5704 9.8454 25.6925
-v  -8.5704 9.8454 22.0052
-v  -11.3493 9.8454 21.9935
-v  -11.3478 9.8454 17.2731
+v  -33.7472 9.8454 8.5854
 v  -18.7412 9.8454 17.2731
-v  -22.0887 9.8454 15.8911
-v  -22.0887 9.8454 25.6925
+v  -22.0887 9.8454 21.4375
+v  -11.2152 9.8454 21.4375
+v  -11.2138 9.8454 17.2731
 v  -8.5704 9.8454 16.8646
 v  -10.7348 9.8454 16.8647
+v  -22.0887 9.8454 15.8911
 v  -23.2027 9.8454 10.4106
-v  -18.7500 9.8454 15.8920
+v  -18.7566 9.8454 15.9025
 v  -18.7676 9.8454 14.4459
 v  -22.5111 9.8454 14.4459
 v  -22.5111 9.8454 15.5681
-v  -18.7588 9.8454 15.5681
+v  -18.7632 9.8454 15.5840
 v  -2.8636 9.8454 21.4382
 v  -2.8828 9.8454 16.8742
 v  -3.7582 9.8454 17.7820
@@ -359,6 +360,8 @@ v  7.3420 9.8454 15.5800
 v  11.1340 9.8454 15.5800
 v  11.1340 9.8454 14.2816
 v  0.1622 9.8454 14.2816
+v  -8.5704 9.8454 22.0052
+v  -8.5704 9.8454 25.6925
 v  -3.7582 9.8454 25.6925
 v  -3.7582 9.8454 22.0255
 v  -2.8450 9.8454 25.6925
@@ -448,7 +451,11 @@ v  11.2845 9.8454 -5.0156
 v  -3.0683 9.8454 7.8959
 v  -0.3214 9.8454 7.8960
 v  10.4639 9.8454 8.3750
+v  -45.9034 9.8454 21.9935
+v  -49.0307 9.8454 21.9934
 v  -49.0307 9.8454 25.6925
+v  -33.3416 9.8454 -0.8639
+v  -33.1634 9.8454 -5.0156
 v  6.5981 1.7700 11.9086
 v  -18.0861 1.7700 14.2820
 v  -23.2027 9.8454 12.1559
@@ -706,7 +713,21 @@ v  -86.8627 17.3766 47.7962
 v  -86.8622 17.3766 50.0645
 v  -86.8584 17.3766 52.1600
 v  -86.8594 17.3766 45.4291
-# 699 vertices
+v  -24.1194 9.8454 -5.0156
+v  -10.9714 9.8454 15.6000
+v  -10.9714 9.8454 15.9289
+v  -22.8640 9.8454 25.6925
+v  -22.8775 9.8454 21.9935
+v  -39.7050 9.8454 21.4375
+v  -22.0887 9.8454 25.6925
+v  -22.0887 9.8454 21.9935
+v  -45.7858 9.8454 21.4375
+v  -49.0307 9.8454 21.4375
+v  -11.2153 9.8454 21.9935
+v  -33.6450 9.8454 6.2052
+v  -31.6355 9.8454 -0.8693
+v  -31.4903 9.8454 -5.0156
+# 720 vertices
 
 vn 0.0000 1.0000 -0.0000
 vn -0.0000 1.0000 -0.0000
@@ -1035,15 +1056,14 @@ vt 1.0078 0.6807 0.0000
 vt 0.8348 0.8080 0.0000
 vt 0.9529 0.8562 0.0000
 vt 0.8348 0.8562 0.0000
+vt 0.2485 0.5735 0.0000
+vt 0.3584 0.5642 0.0000
+vt 0.3584 0.6224 0.0000
 vt 0.3584 0.6424 0.0000
 vt 0.2485 0.6424 0.0000
-vt 0.2485 0.5133 0.0000
-vt 0.3584 0.5133 0.0000
-vt 0.3584 0.6224 0.0000
-vt 0.2485 0.8562 0.0000
-vt 0.2485 0.7007 0.0000
 vt 0.3667 0.7007 0.0000
-vt 0.3667 0.8562 0.0000
+vt 0.2704 0.7279 0.0000
+vt 0.2704 0.7007 0.0000
 vt 0.5109 0.6228 0.0000
 vt 0.4628 0.6228 0.0000
 vt 0.4878 0.5671 0.0000
@@ -1053,6 +1073,9 @@ vt 0.1712 0.6424 0.0000
 vt 0.1712 0.6726 0.0000
 vt 0.1425 0.6726 0.0000
 vt 0.1939 0.5133 0.0000
+vt 0.2485 0.5133 0.0000
+vt 0.2485 0.5636 0.0000
+vt 0.1850 0.5636 0.0000
 vt 0.1712 0.6867 0.0000
 vt 0.1712 0.7007 0.0000
 vt 0.1425 0.7007 0.0000
@@ -1080,6 +1103,7 @@ vt 0.4826 0.9318 0.0000
 vt 0.4697 0.7157 0.0000
 vt 0.3978 0.7478 0.0000
 vt 0.3667 0.7617 0.0000
+vt 0.3667 0.8562 0.0000
 vt 0.5623 0.7919 0.0000
 vt 0.5109 0.7919 0.0000
 vt 0.5109 0.7324 0.0000
@@ -1087,18 +1111,18 @@ vt 0.5623 0.7324 0.0000
 vt 0.2485 0.6726 0.0000
 vt 0.0652 0.6726 0.0000
 vt 0.0652 0.6424 0.0000
-vt 0.5109 0.5133 0.0000
-vt 0.5109 0.5627 0.0000
-vt 0.4813 0.5629 0.0000
-vt 0.4603 0.6228 0.0000
+vt 0.2485 0.7007 0.0000
 vt 0.4148 0.6228 0.0000
-vt 0.3667 0.6256 0.0000
-vt 0.3667 0.5133 0.0000
+vt 0.3667 0.5657 0.0000
+vt 0.4787 0.5704 0.0000
+vt 0.4603 0.6228 0.0000
 vt 0.5109 0.6313 0.0000
 vt 0.4565 0.6313 0.0000
+vt 0.3667 0.5642 0.0000
 vt 0.3667 0.6224 0.0000
 vt 0.3667 0.7082 0.0000
 vt 0.4127 0.6285 0.0000
+vt 0.3667 0.6256 0.0000
 vt 0.4084 0.6399 0.0000
 vt 0.3667 0.6399 0.0000
 vt 0.3667 0.6342 0.0000
@@ -1115,6 +1139,8 @@ vt 0.6812 0.6242 0.0000
 vt 0.7228 0.5770 0.0000
 vt 0.7228 0.6399 0.0000
 vt 0.5958 0.6399 0.0000
+vt 0.5109 0.5627 0.0000
+vt 0.5109 0.5133 0.0000
 vt 0.5623 0.5133 0.0000
 vt 0.5623 0.5573 0.0000
 vt 0.5720 0.5133 0.0000
@@ -1185,9 +1211,13 @@ vt 0.7146 0.6982 0.0000
 vt 0.7228 0.6985 0.0000
 vt 0.4513 0.2342 0.0000
 vt 0.4513 0.2434 0.0000
+vt 0.1133 0.5636 0.0000
 vt 0.0947 0.5133 0.0000
+vt 0.0652 0.5636 0.0000
 vt 0.0652 0.5133 0.0000
 vt 0.2026 0.8562 0.0000
+vt 0.2485 0.8087 0.0000
+vt 0.2485 0.8562 0.0000
 vt 0.7981 0.6707 0.0000
 vt 0.1382 0.2443 0.0000
 vt 0.5109 0.8562 0.0000
@@ -1206,7 +1236,19 @@ vt 0.6190 0.4836 0.0000
 vt 0.5616 0.4836 0.0000
 vt 0.5916 0.4836 0.0000
 vt 0.5581 0.4836 0.0000
-# 445 texture coords
+vt 0.3584 0.5133 0.0000
+vt 0.3584 0.5558 0.0000
+vt 0.1833 0.5735 0.0000
+vt 0.3667 0.5133 0.0000
+vt 0.3667 0.5558 0.0000
+vt 0.1170 0.5735 0.0000
+vt 0.0652 0.5735 0.0000
+vt 0.4813 0.5629 0.0000
+vt 0.3667 0.5571 0.0000
+vt 0.2485 0.7279 0.0000
+vt 0.2704 0.8087 0.0000
+vt 0.2704 0.8562 0.0000
+# 466 texture coords
 
 g Object003
 usemtl 10___Default
@@ -1384,282 +1426,300 @@ f 262/264/1 263/265/1 264/266/1
 f 265/267/1 266/268/1 267/269/1 268/270/1 269/271/1 
 f 270/272/1 271/273/1 272/274/1 
 f 273/275/1 274/276/1 275/277/1 276/278/1 277/279/1 
-f 278/280/1 279/281/1 280/282/1 281/283/1 
-f 282/284/1 283/285/1 284/286/1 285/287/1 
-f 286/288/1 287/289/1 288/290/1 289/291/1 
-f 274/276/1 287/289/1 290/292/1 275/277/1 
-f 291/293/1 292/294/1 293/295/1 294/296/1 
-f 295/297/1 293/295/1 296/298/1 297/299/1 
-f 298/300/1 299/301/1 300/302/1 301/303/1 
-f 298/300/1 301/303/1 290/304/1 302/305/1 
-f 303/306/1 296/307/1 304/308/1 305/309/1 
-f 271/307/1 306/310/1 307/311/1 308/312/1 
-f 309/313/1 310/314/1 264/315/1 311/316/1 
-f 253/255/1 252/254/1 312/317/1 313/318/1 
-f 314/319/1 315/319/1 316/283/1 317/283/1 
-f 318/320/1 319/321/1 320/322/1 321/323/1 
-f 287/289/1 274/276/1 322/276/1 323/324/1 288/290/1 
-f 289/291/1 324/325/1 325/326/1 286/288/1 
-f 295/297/1 324/325/1 289/291/1 294/296/1 293/295/1 
-f 291/293/1 288/290/1 323/324/1 279/281/1 292/294/1 
-f 326/327/1 327/328/1 328/329/1 329/330/1 330/331/1 331/332/1 332/333/1 
-f 282/284/1 333/334/1 334/335/1 283/285/1 
-f 332/333/1 331/336/1 277/279/1 276/278/1 
-f 313/318/1 315/319/1 335/337/1 
-f 330/331/1 336/338/1 331/332/1 
-f 337/339/1 338/340/1 339/341/1 340/342/1 
-f 341/343/1 342/344/1 343/345/1 344/346/1 
-f 345/347/1 333/334/1 282/284/1 285/287/1 344/346/1 343/345/1 
-f 342/344/1 341/343/1 346/348/1 
-f 341/343/1 347/349/1 348/350/1 346/348/1 
-f 349/351/1 350/352/1 351/353/1 352/354/1 
-f 327/328/1 326/327/1 353/355/1 354/356/1 
-f 353/355/1 355/357/1 356/358/1 354/356/1 
-f 357/359/1 356/358/1 355/357/1 358/360/1 
-f 357/361/1 358/360/1 359/362/1 360/363/1 
-f 320/322/1 361/364/1 362/365/1 321/323/1 
-f 315/319/1 363/366/1 364/367/1 316/283/1 
-f 365/368/1 363/366/1 366/369/1 367/370/1 
-f 368/371/1 369/372/1 370/373/1 
-f 371/374/1 250/252/1 249/251/1 338/340/1 337/339/1 372/375/1 
-f 351/353/1 257/259/1 256/258/1 352/354/1 
-f 254/256/1 373/376/1 374/377/1 255/257/1 
-f 321/323/1 375/378/1 376/379/1 377/380/1 378/381/1 318/320/1 
-f 379/382/1 380/383/1 381/384/1 
-f 268/270/1 382/385/1 383/386/1 269/271/1 
-f 260/262/1 384/387/1 385/388/1 261/263/1 
-f 386/389/1 387/390/1 388/391/1 389/392/1 
-f 390/365/3 391/365/3 392/364/3 393/364/3 
-f 390/365/1 393/364/1 394/364/1 395/365/1 
-f 396/364/4 397/364/4 398/364/4 399/364/4 
-f 400/365/5 401/365/5 402/365/5 403/365/5 
-f 404/393/1 405/251/1 406/251/1 407/393/1 
-f 1/337/1 408/337/1 409/319/1 2/319/1 
-f 410/394/1 257/259/1 411/259/1 412/394/1 
-f 413/395/1 414/395/1 415/396/1 416/396/1 
-f 238/394/1 417/394/1 418/259/1 240/259/1 
-f 239/395/1 419/395/1 420/396/1 237/396/1 
-f 421/397/1 381/384/1 380/383/1 347/398/1 
-f 421/397/1 347/398/1 422/399/1 423/400/1 
-f 259/261/1 258/260/1 424/401/1 
-f 259/261/1 424/401/1 263/265/1 262/264/1 
-f 425/402/1 383/386/1 382/385/1 426/403/1 427/404/1 427/404/1 
-f 427/404/1 428/405/1 423/400/1 429/406/1 425/402/1 
-f 423/400/1 422/399/1 430/407/1 429/406/1 
-f 431/408/1 311/409/1 430/407/1 422/399/1 
-f 383/386/1 425/402/1 258/260/1 261/263/1 
-f 425/402/1 429/406/1 424/401/1 258/260/1 
-f 424/401/1 429/406/1 430/407/1 263/265/1 
-f 264/266/1 263/265/1 430/407/1 311/409/1 
-f 269/271/1 385/388/1 432/410/1 265/267/1 
-f 306/411/1 271/273/1 433/412/1 
-f 384/387/1 434/413/1 432/410/1 385/388/1 
-f 306/411/1 433/412/1 435/414/1 436/415/1 
-f 437/416/1 438/417/1 387/390/1 386/389/1 
-f 387/418/1 439/419/1 440/420/1 441/421/1 388/422/1 
-f 415/396/1 414/395/1 369/372/1 368/371/1 
-f 374/377/1 373/376/1 368/371/1 370/373/1 
-f 108/108/1 404/423/1 1/1/1 3/3/1 
-f 108/108/1 405/424/1 404/423/1 
+f 278/280/1 279/281/1 280/282/1 
+f 281/283/1 282/284/1 283/285/1 284/286/1 
+f 285/287/1 286/288/1 287/289/1 288/290/1 
+f 289/291/1 290/292/1 291/293/1 292/294/1 
+f 293/295/1 294/296/1 295/297/1 296/298/1 
+f 297/299/1 295/297/1 298/300/1 299/301/1 
+f 300/302/1 301/303/1 302/304/1 303/305/1 
+f 300/302/1 303/305/1 289/306/1 304/307/1 
+f 305/308/1 298/309/1 306/310/1 307/311/1 
+f 271/309/1 308/312/1 309/313/1 310/314/1 
+f 311/315/1 312/316/1 264/317/1 313/318/1 
+f 253/255/1 252/254/1 314/319/1 315/320/1 
+f 316/321/1 317/321/1 318/322/1 319/322/1 
+f 320/323/1 321/324/1 322/325/1 323/326/1 
+f 286/288/1 277/279/1 324/279/1 325/327/1 287/289/1 
+f 288/290/1 326/328/1 327/329/1 285/287/1 
+f 297/299/1 326/328/1 288/290/1 296/298/1 295/297/1 
+f 293/295/1 287/289/1 325/327/1 328/330/1 294/296/1 
+f 329/331/1 330/332/1 331/333/1 332/334/1 
+f 281/283/1 333/335/1 334/336/1 282/284/1 
+f 274/276/1 330/337/1 335/338/1 275/277/1 
+f 315/320/1 317/321/1 336/339/1 
+f 329/331/1 337/340/1 335/341/1 
+f 338/342/1 339/343/1 340/344/1 341/345/1 
+f 342/346/1 343/347/1 344/348/1 345/349/1 
+f 346/350/1 333/335/1 281/283/1 284/286/1 345/349/1 344/348/1 
+f 343/347/1 342/346/1 347/351/1 
+f 342/346/1 348/352/1 349/353/1 347/351/1 
+f 350/354/1 351/355/1 352/356/1 353/357/1 
+f 354/358/1 355/359/1 356/360/1 357/361/1 
+f 356/360/1 358/362/1 359/363/1 357/361/1 
+f 360/364/1 359/363/1 358/362/1 361/365/1 
+f 360/366/1 361/365/1 362/367/1 363/368/1 
+f 322/325/1 364/369/1 365/370/1 323/326/1 
+f 317/321/1 366/371/1 367/372/1 318/322/1 
+f 368/373/1 366/371/1 369/374/1 370/375/1 
+f 371/376/1 372/377/1 373/378/1 
+f 374/379/1 250/252/1 249/251/1 339/343/1 338/342/1 375/380/1 
+f 352/356/1 257/259/1 256/258/1 353/357/1 
+f 254/256/1 376/381/1 377/382/1 255/257/1 
+f 323/326/1 378/383/1 379/384/1 380/385/1 381/386/1 320/323/1 
+f 382/387/1 383/388/1 384/389/1 
+f 268/270/1 385/390/1 386/391/1 269/271/1 
+f 260/262/1 387/392/1 388/393/1 261/263/1 
+f 389/394/1 390/395/1 391/396/1 392/397/1 
+f 393/370/3 394/370/3 395/369/3 396/369/3 
+f 393/370/1 396/369/1 397/369/1 398/370/1 
+f 399/369/4 400/369/4 401/369/4 402/369/4 
+f 403/370/5 404/370/5 405/370/5 406/370/5 
+f 407/398/1 408/251/1 409/251/1 410/398/1 
+f 1/339/1 411/339/1 412/321/1 2/321/1 
+f 413/399/1 257/259/1 414/259/1 415/399/1 
+f 416/400/1 417/400/1 418/401/1 419/401/1 
+f 238/399/1 420/399/1 421/259/1 240/259/1 
+f 239/400/1 422/400/1 423/401/1 237/401/1 
+f 424/402/1 384/389/1 383/388/1 348/403/1 
+f 424/402/1 348/403/1 425/404/1 426/405/1 
+f 259/261/1 258/260/1 427/406/1 
+f 259/261/1 427/406/1 263/265/1 262/264/1 
+f 428/407/1 386/391/1 385/390/1 429/408/1 430/409/1 430/409/1 
+f 430/409/1 431/410/1 426/405/1 432/411/1 428/407/1 
+f 426/405/1 425/404/1 433/412/1 432/411/1 
+f 434/413/1 313/414/1 433/412/1 425/404/1 
+f 386/391/1 428/407/1 258/260/1 261/263/1 
+f 428/407/1 432/411/1 427/406/1 258/260/1 
+f 427/406/1 432/411/1 433/412/1 263/265/1 
+f 264/266/1 263/265/1 433/412/1 313/414/1 
+f 269/271/1 388/393/1 435/415/1 265/267/1 
+f 308/416/1 271/273/1 436/417/1 
+f 387/392/1 437/418/1 435/415/1 388/393/1 
+f 308/416/1 436/417/1 438/419/1 439/420/1 
+f 440/421/1 441/422/1 390/395/1 389/394/1 
+f 390/423/1 442/424/1 443/425/1 444/426/1 391/427/1 
+f 418/401/1 417/400/1 372/377/1 371/376/1 
+f 377/382/1 376/381/1 371/376/1 373/378/1 
+f 108/108/1 407/428/1 1/1/1 3/3/1 
+f 108/108/1 408/429/1 407/428/1 
 f 2/2/1 109/109/1 3/3/1 
-f 108/108/1 107/107/1 405/424/1 
+f 108/108/1 107/107/1 408/429/1 
 f 240/243/1 110/110/1 186/189/1 232/235/1 
 f 239/242/1 237/240/1 229/232/1 
-f 286/288/1 302/425/1 290/292/1 287/289/1 
-f 325/326/1 442/426/1 302/425/1 286/288/1 
-f 293/295/1 292/294/1 304/427/1 296/298/1 
-f 279/281/1 278/280/1 304/427/1 292/294/1 
-f 403/365/6 172/365/6 443/365/6 400/365/6 
-f 123/123/1 124/124/1 443/428/1 172/175/1 
-f 124/124/1 166/169/1 443/428/1 
-f 396/364/1 399/364/1 147/364/1 444/364/1 
-f 146/146/1 444/429/1 147/147/1 145/145/1 
-f 146/146/1 117/117/1 444/429/1 
-f 253/255/1 445/393/1 249/251/1 
-f 406/251/7 249/251/7 445/393/7 407/393/7 
-f 408/337/8 335/337/8 315/319/8 409/319/8 
-f 320/322/1 319/321/1 446/430/1 316/283/1 364/367/1 
-f 391/365/9 362/365/9 361/364/9 392/364/9 
-f 447/365/10 390/365/10 395/365/10 448/365/10 
-f 402/365/11 401/365/11 447/365/11 448/365/11 
-f 449/364/12 394/364/12 393/364/12 450/364/12 
-f 398/364/13 397/364/13 449/364/13 450/364/13 
-f 417/394/14 412/394/14 411/259/14 418/259/14 
-f 419/395/14 413/395/14 416/396/14 420/396/14 
-f 257/259/1 410/394/1 254/256/1 
-f 440/420/1 451/431/1 370/373/1 
-f 370/373/1 369/372/1 441/421/1 440/420/1 
-f 347/349/1 380/432/1 348/350/1 
-f 374/377/1 452/433/1 255/257/1 
-f 270/389/1 386/389/1 389/392/1 453/392/1 
-f 388/391/1 454/434/1 389/392/1 
-f 271/273/1 270/272/1 453/435/1 265/267/1 
-f 453/435/1 266/268/1 265/267/1 
-f 352/354/1 455/354/1 349/436/1 
-f 348/436/1 349/436/1 455/354/1 456/354/1 
-f 348/436/1 456/354/1 346/354/1 
-f 433/412/1 432/410/1 434/413/1 435/414/1 
-f 436/415/1 435/414/1 457/414/1 458/415/1 
-f 265/267/1 432/410/1 433/412/1 271/273/1 
-f 459/437/1 460/438/1 310/314/1 309/313/1 
-f 310/314/1 460/438/1 461/438/1 
-f 460/438/1 459/437/1 462/439/1 463/438/1 
-f 461/438/1 460/438/1 464/438/1 465/438/1 
-f 463/438/1 462/439/1 466/439/1 467/438/1 
-f 465/438/1 464/438/1 468/438/1 469/438/1 
-f 470/440/1 471/437/1 472/437/1 473/440/1 
-f 462/439/1 470/440/1 473/440/1 466/439/1 
-f 472/437/1 471/437/1 474/437/1 475/437/1 
-f 463/438/1 467/438/1 476/438/1 
-f 464/438/1 463/438/1 476/438/1 468/438/1 
-f 460/438/1 463/438/1 464/438/1 
-f 473/440/1 472/437/1 477/437/1 478/440/1 
-f 467/438/1 466/439/1 479/439/1 480/438/1 
-f 468/438/1 476/438/1 481/438/1 482/438/1 
-f 480/438/15 479/439/15 483/439/15 484/438/15 
-f 478/440/16 477/437/16 485/437/16 486/440/16 
-f 486/440/1 485/437/1 487/437/1 488/440/1 
-f 482/438/17 481/438/17 489/438/17 490/438/17 
-f 490/438/1 489/438/1 491/438/1 492/438/1 
-f 484/438/1 483/439/1 493/439/1 494/438/1 
-f 494/438/18 493/439/18 495/439/18 496/438/18 
-f 496/438/1 495/439/1 497/439/1 498/438/1 
-f 488/440/1 487/437/1 499/437/1 500/440/1 
-f 492/438/1 491/438/1 501/438/1 502/438/1 
-f 498/438/1 497/439/1 503/439/1 504/438/1 
-f 488/440/19 500/440/19 503/440/19 497/440/19 
-f 498/438/20 504/438/20 501/438/20 491/438/20 
-f 499/437/1 487/437/1 505/437/1 506/437/1 
-f 492/438/1 502/438/1 507/438/1 508/438/1 
-f 500/440/21 499/437/21 509/437/21 510/440/21 
-f 502/438/22 501/438/22 511/438/22 512/438/22 
-f 504/438/23 503/439/23 513/439/23 514/438/23 
-f 503/440/24 500/440/24 510/440/24 513/440/24 
-f 501/438/25 504/438/25 514/438/25 511/438/25 
-f 499/437/21 506/437/21 515/437/21 509/437/21 
-f 507/438/26 502/438/26 512/438/26 516/438/26 
-f 510/440/1 509/437/1 517/437/1 518/440/1 
-f 512/438/1 511/438/1 519/438/1 520/438/1 
-f 514/438/1 513/439/1 521/439/1 522/438/1 
-f 513/440/1 510/440/1 518/440/1 521/440/1 
-f 511/438/1 514/438/1 522/438/1 519/438/1 
-f 509/437/1 515/437/1 523/437/1 517/437/1 
-f 516/438/1 512/438/1 520/438/1 524/438/1 
-f 307/311/1 525/311/1 526/312/1 308/312/1 
-f 527/311/1 528/311/1 529/311/1 
-f 527/311/1 530/312/1 526/312/1 525/311/1 
-f 307/311/1 531/311/1 532/311/1 525/311/1 
-f 533/311/1 534/311/1 535/311/1 536/311/1 
-f 536/311/27 535/311/27 537/311/27 538/311/27 
-f 538/311/1 537/311/1 539/311/1 540/311/1 
-f 533/311/1 541/311/1 542/311/1 532/311/1 
-f 534/311/1 533/311/1 532/311/1 531/311/1 
-f 543/311/1 528/311/1 544/311/1 545/311/1 
-f 546/311/1 529/311/1 528/311/1 543/311/1 
-f 545/311/1 544/311/1 547/311/1 548/311/1 
-f 548/311/1 547/311/1 542/311/1 541/311/1 
-f 543/311/1 545/311/1 549/311/1 550/311/1 
-f 548/311/1 541/311/1 551/311/1 552/311/1 
-f 550/311/28 549/311/28 553/311/28 554/311/28 
-f 552/311/28 551/311/28 555/311/28 556/311/28 
-f 554/311/1 553/311/1 557/311/1 558/311/1 
-f 556/311/1 555/311/1 559/311/1 560/311/1 
-f 540/311/29 539/311/29 561/311/29 562/311/29 
-f 562/311/1 561/311/1 563/311/1 564/311/1 
-f 558/311/1 557/311/1 565/311/1 566/311/1 
-f 560/311/1 559/311/1 567/311/1 568/311/1 
-f 564/311/1 563/311/1 569/311/1 570/311/1 
-f 566/311/1 565/311/1 571/311/1 572/311/1 
-f 568/311/1 567/311/1 573/311/1 574/311/1 
-f 569/311/1 563/311/1 575/311/1 576/311/1 
-f 564/311/30 570/311/30 573/311/30 567/311/30 
-f 568/311/1 574/311/1 571/311/1 565/311/1 
-f 566/311/1 572/311/1 577/311/1 578/311/1 
-f 525/311/1 532/311/1 542/311/1 
-f 527/311/1 544/311/1 528/311/1 
-f 525/311/1 547/311/1 544/311/1 527/311/1 
-f 525/311/1 542/311/1 547/311/1 
-f 303/306/1 305/309/1 579/309/1 580/306/1 
-f 581/309/1 582/306/1 580/306/1 579/309/1 
-f 580/306/1 582/306/1 583/306/1 584/306/1 
-f 584/306/1 583/306/1 585/306/1 586/306/1 
-f 587/306/1 588/306/1 589/306/1 
-f 588/306/1 590/306/1 591/306/1 592/306/1 
-f 593/306/1 594/306/1 595/306/1 596/306/1 
-f 589/306/1 584/306/1 586/306/1 587/306/1 
-f 587/306/1 586/306/1 597/306/1 598/306/1 
-f 599/306/1 600/306/1 593/306/1 596/306/1 
-f 587/306/1 598/306/1 590/306/1 588/306/1 
-f 599/306/1 596/306/1 592/306/1 591/306/1 
-f 591/306/1 590/306/1 601/306/1 602/306/1 
-f 598/306/1 597/306/1 603/306/1 604/306/1 
-f 600/306/1 599/306/1 605/306/1 606/306/1 
-f 604/306/31 603/306/31 607/306/31 608/306/31 
-f 606/306/32 605/306/32 609/306/32 610/306/32 
-f 608/306/1 607/306/1 611/306/1 612/306/1 
-f 610/306/1 609/306/1 613/306/1 614/306/1 
-f 602/306/33 601/306/33 615/306/33 616/306/33 
-f 616/306/34 615/306/34 617/306/34 618/306/34 
-f 618/306/35 617/306/35 619/306/35 620/306/35 
-f 620/306/36 619/306/36 621/306/36 622/306/36 
-f 612/306/1 611/306/1 623/306/1 624/306/1 
-f 614/306/1 613/306/1 625/306/1 626/306/1 
-f 622/306/36 621/306/36 627/306/36 628/306/36 
-f 622/306/37 628/306/37 625/306/37 613/306/37 
-f 612/306/38 624/306/38 627/306/38 621/306/38 
-f 623/306/1 611/306/1 629/306/1 630/306/1 
-f 614/306/1 626/306/1 631/306/1 632/306/1 
-f 624/306/1 623/306/1 633/306/1 634/306/1 
-f 626/306/1 625/306/1 635/306/1 636/306/1 
-f 628/306/39 627/306/39 637/306/39 638/306/39 
-f 625/306/40 628/306/40 638/306/40 635/306/40 
-f 627/306/41 624/306/41 634/306/41 637/306/41 
-f 623/306/1 630/306/1 639/306/1 633/306/1 
-f 631/306/1 626/306/1 636/306/1 640/306/1 
-f 592/306/1 596/306/1 595/306/1 
-f 588/306/1 592/306/1 595/306/1 589/306/1 
-f 300/302/1 299/301/1 641/301/1 642/302/1 
-f 642/302/1 643/441/1 644/442/1 
-f 645/443/1 646/443/1 647/444/1 648/444/1 
-f 649/301/1 650/301/1 651/445/1 652/445/1 
-f 653/442/1 644/442/1 643/441/1 654/441/1 
-f 652/445/1 651/445/1 646/443/1 645/443/1 
-f 654/441/1 643/441/1 648/444/1 647/444/1 
-f 653/442/1 655/302/1 644/442/1 
-f 642/302/1 648/444/1 643/441/1 
-f 641/301/1 649/301/1 652/445/1 
-f 641/301/1 652/445/1 645/443/1 
-f 642/302/1 641/301/1 645/443/1 648/444/1 
-f 651/445/1 650/301/1 656/301/1 657/445/1 
-f 653/442/1 654/441/1 658/441/1 659/442/1 
-f 647/444/1 646/443/1 660/443/1 661/444/1 
-f 657/445/42 656/301/42 662/301/42 663/445/42 
-f 659/442/42 658/441/42 664/441/42 665/442/42 
-f 661/444/43 660/443/43 666/443/43 667/444/43 
-f 667/444/1 666/443/1 668/443/1 669/444/1 
-f 663/445/1 662/301/1 670/301/1 671/445/1 
-f 665/442/1 664/441/1 672/441/1 673/442/1 
-f 671/445/1 670/301/1 674/301/1 675/445/1 
-f 673/442/1 672/441/1 676/441/1 677/442/1 
-f 669/444/44 668/443/44 678/443/44 679/444/44 
-f 679/444/1 678/443/1 680/443/1 681/444/1 
-f 675/445/45 674/301/45 682/301/45 683/445/45 
-f 677/442/46 676/441/46 684/441/46 685/442/46 
-f 681/444/47 680/443/47 686/443/47 687/444/47 
-f 675/445/48 683/445/48 686/445/48 680/445/48 
-f 681/444/49 687/444/49 684/444/49 676/444/49 
-f 677/442/50 685/442/50 688/442/50 689/442/50 
-f 682/301/51 674/301/51 690/301/51 691/301/51 
-f 683/445/1 682/301/1 692/301/1 693/445/1 
-f 685/442/1 684/441/1 694/441/1 695/442/1 
-f 687/444/1 686/443/1 696/443/1 697/444/1 
-f 686/445/1 683/445/1 693/445/1 696/445/1 
-f 684/444/1 687/444/1 697/444/1 694/444/1 
-f 688/442/1 685/442/1 695/442/1 698/442/1 
-f 682/301/1 691/301/1 699/301/1 692/301/1 
-f 459/437/1 471/437/1 470/440/1 
-f 459/437/1 470/440/1 462/439/1 
-f 387/418/1 376/379/1 375/378/1 439/419/1 
-f 312/317/1 366/369/1 363/366/1 315/319/1 313/318/1 
-# 404 polygons - 46 triangles
+f 289/291/1 292/294/1 445/430/1 304/431/1 
+f 304/431/1 445/430/1 446/432/1 447/433/1 
+f 295/297/1 294/296/1 306/434/1 298/300/1 
+f 306/434/1 448/435/1 449/436/1 
+f 406/370/6 172/370/6 450/370/6 403/370/6 
+f 123/123/1 124/124/1 450/437/1 172/175/1 
+f 124/124/1 166/169/1 450/437/1 
+f 399/369/1 402/369/1 147/369/1 451/369/1 
+f 146/146/1 451/438/1 147/147/1 145/145/1 
+f 146/146/1 117/117/1 451/438/1 
+f 253/255/1 452/398/1 249/251/1 
+f 409/251/7 249/251/7 452/398/7 410/398/7 
+f 411/339/8 336/339/8 317/321/8 412/321/8 
+f 322/325/1 321/324/1 453/439/1 318/322/1 367/372/1 
+f 394/370/9 365/370/9 364/369/9 395/369/9 
+f 454/370/10 393/370/10 398/370/10 455/370/10 
+f 405/370/11 404/370/11 454/370/11 455/370/11 
+f 456/369/12 397/369/12 396/369/12 457/369/12 
+f 401/369/13 400/369/13 456/369/13 457/369/13 
+f 420/399/14 415/399/14 414/259/14 421/259/14 
+f 422/400/14 416/400/14 419/401/14 423/401/14 
+f 257/259/1 413/399/1 254/256/1 
+f 443/425/1 458/440/1 373/378/1 
+f 373/378/1 372/377/1 444/426/1 443/425/1 
+f 348/352/1 383/441/1 349/353/1 
+f 377/382/1 459/442/1 255/257/1 
+f 270/394/1 389/394/1 392/397/1 460/397/1 
+f 391/396/1 461/443/1 392/397/1 
+f 271/273/1 270/272/1 460/444/1 265/267/1 
+f 460/444/1 266/268/1 265/267/1 
+f 353/357/1 462/357/1 350/445/1 
+f 349/445/1 463/357/1 347/357/1 
+f 436/417/1 435/415/1 437/418/1 438/419/1 
+f 439/420/1 438/419/1 464/419/1 465/420/1 
+f 265/267/1 435/415/1 436/417/1 271/273/1 
+f 466/446/1 467/447/1 312/316/1 311/315/1 
+f 312/316/1 467/447/1 468/447/1 
+f 467/447/1 466/446/1 469/448/1 470/447/1 
+f 468/447/1 467/447/1 471/447/1 472/447/1 
+f 470/447/1 469/448/1 473/448/1 474/447/1 
+f 472/447/1 471/447/1 475/447/1 476/447/1 
+f 477/449/1 478/446/1 479/446/1 480/449/1 
+f 469/448/1 477/449/1 480/449/1 473/448/1 
+f 479/446/1 478/446/1 481/446/1 482/446/1 
+f 470/447/1 474/447/1 483/447/1 
+f 471/447/1 470/447/1 483/447/1 475/447/1 
+f 467/447/1 470/447/1 471/447/1 
+f 480/449/1 479/446/1 484/446/1 485/449/1 
+f 474/447/1 473/448/1 486/448/1 487/447/1 
+f 475/447/1 483/447/1 488/447/1 489/447/1 
+f 487/447/15 486/448/15 490/448/15 491/447/15 
+f 485/449/16 484/446/16 492/446/16 493/449/16 
+f 493/449/1 492/446/1 494/446/1 495/449/1 
+f 489/447/17 488/447/17 496/447/17 497/447/17 
+f 497/447/1 496/447/1 498/447/1 499/447/1 
+f 491/447/1 490/448/1 500/448/1 501/447/1 
+f 501/447/18 500/448/18 502/448/18 503/447/18 
+f 503/447/1 502/448/1 504/448/1 505/447/1 
+f 495/449/1 494/446/1 506/446/1 507/449/1 
+f 499/447/1 498/447/1 508/447/1 509/447/1 
+f 505/447/1 504/448/1 510/448/1 511/447/1 
+f 495/449/19 507/449/19 510/449/19 504/449/19 
+f 505/447/20 511/447/20 508/447/20 498/447/20 
+f 506/446/1 494/446/1 512/446/1 513/446/1 
+f 499/447/1 509/447/1 514/447/1 515/447/1 
+f 507/449/21 506/446/21 516/446/21 517/449/21 
+f 509/447/22 508/447/22 518/447/22 519/447/22 
+f 511/447/23 510/448/23 520/448/23 521/447/23 
+f 510/449/24 507/449/24 517/449/24 520/449/24 
+f 508/447/25 511/447/25 521/447/25 518/447/25 
+f 506/446/21 513/446/21 522/446/21 516/446/21 
+f 514/447/26 509/447/26 519/447/26 523/447/26 
+f 517/449/1 516/446/1 524/446/1 525/449/1 
+f 519/447/1 518/447/1 526/447/1 527/447/1 
+f 521/447/1 520/448/1 528/448/1 529/447/1 
+f 520/449/1 517/449/1 525/449/1 528/449/1 
+f 518/447/1 521/447/1 529/447/1 526/447/1 
+f 516/446/1 522/446/1 530/446/1 524/446/1 
+f 523/447/1 519/447/1 527/447/1 531/447/1 
+f 309/313/1 532/313/1 533/314/1 310/314/1 
+f 534/313/1 535/313/1 536/313/1 
+f 534/313/1 537/314/1 533/314/1 532/313/1 
+f 309/313/1 538/313/1 539/313/1 532/313/1 
+f 540/313/1 541/313/1 542/313/1 543/313/1 
+f 543/313/27 542/313/27 544/313/27 545/313/27 
+f 545/313/1 544/313/1 546/313/1 547/313/1 
+f 540/313/1 548/313/1 549/313/1 539/313/1 
+f 541/313/1 540/313/1 539/313/1 538/313/1 
+f 550/313/1 535/313/1 551/313/1 552/313/1 
+f 553/313/1 536/313/1 535/313/1 550/313/1 
+f 552/313/1 551/313/1 554/313/1 555/313/1 
+f 555/313/1 554/313/1 549/313/1 548/313/1 
+f 550/313/1 552/313/1 556/313/1 557/313/1 
+f 555/313/1 548/313/1 558/313/1 559/313/1 
+f 557/313/28 556/313/28 560/313/28 561/313/28 
+f 559/313/28 558/313/28 562/313/28 563/313/28 
+f 561/313/1 560/313/1 564/313/1 565/313/1 
+f 563/313/1 562/313/1 566/313/1 567/313/1 
+f 547/313/29 546/313/29 568/313/29 569/313/29 
+f 569/313/1 568/313/1 570/313/1 571/313/1 
+f 565/313/1 564/313/1 572/313/1 573/313/1 
+f 567/313/1 566/313/1 574/313/1 575/313/1 
+f 571/313/1 570/313/1 576/313/1 577/313/1 
+f 573/313/1 572/313/1 578/313/1 579/313/1 
+f 575/313/1 574/313/1 580/313/1 581/313/1 
+f 576/313/1 570/313/1 582/313/1 583/313/1 
+f 571/313/30 577/313/30 580/313/30 574/313/30 
+f 575/313/1 581/313/1 578/313/1 572/313/1 
+f 573/313/1 579/313/1 584/313/1 585/313/1 
+f 532/313/1 539/313/1 549/313/1 
+f 534/313/1 551/313/1 535/313/1 
+f 532/313/1 554/313/1 551/313/1 534/313/1 
+f 532/313/1 549/313/1 554/313/1 
+f 305/308/1 307/311/1 586/311/1 587/308/1 
+f 588/311/1 589/308/1 587/308/1 586/311/1 
+f 587/308/1 589/308/1 590/308/1 591/308/1 
+f 591/308/1 590/308/1 592/308/1 593/308/1 
+f 594/308/1 595/308/1 596/308/1 
+f 595/308/1 597/308/1 598/308/1 599/308/1 
+f 600/308/1 601/308/1 602/308/1 603/308/1 
+f 596/308/1 591/308/1 593/308/1 594/308/1 
+f 594/308/1 593/308/1 604/308/1 605/308/1 
+f 606/308/1 607/308/1 600/308/1 603/308/1 
+f 594/308/1 605/308/1 597/308/1 595/308/1 
+f 606/308/1 603/308/1 599/308/1 598/308/1 
+f 598/308/1 597/308/1 608/308/1 609/308/1 
+f 605/308/1 604/308/1 610/308/1 611/308/1 
+f 607/308/1 606/308/1 612/308/1 613/308/1 
+f 611/308/31 610/308/31 614/308/31 615/308/31 
+f 613/308/32 612/308/32 616/308/32 617/308/32 
+f 615/308/1 614/308/1 618/308/1 619/308/1 
+f 617/308/1 616/308/1 620/308/1 621/308/1 
+f 609/308/33 608/308/33 622/308/33 623/308/33 
+f 623/308/34 622/308/34 624/308/34 625/308/34 
+f 625/308/35 624/308/35 626/308/35 627/308/35 
+f 627/308/36 626/308/36 628/308/36 629/308/36 
+f 619/308/1 618/308/1 630/308/1 631/308/1 
+f 621/308/1 620/308/1 632/308/1 633/308/1 
+f 629/308/36 628/308/36 634/308/36 635/308/36 
+f 629/308/37 635/308/37 632/308/37 620/308/37 
+f 619/308/38 631/308/38 634/308/38 628/308/38 
+f 630/308/1 618/308/1 636/308/1 637/308/1 
+f 621/308/1 633/308/1 638/308/1 639/308/1 
+f 631/308/1 630/308/1 640/308/1 641/308/1 
+f 633/308/1 632/308/1 642/308/1 643/308/1 
+f 635/308/39 634/308/39 644/308/39 645/308/39 
+f 632/308/40 635/308/40 645/308/40 642/308/40 
+f 634/308/41 631/308/41 641/308/41 644/308/41 
+f 630/308/1 637/308/1 646/308/1 640/308/1 
+f 638/308/1 633/308/1 643/308/1 647/308/1 
+f 599/308/1 603/308/1 602/308/1 
+f 595/308/1 599/308/1 602/308/1 596/308/1 
+f 302/304/1 301/303/1 648/303/1 649/304/1 
+f 649/304/1 650/450/1 651/451/1 
+f 652/452/1 653/452/1 654/453/1 655/453/1 
+f 656/303/1 657/303/1 658/454/1 659/454/1 
+f 660/451/1 651/451/1 650/450/1 661/450/1 
+f 659/454/1 658/454/1 653/452/1 652/452/1 
+f 661/450/1 650/450/1 655/453/1 654/453/1 
+f 660/451/1 662/304/1 651/451/1 
+f 649/304/1 655/453/1 650/450/1 
+f 648/303/1 656/303/1 659/454/1 
+f 648/303/1 659/454/1 652/452/1 
+f 649/304/1 648/303/1 652/452/1 655/453/1 
+f 658/454/1 657/303/1 663/303/1 664/454/1 
+f 660/451/1 661/450/1 665/450/1 666/451/1 
+f 654/453/1 653/452/1 667/452/1 668/453/1 
+f 664/454/42 663/303/42 669/303/42 670/454/42 
+f 666/451/42 665/450/42 671/450/42 672/451/42 
+f 668/453/43 667/452/43 673/452/43 674/453/43 
+f 674/453/1 673/452/1 675/452/1 676/453/1 
+f 670/454/1 669/303/1 677/303/1 678/454/1 
+f 672/451/1 671/450/1 679/450/1 680/451/1 
+f 678/454/1 677/303/1 681/303/1 682/454/1 
+f 680/451/1 679/450/1 683/450/1 684/451/1 
+f 676/453/44 675/452/44 685/452/44 686/453/44 
+f 686/453/1 685/452/1 687/452/1 688/453/1 
+f 682/454/45 681/303/45 689/303/45 690/454/45 
+f 684/451/46 683/450/46 691/450/46 692/451/46 
+f 688/453/47 687/452/47 693/452/47 694/453/47 
+f 682/454/48 690/454/48 693/454/48 687/454/48 
+f 688/453/49 694/453/49 691/453/49 683/453/49 
+f 684/451/50 692/451/50 695/451/50 696/451/50 
+f 689/303/51 681/303/51 697/303/51 698/303/51 
+f 690/454/1 689/303/1 699/303/1 700/454/1 
+f 692/451/1 691/450/1 701/450/1 702/451/1 
+f 694/453/1 693/452/1 703/452/1 704/453/1 
+f 693/454/1 690/454/1 700/454/1 703/454/1 
+f 691/453/1 694/453/1 704/453/1 701/453/1 
+f 695/451/1 692/451/1 702/451/1 705/451/1 
+f 689/303/1 698/303/1 706/303/1 699/303/1 
+f 466/446/1 478/446/1 477/449/1 
+f 466/446/1 477/449/1 469/448/1 
+f 390/423/1 379/384/1 378/383/1 442/424/1 
+f 314/319/1 369/374/1 366/371/1 317/321/1 315/320/1 
+f 316/321/1 319/322/1 707/322/1 278/321/1 
+f 375/380/1 338/342/1 341/342/1 708/380/1 
+f 709/380/1 337/342/1 329/342/1 332/380/1 
+f 283/285/1 282/284/1 332/284/1 331/285/1 
+f 290/292/1 710/455/1 711/456/1 291/293/1 
+f 273/275/1 712/457/1 292/294/1 291/293/1 
+f 710/455/1 713/458/1 714/459/1 711/456/1 
+f 712/457/1 715/460/1 445/430/1 292/294/1 
+f 445/430/1 715/460/1 716/461/1 446/432/1 
+f 713/458/1 355/359/1 354/358/1 717/462/1 714/463/1 
+f 277/279/1 286/288/1 712/457/1 273/275/1 
+f 712/457/1 286/288/1 285/287/1 715/460/1 
+f 715/460/1 285/287/1 327/329/1 716/461/1 
+f 329/331/1 335/341/1 330/332/1 
+f 448/435/1 718/464/1 279/281/1 719/465/1 
+f 707/322/1 720/466/1 719/465/1 
+f 278/280/1 707/322/1 719/465/1 279/281/1 
+f 294/296/1 328/330/1 718/464/1 
+f 306/434/1 294/296/1 718/464/1 448/435/1 
+# 417 polygons - 51 triangles
 
diff --git a/static/jl3d/path/stationmanagerold.obj b/static/jl3d/path/stationmanagerold.obj
new file mode 100644
index 000000000..ddfebfbb1
--- /dev/null
+++ b/static/jl3d/path/stationmanagerold.obj
@@ -0,0 +1,1710 @@
+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# File Created: 15.03.2021 11:31:43
+
+mtllib path315.mtl
+
+#
+# object Object003
+#
+
+v  -39.8140 1.7700 10.3934
+v  -39.8140 1.7700 8.8954
+v  -41.8258 1.7700 10.3643
+v  -39.6705 1.7700 -3.4526
+v  -39.6705 1.7700 3.6701
+v  -36.2598 1.7700 3.6701
+v  -36.2598 1.7700 -3.4526
+v  -39.6705 1.7700 26.3451
+v  -39.6705 1.7700 20.0796
+v  -43.0812 1.7700 20.0796
+v  -43.0812 1.7700 26.3451
+v  22.7198 1.7700 -3.4526
+v  22.7198 1.7700 3.6701
+v  29.1133 1.7700 3.6701
+v  29.1133 1.7700 -3.4526
+v  29.1133 1.7700 26.3451
+v  29.1133 1.7700 20.0796
+v  22.7198 1.7700 20.0796
+v  22.7198 1.7700 26.3451
+v  -23.1627 1.7700 11.9786
+v  -23.1627 1.7700 10.4133
+v  -27.3418 1.7700 7.9943
+v  -27.3418 1.7700 14.6097
+v  -46.4919 1.7700 -3.4526
+v  -66.9803 1.7700 -3.4526
+v  -66.9803 1.7700 3.3301
+v  -46.4919 1.7700 3.6701
+v  -13.3889 1.7700 3.6701
+v  -13.3889 1.7700 -3.4526
+v  -14.6588 1.7700 -3.4526
+v  -14.6588 1.7700 3.6701
+v  -23.7540 1.7700 3.6701
+v  -23.7540 1.7700 -3.4526
+v  -27.3418 1.7700 -3.4526
+v  -27.3418 1.7700 3.6701
+v  -10.1112 1.7700 26.3451
+v  -10.1112 1.7700 20.0796
+v  -14.6588 1.7700 20.0796
+v  -14.6588 1.7700 26.3451
+v  -23.7540 1.7700 26.3451
+v  -23.7540 1.7700 20.0796
+v  -27.3418 1.7700 20.0796
+v  -27.3418 1.7700 26.3451
+v  -46.4919 1.7700 20.0796
+v  -67.3049 1.7700 19.5942
+v  -67.3049 1.7700 26.3451
+v  -46.4919 1.7700 26.3451
+v  -0.3188 1.7700 3.6701
+v  -0.3188 1.7700 -3.4526
+v  -3.3044 1.7700 -3.4526
+v  -3.6383 1.7700 3.6701
+v  10.1563 1.7700 -3.4526
+v  10.1563 1.7700 3.6701
+v  12.2524 1.7700 3.6701
+v  12.2524 1.7700 -3.4526
+v  46.7687 1.7700 3.6701
+v  46.7687 1.7700 -3.4526
+v  40.8740 1.7700 -3.4526
+v  41.2768 1.7700 3.6701
+v  47.7302 1.7700 26.3451
+v  47.7302 1.7700 20.0796
+v  41.7369 1.7700 20.0796
+v  41.7369 1.7700 26.3451
+v  -3.3044 1.7700 20.0796
+v  -3.3044 1.7700 26.3451
+v  2.3873 1.7700 26.3451
+v  2.3873 1.7700 20.0796
+v  10.1563 1.7700 20.0796
+v  10.1563 1.7700 26.3451
+v  12.2524 1.7700 26.3451
+v  12.2524 1.7700 20.0796
+v  -72.8226 1.7700 15.0602
+v  -72.8226 1.7700 19.5942
+v  -64.5896 1.7700 15.0602
+v  -72.8226 1.7700 7.6643
+v  -64.5896 1.7700 7.6643
+v  -72.8226 1.7700 3.3301
+v  -46.3581 1.7700 12.1065
+v  -46.6636 1.7700 11.8423
+v  -48.2912 1.7700 11.8423
+v  -51.0997 1.7700 12.2997
+v  -54.5549 1.7700 12.0355
+v  -56.7749 1.7700 11.2578
+v  -59.5387 1.7700 11.3094
+v  -61.2585 1.7700 12.0071
+v  -63.4810 1.7700 12.0071
+v  -64.5896 1.7700 12.7601
+v  -63.4810 1.7700 10.4683
+v  -61.2585 1.7700 10.4683
+v  -59.5387 1.7700 10.1516
+v  -56.7749 1.7700 10.1483
+v  -54.5549 1.7700 10.3210
+v  -51.0997 1.7700 10.1886
+v  -48.2912 1.7700 10.6868
+v  -46.6636 1.7700 10.6868
+v  -46.3581 1.7700 10.6700
+v  -64.5896 1.7700 10.0665
+v  -43.7832 1.7700 10.3643
+v  -43.0812 1.7700 3.6701
+v  -43.0812 1.7700 -3.4526
+v  -32.8491 1.7700 3.6701
+v  -32.8491 1.7700 -3.4526
+v  -32.8491 1.7700 26.3451
+v  -32.8491 1.7700 20.0796
+v  -36.2598 1.7700 20.0796
+v  -36.2598 1.7700 26.3451
+v  -39.8140 1.7700 14.6097
+v  -41.8258 1.7700 11.9764
+v  -39.8140 1.7700 7.9943
+v  28.9810 1.7700 14.6097
+v  22.7198 1.7700 14.6097
+v  22.7198 1.7700 7.9943
+v  28.9810 1.7700 7.9943
+v  -12.5445 1.7700 11.3755
+v  -18.0861 1.7700 11.3755
+v  -10.6822 1.7700 14.6978
+v  -18.0861 1.7700 14.6978
+v  2.3873 1.7700 14.6978
+v  -3.3044 1.7700 14.6978
+v  -0.3838 1.7700 7.9074
+v  -0.1964 1.7700 10.4165
+v  12.2524 1.7700 12.1642
+v  10.1563 1.7700 12.1642
+v  10.1563 1.7700 10.1269
+v  12.2524 1.7700 10.2589
+v  61.2467 1.7700 7.5672
+v  61.2467 1.7700 3.6701
+v  54.4041 1.7700 3.6701
+v  50.5224 1.7700 7.5672
+v  61.2467 1.7700 14.9969
+v  50.4514 1.7700 14.9969
+v  55.8860 1.7700 20.0796
+v  61.2467 1.7700 20.0796
+v  44.2499 1.7700 7.9943
+v  40.0714 1.7700 7.9943
+v  44.2038 1.7700 14.6097
+v  40.0494 1.7700 14.6097
+v  -43.7832 1.7700 11.9764
+v  -32.8491 1.7700 7.9943
+v  -32.8491 1.7700 14.6097
+v  -19.2064 1.7700 3.6701
+v  -19.2064 1.7700 -3.4526
+v  -19.2064 1.7700 26.3451
+v  -19.2064 1.7700 20.0796
+v  -20.9192 1.7700 10.4133
+v  -20.9192 1.7700 11.9786
+v  -18.0861 1.7700 11.9209
+v  -10.5492 1.7700 3.6701
+v  -10.5492 1.7700 -3.4526
+v  -8.9962 1.7700 26.3451
+v  -8.9962 1.7700 20.0796
+v  -12.5445 1.7700 10.5318
+v  -8.9962 1.7700 14.6978
+v  -8.9962 1.7700 -3.4526
+v  -8.9962 1.7700 3.6701
+v  6.5981 1.7700 3.6701
+v  6.5981 1.7700 -3.4526
+v  2.3873 1.7700 -3.4526
+v  2.3873 1.7700 3.6701
+v  6.5981 1.7700 26.3451
+v  6.5981 1.7700 20.0796
+v  6.5981 1.7700 14.6978
+v  -8.9962 1.7700 7.9943
+v  -3.6383 1.7700 7.9943
+v  1.5269 1.7700 11.3556
+v  6.5981 1.7700 11.3556
+v  1.4597 1.7700 3.6701
+v  1.4597 1.7700 -3.4526
+v  1.5269 1.7700 10.4165
+v  16.4686 1.7700 14.6097
+v  16.4686 1.7700 7.9943
+v  6.5981 1.7700 14.1832
+v  16.4686 1.7700 3.6701
+v  16.4686 1.7700 -3.4526
+v  16.4686 1.7700 26.3451
+v  16.4686 1.7700 20.0796
+v  31.6495 1.7700 3.6701
+v  31.6495 1.7700 -3.4526
+v  30.7390 1.7700 -3.4526
+v  30.7390 1.7700 3.6701
+v  31.6495 1.7700 26.3451
+v  31.6495 1.7700 20.0796
+v  30.7390 1.7700 20.0796
+v  30.7390 1.7700 26.3451
+v  31.6495 1.7700 14.6097
+v  30.7390 1.7700 14.6097
+v  31.6495 1.7700 7.9943
+v  30.7390 1.7700 7.9943
+v  51.4215 1.7700 3.6701
+v  51.4215 1.7700 -3.4526
+v  49.7513 1.7700 -3.4526
+v  49.7513 1.7700 3.6701
+v  36.1802 1.7700 -3.4526
+v  36.1802 1.7700 3.6701
+v  38.1806 1.7700 3.6701
+v  38.1806 1.7700 -3.4526
+v  52.7001 1.7700 26.3451
+v  52.7001 1.7700 20.0796
+v  50.9161 1.7700 20.0796
+v  50.9161 1.7700 26.3451
+v  36.2437 1.7700 20.0796
+v  36.2437 1.7700 26.3451
+v  38.3998 1.7700 26.3451
+v  38.3998 1.7700 20.0796
+v  37.6065 1.7700 7.9943
+v  36.0139 1.7700 7.9943
+v  46.7001 1.7700 7.9943
+v  48.0722 1.7700 7.9943
+v  48.0109 1.7700 14.6097
+v  46.6443 1.7700 14.6097
+v  37.5960 1.7700 14.6097
+v  36.0109 1.7700 14.6097
+v  33.2752 1.7700 12.0256
+v  36.0121 1.7700 12.0256
+v  36.0127 1.7700 10.5785
+v  33.2752 1.7700 10.5785
+v  40.0580 1.7700 12.0256
+v  40.0628 1.7700 10.1071
+v  37.6024 1.7700 10.5785
+v  37.6001 1.7700 12.0256
+v  33.2752 1.7700 -3.4526
+v  33.2752 1.7700 3.6701
+v  33.2752 1.7700 20.0796
+v  33.2752 1.7700 26.3451
+v  33.2752 1.7700 7.9943
+v  33.2752 1.7700 14.6097
+v  44.2218 1.7700 12.0256
+v  44.2319 1.7700 10.1071
+v  30.7390 1.7700 10.5785
+v  31.6495 1.7700 10.5785
+v  31.6495 1.7700 12.0256
+v  30.7390 1.7700 12.0256
+v  46.1511 1.7700 10.5173
+v  48.9139 1.7700 10.5943
+v  46.1265 1.7700 11.8126
+v  48.8868 1.7700 11.8126
+v  28.9810 1.7700 10.3745
+v  28.9810 1.7700 12.1864
+v  28.9810 1.7700 8.8646
+v  28.9810 1.7700 13.7280
+v  50.4946 1.7700 10.5785
+v  50.4791 1.7700 12.0256
+v  54.4041 1.7700 -3.4526
+v  55.8860 1.7700 26.3451
+v  -8.9962 1.7700 11.3757
+v  -3.6383 1.7700 11.3757
+v  -10.3463 1.7700 10.5318
+v  -10.3443 1.7700 11.3757
+v  -23.2027 9.8454 13.8078
+v  -11.0396 9.8454 13.7320
+v  -11.0396 9.8454 12.1185
+v  -12.5938 9.8454 12.1185
+v  -20.9597 9.8454 12.1185
+v  10.1084 9.8454 12.1864
+v  0.1622 9.8454 12.1864
+v  0.1622 9.8454 13.7280
+v  11.2500 9.8454 13.7280
+v  33.6353 9.8454 14.0505
+v  39.5502 9.8454 14.0505
+v  39.5502 9.8454 12.0085
+v  33.2127 9.8454 12.0085
+v  39.5502 9.8454 25.6926
+v  36.3799 9.8454 25.2073
+v  36.6896 9.8454 25.7142
+v  30.2462 9.8454 8.4730
+v  21.7860 9.8454 8.3750
+v  21.7860 9.8454 10.4284
+v  22.9972 9.8454 10.4284
+v  30.7197 9.8454 10.4284
+v  21.7861 9.8454 -1.5328
+v  27.4298 9.8454 -5.0178
+v  21.7861 9.8454 -5.0156
+v  -34.4179 9.8454 21.4375
+v  -22.8801 9.8454 21.4375
+v  -22.8985 9.8454 15.8912
+v  -22.9049 9.8454 14.1364
+v  -33.7472 9.8454 14.1364
+v  -33.1634 9.8454 -5.0156
+v  -33.7472 9.8454 8.5854
+v  -24.1194 9.8454 8.4892
+v  -24.1194 9.8454 -5.0156
+v  -8.5704 9.8454 17.2820
+v  -10.7366 9.8454 17.2731
+v  -10.7357 9.8454 21.4374
+v  -8.5704 9.8454 21.4387
+v  -44.9622 9.8454 14.0505
+v  -40.4129 9.8454 14.0505
+v  -41.8927 9.8454 11.8541
+v  -43.7034 9.8454 11.8542
+v  -39.0867 9.8454 25.7142
+v  -33.1634 9.8454 25.6925
+v  -34.3734 9.8454 21.9937
+v  -39.6039 9.8454 21.9935
+v  -41.8927 9.8454 10.5376
+v  -40.4129 9.8454 8.5854
+v  -43.0999 9.8454 8.5854
+v  -43.7034 9.8454 10.5376
+v  -49.0307 9.8454 8.5854
+v  -46.3456 9.8454 -5.0178
+v  -49.0307 9.8454 -5.0156
+v  -46.5052 9.8454 30.2966
+v  -46.5052 9.8454 33.3474
+v  -39.1200 9.8454 33.3474
+v  -39.1200 9.8454 30.2966
+v  -46.5052 9.8454 25.7142
+v  -46.3456 9.8454 -10.5865
+v  -39.2166 9.8454 -5.0178
+v  -39.2165 9.8454 -10.5865
+v  36.6280 9.8454 -5.0178
+v  36.6280 9.8454 -23.5904
+v  27.4298 9.8454 -23.5904
+v  27.4158 9.8454 31.1248
+v  36.6896 9.8454 31.1248
+v  27.4158 9.8454 25.7142
+v  -12.5916 9.8454 10.4922
+v  -20.9608 9.8454 10.4534
+v  -23.3414 9.8454 8.4894
+v  -23.2027 9.8454 8.8551
+v  -22.0887 9.8454 -5.0156
+v  -23.3414 9.8454 -5.0156
+v  -4.4674 9.8454 -3.1824
+v  -8.0470 9.8454 -3.1824
+v  -8.5997 9.8454 5.4342
+v  -3.8321 9.8454 5.4342
+v  -33.7472 9.8454 14.0505
+v  -33.7472 9.8454 11.2184
+v  -49.0307 9.8454 11.2184
+v  -49.0307 9.8454 14.0505
+v  -18.7412 9.8454 17.2731
+v  -22.0887 9.8454 21.4375
+v  -11.2152 9.8454 21.4375
+v  -11.2138 9.8454 17.2731
+v  -8.5704 9.8454 16.8646
+v  -10.7348 9.8454 16.8647
+v  -22.0887 9.8454 15.8911
+v  -23.2027 9.8454 10.4106
+v  -18.7566 9.8454 15.9025
+v  -18.7676 9.8454 14.4459
+v  -22.5111 9.8454 14.4459
+v  -22.5111 9.8454 15.5681
+v  -18.7632 9.8454 15.5840
+v  -2.8636 9.8454 21.4382
+v  -2.8828 9.8454 16.8742
+v  -3.7582 9.8454 17.7820
+v  -3.7582 9.8454 21.4383
+v  -7.4595 9.8454 17.8002
+v  0.1622 9.8454 16.8708
+v  11.5320 9.8454 21.4400
+v  7.3426 9.8454 15.9791
+v  7.3420 9.8454 15.5800
+v  11.1340 9.8454 15.5800
+v  11.1340 9.8454 14.2816
+v  0.1622 9.8454 14.2816
+v  -8.5704 9.8454 22.0052
+v  -8.5704 9.8454 25.6925
+v  -3.7582 9.8454 25.6925
+v  -3.7582 9.8454 22.0255
+v  -2.8450 9.8454 25.6925
+v  -2.8618 9.8454 22.0293
+v  11.5320 9.8454 22.0666
+v  11.5365 9.8454 25.6925
+v  19.2251 9.8454 25.6925
+v  19.2251 9.8454 22.0431
+v  -8.4929 9.8454 6.8954
+v  -3.8395 9.8454 6.8954
+v  -8.9990 9.8454 10.2201
+v  -9.1031 9.8454 5.4122
+v  -8.9664 9.8454 11.3080
+v  -10.3261 9.8454 10.4922
+v  -10.3449 9.8454 11.3111
+v  10.1053 9.8454 10.3995
+v  10.4639 9.8454 8.8646
+v  1.4590 9.8454 10.5012
+v  -11.0396 9.8454 14.4459
+v  -10.9714 9.8454 14.4459
+v  10.1092 9.8454 11.7284
+v  1.4621 9.8454 11.7284
+v  -3.1144 9.8454 5.4672
+v  9.6671 9.8454 -4.5869
+v  9.6834 9.8454 -5.0156
+v  -4.4674 9.8454 -5.0156
+v  11.5320 9.8454 14.0505
+v  11.5409 9.8454 15.9791
+v  15.6336 9.8454 14.0505
+v  22.9972 9.8454 12.0085
+v  30.7197 9.8454 12.0085
+v  39.5502 9.8454 10.4284
+v  33.2127 9.8454 10.4284
+v  20.6019 9.8454 -1.5328
+v  11.2845 9.8454 -4.5869
+v  11.2845 9.8454 8.3750
+v  20.6019 9.8454 6.5719
+v  -3.7350 6.8736 11.9085
+v  -3.8177 6.8934 11.6621
+v  -8.5319 6.8934 11.6621
+v  -8.6566 6.8736 11.9085
+v  -8.6566 6.8736 14.1800
+v  -3.7350 6.8736 14.1643
+v  -17.3892 1.7700 14.1800
+v  -13.9584 3.9918 14.1800
+v  -13.9584 3.9918 11.9086
+v  -17.3892 1.7700 11.9086
+v  5.0010 1.7622 11.9086
+v  1.5652 4.0149 11.9086
+v  1.5652 4.0149 14.1643
+v  5.0010 1.7622 14.1643
+v  -39.8140 1.7700 12.1468
+v  -39.8140 1.7700 13.7091
+v  -38.4316 1.7700 13.7150
+v  -38.4316 1.7700 12.1474
+v  -38.4328 1.7700 10.3944
+v  -38.4328 1.7700 8.8930
+v  11.2500 9.8454 12.1864
+v  12.4168 9.8454 13.7280
+v  12.4168 9.8454 12.1864
+v  12.4168 9.8454 8.8646
+v  11.2650 9.8454 8.8646
+v  11.2649 9.8454 10.3745
+v  12.4168 9.8454 10.3745
+v  27.3042 1.7700 12.1864
+v  27.3042 1.7700 13.7280
+v  27.3042 1.7700 8.8646
+v  27.3042 1.7700 10.3745
+v  15.6336 9.8454 17.6729
+v  19.8916 9.8454 21.4431
+v  20.5873 9.8454 17.6729
+v  33.8707 9.8454 15.1882
+v  30.0552 9.8454 14.0505
+v  21.7860 9.8454 12.0085
+v  21.7860 9.8454 14.0505
+v  20.5873 9.8454 14.0505
+v  29.4137 9.8454 16.0219
+v  27.0995 9.8454 23.1333
+v  19.8916 9.8454 25.6925
+v  33.5236 9.8454 8.5109
+v  34.1479 9.8454 -0.3628
+v  39.5502 9.8454 8.5854
+v  39.5502 9.8454 -0.3245
+v  39.5502 9.8454 -5.0156
+v  20.6019 9.8454 -5.0156
+v  11.2845 9.8454 -5.0156
+v  -3.0683 9.8454 7.8959
+v  -0.3214 9.8454 7.8960
+v  10.4639 9.8454 8.3750
+v  -45.9034 9.8454 21.9935
+v  -49.0307 9.8454 21.9934
+v  -49.0307 9.8454 25.6925
+v  6.5981 1.7700 11.9086
+v  -18.0861 1.7700 14.2820
+v  -23.2027 9.8454 12.1559
+v  -8.0470 9.8454 -5.0156
+v  0.0431 4.1998 11.9086
+v  0.0431 4.1998 14.1643
+v  -12.4112 4.1992 14.1800
+v  -12.4112 4.1992 11.9086
+v  -0.3199 9.8454 10.4983
+v  0.1622 9.8454 11.7284
+v  21.7860 9.8454 6.5719
+v  20.6019 9.8454 8.3750
+v  0.1622 9.8454 15.5800
+v  0.1622 9.8454 15.9791
+v  47.4891 9.8454 -0.3245
+v  47.4891 9.8454 -5.0156
+v  27.4158 9.8454 33.6314
+v  36.6896 9.8454 33.1868
+v  37.8689 9.8454 33.0756
+v  47.0822 9.8454 59.5101
+v  48.8252 9.8454 56.3399
+v  49.9100 9.8454 54.3823
+v  50.1848 9.8454 53.8488
+v  55.5878 9.8454 60.8075
+v  55.5878 9.8454 57.5859
+v  55.5878 9.8454 54.6765
+v  55.5878 9.8454 53.8611
+v  46.5346 9.8454 60.4421
+v  44.4393 9.8454 63.4838
+v  55.5878 9.8454 63.3669
+v  55.5878 9.8454 61.1758
+v  44.7575 9.8454 63.7537
+v  55.5878 9.8454 63.7650
+v  55.5878 9.8454 57.1969
+v  56.8007 9.8454 63.3669
+v  56.8007 9.8454 61.1758
+v  56.3933 9.8454 60.8075
+v  56.3933 9.8454 57.5859
+v  56.7994 9.8454 57.1969
+v  56.7994 9.8454 54.6765
+v  63.6583 13.8807 60.7964
+v  63.6583 13.8807 57.5748
+v  70.2179 17.3405 63.3669
+v  70.2179 17.3405 61.1758
+v  72.4923 17.3405 63.3669
+v  72.4923 17.3405 61.1758
+v  70.2144 17.3787 57.1969
+v  70.2144 17.3787 54.6765
+v  72.4479 17.3787 57.1969
+v  72.4479 17.3787 54.6765
+v  65.9596 13.8807 60.7964
+v  65.9596 13.8807 57.5748
+v  71.6443 17.3383 60.7964
+v  71.6443 17.3383 57.5748
+v  72.5090 17.3383 60.7964
+v  72.5090 17.3383 57.5748
+v  74.0065 17.3405 63.3669
+v  74.0065 17.3405 61.1758
+v  73.9621 17.3787 57.1969
+v  73.9621 17.3787 54.6765
+v  74.0232 17.3383 60.7964
+v  74.0232 17.3383 57.5748
+v  72.4923 17.3405 63.7948
+v  74.0065 17.3405 63.7948
+v  73.9621 17.3787 53.7216
+v  72.4479 17.3787 53.7216
+v  74.3597 17.3535 63.3669
+v  74.3597 17.3535 61.1758
+v  74.3322 17.3535 57.1969
+v  74.3322 17.3535 54.6765
+v  74.3764 17.3535 60.7964
+v  74.3764 17.3535 57.5748
+v  74.3597 17.3535 63.7948
+v  74.3153 17.3535 53.7216
+v  97.7623 17.3535 63.3669
+v  97.7623 17.3535 61.1758
+v  97.7180 17.3535 57.1969
+v  97.7180 17.3535 54.6765
+v  97.7791 17.3535 60.7964
+v  97.7791 17.3535 57.5748
+v  97.7623 17.3535 63.7948
+v  97.7180 17.3535 53.7216
+v  36.6280 9.8454 -26.8193
+v  27.4298 9.8454 -26.8193
+v  36.6280 9.8454 -31.7138
+v  73.2738 9.8454 -31.4662
+v  73.2738 9.8454 -31.7138
+v  27.4298 9.8454 -31.7138
+v  73.2738 9.8454 -23.5904
+v  73.2738 9.8454 -26.8193
+v  79.2394 9.8454 -26.8193
+v  79.2394 9.8454 -23.5904
+v  79.9802 9.8454 -23.6640
+v  79.9802 9.8454 -26.8193
+v  86.6870 14.5652 -23.6640
+v  86.6870 14.5652 -26.8193
+v  88.3134 14.5652 -23.6640
+v  88.3134 14.5652 -26.8193
+v  79.2394 9.8454 -27.2419
+v  73.2738 9.8454 -27.2419
+v  79.2394 9.8454 -31.4662
+v  73.2738 9.8454 -29.8242
+v  79.2394 9.8454 -29.4623
+v  79.2394 9.8454 -31.7138
+v  73.2738 9.8454 -28.6248
+v  79.2394 9.8454 -28.9866
+v  80.1008 9.8454 -29.4623
+v  80.1008 9.8454 -31.4662
+v  80.1008 9.8454 -27.2419
+v  80.1008 9.8454 -28.9866
+v  92.9855 19.0093 -29.4623
+v  92.9855 19.0093 -31.4662
+v  92.9855 19.0093 -27.2419
+v  92.9855 19.0093 -28.9866
+v  94.1895 19.0093 -29.4623
+v  94.1895 19.0093 -31.4662
+v  94.1895 19.0093 -27.2419
+v  94.1895 19.0093 -28.9866
+v  93.9410 18.9921 -23.6640
+v  93.9410 18.9921 -26.8193
+v  94.6167 18.9921 -23.6640
+v  94.6167 18.9921 -26.8193
+v  94.6383 19.0093 -29.4623
+v  94.6383 19.0093 -31.4662
+v  94.6383 19.0093 -27.2419
+v  94.6383 19.0093 -28.9866
+v  119.4256 18.9921 -23.6640
+v  119.4256 18.9921 -26.8193
+v  119.4472 19.0093 -29.4623
+v  119.4472 19.0093 -31.4662
+v  119.4472 19.0093 -27.2419
+v  119.4472 19.0093 -28.9866
+v  94.6167 18.9921 -22.2457
+v  119.4256 18.9921 -22.3195
+v  119.4472 19.0093 -32.8311
+v  94.6383 19.0093 -32.9028
+v  -39.2165 9.8454 -36.3442
+v  -46.3456 9.8454 -36.5526
+v  -39.2165 9.8454 -44.7027
+v  -46.3456 9.8454 -45.1736
+v  -88.2752 9.8454 -47.9655
+v  -89.5096 9.8454 -39.8693
+v  -97.1859 9.8454 -48.5360
+v  -97.5792 9.8454 -39.9382
+v  -97.7690 9.8454 -37.4282
+v  -97.7871 9.8454 -37.1477
+v  -89.7021 9.8454 -36.9393
+v  -100.8271 9.8454 -37.3536
+v  -101.0286 9.8454 -34.4664
+v  -97.9408 9.8454 -34.2519
+v  -98.1487 9.8454 -31.6969
+v  -90.0871 9.8454 -31.0792
+v  -89.8946 9.8454 -34.0092
+v  -97.9588 9.8454 -33.9427
+v  -100.5544 9.8454 -40.1327
+v  -100.8034 9.8454 -37.6331
+v  -101.0523 9.8454 -34.1581
+v  -101.3012 9.8454 -31.9228
+v  -101.4525 9.8454 -37.3970
+v  -101.7154 9.8454 -34.5504
+v  -101.6070 9.8454 -39.9122
+v  -101.7917 9.8454 -37.7217
+v  -102.1173 9.8454 -34.2228
+v  -102.2814 9.8454 -32.2376
+v  -112.3762 19.1173 -40.7836
+v  -112.5698 19.1173 -38.5931
+v  -112.8607 19.1173 -35.0942
+v  -113.0405 19.1173 -33.1090
+v  -114.1476 19.1173 -40.8976
+v  -114.3429 19.1173 -38.7158
+v  -114.6390 19.1173 -35.2295
+v  -114.8164 19.1173 -33.2521
+v  -107.3564 14.9161 -37.7994
+v  -107.5640 14.9088 -35.0427
+v  -109.2160 14.9161 -37.9308
+v  -109.4236 14.9088 -35.1741
+v  -113.7836 19.0961 -38.2854
+v  -113.9912 19.0888 -35.5287
+v  -114.3801 19.0961 -38.2807
+v  -114.6233 19.0888 -35.5347
+v  -120.3066 19.1173 -40.9518
+v  -120.3646 19.1173 -38.7621
+v  -120.4563 19.1173 -35.2644
+v  -120.5088 19.1173 -33.2798
+v  -120.3760 19.0961 -38.3255
+v  -120.4488 19.0888 -35.5698
+v  -114.0328 19.1173 -42.2831
+v  -120.2607 19.1173 -42.6775
+v  -120.5383 19.1173 -32.1516
+v  -114.9096 19.1173 -31.7960
+v  -137.7519 19.1173 -42.0639
+v  -137.9026 19.1173 -39.8787
+v  -138.1427 19.1173 -36.3880
+v  -138.2793 19.1173 -34.4075
+v  -137.9326 19.0961 -39.4430
+v  -138.1222 19.0888 -36.6928
+v  -137.6328 19.1173 -43.7861
+v  -138.3566 19.1173 -33.2815
+v  -46.4800 9.8454 34.1331
+v  -39.1445 9.8454 36.5917
+v  -50.5235 9.8454 50.3878
+v  -49.2676 9.8454 52.2457
+v  -52.1164 9.8454 47.7366
+v  -56.3039 9.8454 47.7027
+v  -56.2961 9.8454 50.0768
+v  -50.6911 9.8454 50.0938
+v  -53.5399 9.8454 45.4835
+v  -56.3116 9.8454 45.5315
+v  -56.3048 9.8454 47.4186
+v  -52.2840 9.8454 47.4713
+v  -56.2890 9.8454 52.0131
+v  -56.2952 9.8454 50.3729
+v  -56.2883 9.8454 52.2457
+v  -57.5555 9.8454 45.6157
+v  -57.5487 9.8454 47.4186
+v  -57.5484 9.8454 50.3717
+v  -57.5422 9.8454 51.9899
+v  -57.1631 9.8454 47.7859
+v  -57.1553 9.8454 50.0543
+v  -70.9500 17.3877 45.6157
+v  -70.9431 17.3877 47.4186
+v  -70.9428 17.3877 50.3717
+v  -70.9366 17.3877 51.9899
+v  -64.4121 13.8885 47.7859
+v  -64.4043 13.8885 50.0543
+v  -66.7232 13.8885 47.7962
+v  -66.7153 13.8885 50.0645
+v  -72.8177 17.3877 45.6157
+v  -72.8109 17.3877 47.4186
+v  -72.8106 17.3877 50.3717
+v  -72.8044 17.3877 51.9899
+v  -73.1348 17.3877 45.6157
+v  -73.1279 17.3877 47.4186
+v  -73.1276 17.3877 50.3717
+v  -73.1214 17.3877 51.9899
+v  -72.3971 17.3434 47.7962
+v  -72.3893 17.3434 50.0645
+v  -73.0657 17.3434 47.7962
+v  -73.0578 17.3434 50.0645
+v  -74.8144 17.3766 45.6157
+v  -74.8139 17.3766 47.4186
+v  -74.8139 17.3766 50.3717
+v  -74.8134 17.3766 51.9899
+v  -74.8177 17.3766 47.7962
+v  -74.8172 17.3766 50.0645
+v  -74.8134 17.3766 52.1600
+v  -73.1214 17.3877 52.1600
+v  -73.1348 17.3877 45.4291
+v  -74.8144 17.3766 45.4291
+v  -86.8594 17.3766 45.6157
+v  -86.8589 17.3766 47.4186
+v  -86.8588 17.3766 50.3717
+v  -86.8584 17.3766 51.9899
+v  -86.8627 17.3766 47.7962
+v  -86.8622 17.3766 50.0645
+v  -86.8584 17.3766 52.1600
+v  -86.8594 17.3766 45.4291
+v  -10.9714 9.8454 15.6000
+v  -10.9714 9.8454 15.9289
+v  -22.8640 9.8454 25.6925
+v  -22.8775 9.8454 21.9935
+v  -39.7050 9.8454 21.4375
+v  -22.0887 9.8454 25.6925
+v  -22.0887 9.8454 21.9935
+v  -45.7858 9.8454 21.4375
+v  -49.0307 9.8454 21.4375
+v  -11.2153 9.8454 21.9935
+# 714 vertices
+
+vn 0.0000 1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vn 0.0000 0.9968 0.0800
+vn -0.5436 0.8394 -0.0000
+vn 0.5483 0.8363 -0.0000
+vn -0.0049 1.0000 -0.0000
+vn -0.4685 0.8835 -0.0000
+vn -0.4684 0.8835 -0.0000
+vn 0.0000 0.8502 0.5265
+vn 0.5777 0.8163 -0.0000
+vn 0.1206 0.9927 -0.0000
+vn -0.5802 0.8145 -0.0000
+vn -0.1329 0.9911 -0.0000
+vn 0.4768 0.8790 -0.0000
+vn -0.4856 0.8742 -0.0000
+vn -0.4877 0.8730 -0.0000
+vn -0.4896 0.8719 -0.0000
+vn -0.5197 0.8544 -0.0000
+vn 0.0000 1.0000 -0.0059
+vn 0.0000 0.9943 0.1065
+vn -0.0369 0.9993 -0.0000
+vn 0.0680 0.9977 -0.0000
+vn -0.0432 0.9991 -0.0000
+vn -0.0400 0.9992 -0.0047
+vn 0.0138 0.9986 0.0516
+vn 0.0696 0.9976 -0.0006
+vn -0.5755 0.8178 -0.0000
+vn -0.5796 0.8149 -0.0000
+vn -0.6183 0.7860 -0.0000
+vn 0.0000 0.9992 0.0407
+vn 0.6487 0.7590 0.0560
+vn 0.6494 0.7583 0.0562
+vn 0.6496 0.7582 0.0555
+vn -0.0002 1.0000 0.0026
+vn 0.6719 0.7387 0.0526
+vn -0.0000 1.0000 0.0027
+vn 0.0006 0.9957 -0.0929
+vn -0.0004 0.9988 0.0485
+vn -0.0002 1.0000 0.0027
+vn 0.0059 0.9957 -0.0927
+vn -0.0031 0.9988 0.0484
+vn 0.4906 0.8714 -0.0019
+vn 0.4871 0.8733 -0.0017
+vn 0.5201 0.8541 -0.0018
+vn -0.0066 1.0000 0.0000
+vn -0.0065 1.0000 0.0000
+vn 0.0189 0.9998 -0.0000
+vn 0.0064 0.9983 0.0580
+vn 0.0064 0.9974 -0.0711
+vn -0.0065 1.0000 -0.0000
+vn -0.0066 1.0000 -0.0000
+# 51 vertex normals
+
+vt 0.4513 0.2239 0.0000
+vt 0.4513 0.2148 0.0000
+vt 0.5008 0.2094 0.0000
+vt 0.5008 0.0495 0.0000
+vt 0.5008 0.1694 0.0000
+vt 0.4513 0.1694 0.0000
+vt 0.4513 0.0495 0.0000
+vt 0.5008 0.4092 0.0000
+vt 0.5008 0.2893 0.0000
+vt 0.5502 0.2893 0.0000
+vt 0.5502 0.4092 0.0000
+vt 0.5349 0.5045 0.0000
+vt 0.5349 0.6244 0.0000
+vt 0.4680 0.6244 0.0000
+vt 0.4680 0.5045 0.0000
+vt 0.4680 0.8642 0.0000
+vt 0.4680 0.7443 0.0000
+vt 0.5349 0.7443 0.0000
+vt 0.5349 0.8642 0.0000
+vt 0.2700 0.2493 0.0000
+vt 0.2700 0.2094 0.0000
+vt 0.3360 0.2094 0.0000
+vt 0.3360 0.2493 0.0000
+vt 0.5997 0.0495 0.0000
+vt 0.7974 0.0495 0.0000
+vt 0.7974 0.1694 0.0000
+vt 0.5997 0.1694 0.0000
+vt 0.0723 0.1694 0.0000
+vt 0.0723 0.0495 0.0000
+vt 0.1382 0.0495 0.0000
+vt 0.1382 0.1694 0.0000
+vt 0.2700 0.1694 0.0000
+vt 0.2700 0.0495 0.0000
+vt 0.3360 0.0495 0.0000
+vt 0.3360 0.1694 0.0000
+vt 0.0723 0.4092 0.0000
+vt 0.0723 0.2893 0.0000
+vt 0.1382 0.2893 0.0000
+vt 0.1382 0.4092 0.0000
+vt 0.2700 0.4092 0.0000
+vt 0.2700 0.2893 0.0000
+vt 0.3360 0.2893 0.0000
+vt 0.3360 0.4092 0.0000
+vt 0.5997 0.2893 0.0000
+vt 0.7974 0.2893 0.0000
+vt 0.7974 0.4092 0.0000
+vt 0.5997 0.4092 0.0000
+vt 0.8860 0.6244 0.0000
+vt 0.8860 0.5045 0.0000
+vt 0.9299 0.5045 0.0000
+vt 0.9299 0.6244 0.0000
+vt 0.7516 0.5045 0.0000
+vt 0.7516 0.6244 0.0000
+vt 0.7242 0.6244 0.0000
+vt 0.7242 0.5045 0.0000
+vt 0.2742 0.6244 0.0000
+vt 0.2742 0.5045 0.0000
+vt 0.3411 0.5045 0.0000
+vt 0.3411 0.6244 0.0000
+vt 0.2742 0.8642 0.0000
+vt 0.2742 0.7443 0.0000
+vt 0.3411 0.7443 0.0000
+vt 0.3411 0.8642 0.0000
+vt 0.9299 0.7443 0.0000
+vt 0.9299 0.8642 0.0000
+vt 0.8640 0.8642 0.0000
+vt 0.8640 0.7443 0.0000
+vt 0.7516 0.7443 0.0000
+vt 0.7516 0.8642 0.0000
+vt 0.7242 0.8642 0.0000
+vt 0.7242 0.7443 0.0000
+vt 0.9952 0.2493 0.0000
+vt 0.9952 0.2893 0.0000
+vt 0.7974 0.2493 0.0000
+vt 0.9952 0.2094 0.0000
+vt 0.7974 0.2094 0.0000
+vt 0.9952 0.1694 0.0000
+vt 0.5997 0.2493 0.0000
+vt 0.6279 0.2474 0.0000
+vt 0.6562 0.2455 0.0000
+vt 0.6844 0.2436 0.0000
+vt 0.7127 0.2417 0.0000
+vt 0.7237 0.2410 0.0000
+vt 0.7299 0.2406 0.0000
+vt 0.7409 0.2398 0.0000
+vt 0.7692 0.2379 0.0000
+vt 0.7974 0.2360 0.0000
+vt 0.7692 0.2208 0.0000
+vt 0.7409 0.2189 0.0000
+vt 0.7299 0.2182 0.0000
+vt 0.7237 0.2177 0.0000
+vt 0.7127 0.2170 0.0000
+vt 0.6844 0.2151 0.0000
+vt 0.6562 0.2132 0.0000
+vt 0.6279 0.2113 0.0000
+vt 0.5997 0.2094 0.0000
+vt 0.7974 0.2227 0.0000
+vt 0.5502 0.2094 0.0000
+vt 0.5502 0.1694 0.0000
+vt 0.5502 0.0495 0.0000
+vt 0.4019 0.1694 0.0000
+vt 0.4019 0.0495 0.0000
+vt 0.4019 0.4092 0.0000
+vt 0.4019 0.2893 0.0000
+vt 0.4513 0.2893 0.0000
+vt 0.4513 0.4092 0.0000
+vt 0.4513 0.2493 0.0000
+vt 0.5008 0.2493 0.0000
+vt 0.4513 0.2094 0.0000
+vt 0.4680 0.7043 0.0000
+vt 0.5349 0.7043 0.0000
+vt 0.5349 0.6644 0.0000
+vt 0.4680 0.6644 0.0000
+vt 0.0723 0.2094 0.0000
+vt 0.1382 0.2094 0.0000
+vt 0.0723 0.2493 0.0000
+vt 0.1382 0.2493 0.0000
+vt 0.8640 0.7043 0.0000
+vt 0.9299 0.7043 0.0000
+vt 0.9080 0.6644 0.0000
+vt 0.8860 0.6644 0.0000
+vt 0.7242 0.7043 0.0000
+vt 0.7516 0.7043 0.0000
+vt 0.7516 0.6644 0.0000
+vt 0.7242 0.6644 0.0000
+vt 0.0070 0.6644 0.0000
+vt 0.0070 0.6244 0.0000
+vt 0.2048 0.6244 0.0000
+vt 0.2048 0.6644 0.0000
+vt 0.0070 0.7043 0.0000
+vt 0.2048 0.7043 0.0000
+vt 0.2048 0.7443 0.0000
+vt 0.0070 0.7443 0.0000
+vt 0.2742 0.6644 0.0000
+vt 0.3411 0.6644 0.0000
+vt 0.2742 0.7043 0.0000
+vt 0.3411 0.7043 0.0000
+vt 0.5502 0.2493 0.0000
+vt 0.4019 0.2094 0.0000
+vt 0.4019 0.2493 0.0000
+vt 0.2041 0.1694 0.0000
+vt 0.2041 0.0495 0.0000
+vt 0.2041 0.4092 0.0000
+vt 0.2041 0.2893 0.0000
+vt 0.2041 0.2094 0.0000
+vt 0.2041 0.2493 0.0000
+vt 0.1382 0.2159 0.0000
+vt 0.0393 0.1694 0.0000
+vt 0.0393 0.0495 0.0000
+vt 0.0063 0.4092 0.0000
+vt 0.0063 0.2893 0.0000
+vt 0.0393 0.2094 0.0000
+vt 0.0063 0.2493 0.0000
+vt 0.9959 0.5045 0.0000
+vt 0.9959 0.6244 0.0000
+vt 0.7981 0.6244 0.0000
+vt 0.7981 0.5045 0.0000
+vt 0.8640 0.5045 0.0000
+vt 0.8640 0.6244 0.0000
+vt 0.9959 0.7443 0.0000
+vt 0.9959 0.8642 0.0000
+vt 0.7981 0.8642 0.0000
+vt 0.7981 0.7443 0.0000
+vt 0.7981 0.7043 0.0000
+vt 0.9959 0.7043 0.0000
+vt 0.9959 0.6644 0.0000
+vt 0.9299 0.6644 0.0000
+vt 0.8640 0.6644 0.0000
+vt 0.7981 0.6644 0.0000
+vt 0.8750 0.6244 0.0000
+vt 0.8750 0.5045 0.0000
+vt 0.8750 0.6644 0.0000
+vt 0.6003 0.7043 0.0000
+vt 0.6003 0.6644 0.0000
+vt 0.7981 0.6984 0.0000
+vt 0.6003 0.6244 0.0000
+vt 0.6003 0.5045 0.0000
+vt 0.6003 0.8642 0.0000
+vt 0.6003 0.7443 0.0000
+vt 0.4281 0.6244 0.0000
+vt 0.4281 0.5045 0.0000
+vt 0.4424 0.5045 0.0000
+vt 0.4424 0.6244 0.0000
+vt 0.4281 0.8642 0.0000
+vt 0.4281 0.7443 0.0000
+vt 0.4424 0.7443 0.0000
+vt 0.4424 0.8642 0.0000
+vt 0.4281 0.7043 0.0000
+vt 0.4424 0.7043 0.0000
+vt 0.4281 0.6644 0.0000
+vt 0.4424 0.6644 0.0000
+vt 0.2319 0.6244 0.0000
+vt 0.2319 0.5045 0.0000
+vt 0.2471 0.5045 0.0000
+vt 0.2471 0.6244 0.0000
+vt 0.3941 0.5045 0.0000
+vt 0.3941 0.6244 0.0000
+vt 0.3733 0.6244 0.0000
+vt 0.3733 0.5045 0.0000
+vt 0.2319 0.8642 0.0000
+vt 0.2319 0.7443 0.0000
+vt 0.2471 0.7443 0.0000
+vt 0.2471 0.8642 0.0000
+vt 0.3941 0.7443 0.0000
+vt 0.3941 0.8642 0.0000
+vt 0.3733 0.8642 0.0000
+vt 0.3733 0.7443 0.0000
+vt 0.3733 0.6644 0.0000
+vt 0.3941 0.6644 0.0000
+vt 0.2471 0.6644 0.0000
+vt 0.2319 0.6644 0.0000
+vt 0.2319 0.7043 0.0000
+vt 0.2471 0.7043 0.0000
+vt 0.3733 0.7043 0.0000
+vt 0.3941 0.7043 0.0000
+vt 0.4025 0.6887 0.0000
+vt 0.3941 0.6887 0.0000
+vt 0.3941 0.6800 0.0000
+vt 0.4025 0.6800 0.0000
+vt 0.3411 0.6887 0.0000
+vt 0.3411 0.6800 0.0000
+vt 0.3733 0.6800 0.0000
+vt 0.3733 0.6887 0.0000
+vt 0.4025 0.5045 0.0000
+vt 0.4025 0.6244 0.0000
+vt 0.4025 0.7443 0.0000
+vt 0.4025 0.8642 0.0000
+vt 0.4025 0.6644 0.0000
+vt 0.4025 0.7043 0.0000
+vt 0.2742 0.6887 0.0000
+vt 0.2742 0.6800 0.0000
+vt 0.4424 0.6800 0.0000
+vt 0.4281 0.6800 0.0000
+vt 0.4281 0.6887 0.0000
+vt 0.4424 0.6887 0.0000
+vt 0.2471 0.6800 0.0000
+vt 0.2319 0.6800 0.0000
+vt 0.2471 0.6887 0.0000
+vt 0.2319 0.6887 0.0000
+vt 0.4680 0.6800 0.0000
+vt 0.4680 0.6887 0.0000
+vt 0.4680 0.6702 0.0000
+vt 0.4680 0.6989 0.0000
+vt 0.2048 0.6800 0.0000
+vt 0.2048 0.6887 0.0000
+vt 0.2048 0.5045 0.0000
+vt 0.2048 0.8642 0.0000
+vt 0.0063 0.1694 0.0000
+vt 0.0063 0.0495 0.0000
+vt 0.0063 0.2094 0.0000
+vt 0.3667 0.6490 0.0000
+vt 0.4918 0.6490 0.0000
+vt 0.4918 0.6672 0.0000
+vt 0.4648 0.6672 0.0000
+vt 0.4025 0.6672 0.0000
+vt 0.6804 0.6613 0.0000
+vt 0.5958 0.6613 0.0000
+vt 0.5958 0.6458 0.0000
+vt 0.7228 0.6458 0.0000
+vt 1.1169 0.6424 0.0000
+vt 1.2674 0.6424 0.0000
+vt 1.2674 0.6642 0.0000
+vt 1.0779 0.6642 0.0000
+vt 1.2674 0.5133 0.0000
+vt 1.1768 0.5234 0.0000
+vt 1.1812 0.5133 0.0000
+vt 1.0362 0.7007 0.0000
+vt 0.8348 0.7007 0.0000
+vt 0.8348 0.6804 0.0000
+vt 0.8636 0.6805 0.0000
+vt 1.0078 0.6807 0.0000
+vt 0.8348 0.8080 0.0000
+vt 0.9529 0.8562 0.0000
+vt 0.8348 0.8562 0.0000
+vt 0.2485 0.5735 0.0000
+vt 0.3584 0.5642 0.0000
+vt 0.3584 0.6224 0.0000
+vt 0.3584 0.6424 0.0000
+vt 0.2485 0.6424 0.0000
+vt 0.2485 0.8562 0.0000
+vt 0.2485 0.7007 0.0000
+vt 0.3667 0.7007 0.0000
+vt 0.3667 0.8562 0.0000
+vt 0.5109 0.6228 0.0000
+vt 0.4628 0.6228 0.0000
+vt 0.4878 0.5671 0.0000
+vt 0.5109 0.5674 0.0000
+vt 0.1425 0.6424 0.0000
+vt 0.1712 0.6424 0.0000
+vt 0.1712 0.6726 0.0000
+vt 0.1425 0.6726 0.0000
+vt 0.1939 0.5133 0.0000
+vt 0.2485 0.5133 0.0000
+vt 0.2485 0.5636 0.0000
+vt 0.1850 0.5636 0.0000
+vt 0.1712 0.6867 0.0000
+vt 0.1712 0.7007 0.0000
+vt 0.1425 0.7007 0.0000
+vt 0.1425 0.6867 0.0000
+vt 0.0652 0.7007 0.0000
+vt 0.0785 0.8562 0.0000
+vt 0.0652 0.8562 0.0000
+vt 0.5317 0.5162 0.0000
+vt 0.5317 0.4836 0.0000
+vt 0.6215 0.4836 0.0000
+vt 0.6215 0.5162 0.0000
+vt 0.6215 0.5602 0.0000
+vt 0.5317 0.5602 0.0000
+vt 0.5158 0.5397 0.0000
+vt 0.5158 0.5887 0.0000
+vt 0.6317 0.5887 0.0000
+vt 0.6317 0.5397 0.0000
+vt 0.6032 0.5887 0.0000
+vt 0.6032 0.5418 0.0000
+vt 0.5158 0.5418 0.0000
+vt 0.4826 0.9860 0.0000
+vt 0.6096 0.9860 0.0000
+vt 0.6096 0.9318 0.0000
+vt 0.4826 0.9318 0.0000
+vt 0.4697 0.7157 0.0000
+vt 0.3978 0.7478 0.0000
+vt 0.3667 0.7617 0.0000
+vt 0.5623 0.7919 0.0000
+vt 0.5109 0.7919 0.0000
+vt 0.5109 0.7324 0.0000
+vt 0.5623 0.7324 0.0000
+vt 0.2485 0.6726 0.0000
+vt 0.0652 0.6726 0.0000
+vt 0.0652 0.6424 0.0000
+vt 0.4148 0.6228 0.0000
+vt 0.3667 0.5657 0.0000
+vt 0.4787 0.5704 0.0000
+vt 0.4603 0.6228 0.0000
+vt 0.5109 0.6313 0.0000
+vt 0.4565 0.6313 0.0000
+vt 0.3667 0.5642 0.0000
+vt 0.3667 0.6224 0.0000
+vt 0.3667 0.7082 0.0000
+vt 0.4127 0.6285 0.0000
+vt 0.3667 0.6256 0.0000
+vt 0.4084 0.6399 0.0000
+vt 0.3667 0.6399 0.0000
+vt 0.3667 0.6342 0.0000
+vt 0.4105 0.6342 0.0000
+vt 0.5718 0.5573 0.0000
+vt 0.5716 0.6026 0.0000
+vt 0.5623 0.6026 0.0000
+vt 0.5623 0.5620 0.0000
+vt 0.5228 0.6113 0.0000
+vt 0.5996 0.6080 0.0000
+vt 0.7227 0.5308 0.0000
+vt 0.6811 0.6176 0.0000
+vt 0.6812 0.6242 0.0000
+vt 0.7228 0.5770 0.0000
+vt 0.7228 0.6399 0.0000
+vt 0.5958 0.6399 0.0000
+vt 0.5109 0.5627 0.0000
+vt 0.5109 0.5133 0.0000
+vt 0.5623 0.5133 0.0000
+vt 0.5623 0.5573 0.0000
+vt 0.5720 0.5133 0.0000
+vt 0.5718 0.5530 0.0000
+vt 0.7227 0.5284 0.0000
+vt 0.7228 0.5133 0.0000
+vt 0.7228 0.5571 0.0000
+vt 0.8068 0.5133 0.0000
+vt 0.8068 0.5571 0.0000
+vt 0.5109 0.7275 0.0000
+vt 0.5623 0.7275 0.0000
+vt 0.5071 0.6991 0.0000
+vt 0.5053 0.7340 0.0000
+vt 0.5078 0.6781 0.0000
+vt 0.4973 0.7034 0.0000
+vt 0.4941 0.6821 0.0000
+vt 0.7115 0.6799 0.0000
+vt 0.7144 0.6937 0.0000
+vt 0.6183 0.6816 0.0000
+vt 0.4918 0.6399 0.0000
+vt 0.4501 0.6399 0.0000
+vt 0.6884 0.6672 0.0000
+vt 0.6197 0.6672 0.0000
+vt 0.5691 0.7337 0.0000
+vt 0.7054 0.8357 0.0000
+vt 0.7054 0.8562 0.0000
+vt 0.5623 0.8562 0.0000
+vt 0.7228 0.6424 0.0000
+vt 0.7228 0.6038 0.0000
+vt 0.7676 0.6424 0.0000
+vt 0.8636 0.6642 0.0000
+vt 1.0078 0.6642 0.0000
+vt 1.2674 0.6810 0.0000
+vt 1.0779 0.6808 0.0000
+vt 0.8062 0.8080 0.0000
+vt 0.7228 0.8444 0.0000
+vt 0.7228 0.7007 0.0000
+vt 0.8062 0.7489 0.0000
+vt 0.3667 0.6672 0.0000
+vt 0.7228 0.6613 0.0000
+vt 0.7228 0.6925 0.0000
+vt 0.7228 0.6795 0.0000
+vt 0.7676 0.6038 0.0000
+vt 0.7228 0.5635 0.0000
+vt 0.8141 0.5635 0.0000
+vt 0.8049 0.6038 0.0000
+vt 1.1221 0.6303 0.0000
+vt 1.0317 0.6424 0.0000
+vt 0.8348 0.6642 0.0000
+vt 0.8348 0.6424 0.0000
+vt 0.8049 0.6424 0.0000
+vt 1.0157 0.6214 0.0000
+vt 0.9770 0.5455 0.0000
+vt 0.8141 0.5133 0.0000
+vt 0.9548 0.5133 0.0000
+vt 1.1143 0.7007 0.0000
+vt 1.1702 0.8562 0.0000
+vt 1.1423 0.7785 0.0000
+vt 1.2674 0.7007 0.0000
+vt 1.2674 0.7785 0.0000
+vt 1.2674 0.8562 0.0000
+vt 0.8062 0.8562 0.0000
+vt 0.7228 0.8562 0.0000
+vt 0.7228 0.8152 0.0000
+vt 0.5696 0.7103 0.0000
+vt 0.5985 0.7099 0.0000
+vt 0.7146 0.6982 0.0000
+vt 0.7228 0.6985 0.0000
+vt 0.4513 0.2342 0.0000
+vt 0.4513 0.2434 0.0000
+vt 0.1133 0.5636 0.0000
+vt 0.0947 0.5133 0.0000
+vt 0.0652 0.5636 0.0000
+vt 0.0652 0.5133 0.0000
+vt 0.2026 0.8562 0.0000
+vt 0.7981 0.6707 0.0000
+vt 0.1382 0.2443 0.0000
+vt 0.5109 0.8562 0.0000
+vt 0.5994 0.6817 0.0000
+vt 0.7228 0.5507 0.0000
+vt 0.5958 0.6672 0.0000
+vt 0.8062 0.7007 0.0000
+vt 0.8348 0.7489 0.0000
+vt 0.6812 0.6399 0.0000
+vt 0.4826 1.0055 0.0000
+vt 0.6096 1.0055 0.0000
+vt 0.5446 1.0055 0.0000
+vt 0.5309 1.0055 0.0000
+vt 0.5951 0.4836 0.0000
+vt 0.6190 0.4836 0.0000
+vt 0.5616 0.4836 0.0000
+vt 0.5916 0.4836 0.0000
+vt 0.5581 0.4836 0.0000
+vt 0.3584 0.5133 0.0000
+vt 0.3584 0.5558 0.0000
+vt 0.1833 0.5735 0.0000
+vt 0.3667 0.5133 0.0000
+vt 0.3667 0.5558 0.0000
+vt 0.1170 0.5735 0.0000
+vt 0.0652 0.5735 0.0000
+vt 0.4813 0.5629 0.0000
+vt 0.3667 0.5571 0.0000
+# 460 texture coords
+
+g Object003
+usemtl 10___Default
+s off
+f 1/1/1 2/2/1 3/3/1 
+f 4/4/1 5/5/1 6/6/1 7/7/1 
+f 8/8/1 9/9/1 10/10/1 11/11/1 
+f 12/12/1 13/13/1 14/14/1 15/15/1 
+f 16/16/1 17/17/1 18/18/1 19/19/1 
+f 20/20/1 21/21/1 22/22/1 23/23/1 
+f 24/24/1 25/25/1 26/26/1 27/27/1 
+f 28/28/1 29/29/1 30/30/1 31/31/1 
+f 32/32/1 33/33/1 34/34/1 35/35/1 
+f 36/36/1 37/37/1 38/38/1 39/39/1 
+f 40/40/1 41/41/1 42/42/1 43/43/1 
+f 44/44/1 45/45/1 46/46/1 47/47/1 
+f 48/48/1 49/49/1 50/50/1 51/51/1 
+f 52/52/1 53/53/1 54/54/1 55/55/1 
+f 56/56/1 57/57/1 58/58/1 59/59/1 
+f 60/60/1 61/61/1 62/62/1 63/63/1 
+f 64/64/1 65/65/1 66/66/1 67/67/1 
+f 68/68/1 69/69/1 70/70/1 71/71/1 
+f 72/72/1 73/73/1 45/45/1 74/74/1 
+f 75/75/1 76/76/1 26/26/1 77/77/1 
+f 74/74/1 45/45/1 44/44/1 78/78/1 79/79/1 80/80/1 81/81/1 82/82/1 83/83/1 84/84/1 85/85/1 86/86/1 87/87/1 
+f 88/88/2 89/89/2 90/90/2 91/91/2 92/92/2 93/93/2 94/94/2 95/95/2 96/96/2 27/27/2 26/26/2 76/76/2 97/97/2 
+f 96/96/1 95/95/1 79/79/1 78/78/1 
+f 94/94/1 93/93/1 81/81/1 80/80/1 
+f 86/86/1 88/88/1 97/97/1 87/87/1 
+f 98/98/1 99/99/1 27/27/1 96/96/1 
+f 24/24/1 27/27/1 99/99/1 100/100/1 
+f 100/100/1 99/99/1 5/5/1 4/4/1 
+f 101/101/1 102/102/1 7/7/1 6/6/1 
+f 103/103/1 104/104/1 105/105/1 106/106/1 
+f 106/106/1 105/105/1 9/9/1 8/8/1 
+f 44/44/1 47/47/1 11/11/1 10/10/1 
+f 9/9/1 105/105/1 107/107/1 108/108/1 
+f 5/5/1 3/3/1 109/109/1 6/6/1 
+f 18/18/1 17/17/1 110/110/1 111/111/1 
+f 13/13/1 112/112/1 113/113/1 14/14/1 
+f 114/114/1 28/28/1 31/31/1 115/115/1 
+f 116/116/1 117/117/1 38/38/1 37/37/1 
+f 32/32/1 35/35/1 22/22/1 21/21/1 
+f 23/23/1 42/42/1 41/41/1 20/20/1 
+f 67/67/1 118/118/1 119/119/1 64/64/1 
+f 48/48/1 120/120/1 121/121/1 
+f 71/71/1 122/122/1 123/123/1 68/68/1 
+f 54/54/1 53/53/1 124/124/1 125/125/1 
+f 126/126/1 127/127/1 128/128/1 129/129/1 
+f 130/130/1 131/131/1 132/132/1 133/133/1 
+f 134/134/1 56/56/1 59/59/1 135/135/1 
+f 136/136/1 137/137/1 62/62/1 61/61/1 
+f 108/108/1 138/138/1 10/10/1 9/9/1 
+f 3/3/1 5/5/1 99/99/1 98/98/1 
+f 139/139/1 101/101/1 6/6/1 109/109/1 
+f 140/140/1 107/107/1 105/105/1 104/104/1 
+f 138/138/1 98/98/1 96/96/1 78/78/1 
+f 138/138/1 78/78/1 44/44/1 10/10/1 
+f 141/141/1 142/142/1 33/33/1 32/32/1 
+f 102/102/1 101/101/1 35/35/1 34/34/1 
+f 143/143/1 144/144/1 41/41/1 40/40/1 
+f 104/104/1 103/103/1 43/43/1 42/42/1 
+f 101/101/1 139/139/1 22/22/1 35/35/1 
+f 32/32/1 21/21/1 145/145/1 141/141/1 
+f 41/41/1 144/144/1 146/146/1 20/20/1 
+f 140/140/1 104/104/1 42/42/1 23/23/1 
+f 115/115/1 145/145/1 147/147/1 
+f 148/148/1 149/149/1 29/29/1 28/28/1 
+f 142/142/1 141/141/1 31/31/1 30/30/1 
+f 150/150/1 151/151/1 37/37/1 36/36/1 
+f 144/144/1 143/143/1 39/39/1 38/38/1 
+f 115/115/1 31/31/1 141/141/1 145/145/1 
+f 28/28/1 114/114/1 152/152/1 148/148/1 
+f 153/153/1 116/116/1 37/37/1 151/151/1 
+f 144/144/1 38/38/1 117/117/1 146/146/1 
+f 51/51/1 50/50/1 154/154/1 155/155/1 
+f 156/156/1 157/157/1 158/158/1 159/159/1 
+f 151/160/1 150/161/1 65/65/1 64/64/1 
+f 160/162/1 161/163/1 67/67/1 66/66/1 
+f 161/163/1 162/164/1 118/118/1 67/67/1 
+f 153/165/1 151/160/1 64/64/1 119/119/1 
+f 155/155/1 163/166/1 164/167/1 51/51/1 
+f 159/159/1 165/168/1 166/169/1 156/156/1 
+f 167/170/1 168/171/1 49/49/1 48/48/1 
+f 120/120/1 48/48/1 51/51/1 164/167/1 
+f 167/170/1 48/48/1 121/121/1 169/172/1 
+f 122/122/1 170/173/1 171/174/1 125/125/1 
+f 172/175/1 162/164/1 123/123/1 
+f 157/157/1 156/156/1 53/53/1 52/52/1 
+f 173/176/1 174/177/1 55/55/1 54/54/1 
+f 161/163/1 160/162/1 69/69/1 68/68/1 
+f 175/178/1 176/179/1 71/71/1 70/70/1 
+f 71/71/1 176/179/1 170/173/1 122/122/1 
+f 68/68/1 123/123/1 162/164/1 161/163/1 
+f 124/124/1 53/53/1 156/156/1 166/169/1 
+f 54/54/1 125/125/1 171/174/1 173/176/1 
+f 174/177/1 173/176/1 13/13/1 12/12/1 
+f 177/180/1 178/181/1 179/182/1 180/183/1 
+f 181/184/1 182/185/1 183/186/1 184/187/1 
+f 176/179/1 175/178/1 19/19/1 18/18/1 
+f 182/185/1 185/188/1 186/189/1 183/186/1 
+f 170/173/1 176/179/1 18/18/1 111/111/1 
+f 173/176/1 171/174/1 112/112/1 13/13/1 
+f 187/190/1 177/180/1 180/183/1 188/191/1 
+f 189/192/1 190/193/1 191/194/1 192/195/1 
+f 193/196/1 194/197/1 195/198/1 196/199/1 
+f 197/200/1 198/201/1 199/202/1 200/203/1 
+f 201/204/1 202/205/1 203/206/1 204/207/1 
+f 205/208/1 195/198/1 194/197/1 206/209/1 
+f 192/195/1 207/210/1 208/211/1 189/192/1 
+f 209/212/1 210/213/1 199/202/1 198/201/1 
+f 201/204/1 204/207/1 211/214/1 212/215/1 
+f 213/216/1 214/217/1 215/218/1 216/219/1 
+f 217/220/1 218/221/1 219/222/1 220/223/1 
+f 221/224/1 222/225/1 194/197/1 193/196/1 
+f 59/59/1 58/58/1 196/199/1 195/198/1 
+f 223/226/1 224/227/1 202/205/1 201/204/1 
+f 63/63/1 62/62/1 204/207/1 203/206/1 
+f 206/209/1 194/197/1 222/225/1 225/228/1 
+f 195/198/1 205/208/1 135/135/1 59/59/1 
+f 223/226/1 201/204/1 212/215/1 226/229/1 
+f 137/137/1 211/214/1 204/207/1 62/62/1 
+f 137/137/1 136/136/1 227/230/1 217/220/1 
+f 228/231/1 134/134/1 135/135/1 218/221/1 
+f 188/191/1 229/232/1 230/233/1 187/190/1 
+f 185/188/1 231/234/1 232/235/1 186/189/1 
+f 212/215/1 211/214/1 220/223/1 214/217/1 
+f 205/208/1 206/209/1 215/218/1 219/222/1 
+f 233/236/1 234/237/1 208/211/1 207/210/1 
+f 235/238/1 210/213/1 209/212/1 236/239/1 
+f 226/229/1 212/215/1 214/217/1 213/216/1 
+f 206/209/1 225/228/1 216/219/1 215/218/1 
+f 218/221/1 135/135/1 205/208/1 219/222/1 
+f 211/214/1 137/137/1 217/220/1 220/223/1 
+f 229/232/1 237/240/1 238/241/1 232/235/1 
+f 222/225/1 221/224/1 178/181/1 177/180/1 
+f 15/15/1 14/14/1 180/183/1 179/182/1 
+f 224/227/1 223/226/1 182/185/1 181/184/1 
+f 17/17/1 16/16/1 184/187/1 183/186/1 
+f 223/226/1 226/229/1 185/188/1 182/185/1 
+f 186/189/1 110/110/1 17/17/1 183/186/1 
+f 225/228/1 222/225/1 177/180/1 187/190/1 
+f 14/14/1 113/113/1 188/191/1 180/183/1 
+f 188/191/1 113/113/1 239/242/1 229/232/1 
+f 216/219/1 225/228/1 187/190/1 230/233/1 
+f 226/229/1 213/216/1 231/234/1 185/188/1 
+f 238/241/1 240/243/1 232/235/1 
+f 227/230/1 235/238/1 233/236/1 228/231/1 
+f 241/244/1 234/237/1 236/239/1 242/245/1 
+f 128/128/1 243/246/1 190/193/1 189/192/1 
+f 57/57/1 56/56/1 192/195/1 191/194/1 
+f 244/247/1 132/132/1 198/201/1 197/200/1 
+f 61/61/1 60/60/1 200/203/1 199/202/1 
+f 189/192/1 208/211/1 129/129/1 128/128/1 
+f 207/210/1 192/195/1 56/56/1 134/134/1 
+f 131/131/1 209/212/1 198/201/1 132/132/1 
+f 61/61/1 199/202/1 210/213/1 136/136/1 
+f 233/236/1 207/210/1 134/134/1 228/231/1 
+f 129/129/1 208/211/1 234/237/1 241/244/1 
+f 236/239/1 209/212/1 131/131/1 242/245/1 
+f 235/238/1 227/230/1 136/136/1 210/213/1 
+f 84/84/1 90/90/1 89/89/1 85/85/1 
+f 83/83/1 82/82/1 92/92/1 91/91/1 
+f 155/248/1 154/249/1 149/149/1 148/148/1 
+f 148/148/1 152/152/1 163/250/1 155/248/1 
+f 164/167/1 163/166/1 245/166/1 246/167/1 
+f 163/250/1 152/152/1 247/250/1 
+f 247/166/1 248/166/1 245/166/1 163/166/1 
+f 159/159/1 158/158/1 168/171/1 167/170/1 
+f 159/159/1 167/170/1 169/172/1 165/168/1 
+f 249/251/1 250/252/1 251/253/1 252/254/1 253/255/1 
+f 254/256/1 255/257/1 256/258/1 257/259/1 
+f 258/260/1 259/261/1 260/262/1 261/263/1 
+f 262/264/1 263/265/1 264/266/1 
+f 265/267/1 266/268/1 267/269/1 268/270/1 269/271/1 
+f 270/272/1 271/273/1 272/274/1 
+f 273/275/1 274/276/1 275/277/1 276/278/1 277/279/1 
+f 278/280/1 279/281/1 280/282/1 281/283/1 
+f 282/284/1 283/285/1 284/286/1 285/287/1 
+f 286/288/1 287/289/1 288/290/1 289/291/1 
+f 290/292/1 291/293/1 292/294/1 293/295/1 
+f 294/296/1 295/297/1 296/298/1 297/299/1 
+f 298/300/1 296/298/1 299/301/1 300/302/1 
+f 301/303/1 302/304/1 303/305/1 304/306/1 
+f 301/303/1 304/306/1 290/307/1 305/308/1 
+f 306/309/1 299/310/1 307/311/1 308/312/1 
+f 271/310/1 309/313/1 310/314/1 311/315/1 
+f 312/316/1 313/317/1 264/318/1 314/319/1 
+f 253/255/1 252/254/1 315/320/1 316/321/1 
+f 317/322/1 318/322/1 319/283/1 320/283/1 
+f 321/323/1 322/324/1 323/325/1 324/326/1 
+f 287/289/1 277/279/1 325/279/1 326/327/1 288/290/1 
+f 289/291/1 327/328/1 328/329/1 286/288/1 
+f 298/300/1 327/328/1 289/291/1 297/299/1 296/298/1 
+f 294/296/1 288/290/1 326/327/1 279/281/1 295/297/1 
+f 329/330/1 330/331/1 331/332/1 332/333/1 
+f 282/284/1 333/334/1 334/335/1 283/285/1 
+f 274/276/1 330/336/1 335/337/1 275/277/1 
+f 316/321/1 318/322/1 336/338/1 
+f 329/330/1 337/339/1 335/340/1 
+f 338/341/1 339/342/1 340/343/1 341/344/1 
+f 342/345/1 343/346/1 344/347/1 345/348/1 
+f 346/349/1 333/334/1 282/284/1 285/287/1 345/348/1 344/347/1 
+f 343/346/1 342/345/1 347/350/1 
+f 342/345/1 348/351/1 349/352/1 347/350/1 
+f 350/353/1 351/354/1 352/355/1 353/356/1 
+f 354/357/1 355/358/1 356/359/1 357/360/1 
+f 356/359/1 358/361/1 359/362/1 357/360/1 
+f 360/363/1 359/362/1 358/361/1 361/364/1 
+f 360/365/1 361/364/1 362/366/1 363/367/1 
+f 323/325/1 364/368/1 365/369/1 324/326/1 
+f 318/322/1 366/370/1 367/371/1 319/283/1 
+f 368/372/1 366/370/1 369/373/1 370/374/1 
+f 371/375/1 372/376/1 373/377/1 
+f 374/378/1 250/252/1 249/251/1 339/342/1 338/341/1 375/379/1 
+f 352/355/1 257/259/1 256/258/1 353/356/1 
+f 254/256/1 376/380/1 377/381/1 255/257/1 
+f 324/326/1 378/382/1 379/383/1 380/384/1 381/385/1 321/323/1 
+f 382/386/1 383/387/1 384/388/1 
+f 268/270/1 385/389/1 386/390/1 269/271/1 
+f 260/262/1 387/391/1 388/392/1 261/263/1 
+f 389/393/1 390/394/1 391/395/1 392/396/1 
+f 393/369/3 394/369/3 395/368/3 396/368/3 
+f 393/369/1 396/368/1 397/368/1 398/369/1 
+f 399/368/4 400/368/4 401/368/4 402/368/4 
+f 403/369/5 404/369/5 405/369/5 406/369/5 
+f 407/397/1 408/251/1 409/251/1 410/397/1 
+f 1/338/1 411/338/1 412/322/1 2/322/1 
+f 413/398/1 257/259/1 414/259/1 415/398/1 
+f 416/399/1 417/399/1 418/400/1 419/400/1 
+f 238/398/1 420/398/1 421/259/1 240/259/1 
+f 239/399/1 422/399/1 423/400/1 237/400/1 
+f 424/401/1 384/388/1 383/387/1 348/402/1 
+f 424/401/1 348/402/1 425/403/1 426/404/1 
+f 259/261/1 258/260/1 427/405/1 
+f 259/261/1 427/405/1 263/265/1 262/264/1 
+f 428/406/1 386/390/1 385/389/1 429/407/1 430/408/1 430/408/1 
+f 430/408/1 431/409/1 426/404/1 432/410/1 428/406/1 
+f 426/404/1 425/403/1 433/411/1 432/410/1 
+f 434/412/1 314/413/1 433/411/1 425/403/1 
+f 386/390/1 428/406/1 258/260/1 261/263/1 
+f 428/406/1 432/410/1 427/405/1 258/260/1 
+f 427/405/1 432/410/1 433/411/1 263/265/1 
+f 264/266/1 263/265/1 433/411/1 314/413/1 
+f 269/271/1 388/392/1 435/414/1 265/267/1 
+f 309/415/1 271/273/1 436/416/1 
+f 387/391/1 437/417/1 435/414/1 388/392/1 
+f 309/415/1 436/416/1 438/418/1 439/419/1 
+f 440/420/1 441/421/1 390/394/1 389/393/1 
+f 390/422/1 442/423/1 443/424/1 444/425/1 391/426/1 
+f 418/400/1 417/399/1 372/376/1 371/375/1 
+f 377/381/1 376/380/1 371/375/1 373/377/1 
+f 108/108/1 407/427/1 1/1/1 3/3/1 
+f 108/108/1 408/428/1 407/427/1 
+f 2/2/1 109/109/1 3/3/1 
+f 108/108/1 107/107/1 408/428/1 
+f 240/243/1 110/110/1 186/189/1 232/235/1 
+f 239/242/1 237/240/1 229/232/1 
+f 290/292/1 293/295/1 445/429/1 305/430/1 
+f 305/430/1 445/429/1 446/431/1 447/432/1 
+f 296/298/1 295/297/1 307/433/1 299/301/1 
+f 279/281/1 278/280/1 307/433/1 295/297/1 
+f 406/369/6 172/369/6 448/369/6 403/369/6 
+f 123/123/1 124/124/1 448/434/1 172/175/1 
+f 124/124/1 166/169/1 448/434/1 
+f 399/368/1 402/368/1 147/368/1 449/368/1 
+f 146/146/1 449/435/1 147/147/1 145/145/1 
+f 146/146/1 117/117/1 449/435/1 
+f 253/255/1 450/397/1 249/251/1 
+f 409/251/7 249/251/7 450/397/7 410/397/7 
+f 411/338/8 336/338/8 318/322/8 412/322/8 
+f 323/325/1 322/324/1 451/436/1 319/283/1 367/371/1 
+f 394/369/9 365/369/9 364/368/9 395/368/9 
+f 452/369/10 393/369/10 398/369/10 453/369/10 
+f 405/369/11 404/369/11 452/369/11 453/369/11 
+f 454/368/12 397/368/12 396/368/12 455/368/12 
+f 401/368/13 400/368/13 454/368/13 455/368/13 
+f 420/398/14 415/398/14 414/259/14 421/259/14 
+f 422/399/14 416/399/14 419/400/14 423/400/14 
+f 257/259/1 413/398/1 254/256/1 
+f 443/424/1 456/437/1 373/377/1 
+f 373/377/1 372/376/1 444/425/1 443/424/1 
+f 348/351/1 383/438/1 349/352/1 
+f 377/381/1 457/439/1 255/257/1 
+f 270/393/1 389/393/1 392/396/1 458/396/1 
+f 391/395/1 459/440/1 392/396/1 
+f 271/273/1 270/272/1 458/441/1 265/267/1 
+f 458/441/1 266/268/1 265/267/1 
+f 353/356/1 460/356/1 350/442/1 
+f 349/442/1 350/442/1 460/356/1 461/356/1 
+f 349/442/1 461/356/1 347/356/1 
+f 436/416/1 435/414/1 437/417/1 438/418/1 
+f 439/419/1 438/418/1 462/418/1 463/419/1 
+f 265/267/1 435/414/1 436/416/1 271/273/1 
+f 464/443/1 465/444/1 313/317/1 312/316/1 
+f 313/317/1 465/444/1 466/444/1 
+f 465/444/1 464/443/1 467/445/1 468/444/1 
+f 466/444/1 465/444/1 469/444/1 470/444/1 
+f 468/444/1 467/445/1 471/445/1 472/444/1 
+f 470/444/1 469/444/1 473/444/1 474/444/1 
+f 475/446/1 476/443/1 477/443/1 478/446/1 
+f 467/445/1 475/446/1 478/446/1 471/445/1 
+f 477/443/1 476/443/1 479/443/1 480/443/1 
+f 468/444/1 472/444/1 481/444/1 
+f 469/444/1 468/444/1 481/444/1 473/444/1 
+f 465/444/1 468/444/1 469/444/1 
+f 478/446/1 477/443/1 482/443/1 483/446/1 
+f 472/444/1 471/445/1 484/445/1 485/444/1 
+f 473/444/1 481/444/1 486/444/1 487/444/1 
+f 485/444/15 484/445/15 488/445/15 489/444/15 
+f 483/446/16 482/443/16 490/443/16 491/446/16 
+f 491/446/1 490/443/1 492/443/1 493/446/1 
+f 487/444/17 486/444/17 494/444/17 495/444/17 
+f 495/444/1 494/444/1 496/444/1 497/444/1 
+f 489/444/1 488/445/1 498/445/1 499/444/1 
+f 499/444/18 498/445/18 500/445/18 501/444/18 
+f 501/444/1 500/445/1 502/445/1 503/444/1 
+f 493/446/1 492/443/1 504/443/1 505/446/1 
+f 497/444/1 496/444/1 506/444/1 507/444/1 
+f 503/444/1 502/445/1 508/445/1 509/444/1 
+f 493/446/19 505/446/19 508/446/19 502/446/19 
+f 503/444/20 509/444/20 506/444/20 496/444/20 
+f 504/443/1 492/443/1 510/443/1 511/443/1 
+f 497/444/1 507/444/1 512/444/1 513/444/1 
+f 505/446/21 504/443/21 514/443/21 515/446/21 
+f 507/444/22 506/444/22 516/444/22 517/444/22 
+f 509/444/23 508/445/23 518/445/23 519/444/23 
+f 508/446/24 505/446/24 515/446/24 518/446/24 
+f 506/444/25 509/444/25 519/444/25 516/444/25 
+f 504/443/21 511/443/21 520/443/21 514/443/21 
+f 512/444/26 507/444/26 517/444/26 521/444/26 
+f 515/446/1 514/443/1 522/443/1 523/446/1 
+f 517/444/1 516/444/1 524/444/1 525/444/1 
+f 519/444/1 518/445/1 526/445/1 527/444/1 
+f 518/446/1 515/446/1 523/446/1 526/446/1 
+f 516/444/1 519/444/1 527/444/1 524/444/1 
+f 514/443/1 520/443/1 528/443/1 522/443/1 
+f 521/444/1 517/444/1 525/444/1 529/444/1 
+f 310/314/1 530/314/1 531/315/1 311/315/1 
+f 532/314/1 533/314/1 534/314/1 
+f 532/314/1 535/315/1 531/315/1 530/314/1 
+f 310/314/1 536/314/1 537/314/1 530/314/1 
+f 538/314/1 539/314/1 540/314/1 541/314/1 
+f 541/314/27 540/314/27 542/314/27 543/314/27 
+f 543/314/1 542/314/1 544/314/1 545/314/1 
+f 538/314/1 546/314/1 547/314/1 537/314/1 
+f 539/314/1 538/314/1 537/314/1 536/314/1 
+f 548/314/1 533/314/1 549/314/1 550/314/1 
+f 551/314/1 534/314/1 533/314/1 548/314/1 
+f 550/314/1 549/314/1 552/314/1 553/314/1 
+f 553/314/1 552/314/1 547/314/1 546/314/1 
+f 548/314/1 550/314/1 554/314/1 555/314/1 
+f 553/314/1 546/314/1 556/314/1 557/314/1 
+f 555/314/28 554/314/28 558/314/28 559/314/28 
+f 557/314/28 556/314/28 560/314/28 561/314/28 
+f 559/314/1 558/314/1 562/314/1 563/314/1 
+f 561/314/1 560/314/1 564/314/1 565/314/1 
+f 545/314/29 544/314/29 566/314/29 567/314/29 
+f 567/314/1 566/314/1 568/314/1 569/314/1 
+f 563/314/1 562/314/1 570/314/1 571/314/1 
+f 565/314/1 564/314/1 572/314/1 573/314/1 
+f 569/314/1 568/314/1 574/314/1 575/314/1 
+f 571/314/1 570/314/1 576/314/1 577/314/1 
+f 573/314/1 572/314/1 578/314/1 579/314/1 
+f 574/314/1 568/314/1 580/314/1 581/314/1 
+f 569/314/30 575/314/30 578/314/30 572/314/30 
+f 573/314/1 579/314/1 576/314/1 570/314/1 
+f 571/314/1 577/314/1 582/314/1 583/314/1 
+f 530/314/1 537/314/1 547/314/1 
+f 532/314/1 549/314/1 533/314/1 
+f 530/314/1 552/314/1 549/314/1 532/314/1 
+f 530/314/1 547/314/1 552/314/1 
+f 306/309/1 308/312/1 584/312/1 585/309/1 
+f 586/312/1 587/309/1 585/309/1 584/312/1 
+f 585/309/1 587/309/1 588/309/1 589/309/1 
+f 589/309/1 588/309/1 590/309/1 591/309/1 
+f 592/309/1 593/309/1 594/309/1 
+f 593/309/1 595/309/1 596/309/1 597/309/1 
+f 598/309/1 599/309/1 600/309/1 601/309/1 
+f 594/309/1 589/309/1 591/309/1 592/309/1 
+f 592/309/1 591/309/1 602/309/1 603/309/1 
+f 604/309/1 605/309/1 598/309/1 601/309/1 
+f 592/309/1 603/309/1 595/309/1 593/309/1 
+f 604/309/1 601/309/1 597/309/1 596/309/1 
+f 596/309/1 595/309/1 606/309/1 607/309/1 
+f 603/309/1 602/309/1 608/309/1 609/309/1 
+f 605/309/1 604/309/1 610/309/1 611/309/1 
+f 609/309/31 608/309/31 612/309/31 613/309/31 
+f 611/309/32 610/309/32 614/309/32 615/309/32 
+f 613/309/1 612/309/1 616/309/1 617/309/1 
+f 615/309/1 614/309/1 618/309/1 619/309/1 
+f 607/309/33 606/309/33 620/309/33 621/309/33 
+f 621/309/34 620/309/34 622/309/34 623/309/34 
+f 623/309/35 622/309/35 624/309/35 625/309/35 
+f 625/309/36 624/309/36 626/309/36 627/309/36 
+f 617/309/1 616/309/1 628/309/1 629/309/1 
+f 619/309/1 618/309/1 630/309/1 631/309/1 
+f 627/309/36 626/309/36 632/309/36 633/309/36 
+f 627/309/37 633/309/37 630/309/37 618/309/37 
+f 617/309/38 629/309/38 632/309/38 626/309/38 
+f 628/309/1 616/309/1 634/309/1 635/309/1 
+f 619/309/1 631/309/1 636/309/1 637/309/1 
+f 629/309/1 628/309/1 638/309/1 639/309/1 
+f 631/309/1 630/309/1 640/309/1 641/309/1 
+f 633/309/39 632/309/39 642/309/39 643/309/39 
+f 630/309/40 633/309/40 643/309/40 640/309/40 
+f 632/309/41 629/309/41 639/309/41 642/309/41 
+f 628/309/1 635/309/1 644/309/1 638/309/1 
+f 636/309/1 631/309/1 641/309/1 645/309/1 
+f 597/309/1 601/309/1 600/309/1 
+f 593/309/1 597/309/1 600/309/1 594/309/1 
+f 303/305/1 302/304/1 646/304/1 647/305/1 
+f 647/305/1 648/447/1 649/448/1 
+f 650/449/1 651/449/1 652/450/1 653/450/1 
+f 654/304/1 655/304/1 656/451/1 657/451/1 
+f 658/448/1 649/448/1 648/447/1 659/447/1 
+f 657/451/1 656/451/1 651/449/1 650/449/1 
+f 659/447/1 648/447/1 653/450/1 652/450/1 
+f 658/448/1 660/305/1 649/448/1 
+f 647/305/1 653/450/1 648/447/1 
+f 646/304/1 654/304/1 657/451/1 
+f 646/304/1 657/451/1 650/449/1 
+f 647/305/1 646/304/1 650/449/1 653/450/1 
+f 656/451/1 655/304/1 661/304/1 662/451/1 
+f 658/448/1 659/447/1 663/447/1 664/448/1 
+f 652/450/1 651/449/1 665/449/1 666/450/1 
+f 662/451/42 661/304/42 667/304/42 668/451/42 
+f 664/448/42 663/447/42 669/447/42 670/448/42 
+f 666/450/43 665/449/43 671/449/43 672/450/43 
+f 672/450/1 671/449/1 673/449/1 674/450/1 
+f 668/451/1 667/304/1 675/304/1 676/451/1 
+f 670/448/1 669/447/1 677/447/1 678/448/1 
+f 676/451/1 675/304/1 679/304/1 680/451/1 
+f 678/448/1 677/447/1 681/447/1 682/448/1 
+f 674/450/44 673/449/44 683/449/44 684/450/44 
+f 684/450/1 683/449/1 685/449/1 686/450/1 
+f 680/451/45 679/304/45 687/304/45 688/451/45 
+f 682/448/46 681/447/46 689/447/46 690/448/46 
+f 686/450/47 685/449/47 691/449/47 692/450/47 
+f 680/451/48 688/451/48 691/451/48 685/451/48 
+f 686/450/49 692/450/49 689/450/49 681/450/49 
+f 682/448/50 690/448/50 693/448/50 694/448/50 
+f 687/304/51 679/304/51 695/304/51 696/304/51 
+f 688/451/1 687/304/1 697/304/1 698/451/1 
+f 690/448/1 689/447/1 699/447/1 700/448/1 
+f 692/450/1 691/449/1 701/449/1 702/450/1 
+f 691/451/1 688/451/1 698/451/1 701/451/1 
+f 689/450/1 692/450/1 702/450/1 699/450/1 
+f 693/448/1 690/448/1 700/448/1 703/448/1 
+f 687/304/1 696/304/1 704/304/1 697/304/1 
+f 464/443/1 476/443/1 475/446/1 
+f 464/443/1 475/446/1 467/445/1 
+f 390/422/1 379/383/1 378/382/1 442/423/1 
+f 315/320/1 369/373/1 366/370/1 318/322/1 316/321/1 
+f 317/322/1 320/283/1 281/283/1 280/322/1 
+f 375/379/1 338/341/1 341/341/1 705/379/1 
+f 705/379/1 341/341/1 337/341/1 706/379/1 
+f 706/379/1 337/341/1 329/341/1 332/379/1 
+f 284/286/1 283/285/1 332/285/1 331/286/1 
+f 291/293/1 707/452/1 708/453/1 292/294/1 
+f 273/275/1 709/454/1 293/295/1 292/294/1 
+f 707/452/1 710/455/1 711/456/1 708/453/1 
+f 709/454/1 712/457/1 445/429/1 293/295/1 
+f 445/429/1 712/457/1 713/458/1 446/431/1 
+f 710/455/1 355/358/1 354/357/1 714/459/1 711/460/1 
+f 277/279/1 287/289/1 709/454/1 273/275/1 
+f 709/454/1 287/289/1 286/288/1 712/457/1 
+f 712/457/1 286/288/1 328/329/1 713/458/1 
+f 329/330/1 335/340/1 330/331/1 
+# 418 polygons - 47 triangles
+

From e945d654ebe3b8030d6446ca5286924a1ec57c10 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 22 Mar 2021 13:16:07 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E4=BB=A3=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/demo/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/demo/index.vue b/src/views/demo/index.vue
index f31c220fb..6d99e51a5 100644
--- a/src/views/demo/index.vue
+++ b/src/views/demo/index.vue
@@ -193,7 +193,7 @@ export default {
         doClick(el) {
             if (this.token && this.userId) {
                 // &noPreLogout=true
-                this.src = `http://localhost:9527/cbtc/demoTraining/teach?lessonId=195&mapId=59&lineCode=02&prdType=01&trainingId=${el.id}&token=${this.token}`;
+                this.src = window.location.origin + `/cbtc/demoTraining/teach?lessonId=195&mapId=59&lineCode=02&prdType=01&trainingId=${el.id}&token=${this.token}`;
                 this.loading = true;
                 setTimeout(()=>{
                     this.show = true;

From 26b72f92282f7886ce9f7dd07f7b560e72c49c61 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 22 Mar 2021 13:20:51 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E4=BB=A3=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/newMapdraft/mapoperate/station.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/views/newMap/newMapdraft/mapoperate/station.vue b/src/views/newMap/newMapdraft/mapoperate/station.vue
index ab3ca8b03..b6fe2866c 100644
--- a/src/views/newMap/newMapdraft/mapoperate/station.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/station.vue
@@ -215,7 +215,6 @@ export default {
                             { prop: 'zcCode', label: this.$t('map.zcCode'), type: 'select', optionLabel: 'code&&name', optionValue: 'code', options: this.zcList, isHidden: !this.isZcCode, disabled:true },
                             { prop: 'chargeStationCodeList', label: '管理车站列表:', type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.chargeStation, isHidden: !this.isZcCode },
                             { prop: 'relStationCodeList', label: '联锁站关联车站:', type: 'multiSelect', optionLabel: 'name', optionValue: 'code', options: this.relStationList, isHidden: !this.idCiStation},
-                            { prop: 'routingStationList', label: '生成交路的车站:', type: 'multiSelectHover', optionLabel: 'name', optionValue: 'code', options: this.stationList, hover: this.hover, buttonType: 'routingStation', buttonShowType: this.routingStationButtonShow },
                             { prop: 'runPlanName', label: this.$t('map.stationRunPlanName'), type: 'input' },
                             { prop: 'jp', label: '车站简称:', type: 'input' }
                         ]
@@ -257,9 +256,6 @@ export default {
         },
         isReentry() {
             return this.editModel.reentry;
-        },
-        routingStationButtonShow() {
-            return this.field === 'routingStation';
         }
     },
     methods: {
@@ -306,11 +302,6 @@ export default {
                     return !data.centralized && data.code != this.editModel.code && !(beCentralizedStation[data.code] && beCentralizedStation[data.code] != this.editModel.code);
                 });
                 this.controlled = !!beCentralizedStation[selected.code];
-            } else if (selected && selected._type === 'Station' && this.field == 'routingStation') {
-                this.activeName = 'first';
-                if (!this.editModel.routingStationList.includes(selected.code) && this.editModel.code != selected.code) {
-                    this.editModel.routingStationList.push(selected.code);
-                }
             } else if (selected && selected._type === 'Section' && this.field == 'standSection') {
                 this.$set(this.rowData, 'sectionCode', selected.code);
             }

From 2dae1bc8d893ee38cc8420aa5c3a3cd3cf910488 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 22 Mar 2021 14:30:21 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E4=BB=A3=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/store/modules/user.js                    |  9 ++++++++-
 src/utils/request.js                         |  6 ++++++
 src/views/demo/index.vue                     | 11 ++++++++++-
 src/views/messageBoard/index.vue             | 10 ++++++----
 src/views/newMap/displayNew/demonMenu.vue    | 16 +++++++++-------
 src/views/newMap/displayNew/lesson/index.vue | 16 +++++++++-------
 6 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 8cda25532..773e9303c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -20,7 +20,8 @@ const user = {
         companyId: '',
         companyAdmin: false,
         companyName: '',
-        companyProject: ''
+        companyProject: '',
+        baseUrl:''
     },
 
     mutations: {
@@ -77,6 +78,9 @@ const user = {
         },
         Disconnect: ()=>{
             disconnect();
+        },
+        setBaseUrl: (state, baseUrl) => {
+            state.baseUrl = baseUrl;
         }
     },
 
@@ -204,6 +208,9 @@ const user = {
         disconnect({commit}, params) {
             commit('Disconnect', params);
             removeToken();
+        },
+        setBaseUrl ({commit}, baseUrl) {
+            commit('setBaseUrl', baseUrl);
         }
     }
 };
diff --git a/src/utils/request.js b/src/utils/request.js
index dcd2705bf..0e004c128 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -24,6 +24,12 @@ service.interceptors.request.use(config => {
     if (getToken()) {
         config.headers['X-Token'] = getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
     }
+
+    //  用于/demo/index 文件中baseUrl 判断（后端要求不管本地还是正式，都要可以访问实训/临时使用）
+    if (store.state.user.baseUrl) {
+        config.baseURL = store.state.user.baseUrl;
+    }
+
     if (config.time) {
         config.timeout = config.time; // 让每个请求携带自定义token 请根据实际情况自行修改
     }
diff --git a/src/views/demo/index.vue b/src/views/demo/index.vue
index 6d99e51a5..fb0e5ea1f 100644
--- a/src/views/demo/index.vue
+++ b/src/views/demo/index.vue
@@ -99,6 +99,7 @@ import md5 from 'js-md5';
 import QrcodeVue from 'qrcode.vue';
 import { getLoginWmurl, checkLoginStatus } from '@/api/login';
 import { LoginParams } from '@/utils/login';
+// import {setSessionStorage } from '@/utils/auth';
 export default {
     components: { QrcodeVue },
     data() {
@@ -188,12 +189,15 @@ export default {
     },
     destroyed() {
         window.removeEventListener('message');
+        this.$store.dispatch('setBaseUrl', '');
     },
     methods: {
         doClick(el) {
             if (this.token && this.userId) {
                 // &noPreLogout=true
-                this.src = window.location.origin + `/cbtc/demoTraining/teach?lessonId=195&mapId=59&lineCode=02&prdType=01&trainingId=${el.id}&token=${this.token}`;
+                // window.location.origin +
+                // setSessionStorage('project', 'DEFAULT');
+                this.src = `https://joylink.club/cbtc/demoTraining/teach?lessonId=195&mapId=59&lineCode=02&prdType=01&trainingId=${el.id}&token=${this.token}&project=DEFAULT`;
                 this.loading = true;
                 setTimeout(()=>{
                     this.show = true;
@@ -209,6 +213,7 @@ export default {
         },
         loginRefresh() {
             // this.loadingCode = true;
+            this.$store.dispatch('setBaseUrl', 'https://api.joylink.club/jlcloud');
             const self = this;
             const params = LoginParams['LianKeTang'];
             params.project = 'DEFAULT';
@@ -253,6 +258,7 @@ export default {
                         // 清除定时器，设置路由
                         self.clearTimer(self.checkLogin);
                         this.$store.dispatch('GetInfo', getToken()).then(res => {
+                            // setSessionStorage('project', 'DEFAULT');
                             this.loginLoading = false;
                             this.dialogVisible = false;
                             this.token = getToken();
@@ -280,6 +286,7 @@ export default {
             // secret: "joylink"
             this.$refs.loginForm.validate(valid => {
                 if (valid) {
+                    this.$store.dispatch('setBaseUrl', 'https://api.joylink.club/jlcloud');
                     const model = Object.assign({}, this.loginForm);
                     model.password = md5(model.password);
                     model.type = 'class';
@@ -289,6 +296,7 @@ export default {
                     this.$store.dispatch('Login', model).then(() => {
                         this.$store.dispatch('SetAccount', model.username);
                         this.$store.dispatch('GetInfo', getToken()).then(res => {
+                            // setSessionStorage('project', 'DEFAULT');
                             this.loginLoading = false;
                             this.dialogVisible = false;
                             this.token = getToken();
@@ -345,6 +353,7 @@ export default {
             }
         },
         quit() {
+            this.$store.dispatch('setBaseUrl', '');
             this.$store.dispatch('LogOut').then(() => {
                 location.reload(); // 为了重新实例化vue-router对象 避免bug
             });
diff --git a/src/views/messageBoard/index.vue b/src/views/messageBoard/index.vue
index 06bba0731..c8a686584 100644
--- a/src/views/messageBoard/index.vue
+++ b/src/views/messageBoard/index.vue
@@ -144,10 +144,12 @@ export default {
         };
     },
     mounted() {
-        getPostByProjectCode(this.projectCode).then(resp => {
-            this.postId = resp.data.id;
-        });
-        this.handleCurrentChange();
+        if (this.project) {
+            getPostByProjectCode(this.projectCode).then(resp => {
+                this.postId = resp.data.id;
+            });
+            this.handleCurrentChange();
+        }
     },
     methods: {
         commitComment() {
diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue
index 6450d1c84..3258ea2f9 100644
--- a/src/views/newMap/displayNew/demonMenu.vue
+++ b/src/views/newMap/displayNew/demonMenu.vue
@@ -155,13 +155,15 @@ export default {
         EventBus.$on('quitScene', () => {
             this.practiceDisabled = false;
         });
-        getPostByProjectCode(ProjectCode[this.project]).then(resp => {
-            if (resp.data) {
-                this.messageBoard = true;
-            }
-        }).catch(() => {
-            this.$message.error('获取留言板信息失败');
-        });
+        if (this.project) {
+            getPostByProjectCode(ProjectCode[this.project]).then(resp => {
+                if (resp.data) {
+                    this.messageBoard = true;
+                }
+            }).catch(() => {
+                this.$message.error('获取留言板信息失败');
+            });
+        }
     },
     methods:{
         menuClick() {
diff --git a/src/views/newMap/displayNew/lesson/index.vue b/src/views/newMap/displayNew/lesson/index.vue
index 1ed89f2cb..064a6bdd7 100644
--- a/src/views/newMap/displayNew/lesson/index.vue
+++ b/src/views/newMap/displayNew/lesson/index.vue
@@ -139,13 +139,15 @@ export default {
         }
     },
     mounted() {
-        getPostByProjectCode(ProjectCode[this.project]).then(resp => {
-            if (resp.data) {
-                this.messageBoard = true;
-            }
-        }).catch(() => {
-            this.$message.error('获取留言板信息失败');
-        });
+        if (this.project) {
+            getPostByProjectCode(ProjectCode[this.project]).then(resp => {
+                if (resp.data) {
+                    this.messageBoard = true;
+                }
+            }).catch(() => {
+                this.$message.error('获取留言板信息失败');
+            });
+        }
     },
     methods: {
         tipInfo(opt) {

From 9b4309d0c1520a133d2be2c819c9f0d089c2c505 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 22 Mar 2021 14:38:19 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E4=BB=A3=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/demonMenu.vue    | 3 ++-
 src/views/newMap/displayNew/lesson/index.vue | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue
index 3258ea2f9..e2dbf49ab 100644
--- a/src/views/newMap/displayNew/demonMenu.vue
+++ b/src/views/newMap/displayNew/demonMenu.vue
@@ -161,7 +161,8 @@ export default {
                     this.messageBoard = true;
                 }
             }).catch(() => {
-                this.$message.error('获取留言板信息失败');
+                // this.$message.error('获取留言板信息失败');
+                console.log('获取留言板信息失败');
             });
         }
     },
diff --git a/src/views/newMap/displayNew/lesson/index.vue b/src/views/newMap/displayNew/lesson/index.vue
index 064a6bdd7..d3a1a27ef 100644
--- a/src/views/newMap/displayNew/lesson/index.vue
+++ b/src/views/newMap/displayNew/lesson/index.vue
@@ -145,7 +145,8 @@ export default {
                     this.messageBoard = true;
                 }
             }).catch(() => {
-                this.$message.error('获取留言板信息失败');
+                // this.$message.error('获取留言板信息失败');
+                console.log('获取留言板信息失败');
             });
         }
     },

From 42b59cc752058dced1634a217ead77d57312ed16 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 22 Mar 2021 14:51:34 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E4=BB=A3=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/demo/index.vue | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/views/demo/index.vue b/src/views/demo/index.vue
index fb0e5ea1f..8d1b094af 100644
--- a/src/views/demo/index.vue
+++ b/src/views/demo/index.vue
@@ -122,17 +122,30 @@ export default {
             tipsMsg: '',
             pwdDisplay: true,
             trainingList: [
+                // {
+                //     title: '区段封锁(TA1601)',
+                //     id: '613144'
+                // },
+                // {
+                //     title: '道岔封锁(W0304)',
+                //     id: '612112'
+                // },
+                // {
+                //     title: '进路选排(S0304-S0301)',
+                //     id: '610065'
+                // }
+
                 {
-                    title: '区段封锁(TA1601)',
-                    id: '613144'
+                    title: '站台扣车(车站五（05）-下行站台)',
+                    id: '4991355'
                 },
                 {
-                    title: '道岔封锁(W0304)',
-                    id: '612112'
+                    title: '道岔封锁(W0904)',
+                    id: '4993548'
                 },
                 {
-                    title: '进路选排(S0304-S0301)',
-                    id: '610065'
+                    title: '进路选排(S0916-S0901)',
+                    id: '4991607'
                 }
             ],
             loginForm: {
@@ -197,7 +210,9 @@ export default {
                 // &noPreLogout=true
                 // window.location.origin +
                 // setSessionStorage('project', 'DEFAULT');
-                this.src = `https://joylink.club/cbtc/demoTraining/teach?lessonId=195&mapId=59&lineCode=02&prdType=01&trainingId=${el.id}&token=${this.token}&project=DEFAULT`;
+                // lessonId=101&mapId=49&prdType=01
+                // lessonId=195&mapId=59&lineCode=02&prdType=01
+                this.src = `https://test.joylink.club/cbtc/demoTraining/teach?lessonId=101&mapId=49&lineCode=02&prdType=01&trainingId=${el.id}&token=${this.token}&project=DEFAULT`;
                 this.loading = true;
                 setTimeout(()=>{
                     this.show = true;
@@ -213,7 +228,8 @@ export default {
         },
         loginRefresh() {
             // this.loadingCode = true;
-            this.$store.dispatch('setBaseUrl', 'https://api.joylink.club/jlcloud');
+            // this.$store.dispatch('setBaseUrl', 'https://api.joylink.club/jlcloud');
+            this.$store.dispatch('setBaseUrl', 'https://test.joylink.club/jlcloud');
             const self = this;
             const params = LoginParams['LianKeTang'];
             params.project = 'DEFAULT';
@@ -286,7 +302,8 @@ export default {
             // secret: "joylink"
             this.$refs.loginForm.validate(valid => {
                 if (valid) {
-                    this.$store.dispatch('setBaseUrl', 'https://api.joylink.club/jlcloud');
+                    // this.$store.dispatch('setBaseUrl', 'https://api.joylink.club/jlcloud');
+                    this.$store.dispatch('setBaseUrl', 'https://test.joylink.club/jlcloud');
                     const model = Object.assign({}, this.loginForm);
                     model.password = md5(model.password);
                     model.type = 'class';

From 7ac00f45dcdcb6e52c423a12079145553012039a Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 22 Mar 2021 15:12:34 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E7=BC=96?=
 =?UTF-8?q?=E5=88=B6=20=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../planMonitor/components/menus/addTask.vue  | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/views/planMonitor/components/menus/addTask.vue b/src/views/planMonitor/components/menus/addTask.vue
index c944d13b0..907f943cd 100644
--- a/src/views/planMonitor/components/menus/addTask.vue
+++ b/src/views/planMonitor/components/menus/addTask.vue
@@ -213,7 +213,7 @@ export default {
                 tripNumber: '',
                 planId: '',
                 serviceNumber: '',
-				startTbFront: false,
+                startTbFront: false,
                 endTbFront: false
             },
             tripNumberList: [{ value: '', label: this.$t('planMonitor.automatic') }],
@@ -281,8 +281,16 @@ export default {
                             endStationFilterMap[routing.endStationCode] = {text:formatName(routing.endStationCode), value:routing.endStationCode};
                         }
                     });
-                    this.startStationFilters = Object.values(startStationFilterMap);
-                    this.endStationFilters = Object.values(endStationFilterMap);
+                    this.startStationFilters = Object.values(startStationFilterMap).sort((a, b)=>{
+                        const startStationA = this.$store.getters['map/getDeviceByCode'](a.value);
+                        const startStationB = this.$store.getters['map/getDeviceByCode'](b.value);
+                        return startStationA.kmRange - startStationB.kmRange;
+                    });
+                    this.endStationFilters = Object.values(endStationFilterMap).sort((a, b)=>{
+                        const endStationA = this.$store.getters['map/getDeviceByCode'](a.value);
+                        const endStationB = this.$store.getters['map/getDeviceByCode'](b.value);
+                        return endStationA.kmRange - endStationB.kmRange;
+                    });
                 });
 
                 getMapStationRunUser(mapId).then(resp =>{
@@ -324,10 +332,10 @@ export default {
         compuntedRunTime(list, index, runLevel) {
             let runTime = 0;
 
-			if ((index == 0 && String(this.addModel.startTbFront) != 'undefined') ||
-				(index == list.length-1 && String(this.addModel.endTbFront) != 'undefined')) {
-				return 0
-			}
+            if ((index == 0 && String(this.addModel.startTbFront) != 'undefined') ||
+				(index == list.length - 1 && String(this.addModel.endTbFront) != 'undefined')) {
+                return 0;
+            }
 
             if (index < list.length - 1) {
                 const stopStationObj = this.stopStationMap[[list[index].sectionCode, list[index + 1].sectionCode].toString()];
@@ -371,14 +379,14 @@ export default {
                     elem.speedLevelTime = realRunlevel;
                     elem.speedLevel = runLevelObj.label;
 
-					let fronTime = 0;
-					if (index == 0 && String(this.addModel.startTbFront) == 'false') {
-						const data = this.reentryData[elem.stationCode]||{};
-						fronTime = data.tbTo || 0;
-					} else if (index == list.length - 2 && String(this.addModel.endTbFront) == 'false') {
-						const data = this.reentryData[list[index+1].stationCode]||{};
-						fronTime = data.tbTo || 0;
-					}
+                    let fronTime = 0;
+                    if (index == 0 && String(this.addModel.startTbFront) == 'false') {
+                        const data = this.reentryData[elem.stationCode] || {};
+                        fronTime = data.tbTo || 0;
+                    } else if (index == list.length - 2 && String(this.addModel.endTbFront) == 'false') {
+                        const data = this.reentryData[list[index + 1].stationCode] || {};
+                        fronTime = data.tbTo || 0;
+                    }
 
                     tempTime = tempTime + fronTime + elem.stopTime + elem.speedLevelTime;
                 });
@@ -397,8 +405,8 @@ export default {
             this.addModel.endSectionCode = row.endSectionCode;
             this.addModel.startSectionCode = row.startSectionCode;
             this.addModel.routingCode = row.code;
-			this.addModel.startTbFront = row.startTbFront;
-			this.addModel.endTbFront = row.endTbFront;
+            this.addModel.startTbFront = row.startTbFront;
+            this.addModel.endTbFront = row.endTbFront;
             this.computedDetailList('routingCode');
         },
         handleCommit() {

From 74c5764087d9419e39fc99e5f5081a7c94b000c2 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 22 Mar 2021 15:30:10 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E4=BB=A3=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/demo/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/demo/index.vue b/src/views/demo/index.vue
index 8d1b094af..2c256c265 100644
--- a/src/views/demo/index.vue
+++ b/src/views/demo/index.vue
@@ -181,7 +181,7 @@ export default {
                 this.loading = false;
             } else {
                 this.show = false;
-                this.src = 'http://localhost:9527/cbtc/trainingPlatform';
+                this.src = 'https://test.joylink.club/cbtc/trainingPlatform';
                 this.$nextTick(_ => {
                     if (result.type == 'DEMO_RESULT' && result.hasOwnProperty('score')) {
                         this.$confirm(`得分：${result.score}分`, '结果', {

From 7e80c71fefaed0a7f1baf46f7f1ba89ca54961df Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 22 Mar 2021 15:49:14 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E4=BB=A3=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/demoTraining/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/newMap/displayNew/demoTraining/index.vue b/src/views/newMap/displayNew/demoTraining/index.vue
index e92ce2594..134c1ad68 100644
--- a/src/views/newMap/displayNew/demoTraining/index.vue
+++ b/src/views/newMap/displayNew/demoTraining/index.vue
@@ -29,7 +29,7 @@ export default {
         '$route': function() {
         },
         '$store.state.map.mapViewLoadedCount': function (val) {
-            window.parent.postMessage(Object.assign({}, {type: 'DEMO_MAP_LOADED'}), 'http://localhost:9527/cbtc/demo');
+            window.parent.postMessage(Object.assign({}, {type: 'DEMO_MAP_LOADED'}), 'https://test.joylink.club/cbtc/demo');
         }
     },
     async mounted() {
@@ -58,7 +58,7 @@ export default {
             }
         },
         exitSimulation(result = {}) {
-            window.parent.postMessage(Object.assign(result, {type: 'DEMO_RESULT'}), 'http://localhost:9527/cbtc/demo');
+            window.parent.postMessage(Object.assign(result, {type: 'DEMO_RESULT'}), 'https://test.joylink.club/cbtc/demo');
         }
     }
 };

From b383815100c03a1d7368b3f498ab5d745ece491a Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 22 Mar 2021 16:04:33 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=98=E5=88=B6=20?=
 =?UTF-8?q?=E4=BA=A4=E8=B7=AF=E9=A2=84=E8=A7=88=20=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataRelation/routingoperate/detail.vue    | 50 +++++++++--------
 .../dataRelation/routingoperate/index.vue     | 54 +++++++++++++++++--
 2 files changed, 79 insertions(+), 25 deletions(-)

diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
index 38b89d578..adfa8b79f 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/detail.vue
@@ -125,28 +125,32 @@ export default {
                                 handleClick: this.sectionDetail
                             }
                         ]
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('map.operation'),
+                        width: '300',
+                        buttons: [
+                            {
+                                name: this.$t('map.preview'),
+                                handleClick: this.routingPreview
+                            }
+                            // {
+                            //     name: this.$t('map.compile'),
+                            //     handleClick: this.editObj
+                            // },
+                            // {
+                            //     name: this.$t('map.deleteObj'),
+                            //     handleClick: this.deleteObj,
+                            //     type: 'danger'
+                            // },
+                            // {
+                            //     name: '生成站间运行数据',
+                            //     handleClick: this.generateData,
+                            //     type: 'danger'
+                            // }
+                        ]
                     }
-                    // {
-                    //     type: 'button',
-                    //     title: this.$t('map.operation'),
-                    //     width: '300',
-                    //     buttons: [
-                    //         {
-                    //             name: this.$t('map.compile'),
-                    //             handleClick: this.editObj
-                    //         },
-                    //         {
-                    //             name: this.$t('map.deleteObj'),
-                    //             handleClick: this.deleteObj,
-                    //             type: 'danger'
-                    //         },
-                    //         {
-                    //             name: '生成站间运行数据',
-                    //             handleClick: this.generateData,
-                    //             type: 'danger'
-                    //         }
-                    //     ]
-                    // }
                 ]
             }
         };
@@ -271,6 +275,10 @@ export default {
         //         });
         //     }
         // },
+        routingPreview(index, row) {
+            this.$emit('routingSelected', row);
+            this.doClose();
+        },
         sectionDetail(index, row) {
             const sectionDict = {};
             const stationDict = {};
diff --git a/src/views/newMap/newMapdraft/dataRelation/routingoperate/index.vue b/src/views/newMap/newMapdraft/dataRelation/routingoperate/index.vue
index 8f67485f5..c3f3bc7e8 100644
--- a/src/views/newMap/newMapdraft/dataRelation/routingoperate/index.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/routingoperate/index.vue
@@ -35,7 +35,8 @@ export default {
     },
     data() {
         return {
-            enabledTab: 'Route'
+            enabledTab: 'Route',
+            oldsection:[]
             // routeData: null
         };
     },
@@ -59,9 +60,10 @@ export default {
         },
         routingSelected: function (data) {
             // this.routeData = data;
-            if (this.$refs && this.$refs.routeEdit) {
-                this.$refs.routeEdit.editData(data);
-            }
+            // if (this.$refs && this.$refs.routeEdit) {
+            //     this.$refs.routeEdit.editData(data);
+            // }
+            this.changeSectionSelected(data.parkSectionCodeList, true);
         },
         previewRouteEvent: function () {
             if (this.$refs && this.$refs.routeDetail) {
@@ -84,6 +86,50 @@ export default {
         },
         batchSectionListFocus(flag) {
             // this.$refs.routeEdit.batchSectionListFocus(flag);
+            this.changeSectionSelected(this.oldsection, flag);
+        },
+        changeSectionSelected(selectedList, flag) {
+            if (selectedList && selectedList.length > 0) {
+                if (flag) {
+                    if (this.oldsection.length > 0) {
+                        this.oldsection.forEach((sectionInfo)=>{
+                            const section = this.$store.getters['map/getDeviceByCode'](sectionInfo.sectionCode);
+                            section.instance.drawBatchSelected(section, '');
+                        });
+                        this.oldsection = [];
+                    }
+                    selectedList.forEach(each=>{
+                        const section = this.$store.getters['map/getDeviceByCode'](each.sectionCode);
+                        const list = section.logicSectionCodeList;
+                        // if()
+                        // relSwitchCode
+                        if (list && list.length > 0) {
+                            list.forEach(logicSectionCode=>{
+                                const logicSection = this.$store.getters['map/getDeviceByCode'](logicSectionCode);
+                                this.oldsection.push(logicSection);
+                                logicSection.instance.drawBatchSelected(section, 'routingSection');
+                            });
+                        } else {
+                            this.oldsection.push({sectionCode:section.code});
+                            section.instance.drawBatchSelected(section, 'routingSection');
+                        }
+                    });
+                    this.$jlmap.setCenter(selectedList[0].sectionCode);
+                } else {
+                    selectedList.forEach(each=>{
+                        const section = this.$store.getters['map/getDeviceByCode'](each.sectionCode);
+                        const list = section.logicSectionCodeList;
+                        if (list && list.length > 0) {
+                            list.forEach(logicSectionCode=>{
+                                const logicSection = this.$store.getters['map/getDeviceByCode'](logicSectionCode);
+                                logicSection.instance.drawBatchSelected(section, '');
+                            });
+                        } else {
+                            section.instance.drawBatchSelected(section, '');
+                        }
+                    });
+                }
+            }
         }
     }
 };

From ba18a549fbcbcca9d3227394371111b2b54ce5f6 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 22 Mar 2021 17:39:12 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E5=9B=BE=E7=BC=96?=
 =?UTF-8?q?=E5=88=B6=20=E7=94=9F=E6=88=90=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/components/QueryListPage/DataForm.vue     | 32 +++++++++++++++++++
 .../components/menus/gernaratePlanTrain.vue   |  1 +
 2 files changed, 33 insertions(+)

diff --git a/src/components/QueryListPage/DataForm.vue b/src/components/QueryListPage/DataForm.vue
index ee8e4fea4..524eb2834 100644
--- a/src/components/QueryListPage/DataForm.vue
+++ b/src/components/QueryListPage/DataForm.vue
@@ -141,6 +141,7 @@
         <el-form-item :key="item.prop" :prop="item.prop" :label="item.label" :required="item.required">
           <template v-if="item.remote">
             <el-select
+              :ref="'select_'+item.prop"
               v-model="formModel[item.prop]"
               :placeholder="item.placeholder"
               :disabled="item.disabled"
@@ -160,6 +161,7 @@
           </template>
           <template v-else-if="item.allowCreate">
             <el-select
+              :ref="'select_'+item.prop"
               v-model="formModel[item.prop]"
               :placeholder="item.placeholder"
               :disabled="item.disabled"
@@ -179,6 +181,7 @@
           </template>
           <template v-else-if="item.multiple">
             <el-select
+              :ref="'select_'+item.prop"
               v-model="formModel[item.prop]"
               :placeholder="item.placeholder"
               :disabled="item.disabled"
@@ -196,6 +199,7 @@
           </template>
           <template v-else-if="item.change">
             <el-select
+              :ref="'select_'+item.prop"
               v-model="formModel[item.prop]"
               filterable
               :clearable="!!item.clearable"
@@ -216,6 +220,7 @@
           </template>
           <template v-else>
             <el-select
+              :ref="'select_'+item.prop"
               v-model="formModel[item.prop]"
               filterable
               :no-data-text="item.noDataText?item.noDataText:'无数据'"
@@ -239,6 +244,7 @@
       <template v-else-if="checkFieldType(item, 'datetime') || checkFieldType(item, 'date') || checkFieldType(item, 'daterange') || checkFieldType(item, 'datetimerange')">
         <el-form-item :key="item.prop" :prop="item.prop" :label="item.label" :required="item.required" style="width: 100%;">
           <el-date-picker
+            :ref="'select_'+item.prop"
             v-model="formModel[item.prop]"
             align="right"
             :type="item.type"
@@ -253,6 +259,7 @@
       <template v-else-if="checkFieldType(item, 'time')">
         <el-form-item :key="item.prop" :prop="item.prop" :label="item.label" :required="item.required">
           <el-time-select
+            :ref="'select_'+item.prop"
             v-model="formModel[item.prop]"
             :placeholder="item.placeholder"
             :disabled="item.disabled"
@@ -263,6 +270,7 @@
       <template v-else-if="checkFieldType(item, 'timePicker')">
         <el-form-item :key="item.prop" :prop="item.prop" :label="item.label" :required="item.required">
           <el-time-picker
+            :ref="'select_'+item.prop"
             v-model="formModel[item.prop]"
             :placeholder="item.placeholder"
             :disabled="item.disabled"
@@ -410,6 +418,30 @@ export default {
             if (item.deviceChange) {
                 item.deviceChange(data);
             }
+        },
+        allSelectBlur() {
+            const that = this;
+            const list = ['datetime', 'date', 'daterange', 'datetimerange', 'time', 'timePicker'];
+            this.form.items.forEach(each=>{
+                if (each.hasOwnProperty('show')) {
+                    if ((list.includes(each.type) || this.checkFieldType(each, 'select')) && each.show) {
+                        // that.$refs['select_' + each.prop][0].blur();
+                        if (this.checkFieldType(each, 'select')) {
+                            that.$refs['select_' + each.prop][0].blur();
+                        } else {
+                            that.$refs['select_' + each.prop][0].hidePicker();
+                        }
+                    }
+                } else {
+                    if (list.includes(each.type) || this.checkFieldType(each, 'select')) {
+                        if (this.checkFieldType(each, 'select')) {
+                            that.$refs['select_' + each.prop][0].blur();
+                        } else {
+                            that.$refs['select_' + each.prop][0].hidePicker();
+                        }
+                    }
+                }
+            });
         }
     }
 };
diff --git a/src/views/planMonitor/components/menus/gernaratePlanTrain.vue b/src/views/planMonitor/components/menus/gernaratePlanTrain.vue
index b4c981875..93497811d 100644
--- a/src/views/planMonitor/components/menus/gernaratePlanTrain.vue
+++ b/src/views/planMonitor/components/menus/gernaratePlanTrain.vue
@@ -346,6 +346,7 @@ export default {
             this.loading = false;
             // this.$refs.dataform.validateField('runningRouting');
             this.$refs.dataform.resetForm();
+            this.$refs.dataform.allSelectBlur();
             // this.$refs.dataform.clearValidate();
             // blur
             this.formModel = {