From 9d71e24e7982f6915e5f832512925bee9b245f35 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 20 八月 2024 16:13:26 +0800
Subject: [PATCH] #
---
src/core/warehouse.jsx | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/src/core/warehouse.jsx b/src/core/warehouse.jsx
index 1792fad..c9b74c3 100644
--- a/src/core/warehouse.jsx
+++ b/src/core/warehouse.jsx
@@ -7,6 +7,7 @@
import Shelf from '../components/shelf';
import Box from '../components/box';
import Agv from '../components/agv';
+import Path from '../components/path'
import tunnelData from '@/assets/data/tunnel';
import areaData from '@/assets/data/area';
@@ -20,12 +21,10 @@
const Warehouse = (props) => {
- const [agvData, setAgvData] = useState([
- {}
- ]);
const [agv1Data, setAgv1Data] = useState({});
const [agv2Data, setAgv2Data] = useState({});
const [boxData, setBoxData] = useState([]);
+ const [pathData, setPathData] = useState([]);
useEffect(() => {
const websocket = new WebSocketClient('/ws/digitalTwin/websocket');
@@ -44,6 +43,9 @@
break;
}
}
+ if (data.type === 'path') {
+ setPathData(data.obj);
+ }
}
const timer = setInterval(() => {
@@ -58,19 +60,6 @@
// console.log(res);
setBoxData(res);
})
-
- // getAgvData().then(res => {
- // // console.log(JSON.stringify(res))
- // if (res && res.length > 0) {
- // setAgvData(res);
- // }
- // })
-
- const agvRealData = agvRealDataList[index];
- if (agvRealData) {
- // setAgvData(agvRealData);
- }
- index++;
}, INTERVAL_TIME);
return () => {
@@ -101,10 +90,6 @@
return boxData.map((data, idx) => <Box key={idx} {...data} />)
}, [boxData]);
- const agvEl = useMemo(() => {
- return agvData.map((data, idx) => <Agv key={idx} {...data} />)
- }, [agvData]);
-
const agv1El = useMemo(() => {
return <Agv key={1} {...agv1Data} />
}, [agv1Data]);
@@ -113,6 +98,9 @@
return <Agv key={2} {...agv2Data} />
}, [agv2Data]);
+ const pathEl = useMemo(() => {
+ return pathData.map((data, idx) => <Path key={idx} list={data} />)
+ }, [pathData])
useFrame((state, delta) => {
@@ -124,10 +112,10 @@
{tunnelEl}
{areaEl}
{shelfEl}
- {/* {agvEl} */}
{agv1El}
{agv2El}
{boxEl}
+ {pathEl}
</group>
</>
)
--
Gitblit v1.9.1