From 1612ce1ff4b1185800b6e2ea9f2a3af54c0822cf Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 九月 2024 15:37:13 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/themes/rcsTheme.js | 3 +++
zy-acs-flow/src/page/agv/show/AgvShowTask.jsx | 26 +++++++++++++++++++-------
2 files changed, 22 insertions(+), 7 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..260c8e8 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"
+ >
+ - {record.taskTypeEl}
+ </Typography>
+ </Stack>
+
</>}
secondary={
<>
@@ -65,6 +76,7 @@
variant="body2"
color="textSecondary"
component="span"
+ sx={{ fontWeight: 'bold' }}
>
{record.taskSts$}
</Typography>
diff --git a/zy-acs-flow/src/themes/rcsTheme.js b/zy-acs-flow/src/themes/rcsTheme.js
index f512d7d..1b3bf11 100644
--- a/zy-acs-flow/src/themes/rcsTheme.js
+++ b/zy-acs-flow/src/themes/rcsTheme.js
@@ -52,6 +52,9 @@
}
export const rcsLightTheme = {
+ typography: {
+ // fontFamily: `'Microsoft YaHei', Arial, sans-serif`,
+ },
palette: {
primary: {
main: `${MAIN_COLOR}`,
--
Gitblit v1.9.1