From 99a13ac3e2c52881577cbf4a69ccc17f349eeec7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 四月 2024 09:22:12 +0800
Subject: [PATCH] #
---
/dev/null | 0
zy-asrs-flow/public/model/shelf.fbx | 0
zy-asrs-wcs/src/main/resources/application.yml | 2 +-
zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx | 2 +-
4 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-flow/public/model/001-1.fbx b/zy-asrs-flow/public/model/001-1.fbx
deleted file mode 100644
index 387d8fe..0000000
--- a/zy-asrs-flow/public/model/001-1.fbx
+++ /dev/null
Binary files differ
diff --git a/zy-asrs-flow/public/model/001-5.fbx b/zy-asrs-flow/public/model/001-5.fbx
deleted file mode 100644
index 62717da..0000000
--- a/zy-asrs-flow/public/model/001-5.fbx
+++ /dev/null
Binary files differ
diff --git a/zy-asrs-flow/public/model/01.fbx b/zy-asrs-flow/public/model/01.fbx
deleted file mode 100644
index dd0903d..0000000
--- a/zy-asrs-flow/public/model/01.fbx
+++ /dev/null
Binary files differ
diff --git a/zy-asrs-flow/public/model/02.fbx b/zy-asrs-flow/public/model/02.fbx
deleted file mode 100644
index 138ba48..0000000
--- a/zy-asrs-flow/public/model/02.fbx
+++ /dev/null
Binary files differ
diff --git a/zy-asrs-flow/public/model/03.fbx b/zy-asrs-flow/public/model/03.fbx
deleted file mode 100644
index 1663439..0000000
--- a/zy-asrs-flow/public/model/03.fbx
+++ /dev/null
Binary files differ
diff --git a/zy-asrs-flow/public/model/05.fbx b/zy-asrs-flow/public/model/05.fbx
deleted file mode 100644
index b78a522..0000000
--- a/zy-asrs-flow/public/model/05.fbx
+++ /dev/null
Binary files differ
diff --git a/zy-asrs-flow/public/model/04.fbx b/zy-asrs-flow/public/model/shelf.fbx
similarity index 100%
rename from zy-asrs-flow/public/model/04.fbx
rename to zy-asrs-flow/public/model/shelf.fbx
Binary files differ
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 52e098c..ee7ac25 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
@@ -66,7 +66,7 @@
for (const item of res.data) {
const { lev } = Utils.parseLocNo(item.locNo);
promises.push(new Promise((resolve) => {
- loader.load('model/04.fbx', (mesh) => {
+ loader.load('model/shelf.fbx', (mesh) => {
mesh.position.set(0, singleHeight * (lev - 1), 0);
mesh.scale.set(5, 5, 5);
mesh.name = item.locNo;
diff --git a/zy-asrs-wcs/src/main/resources/application.yml b/zy-asrs-wcs/src/main/resources/application.yml
index f9f4428..6c56228 100644
--- a/zy-asrs-wcs/src/main/resources/application.yml
+++ b/zy-asrs-wcs/src/main/resources/application.yml
@@ -18,7 +18,7 @@
# url: jdbc:mysql://47.97.1.152:3306/asrs?useUnicode=trKue&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
# username: root
# password: zy@123
- url: jdbc:mysql://192.168.4.15:3306/asrs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://localhost:3306/asrs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: xltys1995
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
--
Gitblit v1.9.1