From f7a68273c9ae23eb81e90eb0349c8314ccd8927c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 十一月 2024 09:15:04 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/action/Action.jsx |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/zy-acs-flow/src/page/action/Action.jsx b/zy-acs-flow/src/page/action/Action.jsx
index d6bf503..766f824 100644
--- a/zy-acs-flow/src/page/action/Action.jsx
+++ b/zy-acs-flow/src/page/action/Action.jsx
@@ -22,7 +22,6 @@
     const translate = useTranslate();
     const theme = useTheme();
     const [isHover, setHover] = useState(false);
-    console.log(data);
 
     return (
         <Box
@@ -40,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"
+                >
+                    &nbsp;({data.actionSts$ || '-'})
                 </Typography>
                 <Box flex={1}></Box>
                 <Typography
@@ -50,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',
@@ -61,26 +68,33 @@
                         minHeight: '0.75em',
                     },
                 }}
-                direction="row"
             >
                 <Typography
                     variant="body2"
                     color="textSecondary"
-                    lineHeight={1.5}
-                    margin={0}
                 >
-                    task: {data.taskId$}
-                    {/* // taskNo code val param action sts uuid
-                    {paragraph} */}
+                    {translate('table.field.action.taskId')}: {data.taskId$ || '-'}
                 </Typography>
-                <Divider orientation="vertical" flexItem sx={{ height: '1.5em', marginX: 1 }} />
+                <Divider orientation="vertical" flexItem sx={{ marginX: 1 }} />
                 <Typography
                     variant="body2"
                     color="textSecondary"
-                    lineHeight={1.5}
-                    margin={0}
                 >
-                    code: {data.code}
+                    {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