From dafeaf3075a614b93b8f1ba836559c272a3fd487 Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Thu, 17 Jul 2025 09:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=A5=E6=9C=9F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dataManger/deviceData/index.vue | 11 ++++++++-
 .../src/views/dataManger/deviceData/schema.ts | 24 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/apps/web-antd/src/views/dataManger/deviceData/index.vue b/apps/web-antd/src/views/dataManger/deviceData/index.vue
index 25d8d64..1367f6b 100644
--- a/apps/web-antd/src/views/dataManger/deviceData/index.vue
+++ b/apps/web-antd/src/views/dataManger/deviceData/index.vue
@@ -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,
             },
           });
 
diff --git a/apps/web-antd/src/views/dataManger/deviceData/schema.ts b/apps/web-antd/src/views/dataManger/deviceData/schema.ts
index ca6602b..d76e9d2 100644
--- a/apps/web-antd/src/views/dataManger/deviceData/schema.ts
+++ b/apps/web-antd/src/views/dataManger/deviceData/schema.ts
@@ -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 },