完善设备数据查询
This commit is contained in:
parent
cd6d45bed1
commit
6bcf006709
@ -182,6 +182,7 @@ const formOptions: VbenFormProps = {
|
|||||||
'EndCreationTime',
|
'EndCreationTime',
|
||||||
'IoTDataType',
|
'IoTDataType',
|
||||||
'StartCreationTime',
|
'StartCreationTime',
|
||||||
|
'DeviceType',
|
||||||
]);
|
]);
|
||||||
const hasRelevantChange = changedFields.some((field) =>
|
const hasRelevantChange = changedFields.some((field) =>
|
||||||
relevantFields.has(field),
|
relevantFields.has(field),
|
||||||
@ -292,8 +293,9 @@ const gridOptions: VxeGridProps<any> = {
|
|||||||
currentFormValues.IoTDataType = IoTDataType as string;
|
currentFormValues.IoTDataType = IoTDataType as string;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 处理IoTDataType,保持字符串类型
|
// 处理筛选字段
|
||||||
const ioTDataTypeValue = currentFormValues.IoTDataType;
|
const ioTDataTypeValue = currentFormValues.IoTDataType;
|
||||||
|
const deviceTypeValue = currentFormValues.DeviceType;
|
||||||
|
|
||||||
// 调试:打印表单值和路由参数
|
// 调试:打印表单值和路由参数
|
||||||
console.log('表单值:', currentFormValues);
|
console.log('表单值:', currentFormValues);
|
||||||
@ -332,6 +334,7 @@ const gridOptions: VxeGridProps<any> = {
|
|||||||
pageSize: page.pageSize,
|
pageSize: page.pageSize,
|
||||||
DeviceAddress: deviceAddress,
|
DeviceAddress: deviceAddress,
|
||||||
IoTDataType: ioTDataTypeValue,
|
IoTDataType: ioTDataTypeValue,
|
||||||
|
DeviceType: deviceTypeValue,
|
||||||
StartCreationTime: startCreationTime,
|
StartCreationTime: startCreationTime,
|
||||||
EndCreationTime: endCreationTime,
|
EndCreationTime: endCreationTime,
|
||||||
});
|
});
|
||||||
@ -344,6 +347,7 @@ const gridOptions: VxeGridProps<any> = {
|
|||||||
// 使用设备地址作为DeviceAddress
|
// 使用设备地址作为DeviceAddress
|
||||||
DeviceAddress: deviceAddress,
|
DeviceAddress: deviceAddress,
|
||||||
IoTDataType: ioTDataTypeValue || undefined,
|
IoTDataType: ioTDataTypeValue || undefined,
|
||||||
|
DeviceType: deviceTypeValue || undefined,
|
||||||
// 添加日期范围参数
|
// 添加日期范围参数
|
||||||
StartCreationTime: startCreationTime || undefined,
|
StartCreationTime: startCreationTime || undefined,
|
||||||
EndCreationTime: endCreationTime || undefined,
|
EndCreationTime: endCreationTime || undefined,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user