From 3a9a06e078a9d08b9da5ed41d5e63ab67637c909 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 30 三月 2024 13:37:31 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx | 3 +--
zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx | 11 ++++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx b/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
index c42b979..3196964 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/index.jsx
@@ -17,11 +17,10 @@
const { curSprite, curFloor } = props;
const [activeTabKey, setActiveTabKey] = useState('view');
- const [curLocNo, setCurLocNo] = React.useState(curSprite.data.no + '-' + curFloor);
+ const [curLocNo, setCurLocNo] = React.useState(''); // just used to modify the drawer title
useEffect(() => {
const locNo = curSprite.data.no + '-' + curFloor;
- props.setDrawerTitle(intl.formatMessage({ id: 'map.loc.no', defaultMessage: '搴撲綅鍙�' }) + ': ' + locNo);
setCurLocNo(locNo);
}, [curSprite]);
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 283336c..921777b 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
@@ -61,15 +61,16 @@
const { styles } = useStyles();
const refContainer = useRef();
- const { data, curLocNo, setCurLocNo } = props;
+ const { data, curFloor, curLocNo, setCurLocNo } = props;
const [loading, setLoading] = React.useState(false);
useEffect(() => {
+ const originLocNo = data.no + '-' + curFloor;
+
endThree();
setLoading(true);
const fetchShelfInfo = async (locNo) => {
- console.log("api-" + locNo);
const res = await Http.doGet('/api/map/shelf/info', { locNo: locNo });
if (res?.data && shelfThree) {
shelfThree.generateMesh((addObject) => {
@@ -97,10 +98,10 @@
setTimeout(() => {
startThree(refContainer.current);
- shelfThree.handleClick = (locNo) => {
- setCurLocNo(locNo);
+ shelfThree.handleClick = (objName) => {
+ setCurLocNo(objName);
}
- fetchShelfInfo(curLocNo); // curLoc鏇存柊涓嶅強鏃�
+ fetchShelfInfo(originLocNo); // curLoc鏇存柊涓嶅強鏃�
setLoading(false);
}, 300)
--
Gitblit v1.9.1