From d835d1b51f832889929cdf69010034a30ef44d02 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 13:57:29 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 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 d020f2a..ee7ac25 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
@@ -7,6 +7,7 @@
import * as Utils from '../../utils'
import Http from '@/utils/http';
import ShelfThree from './shelfThree'
+import BoolValueIcon from '@/components/BoolValueIcon';
const useStyles = createStyles(({ token, css }) => {
return {
@@ -56,8 +57,8 @@
}
}
-const fetchShelfInfo = async (locNo) => {
- const res = await Http.doGet('/api/map/shelf/info', { locNo: locNo });
+const fetchShelfGroup = async (locNo) => {
+ const res = await Http.doGet('/api/map/shelf/group', { locNo: locNo });
if (res?.data && shelfThree) {
shelfThree.generateMesh((loader, addObject) => {
const promises = [];
@@ -65,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;
@@ -107,7 +108,7 @@
Promise.all(promises).then(() => {
shelfThree.setNewSelectedMesh(locNo);
- shelfThree.rePerspective(singleHeight * res.data.length);
+ shelfThree.rePerspective(singleHeight * res.data.length, 500);
}).catch(error => {
console.error(error);
});
@@ -122,6 +123,7 @@
const { data, curFloor, curLocNo, setCurLocNo } = props;
const [loading, setLoading] = React.useState(false);
+ const [info, setInfo] = React.useState(null);
useEffect(() => {
// init curLocNo
@@ -136,12 +138,25 @@
shelfThree.handleClick = (objName) => {
setCurLocNo(objName);
};
- fetchShelfInfo(originLocNo);
+ fetchShelfGroup(originLocNo);
setLoading(false);
}, 300)
return endThree;
}, [data]);
+
+ useEffect(() => {
+ if (!curLocNo) {
+ return;
+ }
+ const fetchShelfInfo = async (locNo) => {
+ const res = await Http.doGet('/api/map/shelf/info', { locNo: locNo });
+ if (res?.data) {
+ setInfo(res.data);
+ }
+ }
+ fetchShelfInfo(curLocNo);
+ }, [curLocNo])
return (
<>
@@ -164,22 +179,22 @@
items={
[
{
- key: '1',
label: intl.formatMessage({ id: 'map.loc.no', defaultMessage: '搴撲綅鍙�' }),
children: curLocNo,
},
{
- key: '2',
+ label: intl.formatMessage({ id: 'map.loc.sts', defaultMessage: '搴撲綅鐘舵��' }),
+ children: info?.locSts,
+ },
+ {
label: intl.formatMessage({ id: 'map.pallet.barcode', defaultMessage: '鎵樼洏鏉＄爜' }),
- children: '80000010',
+ children: info?.zpallet,
},
{
- key: '3',
label: intl.formatMessage({ id: 'map.is.enable', defaultMessage: '鏄惁鍚敤' }),
- children: 'Disabled',
+ children: <BoolValueIcon value={info?.enable} />,
},
{
- key: '4',
label: intl.formatMessage({ id: 'map.loc.operation', defaultMessage: '搴撲綅鎿嶄綔' }),
children: (
<>
--
Gitblit v1.9.1