From 2f6c32fbfbd3696ed3ccce3b89158e4a5876ddc5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 13 十二月 2021 11:19:27 +0800
Subject: [PATCH] #

---
 static/js/app.js |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index 5b4915f..5fb69a3 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -14,6 +14,8 @@
 		this.firstTime = 1;
 		this.stats = null;
 		this.goodTypes=[];//瀛樺偍鎵�鏈夌殑搴撲綅绫诲瀷
+		this.wrkNo = 0;
+		this.wrkTasks = [];// 浠诲姟鍒楄〃
 
 		this.start = function () {
 			this.initMain();
@@ -29,6 +31,7 @@
 			this.initLight();
 			this.initFloor();
 			this.initModel();
+			this.queryTask();
 			this.initStoreObjects(this);
 		}
 		this.animate = function () {
@@ -36,7 +39,7 @@
 			this.stats.begin();
 			this.renderer.render(this.scene, this.camera);
 			this.stats.end();
-			this.modelMove();
+			// this.modelMove();
 		}
 		this.initScene = function () {
 			this.scene = new THREE.Scene();
@@ -56,7 +59,7 @@
 			// this.camera.position.z = 600;
 			// //鐩告満鐨勬湞鍚�
 			// this.camera.lookAt(0, 0, 0);
-			this.camera.position.set( - 550, 2070, 4550 );
+			this.camera.position.set( - 350, 1070, 1550 );
 			this.camera.lookAt( this.scene.position );
 			//灏嗙浉鏈烘斁鍒板満鏅腑
 			this.scene.add(this.camera);
@@ -185,6 +188,7 @@
 				initStore();
 				if (Store3DData !== null) {
 					for(var group of Store3DData.data.store.groups) {
+						let crn = new StoreCrn(group.crn, object);
 						for (var line of group.lines) {
 							let shelf = new StoreShelf(line);
 							object.addObject(shelf);
@@ -254,8 +258,14 @@
 					//
 					// 	}
 					// }
-					this.firstTime = 0;
+					// this.firstTime = 0;
 				}
+			}
+		}
+		this.queryTask = function () {
+			if (this.firstTime === 1) {
+				queryTaskCurrent();
+				this.wrkTasks = TaskData;
 			}
 		}
 		this.getExistedGoodType=function(state){
@@ -301,11 +311,11 @@
 						.setMaterials( materials )
 						.setPath( '../static/model/obj/' )
 						.load( '璐у弶.obj', function ( object ) {
-							// object.position.z = -500;
-							// object.position.x = -2060;
-							object.position.z = 0;
-							object.position.x = 0;
-							object.position.y = 0;
+							object.position.z = -500;
+							object.position.x = -2060;
+							// object.position.z = 0;
+							// object.position.x = 0;
+							// object.position.y = 0;
 							object.scale.set(0.025, 0.025, 0.025);
 							object.rotateY(- Math.PI / 2)
 							that.addObject( object );
@@ -343,7 +353,12 @@
 				});
 		}
 		this.modelMove = function () {
+			for (var wrkMast of this.wrkTasks) {
+				console.log(wrkMast)
+				let crnBody = getArrVal(this.objects, "name", wrkMast.crnNo + "-body");
 
+				console.log(crnBody.position);
+			}
 		}
 	},
 

--
Gitblit v1.9.1