From 35e8bd80ff9d33a7ab01777f863a41ce97a2051a Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期四, 14 八月 2025 14:54:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev_7004' into dev_7004 --- src/views/equipmentManagement/upkeep/index.vue | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/equipmentManagement/upkeep/index.vue b/src/views/equipmentManagement/upkeep/index.vue index 7183964..72da8bc 100644 --- a/src/views/equipmentManagement/upkeep/index.vue +++ b/src/views/equipmentManagement/upkeep/index.vue @@ -154,7 +154,12 @@ getTableData, resetFilters, onCurrentChange, -} = usePaginationApi(getUpkeepPage, {}, [ +} = usePaginationApi(getUpkeepPage, { + deviceName: undefined, + maintenancePlanTime: undefined, + maintenanceActuallyTime: undefined, + maintenanceActuallyName: undefined, +}, [ { label: "璁惧鍚嶇О", align: "center", @@ -250,9 +255,10 @@ planModalRef.value.openEdit(id); }; -const changePage = ({ page }) => { - pagination.currentPage = page; - onCurrentChange(page); +const changePage = ({ page, limit }) => { + pagination.currentPage = page; + pagination.pageSize = limit; + onCurrentChange(page); }; // 鍗曡鍒犻櫎 -- Gitblit v1.9.3