From 260cef790b7cbb3c338b8b128a0cde52261efcff Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 九月 2024 15:20:35 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/agv/show/AgvShowTask.jsx |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx b/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx
index 9be8043..e96b793 100644
--- a/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx
+++ b/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx
@@ -28,6 +28,7 @@
 const TaskItem = ({ record, now }) => {
     const translate = useTranslate();
     const theme = useTheme();
+    console.log(record);
 
     return (
         <>
@@ -36,11 +37,12 @@
                     <ListItemAvatar>
                         <Avatar
                             alt={record.seqNum}
+                            variant="rounded"
                             sx={{
                                 '& img': { objectFit: 'contain' },
                                 fontSize: '0.9rem',
                                 width: 40,
-                                height: 40,
+                                height: 25,
                                 bgcolor: getTaskStsColor(record.taskSts$),
                             }}
                         >
@@ -48,13 +50,17 @@
                         </Avatar>
                     </ListItemAvatar>
                     <ListItemText
-                        primary={`${record.first_name} ${record.last_name}`}
+                        primary={`${record.taskType$}`}
                         secondary={
                             <>
-                                {record.title}
+                                {record.taskSts$}
                                 &nbsp; &nbsp;
                             </>
                         }
+                    />
+                    <ListItemText
+                        primary={`${record.oriLoc$ || ''}${record.oriSta$ || ''} - ${record.destLoc$ || ''}${record.destSta$ || ''}`}
+                        secondary={`code: ${record.destCode$ || ''}`}
                     />
                     <ListItemSecondaryAction>
                         <Typography
@@ -62,7 +68,7 @@
                             color="textSecondary"
                             component="span"
                         >
-                            last activity{' '}
+                            last update {' '}
                             {formatDistance(record.createTime, now)} ago{' '}
                         </Typography>
                     </ListItemSecondaryAction>
@@ -72,7 +78,7 @@
     )
 }
 
-export const AgvShowTask = ({ agvId, pageSize = 20 }) => {
+export const AgvShowTask = ({ agvId, pageSize = 10 }) => {
     const [currCount, setCurrCount] = useState(pageSize);
     const [records, setRecords] = useState(null);
     const [total, setTotal] = useState(0);
@@ -125,7 +131,7 @@
     return (
         <>
             {records.length > 0 ? (
-                <Box m={1}>
+                <Box >
                     <List>
                         {records.map(record => {
                             return (

--
Gitblit v1.9.1