From 5fd28ccb34f808a634d66e6ff03078b36f9e745d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 29 九月 2024 10:15:36 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/mission/MissionColumn.jsx | 4 +++-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zy-acs-flow/src/page/mission/MissionColumn.jsx b/zy-acs-flow/src/page/mission/MissionColumn.jsx
index 7bae8fb..a85647e 100644
--- a/zy-acs-flow/src/page/mission/MissionColumn.jsx
+++ b/zy-acs-flow/src/page/mission/MissionColumn.jsx
@@ -2,10 +2,12 @@
import { Box, Stack, Typography } from '@mui/material';
import {
useTranslate,
+ useTheme,
} from 'react-admin';
import { MissionCard } from './MissionCard';
export const MissionColumn = ({ stage, missions, }) => {
+ const theme = useTheme();
const translate = useTranslate();
return (
@@ -14,7 +16,7 @@
flex: 1,
paddingTop: '8px',
paddingBottom: '16px',
- bgcolor: '#eaeaee',
+ bgcolor: theme[0] === 'dark' ? '#424242' : '#eaeaee',
'&:first-of-type': {
paddingLeft: '5px',
borderTopLeftRadius: 5,
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
index c0966d8..2325f74 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
@@ -25,6 +25,6 @@
private String destCode;
- private String progress = "50";
+ private Double progress = 50.0;
}
--
Gitblit v1.9.1