From 36891e38d98ea90a0a84cf2624255098d1ad383d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 20 九月 2024 15:32:03 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml | 3 +++
zy-acs-flow/src/page/agv/AgvListFilter.jsx | 18 ++++++++++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/zy-acs-flow/src/page/agv/AgvListFilter.jsx b/zy-acs-flow/src/page/agv/AgvListFilter.jsx
index e31a93f..eae7e77 100644
--- a/zy-acs-flow/src/page/agv/AgvListFilter.jsx
+++ b/zy-acs-flow/src/page/agv/AgvListFilter.jsx
@@ -6,9 +6,7 @@
useTranslate,
} from 'react-admin';
import { Box } from '@mui/material';
-import BusinessIcon from '@mui/icons-material/Business';
-import LocalShippingIcon from '@mui/icons-material/LocalShipping';
-import SupervisorAccountIcon from '@mui/icons-material/SupervisorAccount';
+import CommuteIcon from '@mui/icons-material/Commute';
import FiberManualRecordIcon from '@mui/icons-material/FiberManualRecord';
import request from '@/utils/request'
@@ -37,7 +35,19 @@
<FilterListItem label="common.enums.false" value={{ pos: '0' }} />
</FilterList>
- <FilterList label="Sector" icon={<LocalShippingIcon />}>
+ <FilterList
+ label={translate('table.field.agv.agvModel')}
+ icon={<CommuteIcon />}
+ >
+ {models.map(model => {
+ return (
+ <FilterListItem
+ key={model.id}
+ label={`${model.name}`}
+ value={{ agvModel: model.id }}
+ />
+ )
+ })}
</FilterList>
</Box>
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
index d22bc46..957384a 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
@@ -16,6 +16,9 @@
<if test="param.pos != null">
AND mad.pos = #{param.pos}
</if>
+ <if test="param.agvModel != null">
+ AND ma.agv_model = #{param.agvModel}
+ </if>
order by ma.uuid asc
</select>
--
Gitblit v1.9.1