From 44153e246cc041180f8544e05d81f5432b14a808 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期三, 04 三月 2026 07:52:45 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/agvModel/AgvModelList.jsx | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/zy-acs-flow/src/page/agvModel/AgvModelList.jsx b/zy-acs-flow/src/page/agvModel/AgvModelList.jsx
index a1fd3d5..f745933 100644
--- a/zy-acs-flow/src/page/agvModel/AgvModelList.jsx
+++ b/zy-acs-flow/src/page/agvModel/AgvModelList.jsx
@@ -40,7 +40,7 @@
import MyExportButton from '../components/MyExportButton';
import PageDrawer from "../components/PageDrawer";
import MyField from "../components/MyField";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting';
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -66,6 +66,8 @@
<TextInput source="type" label="table.field.agvModel.type" />,
<TextInput source="name" label="table.field.agvModel.name" />,
<NumberInput source="length" label="table.field.agvModel.length" />,
+ <NumberInput source="headOffset" label="table.field.agvModel.headOffset" />,
+ <NumberInput source="tailOffset" label="table.field.agvModel.tailOffset" />,
<NumberInput source="width" label="table.field.agvModel.width" />,
<NumberInput source="height" label="table.field.agvModel.height" />,
<NumberInput source="liftHeight" label="table.field.agvModel.liftHeight" />,
@@ -111,12 +113,12 @@
theme.transitions.create(['all'], {
duration: theme.transitions.duration.enteringScreen,
}),
- marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.agvModel"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
filters={filters}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "create_time", order: "asc" }}
actions={(
<TopToolbar>
<FilterButton />
@@ -125,21 +127,27 @@
<MyExportButton />
</TopToolbar>
)}
- perPage={25}
+ perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
preferenceKey='agvModel'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ // bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
expand={() => <AgvModelPanel />}
expandSingle={true}
- omit={['id', 'uuid', 'liftHeight', 'mqttTopic', 'password', 'updateBy', 'updateTime', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'uuid', 'liftHeight', 'mqttTopic', 'password', 'protocol'
+ // , 'headOffset', 'tailOffset'
+ , 'length', 'width', 'height', 'allDirectionBool', 'diameter'
+ , 'statusBool', 'updateBy', 'updateTime', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.agvModel.uuid" />
- <TextField source="type" label="table.field.agvModel.type" />
<TextField source="name" label="table.field.agvModel.name" />
+ <TextField source="type" label="table.field.agvModel.type" />
<NumberField source="length" label="table.field.agvModel.length" />
+ <NumberField source="headOffset" label="table.field.agvModel.headOffset" />
+ <NumberField source="tailOffset" label="table.field.agvModel.tailOffset" />
<NumberField source="width" label="table.field.agvModel.width" />
<NumberField source="height" label="table.field.agvModel.height" />
<NumberField source="liftHeight" label="table.field.agvModel.liftHeight" />
@@ -153,6 +161,8 @@
<BooleanField source="allDirectionBool" label="table.field.agvModel.allDirection" sortable={false} />
<TextField source="protocol" label="table.field.agvModel.protocol" />
<TextField source="mqttTopic" label="table.field.agvModel.mqttTopic" />
+ <BooleanField source="needUndockingBool" label="table.field.agvModel.needUndocking" sortable={false} />
+ <BooleanField source="backupActionBool" label="table.field.agvModel.backupAction" sortable={false} />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
--
Gitblit v1.9.1