From 1da741e8519e13d8f92824bf8ef15b92800b70fc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期六, 28 六月 2025 16:27:30 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/jam/JamList.jsx |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/zy-acs-flow/src/page/jam/JamList.jsx b/zy-acs-flow/src/page/jam/JamList.jsx
index e29392b..212cfb0 100644
--- a/zy-acs-flow/src/page/jam/JamList.jsx
+++ b/zy-acs-flow/src/page/jam/JamList.jsx
@@ -49,6 +49,7 @@
 import ConfirmButton from "../components/ConfirmButton";
 import CloseIcon from '@mui/icons-material/Close';
 import request from '@/utils/request';
+import { red } from '@mui/material/colors';
 
 const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
     '& .css-1vooibu-MuiSvgIcon-root': {
@@ -250,7 +251,7 @@
                                     rowClick={(id, resource, record) => false}
                                     // expand={() => <JamPanel />}
                                     // expandSingle={true}
-                                    omit={['id', 'uuid', 'cycleCode', 'updateBy', 'updateTime', 'createTime', 'createBy', 'statusBool', 'memo']}
+                                    omit={['id', 'endTime', 'uuid', 'cycleCode', 'updateBy', 'updateTime', 'createTime', 'createBy', 'statusBool', 'memo']}
                                 >
                                     <NumberField source="id" />
                                     <TextField source="uuid" label="table.field.jam.uuid" />
@@ -260,7 +261,7 @@
                                     </ReferenceField>
                                     <ReferenceField source="jamSeg" label="table.field.jam.jamSeg" reference="segment" link={false} sortable={false}>
                                         <FunctionField render={(record) => {
-                                            return <>{record.groupId}&nbsp;({record.serial})</>
+                                            return <>{record.uuid}&nbsp;({record.serial})</>
                                         }} />
                                     </ReferenceField>
                                     <ReferenceField source="jamCode" label="table.field.jam.jamCode" reference="code" link={false} sortable={false}>
@@ -271,7 +272,7 @@
                                     </ReferenceField>
                                     <ReferenceField source="avoSeg" label="table.field.jam.avoSeg" reference="segment" link={false} sortable={false}>
                                         <FunctionField render={(record) => {
-                                            return <>{record.groupId}&nbsp;({record.serial})</>
+                                            return <>{record.uuid}&nbsp;({record.serial})</>
                                         }} />
                                     </ReferenceField>
                                     <ReferenceField source="avoCode" label="table.field.jam.avoCode" reference="code" link={false} sortable={false}>
@@ -284,7 +285,7 @@
                                     <FunctionField label="table.field.jam.duration" cellClassName="duration" render={record => (
                                         <>
                                             {((record.duration > 6000))
-                                                ? <span style={{ color: 'red', fontWeight: 'bold' }}>{record.duration}</span>
+                                                ? <span style={{ color: red[700], fontWeight: 'bold' }}>{record.duration}</span>
                                                 : <span>{record.duration || "-"}</span>
                                             }
                                             &nbsp;ms

--
Gitblit v1.9.1