diff --git a/apps/web-antd/src/views/dataManger/deviceData/index.vue b/apps/web-antd/src/views/dataManger/deviceData/index.vue index 8db139c..c3b8c9c 100644 --- a/apps/web-antd/src/views/dataManger/deviceData/index.vue +++ b/apps/web-antd/src/views/dataManger/deviceData/index.vue @@ -197,17 +197,25 @@ const gridOptions: VxeGridProps = { columns: fixedColumns, // 初始化时只使用固定列 height: 'auto', keepSource: true, + // 确保分页功能正常工作 + pager: true, pagerConfig: { currentPage: 1, pageSize: 20, // 添加分页事件处理 onChange: (currentPage: number, pageSize: number) => { + console.log('分页变化:', { currentPage, pageSize }); // 当pageSize变化时,重置到第一页 if (pageSize !== gridOptions.pagerConfig.pageSize) { // 更新配置中的pageSize gridOptions.pagerConfig.pageSize = pageSize; gridOptions.pagerConfig.currentPage = 1; } + // 触发数据重新加载 + if (gridApi) { + console.log('触发数据重新加载'); + gridApi.reload(); + } }, }, toolbarConfig: { @@ -253,6 +261,16 @@ const gridOptions: VxeGridProps = { } } try { + console.log('API调用参数:', { + pageIndex: page.currentPage, + pageSize: page.pageSize, + DeviceType: deviceTypeNumber, + DeviceId: finalDeviceId, + FocusAddress: finalFocusAddress, + SystemName: formValues.SystemName || SystemName, + IoTDataType: ioTDataTypeValue, + }); + const { data } = await postTreeModelDeviceDataInfoPage({ body: { pageIndex: page.currentPage, @@ -285,6 +303,9 @@ const gridOptions: VxeGridProps = { gridOptions: { ...gridOptions, columns: allColumns.value, + // 保持分页配置 + pager: true, + pagerConfig: gridOptions.pagerConfig, }, }); } @@ -321,9 +342,26 @@ const [Grid, gridApi] = useVbenVxeGrid({ formOptions, gridOptions }); watch( () => gridApi?.pagerApi?.pageSize, (newSize, oldSize) => { + console.log('页面大小变化:', { newSize, oldSize }); if (newSize !== oldSize && oldSize) { // 重置到第一页 gridApi.pagerApi.currentPage = 1; + // 触发数据重新加载 + console.log('页面大小变化,触发重新加载'); + gridApi.reload(); + } + }, +); + +// 监听当前页变化 +watch( + () => gridApi?.pagerApi?.currentPage, + (newPage, oldPage) => { + console.log('当前页变化:', { newPage, oldPage }); + if (newPage !== oldPage && oldPage) { + // 触发数据重新加载 + console.log('当前页变化,触发重新加载'); + gridApi.reload(); } }, ); @@ -344,6 +382,9 @@ const initializeGrid = async () => { gridOptions: { ...gridOptions, columns: allColumns.value, + // 保持分页配置 + pager: true, + pagerConfig: gridOptions.pagerConfig, }, }); }