From 3fa7cdec6ce44f07a0dc7e1910511ead606990f3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 11 九月 2025 08:19:53 +0800
Subject: [PATCH] 1
---
zy-acs-flow/src/map/insight/agv/AgvMain.jsx | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/zy-acs-flow/src/map/insight/agv/AgvMain.jsx b/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
index c5aaf5b..d15684b 100644
--- a/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
+++ b/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
@@ -14,7 +14,7 @@
} from '@mui/material';
import { useNotification } from '../../Notification';
import AgvThree from './AgvThree';
-import { handleRestoreAgvAll } from '../../http';
+import { handleRestoreAgvAll, handleAgvPatrol } from '../../http';
import BoolValueIcon from '../BoolValueIcon';
import ConfirmButton from '../../../page/components/ConfirmButton';
import { grey } from '@mui/material/colors';
@@ -92,7 +92,7 @@
}
useEffect(() => {
- if (info) {
+ if (curAgvNo) {
setLoading(true);
setTimeout(() => {
startThree(containerRef.current);
@@ -101,7 +101,7 @@
}, 200);
}
return endThree;
- }, [info]);
+ }, [curAgvNo]);
const handleRestoreAll = () => {
handleRestoreAgvAll({ agvNo: info.agvNo });
@@ -120,6 +120,13 @@
notify.success(translate('common.response.fail'));
console.error(`Error: ${error.message}`);
});
+ }
+
+ const patrolControl = async () => {
+ const res = await handleAgvPatrol({ agvNo: info.agvNo })
+ if (res) {
+ fetchAgvInfo(curAgvNo);
+ }
}
return (
@@ -165,19 +172,25 @@
<KeyValuePair label={translate('table.field.agvDetail.pos')} value={info?.pos} bool />
</Grid>
<Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.agvDetail.code')} value={info?.code} />
+ </Grid>
+ <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}>
+ {/* <Grid item xs={12}>
<KeyValuePair label={translate('table.field.agvDetail.soc')} value={info?.soc} />
- </Grid>
+ </Grid> */}
<Grid item xs={12}>
<KeyValuePair label={translate('table.field.agvDetail.agvAngle')} value={info?.direction} />
</Grid>
<Grid item xs={12}>
- <KeyValuePair label={translate('table.field.agvDetail.backpack')} value={info?.backpack.filter(item => item.loaded === true).length} />
+ <KeyValuePair label={translate('table.field.agvDetail.backpack')} value={info?.backpack?.filter(item => item.loaded === true).length} />
+ </Grid>
+ <Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.agvDetail.error')} value={info?.error} />
</Grid>
<Grid item xs={12}>
<KeyValuePair label={translate('table.field.agvDetail.task')} value={info?.taskIds?.join(',')} />
@@ -193,7 +206,8 @@
}}>
<Grid container spacing={2} style={{ marginTop: '0px' }}>
<Grid item xs={12}>
- <Stack spacing={2} mt={2}>
+ <Stack spacing={1} mt={2}>
+ {/* more */}
<Button
color="primary"
variant="contained"
@@ -203,8 +217,33 @@
>
{translate('page.map.settings.map.more.title')}
</Button>
+ {/* patrol */}
{info && (
- info.status === 1
+ info.patrol
+ ?
+ <Button variant="contained" color="error" fullWidth onClick={() => {
+ patrolControl();
+ }}>
+ {translate('page.map.action.stopPatrol')}
+ </Button>
+ :
+ // <Button variant="contained" fullWidth onClick={() => {
+ // patrolControl();
+ // }}>
+ // {translate('page.map.action.startPatrol')}
+ // </Button>
+ <ConfirmButton
+ label="page.map.action.startPatrol"
+ color="primary"
+ variant="contained"
+ onConfirm={() => {
+ patrolControl();
+ }}
+ />
+ )}
+ {/* status */}
+ {info && (
+ info.status === 0
? <Button variant="contained" color="error" fullWidth onClick={() => {
updateStatus();
}}>
@@ -216,6 +255,7 @@
{translate('page.map.action.enable')}
</Button>
)}
+ {/* restore all */}
<ConfirmButton
label="page.map.action.restoreALl"
color="inherit"
--
Gitblit v1.9.1