From cdeb533374b5c5500e846c4fa2e6c9b6624af47c Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 08 十二月 2021 12:40:19 +0800
Subject: [PATCH] #

---
 static/js/app.js |   91 +++++++++++++++++++++++++++++----------------
 1 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index b5d9039..efbbbda 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -29,6 +29,8 @@
 			this.initLight();
 			this.initFloor();
 			this.initModel();
+			// 鍙栨暟鎹�
+			this.initStoreData();
 		}
 		this.animate = function () {
 			requestAnimationFrame(this.animate.bind(this));
@@ -165,44 +167,64 @@
 		}
 		this.initStoreObjects = function (object) {
 			if (this.firstTime === 1) {
+				// initStore();
 				if (Store3DData !== null) {
-					//鏄剧ず浠撳簱鍖哄煙
-					for (let i = 0; i < Store3DData.Areas.length; i++) {
-						let optionArea = Store3DData.Areas[i];
-						let area = new StoreArea(optionArea);
+					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.Stores.length; j++) {
-							let optionStore = optionArea.Stores[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 = CommonFunction.transPosition(optionGroup.Position, optionStore.Position);
-								let shelf = new StoreShelf(optionGroup);
-								let group=new StoreGroup(optionGroup,1);
-								object.addObject(shelf);
-								// object.addObject(group);
-								//鏄剧ず搴撲綅涓婄殑璐х墿
-								for (let m = 0; m < optionGroup.Bins.length; m++) {
-								    let optionBin = optionGroup.Bins[m];
-								    let existGoods=this.getExistedGoodType(optionBin.State);
-								    let storeGoods = new StoreGoods(optionGroup, optionBin);
-								    if(existGoods==null) {
-								        let goods=storeGoods.create();
-								        object.addObject(goods);
-								        this.goodTypes.push({type: optionBin.State, object: goods});
-								    } else {
-								        let goods= storeGoods.clone(existGoods);
-								        object.addObject(goods);
-								    }
-								}
+						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 (let i = 0; i < Store3DData.Areas.length; i++) {
+					// 	let optionArea = Store3DData.Areas[i];
+					// 	let area = new StoreArea(optionArea);
+					// 	object.addObject(area);
+					// 	//鏄剧ず浠撳簱
+					// 	for (let j = 0; j < optionArea.Stores.length; j++) {
+					// 		let optionStore = optionArea.Stores[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 = CommonFunction.transPosition(optionGroup.Position, optionStore.Position);
+					// 			let shelf = new StoreShelf(optionGroup);
+					// 			let group=new StoreGroup(optionGroup,1);
+					// 			object.addObject(shelf);
+					// 			// object.addObject(group);
+					// 			//鏄剧ず搴撲綅涓婄殑璐х墿
+					// 			for (let m = 0; m < optionGroup.Bins.length; m++) {
+					// 			    let optionBin = optionGroup.Bins[m];
+					// 			    let existGoods=this.getExistedGoodType(optionBin.State);
+					// 			    let storeGoods = new StoreGoods(optionGroup, optionBin);
+					// 			    if(existGoods==null) {
+					// 			        let goods=storeGoods.create();
+					// 			        object.addObject(goods);
+					// 			        this.goodTypes.push({type: optionBin.State, object: goods});
+					// 			    } else {
+					// 			        let goods= storeGoods.clone(existGoods);
+					// 			        object.addObject(goods);
+					// 			    }
+					// 			}
+					// 		}
+					//
+					// 	}
+					// }
 					this.firstTime = 0;
 				}
 			}
@@ -291,6 +313,9 @@
 		this.modelMove = function () {
 
 		}
+		this.initStoreData = function () {
+
+		}
 	},
 
 

--
Gitblit v1.9.1