From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
index f1cfead..d020f2a 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
@@ -61,26 +61,38 @@
if (res?.data && shelfThree) {
shelfThree.generateMesh((loader, addObject) => {
const promises = [];
+ const singleHeight = 123;
for (const item of res.data) {
const { lev } = Utils.parseLocNo(item.locNo);
promises.push(new Promise((resolve) => {
loader.load('model/04.fbx', (mesh) => {
- mesh.position.set(0, 20 + 100 * (lev - 1), 0);
+ mesh.position.set(0, singleHeight * (lev - 1), 0);
mesh.scale.set(5, 5, 5);
mesh.name = item.locNo;
mesh.traverse(function (child) {
if (child.isMesh) {
- if (child.name === '涓嶈鍒�') {
- // child.visible = false;
- child.material.color.set(0xE8B67E);
- }
if (child.name === '璐ф灦') {
- // child.visible = false;
child.material.color.set(0x4680BF);
}
+ let palletVisible = true, cargoVisible = true;
+ switch (item.locSts) {
+ case 'D':
+ cargoVisible = false;
+ break;
+ case 'O':
+ palletVisible = false;
+ cargoVisible = false;
+ break;
+ default:
+ break;
+ }
if (child.name === '鎵樼洏') {
- // child.visible = false;
+ child.visible = palletVisible;
child.material.color.set(0xBEBEBE);
+ }
+ if (child.name === '涓嶈鍒�') {
+ child.visible = cargoVisible;
+ child.material.color.set(0xE8B67E);
}
child.name = item.locNo
child.castShadow = true;
@@ -95,6 +107,7 @@
Promise.all(promises).then(() => {
shelfThree.setNewSelectedMesh(locNo);
+ shelfThree.rePerspective(singleHeight * res.data.length);
}).catch(error => {
console.error(error);
});
--
Gitblit v1.9.1