From 93fb3d1236d1a741177fa04eab9a1d3504f7136c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 21 九月 2024 15:04:13 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/agv/show/AgvShowTask.jsx | 69 ++++++++++++++++++++++++++-------- 1 files changed, 52 insertions(+), 17 deletions(-) diff --git a/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx b/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx index d9ddbb4..9be8043 100644 --- a/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx +++ b/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx @@ -16,29 +16,56 @@ Divider, List, ListItem, + ListItemAvatar, + ListItemText, + ListItemSecondaryAction, } from '@mui/material'; import { formatDistance } from 'date-fns'; import request from '@/utils/request'; import { useTheme } from '@mui/material/styles'; import { getTaskStsColor } from '@/utils/common'; -const TaskItem = ({ record }) => { +const TaskItem = ({ record, now }) => { const translate = useTranslate(); const theme = useTheme(); + return ( <> - <ListItem disableGutters> + <ListItem button> <Stack direction="row" spacing={1} alignItems="center" width="100%"> - <Avatar - alt={record.seqNum} - sx={{ - '& img': { objectFit: 'contain' }, - fontSize: '0.9rem', - bgcolor: getTaskStsColor(record.taskSts$), - }} - > - {record.seqNum} - </Avatar> + <ListItemAvatar> + <Avatar + alt={record.seqNum} + sx={{ + '& img': { objectFit: 'contain' }, + fontSize: '0.9rem', + width: 40, + height: 40, + bgcolor: getTaskStsColor(record.taskSts$), + }} + > + {record.seqNum} + </Avatar> + </ListItemAvatar> + <ListItemText + primary={`${record.first_name} ${record.last_name}`} + secondary={ + <> + {record.title} + + </> + } + /> + <ListItemSecondaryAction> + <Typography + variant="body2" + color="textSecondary" + component="span" + > + last activity{' '} + {formatDistance(record.createTime, now)} ago{' '} + </Typography> + </ListItemSecondaryAction> </Stack> </ListItem> </> @@ -93,20 +120,27 @@ </Stack> ); } + const now = Date.now(); return ( <> {records.length > 0 ? ( - <Box m={2}> + <Box m={1}> <List> {records.map(record => { return ( - <TaskItem - key={record.id} - record={record} - /> + <> + <TaskItem + key={record.id} + record={record} + now={now} + /> + <Divider /> + </> + ) })} + {currCount < total && ( <Button onClick={() => @@ -116,6 +150,7 @@ ) } fullWidth + sx={{ mt: 1 }} > Load more activity </Button> -- Gitblit v1.9.1