admin/JiShe.IOT.UI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改分页失效的问题

Browse Source
This commit is contained in:
ChenYi 2025-07-17 08:48:10 +08:00
parent edc6241d7d
commit d55e939e84
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/web-antd/src/views/dataManger/deviceData/index.vue
View File

@ -219,20 +219,22 @@ const gridOptions: VxeGridProps<any> = {
if (!page) { if (!page) {
return { items: [], totalCount: 0 }; return { items: [], totalCount: 0 };
} }
// 获取当前表单值，如果formValues为空则从表单API获取
const currentFormValues = formValues || (gridApi?.formApi ? await gridApi.formApi.getValues() : {}) || {};
// 处理DeviceType和IoTDataType，确保传递数字类型 // 处理DeviceType和IoTDataType，确保传递数字类型
const deviceTypeValue = formValues.DeviceType || DeviceType; const deviceTypeValue = currentFormValues.DeviceType || DeviceType;
const deviceTypeNumber = deviceTypeValue const deviceTypeNumber = deviceTypeValue
? Number(deviceTypeValue) ? Number(deviceTypeValue)
: undefined; : undefined;
const ioTDataTypeValue = formValues.IoTDataType; const ioTDataTypeValue = currentFormValues.IoTDataType;
// 处理DeviceId，当设备类型为集中器(10)时，使用focusId // 处理DeviceId，当设备类型为集中器(10)时，使用focusId
let finalDeviceId = formValues.DeviceId || DeviceId || ''; let finalDeviceId = currentFormValues.DeviceId || DeviceId || '';
let finalFocusAddress = formValues.FocusAddress || ''; let finalFocusAddress = currentFormValues.FocusAddress || '';
// 优先使用选中的设备信息 // 优先使用选中的设备信息
const deviceInfo = selectedDeviceInfo.value || (formValues.DeviceId && deviceOptions.value.length > 0 ? getDeviceInfoById(formValues.DeviceId) : null); const deviceInfo = selectedDeviceInfo.value || (currentFormValues.DeviceId && deviceOptions.value.length > 0 ? getDeviceInfoById(currentFormValues.DeviceId) : null);
if (deviceInfo) { if (deviceInfo) {
finalFocusAddress = deviceInfo.focusAddress || ''; finalFocusAddress = deviceInfo.focusAddress || '';
@ -259,7 +261,7 @@ const gridOptions: VxeGridProps<any> = {
DeviceId: finalDeviceId ? finalDeviceId.toString() : '', DeviceId: finalDeviceId ? finalDeviceId.toString() : '',
FocusAddress: finalFocusAddress || FocusAddress || '', FocusAddress: finalFocusAddress || FocusAddress || '',
// 添加其他表单参数 // 添加其他表单参数
SystemName: formValues.SystemName || SystemName || '', SystemName: currentFormValues.SystemName || SystemName || '',
IoTDataType: ioTDataTypeValue || undefined, IoTDataType: ioTDataTypeValue || undefined,
}, },
}); });