From 3fa7cdec6ce44f07a0dc7e1910511ead606990f3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 11 九月 2025 08:19:53 +0800
Subject: [PATCH] 1

---
 zy-acs-flow/src/page/agv/show/AgvShowTask.jsx |   60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx b/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx
index e96b793..c5474b4 100644
--- a/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx
+++ b/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx
@@ -23,12 +23,12 @@
 import { formatDistance } from 'date-fns';
 import request from '@/utils/request';
 import { useTheme } from '@mui/material/styles';
-import { getTaskStsColor } from '@/utils/common';
+import { getTaskStsColor } from '@/utils/color-util';
+import ListEmptyTip from "../../components/ListEmptyTip";
 
 const TaskItem = ({ record, now }) => {
     const translate = useTranslate();
     const theme = useTheme();
-    console.log(record);
 
     return (
         <>
@@ -50,16 +50,51 @@
                         </Avatar>
                     </ListItemAvatar>
                     <ListItemText
-                        primary={`${record.taskType$}`}
+                        primary={<>
+                            <Stack direction={'row'}>
+                                <Typography
+                                    variant="body1"
+                                    color="textSecondary"
+                                    component="span"
+                                    sx={{ fontWeight: '600' }}
+                                >
+                                    {record.taskType$}
+                                </Typography>
+                                <Typography
+                                    variant="caption"
+                                    color="textSecondary"
+                                    component="span"
+                                >
+                                    &nbsp;-&nbsp; {record.taskTypeEl}
+                                </Typography>
+                            </Stack>
+
+                        </>}
                         secondary={
                             <>
-                                {record.taskSts$}
-                                &nbsp; &nbsp;
+                                <Typography
+                                    variant="body2"
+                                    color="textSecondary"
+                                    component="span"
+                                    sx={{ fontWeight: 'bold' }}
+                                >
+                                    {record.taskSts$}
+                                </Typography>
                             </>
                         }
                     />
                     <ListItemText
-                        primary={`${record.oriLoc$ || ''}${record.oriSta$ || ''} - ${record.destLoc$ || ''}${record.destSta$ || ''}`}
+                        variant="body2"
+                        color="textSecondary"
+                        primary={<>
+                            <Typography
+                                variant="body2"
+                                color="textPrimary"
+                                component="span"
+                            >
+                                {record.oriLoc$ || ''}{record.oriSta$ || ''} - {record.destLoc$ || ''}{record.destSta$ || ''}
+                            </Typography>
+                        </>}
                         secondary={`code: ${record.destCode$ || ''}`}
                     />
                     <ListItemSecondaryAction>
@@ -82,6 +117,7 @@
     const [currCount, setCurrCount] = useState(pageSize);
     const [records, setRecords] = useState(null);
     const [total, setTotal] = useState(0);
+    const translate = useTranslate();
 
     useEffect(() => {
         const http = async () => {
@@ -135,18 +171,16 @@
                     <List>
                         {records.map(record => {
                             return (
-                                <>
+                                <React.Fragment key={record.id}>
                                     <TaskItem
                                         key={record.id}
                                         record={record}
                                         now={now}
                                     />
                                     <Divider />
-                                </>
-
+                                </React.Fragment>
                             )
                         })}
-
                         {currCount < total && (
                             <Button
                                 onClick={() =>
@@ -158,15 +192,13 @@
                                 fullWidth
                                 sx={{ mt: 1 }}
                             >
-                                Load more activity
+                                {translate('common.action.loadMore')}
                             </Button>
                         )}
                     </List>
                 </Box>
             ) : (
-                <Typography>
-                    no data found
-                </Typography>
+                <ListEmptyTip />
             )}
 
         </>

--
Gitblit v1.9.1