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/action/Action.jsx | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/zy-acs-flow/src/page/action/Action.jsx b/zy-acs-flow/src/page/action/Action.jsx index d7999de..766f824 100644 --- a/zy-acs-flow/src/page/action/Action.jsx +++ b/zy-acs-flow/src/page/action/Action.jsx @@ -8,7 +8,7 @@ } from 'react-admin'; import { Box, - Button, + Divider, Stack, Tooltip, Typography, @@ -39,8 +39,14 @@ > {data.priority} </Avatar> - <Typography color="text.secondary" variant="body2"> + <Typography color="textPrimary" variant="body2" sx={{ transform: 'scale(1.1)', pl: 1, pr: .1 }}> {data.actionType$} + </Typography> + <Typography + variant="body2" + color="textSecondary" + > + ({data.actionSts$ || '-'}) </Typography> <Box flex={1}></Box> <Typography @@ -49,10 +55,12 @@ component="span" > {/* {formatRelative(new Date(data.ioTime), new Date())} */} - {format(data.ioTime, 'yyyy-MM-dd HH:mm:ss') || '-'} + {/* {format(data.ioTime, 'yyyy-MM-dd HH:mm:ss') || '-'} */} + No.{data.uuid} </Typography> </Stack> <Stack + direction="row" sx={{ paddingTop: '0.5em', display: 'flex', @@ -62,13 +70,31 @@ }} > <Typography - component="p" variant="body2" - lineHeight={1.5} - margin={0} + color="textSecondary" > - {/* // taskNo code val param action sts uuid - {paragraph} */} + {translate('table.field.action.taskId')}: {data.taskId$ || '-'} + </Typography> + <Divider orientation="vertical" flexItem sx={{ marginX: 1 }} /> + <Typography + variant="body2" + color="textSecondary" + > + {translate('table.field.action.code')}: {data.code || '-'} + </Typography> + <Divider orientation="vertical" flexItem sx={{ marginX: 1 }} /> + <Typography + variant="body2" + color="textSecondary" + > + {translate('table.field.action.val')}: {data.val || '-'} + </Typography> + <Divider orientation="vertical" flexItem sx={{ marginX: 1 }} /> + <Typography + variant="body2" + color="textSecondary" + > + {translate('table.field.action.params')}: {data.param || '-'} </Typography> </Stack> </Box> -- Gitblit v1.9.1