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 | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 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..e4ea8c8 100644
--- a/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx
+++ b/zy-acs-flow/src/page/agv/show/AgvShowTask.jsx
@@ -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"
+ >
+ - {record.taskTypeEl}
+ </Typography>
+ </Stack>
+
+ </>}
secondary={
<>
- {record.taskSts$}
-
+ <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 () => {
@@ -158,7 +194,7 @@
fullWidth
sx={{ mt: 1 }}
>
- Load more activity
+ {translate('common.action.loadMore')}
</Button>
)}
</List>
--
Gitblit v1.9.1