From 4bef71e0cf39ab5f2db45c147d6ab7bbc80e756c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 20 八月 2024 16:06:14 +0800
Subject: [PATCH] #
---
src/components/path.jsx | 15 +--------------
src/core/warehouse.jsx | 20 ++++++--------------
2 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/src/components/path.jsx b/src/components/path.jsx
index da8259b..55dd37b 100644
--- a/src/components/path.jsx
+++ b/src/components/path.jsx
@@ -13,8 +13,6 @@
REAL_COMPARE_MAP_OFFSET_Z,
} from '../config/setting'
-const width = 200;
-
const getMajorPos = (position) => {
return {
x: position?.[2] * REAL_COMPARE_MAP_SCALE + REAL_COMPARE_MAP_OFFSET_X,
@@ -44,23 +42,12 @@
}, [points]);
- useEffect(() => {
- // console.log(JSON.stringify(props.list));
- //[{"code":"00000052","position":[4961,0,2420],"serial":6},{"code":"00000053","position":[5491,0,2420],"serial":7},{"code":"00000054","position":[6021,0,2420],"serial":8}]
- }, [props])
-
return (
<>
<group>
- {/* <mesh position={} rotation={[]}>
- <planeGeometry
- args={[width, height]}
- ></planeGeometry>
- <meshBasicMaterial color="rgb(23,146,247)"></meshBasicMaterial>
- </mesh> */}
<line ref={lineRef}>
<bufferGeometry attach="geometry" />
- <lineBasicMaterial attach="material" color="rgb(23,146,247)" linewidth={width} />
+ <lineBasicMaterial attach="material" color="rgb(23,146,247)" linewidth={50} />
</line>
</group>
</>
diff --git a/src/core/warehouse.jsx b/src/core/warehouse.jsx
index b8af939..c9b74c3 100644
--- a/src/core/warehouse.jsx
+++ b/src/core/warehouse.jsx
@@ -24,7 +24,7 @@
const [agv1Data, setAgv1Data] = useState({});
const [agv2Data, setAgv2Data] = useState({});
const [boxData, setBoxData] = useState([]);
- const [path1Data, setPath1Data] = useState([]);
+ const [pathData, setPathData] = useState([]);
useEffect(() => {
const websocket = new WebSocketClient('/ws/digitalTwin/websocket');
@@ -44,15 +44,7 @@
}
}
if (data.type === 'path') {
- switch (data.no) {
- case "1":
- setPath1Data(data.obj);
- break;
- case "2":
- break;
- default:
- break;
- }
+ setPathData(data.obj);
}
}
@@ -106,9 +98,9 @@
return <Agv key={2} {...agv2Data} />
}, [agv2Data]);
- const path1El = useMemo(() => {
- return <Path list={path1Data} />
- }, [path1Data])
+ const pathEl = useMemo(() => {
+ return pathData.map((data, idx) => <Path key={idx} list={data} />)
+ }, [pathData])
useFrame((state, delta) => {
@@ -123,7 +115,7 @@
{agv1El}
{agv2El}
{boxEl}
- {path1El}
+ {pathEl}
</group>
</>
)
--
Gitblit v1.9.1