新增日期查询
This commit is contained in:
parent
d55e939e84
commit
dafeaf3075
@ -130,6 +130,8 @@ const formOptions: VbenFormProps = {
|
||||
'FocusAddress',
|
||||
'IoTDataType',
|
||||
'SystemName',
|
||||
'StartCreationTime',
|
||||
'EndCreationTime',
|
||||
]);
|
||||
const hasRelevantChange = changedFields.some((field) =>
|
||||
relevantFields.has(field),
|
||||
@ -229,6 +231,10 @@ const gridOptions: VxeGridProps<any> = {
|
||||
|
||||
const ioTDataTypeValue = currentFormValues.IoTDataType;
|
||||
|
||||
// 处理日期范围参数
|
||||
const startCreationTime = currentFormValues.StartCreationTime;
|
||||
const endCreationTime = currentFormValues.EndCreationTime;
|
||||
|
||||
// 处理DeviceId,当设备类型为集中器(10)时,使用focusId
|
||||
let finalDeviceId = currentFormValues.DeviceId || DeviceId || '';
|
||||
let finalFocusAddress = currentFormValues.FocusAddress || '';
|
||||
@ -261,8 +267,11 @@ const gridOptions: VxeGridProps<any> = {
|
||||
DeviceId: finalDeviceId ? finalDeviceId.toString() : '',
|
||||
FocusAddress: finalFocusAddress || FocusAddress || '',
|
||||
// 添加其他表单参数
|
||||
SystemName: currentFormValues.SystemName || SystemName || '',
|
||||
SystemName: currentFormValues.SystemName || SystemName,
|
||||
IoTDataType: ioTDataTypeValue || undefined,
|
||||
// 添加日期范围参数
|
||||
StartCreationTime: startCreationTime || undefined,
|
||||
EndCreationTime: endCreationTime || undefined,
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@ -114,6 +114,30 @@ export const querySchema = computed(() => [
|
||||
allowClear: true,
|
||||
},
|
||||
},
|
||||
// 新增开始时间选择器
|
||||
{
|
||||
component: 'DatePicker',
|
||||
fieldName: 'StartCreationTime',
|
||||
label: '开始时间',
|
||||
componentProps: {
|
||||
placeholder: '开始时间',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
showTime: true,
|
||||
allowClear: true,
|
||||
},
|
||||
},
|
||||
// 新增结束时间选择器
|
||||
{
|
||||
component: 'DatePicker',
|
||||
fieldName: 'EndCreationTime',
|
||||
label: '结束时间',
|
||||
componentProps: {
|
||||
placeholder: '结束时间',
|
||||
format: 'YYYY-MM-DD HH:mm:ss',
|
||||
showTime: true,
|
||||
allowClear: true,
|
||||
},
|
||||
},
|
||||
]);
|
||||
export const tableSchema: any = computed((): VxeGridProps['columns'] => [
|
||||
{ title: $t('common.seq'), type: 'seq', width: 50 },
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user