From 1313906bb1eb983d3beece810035e7fc28d6a92f Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 20 五月 2025 16:57:11 +0800
Subject: [PATCH] 新增充电桩

---
 zy-acs-flow/src/page/jam/JamList.jsx |   45 +++++++++++++++++++++++++++------------------
 1 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/zy-acs-flow/src/page/jam/JamList.jsx b/zy-acs-flow/src/page/jam/JamList.jsx
index 8bcb480..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': {
@@ -123,8 +124,8 @@
     const [createDialog, setCreateDialog] = useState(false);
     const [drawerVal, setDrawerVal] = useState(false);
 
-    const onDeprecated = (jamId) => {
-        request.get("/jam/deprecated/" + jamId).then(res => {
+    const onDeprecate = (jamId) => {
+        request.get("/jam/deprecate/" + jamId).then(res => {
             const { code, msg, data } = res.data;
             if (code === 200) {
                 notify(msg || 'common.response.success', { type: 'success', messageArgs: { _: msg } });
@@ -163,7 +164,7 @@
                 perPage={DEFAULT_PAGE_SIZE}
                 filterDefaultValues={{ state: 'RUNNING' }}
             >
-                <TabbedDatagrid onDeprecated={onDeprecated} />
+                <TabbedDatagrid onDeprecate={onDeprecate} />
             </List>
             <JamCreate
                 open={createDialog}
@@ -186,7 +187,7 @@
     { id: 'DEPRECATED', name: 'page.jam.enums.state.deprecated' },
 ];
 
-const TabbedDatagrid = ({ onDeprecated }) => {
+const TabbedDatagrid = ({ onDeprecate }) => {
     const translate = useTranslate();
     const { filterValues, setFilters, displayedFilters } = useListContext();
     const isXSmall = useMediaQuery(theme =>
@@ -250,29 +251,29 @@
                                     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" />
                                     {/* <TextField source="name" label="table.field.jam.name" /> */}
-                                    <ReferenceField source="jamSeg" label="table.field.jam.jamSeg" reference="segment" link={false} sortable={false}>
-                                        <FunctionField render={(record) => {
-                                            return <>{record.groupId} - ({record.serial})</>
-                                        }} />
-                                    </ReferenceField>
                                     <ReferenceField source="jamAgv" label="table.field.jam.jamAgv" reference="agv" link={false} sortable={false} >
                                         <TextField source="uuid" sx={{ fontWeight: 'bold' }} />
+                                    </ReferenceField>
+                                    <ReferenceField source="jamSeg" label="table.field.jam.jamSeg" reference="segment" link={false} sortable={false}>
+                                        <FunctionField render={(record) => {
+                                            return <>{record.uuid}&nbsp;({record.serial})</>
+                                        }} />
                                     </ReferenceField>
                                     <ReferenceField source="jamCode" label="table.field.jam.jamCode" reference="code" link={false} sortable={false}>
                                         <TextField source="data" />
                                     </ReferenceField>
-                                    <ReferenceField source="avoSeg" label="table.field.jam.avoSeg" reference="segment" link={false} sortable={false}>
-                                        <FunctionField render={(record) => {
-                                            return <>{record.groupId} - ({record.serial})</>
-                                        }} />
-                                    </ReferenceField>
                                     <ReferenceField source="avoAgv" label="table.field.jam.avoAgv" reference="agv" link={false} sortable={false}>
                                         <TextField source="uuid" sx={{ fontWeight: 'bold' }} />
+                                    </ReferenceField>
+                                    <ReferenceField source="avoSeg" label="table.field.jam.avoSeg" reference="segment" link={false} sortable={false}>
+                                        <FunctionField render={(record) => {
+                                            return <>{record.uuid}&nbsp;({record.serial})</>
+                                        }} />
                                     </ReferenceField>
                                     <ReferenceField source="avoCode" label="table.field.jam.avoCode" reference="code" link={false} sortable={false}>
                                         <TextField source="data" />
@@ -281,10 +282,18 @@
                                     <ReferenceField source="cycleCode" label="table.field.jam.cycleCode" reference="code" link={false} sortable={false}>
                                         <TextField source="data" />
                                     </ReferenceField>
+                                    <FunctionField label="table.field.jam.duration" cellClassName="duration" render={record => (
+                                        <>
+                                            {((record.duration > 6000))
+                                                ? <span style={{ color: red[700], fontWeight: 'bold' }}>{record.duration}</span>
+                                                : <span>{record.duration || "-"}</span>
+                                            }
+                                            &nbsp;ms
+                                        </>
+                                    )} />
                                     <DateField source="startTime" label="table.field.jam.startTime" showTime />
                                     <DateField source="notifyTime" label="table.field.jam.notifyTime" showTime />
                                     <DateField source="endTime" label="table.field.jam.endTime" showTime />
-                                    <NumberField source="duration" label="table.field.jam.duration" />
                                     <FunctionField label="table.field.segment.state" cellClassName="state" render={record => (
                                         <>
                                             {translate(states.find(item => item.id === record.state)?.name)}
@@ -304,7 +313,7 @@
                                         (record.state === "RUNNING") && (
                                             <>
                                                 <ConfirmButton
-                                                    label="common.action.deprecated"
+                                                    label="common.action.deprecate"
                                                     size="small"
                                                     color="primary"
                                                     startIcon={<CloseIcon />}
@@ -317,7 +326,7 @@
                                                     }}
                                                     data={record.uuid}
                                                     onConfirm={() => {
-                                                        onDeprecated(record.id);
+                                                        onDeprecate(record.id);
                                                     }}
                                                 />
                                             </>

--
Gitblit v1.9.1