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 |  116 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 80 insertions(+), 36 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index e8dedd1..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,16 +31,15 @@
 			this.initLight();
 			this.initFloor();
 			this.initModel();
-			// 鍙栨暟鎹�
-			this.initStoreData();
+			this.queryTask();
+			this.initStoreObjects(this);
 		}
 		this.animate = function () {
 			requestAnimationFrame(this.animate.bind(this));
 			this.stats.begin();
 			this.renderer.render(this.scene, this.camera);
 			this.stats.end();
-			this.initStoreObjects(this);
-			this.modelMove();
+			// this.modelMove();
 		}
 		this.initScene = function () {
 			this.scene = new THREE.Scene();
@@ -58,7 +59,7 @@
 			// this.camera.position.z = 600;
 			// //鐩告満鐨勬湞鍚�
 			// this.camera.lookAt(0, 0, 0);
-			this.camera.position.set( - 550, 670, 950 );
+			this.camera.position.set( - 350, 1070, 1550 );
 			this.camera.lookAt( this.scene.position );
 			//灏嗙浉鏈烘斁鍒板満鏅腑
 			this.scene.add(this.camera);
@@ -75,12 +76,29 @@
 			this.dom.appendChild( this.renderer.domElement );
 		}
 		this.initLight = function () {
+
+			//棣栧厛娣诲姞涓幆澧冨厜
+			let ambient = new THREE.AmbientLight(0xffffff, 1); //AmbientLight,褰卞搷鏁翠釜鍦烘櫙鐨勫厜婧�
+			ambient.position.set(0, 0, 0);
+			this.addObject(ambient);
+			//娣诲姞骞宠鍏�,骞宠鍏夌被浼间簬澶槼鍏�
+			let directionalLight = new THREE.DirectionalLight(0xffffff, 0.3);//妯℃嫙杩滃绫讳技澶槼鐨勫厜婧�
+			directionalLight.position.set(0, 200, 0);
+			this.addObject(directionalLight);
+			//璁剧疆鐐瑰厜婧�
+			let pointLight1 = new THREE.PointLight(0xffffff, 0.3);
+			pointLight1.position.set(-500, 200, 0);
+			this.addObject(pointLight1);
+			let pointLight2 = new THREE.PointLight(0xffffff, 0.3);
+			pointLight2.position.set(500, 200, 0);
+			this.addObject(pointLight2);
+
 			// ---
-			var bulbLight = new THREE.PointLight( 0xffee88, 1, 2000, 2 );
-			bulbLight.position.set( 600, 600, 500 );
-			bulbLight.castShadow = true;
-			bulbLight.power = 100;
-			this.addObject(bulbLight);
+			// var bulbLight = new THREE.PointLight( 0xffee88, 1, 2000, 2 );
+			// bulbLight.position.set( 600, 600, 500 );
+			// bulbLight.castShadow = true;
+			// bulbLight.power = 100;
+			// this.addObject(bulbLight);
 			// ---
 			// var bulbLight1 = new THREE.PointLight( 0xffee88, 1, 2000, 2 );
 			// bulbLight1.position.set( -600, 600, 500 );
@@ -104,12 +122,12 @@
 			// hemiLight.intensity = 0.0001;
 			// this.addObject(hemiLight);
 
-			const ambientLight = new THREE.AmbientLight( 0xcccccc, 0.4 );
-			this.addObject( ambientLight );
-
-			const directionalLight = new THREE.DirectionalLight( 0xffffff, 0.6 );
-			directionalLight.position.set( - 1, 1, 1 );
-			this.addObject( directionalLight );
+			// const ambientLight = new THREE.AmbientLight( 0xcccccc, 0.4 );
+			// this.addObject( ambientLight );
+			//
+			// const directionalLight = new THREE.DirectionalLight( 0xffffff, 0.6 );
+			// directionalLight.position.set( - 1, 1, 1 );
+			// this.addObject( directionalLight );
 		}
 		this.initOrbitControl = function () {
 			this.orbitControl = new OrbitControls(this.camera, this.renderer.domElement);
@@ -134,7 +152,7 @@
 				"posy.jpg", "negy.jpg",
 				"posz.jpg", "negz.jpg"
 			]);
-			this.scene.background = new THREE.Color( 0x17c5dc );
+			this.scene.background = new THREE.Color( 0xf0f0f0 );
 		}
 		this.removeObject = function (nameorid) {
 			for (let i = 0; i < this.objects.length; i++) {
@@ -159,7 +177,7 @@
 			// this.addObject(plane);
 			//
 			// const helper = new THREE.PolarGridHelper( 2000, 100 );
-			const helper = new THREE.GridHelper( 5000, 300 );
+			const helper = new THREE.GridHelper( 8000, 300 );
 			helper.position.y = - 0;
 			helper.material.opacity = 0.25;
 			helper.material.transparent = true;
@@ -167,23 +185,38 @@
 		}
 		this.initStoreObjects = function (object) {
 			if (this.firstTime === 1) {
-				// initStore();
+				initStore();
 				if (Store3DData !== null) {
-					for(let i = 0;i<Store3DData.data.length;i++){
-						let optionArea = Store3DData.data[i];
-						let area = new Store3DData(optionArea);
-						object.addObject(area);
-						for (let j = 0; j<optionArea.store.length;j++){
-							let optionStore = optionArea[j];
-							optionStore.position=CommonFunction.transPosition(optionStore.position,optionArea.position)
-							let store =new Store(optionStore);
-							object.addObject(store);
-							for (let k = 0; k < optionStore.groups.length;k++){
-								let optionGroup = optionStore.groups[k];
-								optionGroup.position
-							}
+					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);
+							//鏄剧ず搴撲綅涓婄殑璐х墿
+							// for (var bin of line.bins) {
+							// 	let existGoods=this.getExistedGoodType(bin.State);
+							// 	let storeGoods = new StoreGoods(optionGroup, bin);
+							// 	if(existGoods==null) {
+							// 		let goods=storeGoods.create();
+							// 		object.addObject(goods);
+							// 		this.goodTypes.push({type: bin.State, object: goods});
+							// 	} else {
+							// 		let goods= storeGoods.clone(existGoods);
+							// 		object.addObject(goods);
+							// 	}
+							// }
+
 						}
 					}
+
+
+
+
+
+
+
+
+
 
 
 
@@ -225,8 +258,14 @@
 					//
 					// 	}
 					// }
-					this.firstTime = 0;
+					// this.firstTime = 0;
 				}
+			}
+		}
+		this.queryTask = function () {
+			if (this.firstTime === 1) {
+				queryTaskCurrent();
+				this.wrkTasks = TaskData;
 			}
 		}
 		this.getExistedGoodType=function(state){
@@ -274,6 +313,9 @@
 						.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.scale.set(0.025, 0.025, 0.025);
 							object.rotateY(- Math.PI / 2)
 							that.addObject( object );
@@ -311,10 +353,12 @@
 				});
 		}
 		this.modelMove = function () {
+			for (var wrkMast of this.wrkTasks) {
+				console.log(wrkMast)
+				let crnBody = getArrVal(this.objects, "name", wrkMast.crnNo + "-body");
 
-		}
-		this.initStoreData = function () {
-
+				console.log(crnBody.position);
+			}
 		}
 	},
 

--
Gitblit v1.9.1