From 583b31d46bb8abbee7410d29ca229120ee589cba Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 10:10:08 +0800
Subject: [PATCH] # version merge
---
zy-acs-flow/src/map/insight/agv/AgvMain.jsx | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/zy-acs-flow/src/map/insight/agv/AgvMain.jsx b/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
index d15684b..0167d0a 100644
--- a/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
+++ b/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
@@ -63,8 +63,12 @@
loadModel('model/agv/body.fbx'),
loadModel('model/agv/loader.fbx'),
loadModel('model/agv/fork.fbx'),
+ // loadModel('model/asr/body.fbx'),
+ // loadModel('model/asr/loader.fbx'),
+ // loadModel('model/asr/fork.fbx'),
]).then(([bodyMesh, loaderMesh, forkMesh]) => {
const scaleVal = 1;
+ // const scaleVal = 0.48;
bodyMesh.scale.set(scaleVal, scaleVal, scaleVal);
loaderMesh.scale.set(scaleVal, scaleVal, scaleVal);
forkMesh.scale.set(scaleVal, scaleVal, scaleVal);
@@ -72,6 +76,9 @@
bodyMesh.position.set(55, 0, 0);;
loaderMesh.position.set(55, 150, 0);;
forkMesh.position.set(55, 165, 0);;
+ // bodyMesh.position.set(55, 0, 0);;
+ // loaderMesh.position.set(55, 150, 0);;
+ // forkMesh.position.set(55, 165, 0);;
const agvGroup = new THREE.Group();
agvGroup.add(bodyMesh);
@@ -177,13 +184,13 @@
<Grid item xs={12}>
<KeyValuePair label={translate('common.field.status')} value={info?.agvStatus} />
</Grid>
- <Grid item xs={12}>
- <KeyValuePair label={translate('table.field.agvDetail.vol')} value={info?.vol} />
- </Grid>
{/* <Grid item xs={12}>
- <KeyValuePair label={translate('table.field.agvDetail.soc')} value={info?.soc} />
+ <KeyValuePair label={translate('table.field.agvDetail.vol')} value={info?.vol} />
</Grid> */}
<Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.agvDetail.soc')} value={info?.soc} />
+ </Grid>
+ <Grid item xs={12}>
<KeyValuePair label={translate('table.field.agvDetail.agvAngle')} value={info?.direction} />
</Grid>
<Grid item xs={12}>
--
Gitblit v1.9.1