From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/bus/BusList.jsx | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/zy-acs-flow/src/page/bus/BusList.jsx b/zy-acs-flow/src/page/bus/BusList.jsx
index 9be3b02..d411899 100644
--- a/zy-acs-flow/src/page/bus/BusList.jsx
+++ b/zy-acs-flow/src/page/bus/BusList.jsx
@@ -31,8 +31,11 @@
AutocompleteInput,
DeleteButton,
FunctionField,
+ Pagination,
+ useNotify,
+ useRefresh,
} from 'react-admin';
-import { Box, Typography, Card, Chip } from '@mui/material';
+import { Box, Typography, Button, Chip } from '@mui/material';
import { styled } from '@mui/material/styles';
import BusCreate from "./BusCreate";
import BusPanel from "./BusPanel";
@@ -45,6 +48,9 @@
import * as Common from '@/utils/common';
import BusListAside from "./BusListAside";
import { getBusStsColor } from '@/utils/color-util';
+import CancelIcon from '@mui/icons-material/Cancel';
+import request from '@/utils/request';
+import ConfirmButton from "../components/ConfirmButton";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -59,6 +65,9 @@
'& .column-tasksNum': {
maxWidth: '8em',
},
+ '& .column-tasksNumTotal': {
+ maxWidth: '8em',
+ },
'& .column-memo': {
maxWidth: '12em',
overflow: 'hidden',
@@ -66,7 +75,7 @@
whiteSpace: 'nowrap',
},
'& .opt': {
- width: 80
+ width: 120
},
}));
@@ -93,9 +102,22 @@
const BusList = () => {
const translate = useTranslate();
-
+ const notify = useNotify();
+ const refresh = useRefresh();
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+
+ const onCancel = (busId) => {
+ request.get("/bus/cancel/" + busId).then(res => {
+ const { code, msg, data } = res.data;
+ if (code === 200) {
+ notify(msg || 'common.response.success', { type: 'success', messageArgs: { _: msg } });
+ refresh();
+ } else {
+ notify(msg || 'common.response.fail', { type: 'error', messageArgs: { _: msg } });
+ }
+ })
+ }
return (
<Box display="flex">
@@ -120,6 +142,7 @@
<MyExportButton />
</TopToolbar>
)}
+ pagination={<Pagination rowsPerPageOptions={[10, 20, 50, 100]} />}
perPage={20}
// aside={<BusListAside />}
>
@@ -134,7 +157,7 @@
<NumberField source="id" />
<TextField source="uuid" label="table.field.bus.uuid" />
<TextField source="busNo" label="table.field.bus.busNo" />
- <ReferenceField source="busSts" label="table.field.bus.busSts" reference="busSts" link={false} sortable={false}>
+ <ReferenceField source="busSts" label="table.field.bus.busSts" reference="busSts" link={false} sortable={true}>
<FunctionField render={record => (
<Chip
label={record.name}
@@ -146,7 +169,8 @@
)} />
{/* <TextField source="name" /> */}
</ReferenceField>
- <NumberField source="tasksNum" label="table.field.bus.tasksNum" sortable={false} />
+ <NumberField source="tasksNum" label="table.field.bus.tasksNum" sortable={false} sx={{ fontWeight: 'bold' }} />
+ <NumberField source="tasksNumTotal" label="table.field.bus.tasksNumTotal" sortable={false} sx={{ fontWeight: 'bold' }} />
<DateField source="startTime" label="table.field.bus.startTime" showTime />
<DateField source="endTime" label="table.field.bus.endTime" showTime emptyText="-" />
<TextField source="phase" label="table.field.bus.phase" sortable={false} />
@@ -163,7 +187,17 @@
<TextField source="memo" label="common.field.memo" sortable={false} emptyText="-" />
<FunctionField label="common.field.opt" cellClassName="opt" render={record => (
(record.busSts === 15) && (
- <DeleteButton label="" sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ <ConfirmButton
+ label="ra.action.cancel"
+ size="small"
+ color="error"
+ startIcon={<CancelIcon />}
+ sx={{ padding: '1px', fontSize: '.75rem' }}
+ data={record.busNo}
+ onConfirm={() => {
+ onCancel(record.id);
+ }}
+ />
)
)} />
</StyledDatagrid>
--
Gitblit v1.9.1