From 71b4dd3185bbf141fda4b155b0bb759f669b9d69 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 23 九月 2024 14:14:59 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/bus/BusList.jsx | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/zy-acs-flow/src/page/bus/BusList.jsx b/zy-acs-flow/src/page/bus/BusList.jsx
index fbe829d..66f853e 100644
--- a/zy-acs-flow/src/page/bus/BusList.jsx
+++ b/zy-acs-flow/src/page/bus/BusList.jsx
@@ -42,6 +42,7 @@
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting';
import * as Common from '@/utils/common';
+import BusListAside from "./BusListAside";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -50,7 +51,17 @@
'& .RaDatagrid-row': {
cursor: 'auto'
},
- '& .column-name': {
+ '& .column-busNo': {
+ minWidth: '16em',
+ },
+ '& .column-tasksNum': {
+ maxWidth: '8em',
+ },
+ '& .column-memo': {
+ maxWidth: '12em',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ whiteSpace: 'nowrap',
},
'& .opt': {
width: 200
@@ -58,15 +69,15 @@
}));
const filters = [
- <SearchInput source="condition" alwaysOn />,
+ // <SearchInput source="condition" alwaysOn />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
- <TextInput source="uuid" label="table.field.bus.uuid" />,
- <TextInput source="busNo" label="table.field.bus.busNo" />,
+ // <TextInput source="uuid" label="table.field.bus.uuid" />,
+ <TextInput source="busNo" label="table.field.bus.busNo" alwaysOn resettable />,
<DateInput source="startTime" label="table.field.bus.startTime" />,
<DateInput source="endTime" label="table.field.bus.endTime" />,
- <ReferenceInput source="busSts" label="table.field.bus.busSts" reference="busSts">
+ <ReferenceInput source="busSts" label="table.field.bus.busSts" reference="busSts" alwaysOn>
<AutocompleteInput label="table.field.bus.busSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
<TextInput source="phase" label="table.field.bus.phase" />,
@@ -112,6 +123,7 @@
</TopToolbar>
)}
perPage={25}
+ aside={<BusListAside />}
>
<StyledDatagrid
preferenceKey='bus'
@@ -119,16 +131,17 @@
rowClick={(id, resource, record) => false}
expand={() => <BusPanel />}
expandSingle={true}
- omit={['id', 'phase', 'updateBy', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'uuid', 'phase', 'updateBy', 'updateTime', 'createTime', 'createBy']}
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.bus.uuid" />
<TextField source="busNo" label="table.field.bus.busNo" />
- <DateField source="startTime" label="table.field.bus.startTime" showTime />
- <DateField source="endTime" label="table.field.bus.endTime" showTime />
<ReferenceField source="busSts" label="table.field.bus.busSts" reference="busSts" link={false} sortable={false}>
<TextField source="name" />
</ReferenceField>
+ <NumberField source="tasksNum" label="table.field.bus.tasksNum" sortable={false} />
+ <DateField source="startTime" label="table.field.bus.startTime" showTime />
+ <DateField source="endTime" label="table.field.bus.endTime" showTime />
<TextField source="phase" label="table.field.bus.phase" sortable={false} />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
--
Gitblit v1.9.1