From 73e5e4f17c23a7f4832ea2bb36e1bd3799ab9ad9 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 26 四月 2024 14:28:03 +0800 Subject: [PATCH] # --- src/core/warehouse.jsx | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/core/warehouse.jsx b/src/core/warehouse.jsx index 035b9f3..23eda47 100644 --- a/src/core/warehouse.jsx +++ b/src/core/warehouse.jsx @@ -2,13 +2,16 @@ import { useFrame } from '@react-three/fiber'; import * as THREE from 'three'; import Tunnel from '../components/tunnel'; +import Area from '../components/area'; import Shelf from '../components/shelf'; import Box from '../components/box'; import Agv from '../components/agv'; import tunnelData from '@/assets/data/tunnel'; +import areaData from '@/assets/data/area'; import shelfData from '@/assets/data/shelf'; import agvRealDataList from '@/assets/data/agv'; +import { getBoxData } from '../api/box'; import { INTERVAL_TIME } from '@/config/setting' let index = 0; @@ -17,15 +20,15 @@ const [agvData, setAgvData] = useState([ {} - , - {} ]); - const [boxData, setBoxData] = useState([ - {} - ]) + const [boxData, setBoxData] = useState([]) useEffect(() => { const timer = setInterval(() => { + getBoxData().then(res => { + setBoxData(res); + }) + const agvRealData = agvRealDataList[index]; if (agvRealData) { setAgvData(agvRealData); @@ -42,17 +45,26 @@ return tunnelData.map((data, index) => <Tunnel key={index} {...data} />) }, []); + const areaEl = useMemo(() => { + return areaData.map((area, index) => <Area key={index} {...area} />) + }, []); + const shelfEl = useMemo(() => { return shelfData.map((data, index) => <Shelf key={index} {...data} />) }, []); - const agvEl = useMemo(() => { - return agvData.map((data, idx) => <Agv key={idx} {...data} />) - }, [agvData]); + const shelfEl1 = useMemo(() => { + return shelfData.slice(0, 1).map((data, index) => <Shelf key={index} {...data} />) + }, []); const boxEl = useMemo(() => { return boxData.map((data, idx) => <Box key={idx} {...data} />) }, [boxData]); + + const agvEl = useMemo(() => { + return agvData.map((data, idx) => <Agv key={idx} {...data} />) + }, [agvData]); + useFrame((state, delta) => { @@ -62,7 +74,9 @@ <> <group> {tunnelEl} + {areaEl} {shelfEl} + {/* {shelfEl1} */} {agvEl} {boxEl} </group> -- Gitblit v1.9.1