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

---
 zy-acs-flow/src/page/agv/show/AgvShowTask.jsx |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx b/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx
index e134b01..e4ea8c8 100644
--- a/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx
+++ b/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx
@@ -51,13 +51,24 @@
                     </ListItemAvatar>
                     <ListItemText
                         primary={<>
-                            <Typography
-                                variant="body1"
-                                color="textPrimary"
-                                component="span"
-                            >
-                                {record.taskType$}
-                            </Typography>
+                            <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={
                             <>
@@ -65,6 +76,7 @@
                                     variant="body2"
                                     color="textSecondary"
                                     component="span"
+                                    sx={{ fontWeight: 'bold' }}
                                 >
                                     {record.taskSts$}
                                 </Typography>
@@ -105,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 () => {
@@ -181,7 +194,7 @@
                                 fullWidth
                                 sx={{ mt: 1 }}
                             >
-                                Load more activity
+                                {translate('common.action.loadMore')}
                             </Button>
                         )}
                     </List>

--
Gitblit v1.9.1