From 28f9d6aadef16cafb888ff6bcc97f99bde971d8d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 10 五月 2024 13:58:20 +0800
Subject: [PATCH] #
---
src/core/warehouse.jsx | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/src/core/warehouse.jsx b/src/core/warehouse.jsx
index 24224fa..0118bd1 100644
--- a/src/core/warehouse.jsx
+++ b/src/core/warehouse.jsx
@@ -1,11 +1,18 @@
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 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 { getAgvData } from '../api/agv';
import { INTERVAL_TIME } from '@/config/setting'
let index = 0;
@@ -15,16 +22,32 @@
const [agvData, setAgvData] = useState([
{}
]);
-
- const [boxData, setBoxData] = useState([
- {}
- ])
+ const [boxData, setBoxData] = useState([])
useEffect(() => {
const timer = setInterval(() => {
+ getBoxData().then(res => {
+ // res.push({
+ // locNo: "A100301001",
+ // row: 3,
+ // bay: 1,
+ // lev: 1,
+ // locSts: "STOCK",
+ // })
+ // 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);
+ // setAgvData(agvRealData);
}
index++;
}, INTERVAL_TIME);
@@ -35,12 +58,25 @@
}, [])
const tunnelEl = useMemo(() => {
- return tunnelData.map((tunnel, index) => <Tunnel key={index} {...tunnel} />)
+ return tunnelData.map((data, index) => <Tunnel key={index} {...data} />)
}, []);
- const agvEl = agvData.map((data, idx) => <Agv key={idx} {...data} />)
+ const areaEl = useMemo(() => {
+ return areaData.map((area, index) => <Area key={index} {...area} />)
+ }, []);
- const boxEl = boxData.map((data, idx) => <Box key={idx} {...data} />)
+ const shelfEl = useMemo(() => {
+ return shelfData.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) => {
@@ -50,6 +86,8 @@
<>
<group>
{tunnelEl}
+ {areaEl}
+ {shelfEl}
{agvEl}
{boxEl}
</group>
--
Gitblit v1.9.1