From afa8b789bf9ade50f8b76ad33776115a3ff2cc96 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 五月 2024 16:09:25 +0800
Subject: [PATCH] #
---
src/assets/data/agv.js | 2 +-
src/config/setting.js | 8 +++++---
src/assets/data/shelf.js | 2 +-
src/core/warehouse.jsx | 4 ----
src/components/agv.jsx | 14 +++++++-------
5 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/assets/data/agv.js b/src/assets/data/agv.js
index 49bc8a5..0cefe0d 100644
--- a/src/assets/data/agv.js
+++ b/src/assets/data/agv.js
@@ -588,7 +588,7 @@
hasBox: true
},
],
- hasBox: false
+ hasBox: true
}
],
]
\ No newline at end of file
diff --git a/src/assets/data/shelf.js b/src/assets/data/shelf.js
index 2976170..44e5f84 100644
--- a/src/assets/data/shelf.js
+++ b/src/assets/data/shelf.js
@@ -1,7 +1,7 @@
import * as Common from '@/utils/common';
// row
-const shelfRowOffset = 1000;
+const shelfRowOffset = 850 ;
const realRowPos = [0 - shelfRowOffset, 0 + shelfRowOffset, 2420 - shelfRowOffset, 2420 + shelfRowOffset];
// bay
diff --git a/src/components/agv.jsx b/src/components/agv.jsx
index fc893a6..b0cc514 100644
--- a/src/components/agv.jsx
+++ b/src/components/agv.jsx
@@ -172,16 +172,16 @@
<primitive object={loaderModel} castShadow position={[0, 20, 0]} />
<group position-z={forkDis}>
<primitive object={forkModel} castShadow position={[0, 25, 0]} />
- {hasBox && <Box position={[0, 24, 0]} />}
+ {hasBox && <Box position={[0, 26, 0]} />}
</group>
</group>
<group>
- {realTrayList?.[0]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 25, 0]} />}
- {realTrayList?.[1]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 48, 0]} />}
- {realTrayList?.[2]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 71, 0]} />}
- {realTrayList?.[3]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 94, 0]} />}
- {realTrayList?.[4]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 117, 0]} />}
- {realTrayList?.[5]?.hasBox && <Box rotationY={Math.PI / 2} position={[-43, 140, 0]} />}
+ {realTrayList?.[0]?.hasBox && <Box rotationY={Math.PI / 2} position={[-60, 34, 0]} />}
+ {realTrayList?.[1]?.hasBox && <Box rotationY={Math.PI / 2} position={[-60, 66, 0]} />}
+ {realTrayList?.[2]?.hasBox && <Box rotationY={Math.PI / 2} position={[-60, 99, 0]} />}
+ {realTrayList?.[3]?.hasBox && <Box rotationY={Math.PI / 2} position={[-60, 131, 0]} />}
+ {realTrayList?.[4]?.hasBox && <Box rotationY={Math.PI / 2} position={[-60, 163, 0]} />}
+ {realTrayList?.[5]?.hasBox && <Box rotationY={Math.PI / 2} position={[-60, 195, 0]} />}
</group>
</group>
</>
diff --git a/src/config/setting.js b/src/config/setting.js
index 7892d4f..5446bf3 100644
--- a/src/config/setting.js
+++ b/src/config/setting.js
@@ -10,11 +10,13 @@
// model scale rate
-export const MODEL_AGV_SCALE = .5;
+export const BATCH_SCALE = 1.3;
-export const MODEL_BOX_SCALE = .5;
+export const MODEL_AGV_SCALE = .7;
-export const MODEL_SHELF_SCALE = { x: 0.8, y: 0.52, z: 0.55 };
+export const MODEL_BOX_SCALE = .7;
+
+export const MODEL_SHELF_SCALE = { x: 0.8, y: 0.8, z: 0.75 };
// shelf scale & offset
diff --git a/src/core/warehouse.jsx b/src/core/warehouse.jsx
index b23b8b0..db491e0 100644
--- a/src/core/warehouse.jsx
+++ b/src/core/warehouse.jsx
@@ -62,10 +62,6 @@
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 boxEl = useMemo(() => {
return boxData.map((data, idx) => <Box key={idx} {...data} />)
}, [boxData]);
--
Gitblit v1.9.1