From 1930a52581c2189e0a929985d14bd67ec96f7988 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 24 四月 2024 15:25:57 +0800
Subject: [PATCH] #

---
 src/core/warehouse.jsx |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/core/warehouse.jsx b/src/core/warehouse.jsx
index 89a95c8..f1bea49 100644
--- a/src/core/warehouse.jsx
+++ b/src/core/warehouse.jsx
@@ -1,10 +1,13 @@
 import { useState, useEffect, useRef, useMemo } from 'react';
 import { useFrame } from '@react-three/fiber';
 import * as THREE from 'three';
-import Agv from '../components/agv';
-import Box from '../components/box';
-import tunnelData from '../assets/data/tunnel';
 import Tunnel from '../components/tunnel';
+import Shelf from '../components/shelf';
+import Box from '../components/box';
+import Agv from '../components/agv';
+
+import tunnelData from '@/assets/data/tunnel';
+import shelfData from '@/assets/data/shelf';
 import agvRealDataList from '@/assets/data/agv';
 import { INTERVAL_TIME } from '@/config/setting'
 
@@ -13,6 +16,8 @@
 const Warehouse = (props) => {
 
     const [agvData, setAgvData] = useState([
+        {}
+        ,
         {}
     ]);
     const [boxData, setBoxData] = useState([
@@ -23,7 +28,7 @@
         const timer = setInterval(() => {
             const agvRealData = agvRealDataList[index];
             if (agvRealData) {
-                setAgvData(agvRealData);
+                // setAgvData(agvRealData);
             }
             index++;
         }, INTERVAL_TIME * 1.1);
@@ -34,7 +39,15 @@
     }, [])
 
     const tunnelEl = useMemo(() => {
-        return tunnelData.map((tunnel, index) => <Tunnel key={index} {...tunnel} />)
+        return tunnelData.map((data, index) => <Tunnel key={index} {...data} />)
+    }, []);
+
+    const shelfEl = useMemo(() => {
+        return shelfData.map((data, index) => <Shelf key={index} {...data} />)
+    }, []);
+
+    const shelfEl1 = useMemo(() => {
+        return shelfData.slice(0, 1).map((data, index) => <Shelf key={index} {...data} />)
     }, []);
 
     const agvEl = useMemo(() => {
@@ -53,6 +66,8 @@
         <>
             <group>
                 {tunnelEl}
+                {shelfEl}
+                {/* {shelfEl1} */}
                 {agvEl}
                 {boxEl}
             </group>

--
Gitblit v1.9.1