From 4c21e56efdf3acfcd560055fca0969d4868e200c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期四, 07 四月 2022 16:39:05 +0800 Subject: [PATCH] # --- static/js/app.js | 51 +++++++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/static/js/app.js b/static/js/app.js index 7a25951..e5f3e7d 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -12,7 +12,7 @@ import {StoreCrn} from './object/StoreCrn.js'; import {StoreConvey} from './object/StoreConvey.js'; import {StoreGoods} from './object/StoreGoods.js'; - +import {StaTask} from './object/StaTask.js'; var APP = { @@ -27,6 +27,7 @@ this.outlinePass = null; this.goodTypes=[];//瀛樺偍鎵�鏈夌殑搴撲綅绫诲瀷 this.crnTasks = [];// 鍫嗗灈鏈哄垪琛� + this.staTasks = [];// 杈撻�佺嚎鍒楄〃 this.moveForward = false;//鏄惁鍚戝墠杩愯 this.moveBackward = false;//鏄惁鍚戝悗杩愯 this.moveLeft = false;//鏄惁鍚戝乏杩愯 @@ -72,6 +73,8 @@ this.stats.end(); this.queryCrn(); this.crnMove(); + this.querySta(); + this.staChange(); } this.initScene = function () { this.scene = new THREE.Scene(); @@ -177,7 +180,7 @@ this.composer.addPass( this.fxaaPass ); } this.initObjectSelect = function(){ - new ObjectSelect(this.scene, this.camera, this.outlinePass); + new ObjectSelect(this.scene, this.camera, this.outlinePass, this); } this.initPointLockControl = function(object){ this.controls = new PointerLockControls( this.camera, document.body ); @@ -336,20 +339,6 @@ if (line.bins !== null) { new StoreGoods(object, line.bins, 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); - // } - // } - } } this.firstTime = 0; @@ -370,20 +359,30 @@ } } } - this.getExistedGoodType=function(state){ - for (let i=0;i<this.goodTypes.length;i++) { - let type=this.goodTypes[i]; - if(type.type===state) { - return type.object; - } - } - return null; - } - this.crnMove = function (object) { + this.crnMove = function () { for (let crnTask of this.crnTasks) { crnTask.move(); } } + this.querySta = function () { + if (StaDatas !== null && this.firstTime === 0) { + for (let staData of StaDatas) { + let staTask = getArrVal(this.staTasks, "no", staData.no); + if (null == staTask) { + this.staTasks.push(new StaTask(staData, this)); + } else { + if(!staTask.run) { + staTask.modify(staData); + } + } + } + } + } + this.staChange = function () { + for (let staTask of this.staTasks) { + staTask.change(); + } + } // 鍔熻兘鏂规硶鍖� this.changeStats = function () { -- Gitblit v1.9.1