From 648e001c230a4b381c6d7cddcca07afd818c7570 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 26 九月 2024 11:05:39 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/segment/SegmentList.jsx | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/zy-acs-flow/src/page/segment/SegmentList.jsx b/zy-acs-flow/src/page/segment/SegmentList.jsx
index c45df61..eca6837 100644
--- a/zy-acs-flow/src/page/segment/SegmentList.jsx
+++ b/zy-acs-flow/src/page/segment/SegmentList.jsx
@@ -33,7 +33,7 @@
FunctionField,
Count,
} from 'react-admin';
-import { Box, Typography, Card, Stack, useMediaQuery, Tabs, Tab, Divider } from '@mui/material';
+import { Box, Typography, Stack, useMediaQuery, Tabs, Tab, Divider } from '@mui/material';
import { styled } from '@mui/material/styles';
import SegmentPanel from "./SegmentPanel";
import EmptyData from "../components/EmptyData";
@@ -131,13 +131,14 @@
}
const tabs = [
- { id: 'INIT', name: 'INIT' },
- { id: 'WAITING', name: 'WAITING' },
- { id: 'RUNNING', name: 'RUNNING' },
- { id: 'FINISH', name: 'FINISH' },
+ { id: 'INIT', name: 'page.segment.enums.state.init' },
+ { id: 'WAITING', name: 'page.segment.enums.state.waiting' },
+ { id: 'RUNNING', name: 'page.segment.enums.state.running' },
+ { id: 'FINISH', name: 'page.segment.enums.state.finish' },
];
const TabbedDatagrid = () => {
+ const translate = useTranslate();
const { filterValues, setFilters, displayedFilters } = useListContext();
const isXSmall = useMediaQuery(theme =>
theme.breakpoints.down('sm')
@@ -165,15 +166,18 @@
key={item.id}
value={item.id}
label={
- <span>
- {item.name}
+ <span style={{ fontWeight: 'bold' }}>
+ <span >
+ {translate(item.name)}
+ </span>
+
(
<Count
filter={{
...filterValues,
- state: item.name,
+ state: item.id,
}}
- sx={{ lineHeight: 'inherit', fontWeight: 'bold' }}
+ sx={{ lineHeight: 'inherit' }}
/>
)
</span>
@@ -198,7 +202,7 @@
rowClick={(id, resource, record) => false}
expand={() => <SegmentPanel />}
expandSingle={true}
- omit={['id', 'startNode', 'statusBool', 'updateBy', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'uuid', 'startNode', 'statusBool', 'updateBy', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
{/* <TextField source="segDesc" label="table.field.segment.segDesc" /> */}
@@ -207,20 +211,23 @@
<ReferenceField source="travelId" label="table.field.segment.travelId" reference="travel" link={false} sortable={false}>
<TextField source="uuid" />
</ReferenceField>
- <ReferenceField source="taskId" label="table.field.segment.taskId" reference="task" link={false} sortable={false}>
- <TextField source="seqNum" />
- </ReferenceField>
<ReferenceField source="agvId" label="table.field.segment.agvId" reference="agv" link={false} sortable={false}>
<TextField source="uuid" />
</ReferenceField>
- <NumberField source="serial" label="table.field.segment.serial" />
- <ReferenceField source="endNode" label="table.field.segment.endNode" reference="code" link={false} sortable={false}>
- <TextField source="data" />
+ <ReferenceField source="taskId" label="table.field.segment.taskId" reference="task" link={false} sortable={false}>
+ <TextField source="seqNum" />
</ReferenceField>
<TextField source="posType" label="table.field.segment.posType" />
<NumberField source="backpack" label="table.field.segment.backpack" />
- <TextField source="state" label="table.field.segment.state" />
-
+ <ReferenceField source="endNode" label="table.field.segment.endNode" reference="code" link={false} sortable={false}>
+ <TextField source="data" />
+ </ReferenceField>
+ <FunctionField label="table.field.segment.state" cellClassName="state" render={record => (
+ <>
+ {translate(tabs.find(item => item.id === record.state)?.name)}
+ </>
+ )} />
+ <NumberField source="serial" label="table.field.segment.serial" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
--
Gitblit v1.9.1