From 047d6181a5f51711521c5e38f081d6e8760e22d6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 07 四月 2024 10:45:34 +0800
Subject: [PATCH] #
---
zy-asrs-flow/public/model/01.fbx | 0
zy-asrs-flow/public/model/02.fbx | 0
zy-asrs-flow/public/model/05.fbx | 0
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java | 2 ++
zy-asrs-flow/public/model/04.fbx | 0
zy-asrs-flow/public/model/03.fbx | 0
zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js | 14 ++++++++++++--
7 files changed, 14 insertions(+), 2 deletions(-)
diff --git "a/zy-asrs-flow/public/model/01.\350\264\247\346\236\266.fbx" b/zy-asrs-flow/public/model/01.fbx
similarity index 100%
rename from "zy-asrs-flow/public/model/01.\350\264\247\346\236\266.fbx"
rename to zy-asrs-flow/public/model/01.fbx
Binary files differ
diff --git "a/zy-asrs-flow/public/model/02.\350\264\247\346\236\266\345\270\246\346\211\230\347\233\230.fbx" b/zy-asrs-flow/public/model/02.fbx
similarity index 100%
rename from "zy-asrs-flow/public/model/02.\350\264\247\346\236\266\345\270\246\346\211\230\347\233\230.fbx"
rename to zy-asrs-flow/public/model/02.fbx
Binary files differ
diff --git "a/zy-asrs-flow/public/model/03-1\350\264\247\346\236\266\350\247\204\346\240\274\350\264\247\347\211\251.fbx" b/zy-asrs-flow/public/model/03.fbx
similarity index 100%
rename from "zy-asrs-flow/public/model/03-1\350\264\247\346\236\266\350\247\204\346\240\274\350\264\247\347\211\251.fbx"
rename to zy-asrs-flow/public/model/03.fbx
Binary files differ
diff --git "a/zy-asrs-flow/public/model/03-2\350\264\247\346\236\266\344\270\215\350\247\204\345\210\231\350\264\247\347\211\251.fbx" b/zy-asrs-flow/public/model/04.fbx
similarity index 100%
rename from "zy-asrs-flow/public/model/03-2\350\264\247\346\236\266\344\270\215\350\247\204\345\210\231\350\264\247\347\211\251.fbx"
rename to zy-asrs-flow/public/model/04.fbx
Binary files differ
diff --git "a/zy-asrs-flow/public/model/03-3\350\264\247\346\236\266\346\234\250\347\256\261.fbx" b/zy-asrs-flow/public/model/05.fbx
similarity index 100%
rename from "zy-asrs-flow/public/model/03-3\350\264\247\346\236\266\346\234\250\347\256\261.fbx"
rename to zy-asrs-flow/public/model/05.fbx
Binary files differ
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
index a1fc0e9..4ded7ab 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -191,14 +191,24 @@
// fn(this.addObject);
const loader = new FBXLoader();
const promise = new Promise((resolve) => {
- loader.load('model/001-5.fbx', (mesh) => {
+ loader.load('model/04.fbx', (mesh) => {
mesh.position.set(0, 10, 0);
mesh.scale.set(5, 5, 5);
mesh.name = '1-1-1';
// mesh.rotation.x = Utils.rotationParseNum(270);
mesh.traverse(function (child) {
if (child.isMesh) {
- child.name = '1-1-1';
+
+ if (child.name === '涓嶈鍒�') {
+ // child.visible = false;
+ console.log(material);
+ }
+ if (child.name === '璐ф灦') {
+ child.material.color.set(0x4680BF);
+ }
+ // if (child.name === '鎵樼洏') {
+ // child.material.color.set(0xBEBEBE);
+ // }
child.castShadow = true;
child.receiveShadow = true;
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java
index 5322c90..dc29473 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java
@@ -12,4 +12,6 @@
private String curLocNo;
+
+
}
--
Gitblit v1.9.1