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/agvDetail/AgvDetailList.jsx |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/zy-acs-flow/src/page/agvDetail/AgvDetailList.jsx b/zy-acs-flow/src/page/agvDetail/AgvDetailList.jsx
index 23de199..b18562f 100644
--- a/zy-acs-flow/src/page/agvDetail/AgvDetailList.jsx
+++ b/zy-acs-flow/src/page/agvDetail/AgvDetailList.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 }) => ({
@@ -133,7 +133,7 @@
                         <MyExportButton />
                     </TopToolbar>
                 )}
-                perPage={25}
+                perPage={DEFAULT_PAGE_SIZE}
             >
                 <StyledDatagrid
                     preferenceKey='agvDetail'
@@ -141,41 +141,37 @@
                     rowClick={(id, resource, record) => false}
                     expand={() => <AgvDetailPanel />}
                     expandSingle={true}
-                    omit={['id', 'createTime', 'createBy', 'memo']}
+                    omit={['id', 'uuid', 'updateBy', 'createTime', 'createBy', 'memo']}
                 >
                     <NumberField source="id" />
                     <TextField source="uuid" label="table.field.agvDetail.uuid" />
                     <ReferenceField source="agvId" label="table.field.agvDetail.agvId" reference="agv" link={false} sortable={false}>
                         <TextField source="uuid" />
                     </ReferenceField>
-                    <TextField source="title" label="table.field.agvDetail.title" />
-                    <TextField source="pos$" label="table.field.agvDetail.pos" sortable={false} />
+                    <TextField source="statusDesc" label="common.field.status" sortable={false} />
+                    <BooleanField source="posBool" label="table.field.agvDetail.pos" />
                     <ReferenceField source="code" label="table.field.agvDetail.code" reference="code" link={false} sortable={false}>
                         <TextField source="data" />
                     </ReferenceField>
                     <ReferenceField source="lastCode" label="table.field.agvDetail.lastCode" reference="code" link={false} sortable={false}>
                         <TextField source="data" />
                     </ReferenceField>
-                    <TextField source="codeOffsert" label="table.field.agvDetail.codeOffsert" />
-                    <NumberField source="straightVal" label="table.field.agvDetail.straightVal" />
+                    {/* <NumberField source="straightVal" label="table.field.agvDetail.straightVal" /> */}
                     <NumberField source="agvAngle" label="table.field.agvDetail.agvAngle" />
-                    <NumberField source="gyroAngle" label="table.field.agvDetail.gyroAngle" />
-                    <NumberField source="encoderAngle" label="table.field.agvDetail.encoderAngle" />
+                    {/* <NumberField source="gyroAngle" label="table.field.agvDetail.gyroAngle" /> */}
+                    {/* <NumberField source="encoderAngle" label="table.field.agvDetail.encoderAngle" /> */}
                     <NumberField source="high" label="table.field.agvDetail.high" />
-                    <NumberField source="sensorSts" label="table.field.agvDetail.sensorSts" />
+                    {/* <NumberField source="sensorSts" label="table.field.agvDetail.sensorSts" /> */}
                     <NumberField source="vol" label="table.field.agvDetail.vol" />
                     <NumberField source="soc" label="table.field.agvDetail.soc" />
-                    <NumberField source="soh" label="table.field.agvDetail.soh" />
-                    <NumberField source="batteryFail" label="table.field.agvDetail.batteryFail" />
-                    <TextField source="tempe" label="table.field.agvDetail.tempe" />
-                    <TextField source="motorFail" label="table.field.agvDetail.motorFail" />
-                    <TextField source="failSign" label="table.field.agvDetail.failSign" />
+                    {/* <NumberField source="soh" label="table.field.agvDetail.soh" /> */}
+                    {/* <NumberField source="batteryFail" label="table.field.agvDetail.batteryFail" /> */}
+                    {/* <TextField source="tempe" label="table.field.agvDetail.tempe" /> */}
+                    {/* <TextField source="motorFail" label="table.field.agvDetail.motorFail" /> */}
+                    {/* <TextField source="failSign" label="table.field.agvDetail.failSign" /> */}
                     <NumberField source="bootTime" label="table.field.agvDetail.bootTime" />
-                    <NumberField source="workTime" label="table.field.agvDetail.workTime" />
+                    {/* <NumberField source="workTime" label="table.field.agvDetail.workTime" /> */}
                     <NumberField source="workDistance" label="table.field.agvDetail.workDistance" />
-                    <NumberField source="tempQua" label="table.field.agvDetail.tempQua" />
-                    <TextField source="password" label="table.field.agvDetail.password" />
-
                     <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                         <TextField source="nickname" />
                     </ReferenceField>
@@ -184,7 +180,6 @@
                         <TextField source="nickname" />
                     </ReferenceField>
                     <DateField source="createTime" label="common.field.createTime" showTime />
-                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                     <TextField source="memo" label="common.field.memo" sortable={false} />
                     <WrapperField cellClassName="opt" label="common.field.opt">
                         <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />

--
Gitblit v1.9.1