From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 04 十一月 2024 10:22:45 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/mission/MissionShow.jsx | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/zy-acs-flow/src/page/mission/MissionShow.jsx b/zy-acs-flow/src/page/mission/MissionShow.jsx index 6a45af4..4ccffc4 100644 --- a/zy-acs-flow/src/page/mission/MissionShow.jsx +++ b/zy-acs-flow/src/page/mission/MissionShow.jsx @@ -26,11 +26,13 @@ useTheme, } from '@mui/material'; import DialogCloseButton from "../components/DialogCloseButton"; -import { blueGrey } from '@mui/material/colors'; +import { blueGrey, blue } from '@mui/material/colors'; import MoveToInboxIcon from '@mui/icons-material/MoveToInbox'; import { format } from 'date-fns'; import { TaskList } from "./TaskList"; import { ActionsIterator } from "../action/ActionsIterator"; +import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos'; + const MissionShow = ({ open, id }) => { const redirect = useRedirect(); @@ -66,7 +68,6 @@ const record = useRecordContext(); const translate = useTranslate(); if (!record) return null; - console.log(record); return ( <> @@ -87,7 +88,7 @@ sx={{ width: 30, height: 30, - bgcolor: blueGrey[500], + bgcolor: theme.palette.primary.main, }} > {record.agv} @@ -111,7 +112,7 @@ color="textSecondary" variant="caption" > - Last sending date + {translate('table.field.mission.lastSendDate')} </Typography> <Stack direction="row" @@ -129,7 +130,7 @@ color="textSecondary" variant="caption" > - Bus No + {translate('table.field.bus.busNo')} </Typography> <Typography variant="body2"> {record.busNo || '-'} @@ -153,7 +154,7 @@ color="textSecondary" variant="caption" > - Action Count + {translate('table.field.mission.actionCount')} </Typography> <Typography variant="body2"> {record.actionCount || 'unknown'} @@ -173,7 +174,7 @@ color="textSecondary" variant="caption" > - Tasks + {translate('table.field.mission.task')} </Typography> <ReferenceArrayField source="contact_ids" @@ -191,7 +192,7 @@ color="textSecondary" variant="caption" > - Run Path + {translate('table.field.mission.runPath')} </Typography> <Typography variant="body2" sx={{ whiteSpace: 'normal', overflow: 'hidden', display: 'flex', flexWrap: 'wrap' }}> [ {record.codeList.map((code, index) => ( @@ -206,6 +207,12 @@ )} <Box m={2}> + <Typography + color="textSecondary" + variant="caption" + > + {translate('table.field.mission.actions')} + </Typography> <Divider /> <ActionsIterator actionIds={record.actionIds} /> </Box> @@ -224,13 +231,16 @@ const translate = useTranslate(); const handleClick = () => { - alert(1); + redirect(`/mission/${record.id}/resend`, undefined, undefined, undefined, { + _scrollToTop: false, + }); }; return ( <Button onClick={handleClick} - startIcon={<MoveToInboxIcon />} + // startIcon={<MoveToInboxIcon />} + endIcon={<ArrowForwardIosIcon />} size="small" > {translate('common.action.resend')} -- Gitblit v1.9.1