onenet日志查询

apps/web-antd/src/locales/langs/en-US/abp.json

@@ -233,6 +233,7 @@
     "DeviceType": "DeviceType",
     "DeviceId": "DeviceId",
     "Timestamps": "Timestamps",
+    "FormattedTimestamps": "Formatted Timestamps",
     "DevicePath": "DevicePath"
   },
   "CTWingLog": {

apps/web-antd/src/locales/langs/zh-CN/abp.json

@@ -233,6 +233,7 @@
     "DeviceType": "设备类型",
     "DeviceId": "设备ID",
     "Timestamps": "时标(纳秒)",
+    "FormattedTimestamps": "时标",
     "DevicePath": "设备路径"
   },
   "CTWingLog": {

apps/web-antd/src/views/dataManger/ctwingLog/index.vue

@@ -2,6 +2,7 @@
 import type { VbenFormProps } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
+import { ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 
 import { Page } from '@vben/common-ui';
@@ -9,6 +10,7 @@ import { Page } from '@vben/common-ui';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { postCTWingLogInfoPage } from '#/api-client';
 
+import DeviceSelect from '../deviceData/DeviceSelect.vue';
 import { querySchema, tableSchema } from './schema';
 
 defineOptions({
@@ -17,9 +19,24 @@ defineOptions({
 
 const route = useRoute();
 const { DeviceType, DeviceId, FocusAddress } = route.query;
+
+// 添加设备选择器引用
+const deviceSelectRef = ref();
+
+// 添加选中的设备信息
+const selectedDeviceInfo = ref<any>(null);
+
+// 格式化日期函数
+const formatDate = (date: any) => {
+  if (!date) return '';
+  if (typeof date === 'string') return date;
+  if (date.toISOString) return date.format('YYYY-MM-DD HH:mm:ss');
+  return '';
+};
 const formOptions: VbenFormProps = {
   schema: querySchema.value,
 };
+
 const gridOptions: VxeGridProps<any> = {
   checkboxConfig: {
     highlight: true,
@@ -28,7 +45,19 @@ const gridOptions: VxeGridProps<any> = {
   columns: tableSchema.value,
   height: 'auto',
   keepSource: true,
-  pagerConfig: {},
+  pagerConfig: {
+    currentPage: 1,
+    pageSize: 10,
+    pageSizes: [10, 20, 100],
+    layouts: [
+      'PrevPage',
+      'JumpNumber',
+      'NextPage',
+      'FullJump',
+      'Sizes',
+      'Total',
+    ],
+  },
   toolbarConfig: {
     custom: true,
   },
@@ -38,27 +67,41 @@ const gridOptions: VxeGridProps<any> = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues) => {
+        // 获取选中的设备信息
+        let deviceId = '';
+        let systemName = '';
+        const deviceType = formValues?.DeviceType || '';
+        const finalFocusAddress = formValues.FocusAddress || '';
+        if (deviceSelectRef.value) {
+          const deviceInfo = deviceSelectRef.value.getSelectedDeviceInfo();
+          if (deviceInfo) {
+            finalFocusAddress = deviceInfo.focusAddress || '';
+            systemName = deviceInfo.systemName || '';
+            // 设备类型为10时取focusId，其他情况取meterId
+            deviceId =
+              Number(deviceType) === 10
+                ? deviceInfo.focusId || ''
+                : deviceInfo.meterId || '';
+          }
+        }
         // 构建查询参数
         const queryParams: any = {
           pageIndex: page.currentPage,
           pageSize: page.pageSize,
+          SearchKeyword: formValues?.SearchKeyword || '',
+          DeviceType: deviceType,
+          IoTDataType: formValues?.IoTDataType || '',
+          DeviceId: deviceId,
+          SystemName: systemName || formValues?.SystemName || '',
+          StartCreationTime: formatDate(formValues?.StartCreationTime),
+          EndCreationTime: formatDate(formValues?.EndCreationTime),
+          FocusAddress: finalFocusAddress,
         };
-
-        // 如果有表单值，添加到查询参数中
-        if (formValues) {
-          Object.assign(queryParams, formValues);
-        }
-
-        // 添加路由参数
         if (DeviceType) queryParams.DeviceType = DeviceType;
         if (DeviceId) queryParams.DeviceId = DeviceId;
-        if (FocusAddress) queryParams.FocusAddress = FocusAddress;
-
         const { data } = await postCTWingLogInfoPage({
           body: queryParams,
         });
-        
-        // 确保返回的数据包含totalCount字段
         const result = {
           items: data.items || [],
           totalCount: data.totalCount || (data.items ? data.items.length : 0),
@@ -69,11 +112,50 @@ const gridOptions: VxeGridProps<any> = {
   },
 };
 
-const [Grid] = useVbenVxeGrid({ formOptions, gridOptions });
+const [Grid, gridApi] = useVbenVxeGrid({ formOptions, gridOptions });
+
+// 监听分页器状态变化
+watch(
+  () => gridApi?.pagerApi?.pageSize,
+  (newSize, oldSize) => {
+    if (newSize !== oldSize && oldSize) {
+      // 重置到第一页
+      gridApi.pagerApi.currentPage = 1;
+      // 触发数据重新加载
+      gridApi.reload();
+    }
+  },
+);
+
+// 监听当前页变化
+watch(
+  () => gridApi?.pagerApi?.currentPage,
+  (newPage, oldPage) => {
+    if (newPage !== oldPage && oldPage) {
+      // 触发数据重新加载
+      gridApi.reload();
+    }
+  },
+);
+
+// 监听DeviceId变化，自动刷新表格
+watch(
+  () => gridApi?.getFormModel?.()?.DeviceId,
+  (newVal, oldVal) => {
+    if (newVal !== oldVal) {
+      gridApi.reload();
+    }
+  },
+);
 </script>
 
 <template>
   <Page auto-content-height>
-    <Grid />
+    <Grid>
+      <template #DeviceId="{ model, field }">
+        <DeviceSelect ref="deviceSelectRef" v-model:value="model[field]"
+          :placeholder="$t('common.pleaseSelect') + $t('abp.log.deviceInfo')" allow-clear />
+      </template>
+    </Grid>
   </Page>
 </template>

apps/web-antd/src/views/dataManger/ctwingLog/schema.ts

@@ -4,118 +4,212 @@ import { computed } from 'vue';
 
 import dayjs from 'dayjs';
 
+import { getSelectResultList, postMetersPage } from '#/api-client';
 import { $t } from '#/locales';
 
 export const querySchema = computed(() => [
   {
-    component: 'Input',
+    component: 'ApiSelect',
-    fieldName: 'FocusAddress',
-    label: $t('abp.CTWingLog.FocusAddress'),
-  },
-  {
-    component: 'Input',
-    fieldName: 'DeviceId',
-    label: $t('abp.IoTDBBase.DeviceId'),
-  },
-  {
-    component: 'Input',
-    fieldName: 'DeviceType',
-    label: $t('abp.IoTDBBase.DeviceType'),
-  },
-  {
-    component: 'Input',
     fieldName: 'SystemName',
     label: $t('abp.IoTDBBase.SystemName'),
+    componentProps: {
+      api: getSelectResultList,
+      params: {
+        query: {
+          TypeName: 'BusinessSystemEnum',
+        },
+      },
+      labelField: 'secondValue',
+      valueField: 'value',
+      optionsPropName: 'options',
+      immediate: true,
+      afterFetch: (res: any) => {
+        // 确保返回的是数组格式
+        if (Array.isArray(res)) {
+          return res;
+        }
+        // 如果是包装在 items 中的，提取出来
+        if (res && Array.isArray(res.items)) {
+          return res.items;
+        }
+        // 如果是包装在 data 中的，提取出来
+        if (res && Array.isArray(res.data)) {
+          return res.data;
+        }
+        // 如果都不是，返回空数组
+        return [];
+      },
+    },
   },
   {
-    component: 'Input',
+    component: 'ApiSelect',
-    fieldName: 'ProjectId',
+    fieldName: 'DeviceType',
-    label: $t('abp.IoTDBBase.ProjectId'),
+    label: $t('abp.IoTDBBase.DeviceType'),
+    componentProps: {
+      api: getSelectResultList,
+      params: {
+        query: {
+          TypeName: 'MeterTypeEnum',
+        },
+      },
+      labelField: 'value',
+      valueField: 'key',
+      optionsPropName: 'options',
+      immediate: true,
+      afterFetch: (res: any) => {
+        // 确保返回的是数组格式
+        if (Array.isArray(res)) {
+          return res;
+        }
+        // 如果是包装在 items 中的，提取出来
+        if (res && Array.isArray(res.items)) {
+          return res.items;
+        }
+        // 如果是包装在 data 中的，提取出来
+        if (res && Array.isArray(res.data)) {
+          return res.data;
+        }
+        // 如果都不是，返回空数组
+        return [];
+      },
+    },
+  },
+  {
+    component: 'ApiSelect',
+    fieldName: 'IoTDataType',
+    label: $t('abp.IoTDBBase.IoTDataType'),
+    componentProps: {
+      api: getSelectResultList,
+      params: {
+        query: {
+          TypeName: 'IoTDBDataTypeConst',
+        },
+      },
+      labelField: 'value',
+      valueField: 'key',
+      optionsPropName: 'options',
+      immediate: true,
+      afterFetch: (res: any) => {
+        // 确保返回的是数组格式
+        if (Array.isArray(res)) {
+          return res;
+        }
+        // 如果是包装在 items 中的，提取出来
+        if (res && Array.isArray(res.items)) {
+          return res.items;
+        }
+        // 如果是包装在 data 中的，提取出来
+        if (res && Array.isArray(res.data)) {
+          return res.data;
+        }
+        // 如果都不是，返回空数组
+        return [];
+      },
+    },
+  },
+  {
+    component: 'DeviceSelect',
+    fieldName: 'DeviceId',
+    label: $t('abp.log.deviceInfo'),
+    componentProps: {
+      placeholder: $t('common.pleaseSelect') + $t('abp.log.deviceInfo'),
+      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 },
+  { title: $t('common.seq'), type: 'seq', width: 50, slots: {} },
   {
     field: 'timestamps',
     title: $t('abp.IoTDBBase.Timestamps'),
     minWidth: 150,
+    slots: {},
   },
-  { field: 'systemName', title: $t('abp.IoTDBBase.SystemName'), minWidth: 150 },
+  { field: 'systemName', title: $t('abp.IoTDBBase.SystemName'), minWidth: 150, slots: {} },
-  {
-    field: 'projectId',
-    title: $t('abp.IoTDBBase.ProjectId'),
-    minWidth: 150,
-  },
   {
     field: 'deviceType',
     title: $t('abp.IoTDBBase.DeviceType'),
     minWidth: 150,
+    slots: {},
   },
   {
     field: 'ioTDataType',
     title: $t('abp.IoTDBBase.IoTDataType'),
     minWidth: 150,
+    slots: {},
   },
   {
     field: 'deviceId',
     title: $t('abp.IoTDBBase.DeviceId'),
     minWidth: 150,
+    slots: {},
   },
   {
     field: 'platformTenantId',
     title: $t('abp.CTWingLog.PlatformTenantId'),
     minWidth: 150,
-  },
+    slots: {},
-  {
-    field: 'productId',
-    title: $t('abp.CTWingLog.ProductId'),
-    minWidth: 150,
   },
   {
     field: 'serviceId',
     title: $t('abp.CTWingLog.ServiceId'),
     minWidth: 150,
-  },
+    slots: {},
-  {
-    field: 'platformDeviceId',
-    title: $t('abp.CTWingLog.PlatformDeviceId'),
-    minWidth: 150,
   },
   {
     field: 'messageType',
     title: $t('abp.CTWingLog.MessageType'),
     minWidth: 180,
+    slots: {},
   },
   {
     field: 'protocol',
     title: $t('abp.CTWingLog.Protocol'),
     minWidth: 100,
-  },
+    slots: {},
-  {
-    field: 'focusAddress',
-    title: $t('abp.CTWingLog.FocusAddress'),
-    minWidth: 150,
-  },
-  {
-    field: 'meterAddress',
-    title: $t('abp.CTWingLog.MeterAddress'),
-    minWidth: 150,
   },
   {
     field: 'rawMessage',
     title: $t('abp.CTWingLog.RawMessage'),
     minWidth: 200,
+    slots: {},
   },
   {
     field: 'receivedPayload',
     title: $t('abp.CTWingLog.ReceivedPayload'),
     minWidth: 200,
+    slots: {},
   },
   {
     field: 'receivedTime',
     title: $t('abp.CTWingLog.ReceivedTime'),
     minWidth: 150,
+    slots: {},
     formatter: ({ cellValue }) => {
       return cellValue ? dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss') : '';
     },
@@ -124,10 +218,12 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
     field: 'imsi',
     title: $t('abp.CTWingLog.IMSI'),
     minWidth: 150,
+    slots: {},
   },
   {
     field: 'imei',
     title: $t('abp.CTWingLog.IMEI'),
     minWidth: 150,
+    slots: {},
   },
 ]);

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

@@ -49,6 +49,22 @@ const getDeviceInfoById = (deviceId: string) => {
   return deviceOptions.value.find((device) => device.id === deviceId);
 };
 
+// 格式化日期为 yyyy-MM-dd HH:mm:ss 格式
+const formatDate = (date: Date | string) => {
+  if (!date) return undefined;
+  
+  const d = new Date(date);
+  if (isNaN(d.getTime())) return undefined;
+  
+  const year = d.getFullYear();
+  const month = String(d.getMonth() +1).padStart(2, '0');
+  const day = String(d.getDate()).padStart(2, '0');
+  const hours = String(d.getHours()).padStart(2, '0');
+  const minutes = String(d.getMinutes()).padStart(2, '0');
+  const seconds = String(d.getSeconds()).padStart(2, '0');
+  
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+};
 
 
 const route = useRoute();
@@ -61,6 +77,7 @@ const dynamicColumns = ref<any[]>([]);
 const fixedColumns = [
   { title: '序号', type: 'seq', width: 50, field: 'seq', slots: {} },
   { field: 'Timestamps', title: $t('abp.IoTDBBase.Timestamps'), minWidth: 150, showOverflow: true, slots: {} },
+  { field: 'FormattedTimestamps', title: $t('abp.IoTDBBase.FormattedTimestamps'), minWidth: 150, showOverflow: true, slots: {} },
   { field: 'SystemName', title: $t('abp.IoTDBBase.SystemName'), minWidth: 150, showOverflow: true, slots: {} },
   { field: 'ProjectId', title: $t('abp.IoTDBBase.ProjectId'), minWidth: 150, showOverflow: true, slots: {} },
   { field: 'DeviceType', title: $t('abp.IoTDBBase.DeviceType'), minWidth: 150, showOverflow: true, slots: {} },
@@ -130,6 +147,8 @@ const formOptions: VbenFormProps = {
       'FocusAddress',
       'IoTDataType',
       'SystemName',
+      'StartCreationTime',
+      'EndCreationTime',
     ]);
     const hasRelevantChange = changedFields.some((field) =>
       relevantFields.has(field),
@@ -202,21 +221,6 @@ const gridOptions: VxeGridProps<any> = {
   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: {
     custom: true,
@@ -229,21 +233,31 @@ const gridOptions: VxeGridProps<any> = {
   showHeaderOverflow: true,
   proxyConfig: {
     ajax: {
-      query: async ({ page }, formValues) => {
+      query: async ({ page, sorts, filters }, formValues) => {
+        // 确保page参数存在
+        if (!page) {
+          return { items: [], totalCount: 0 };
+        }
+        // 获取当前表单值，如果formValues为空则从表单API获取
+        const currentFormValues = formValues || (gridApi?.formApi ? await gridApi.formApi.getValues() : {}) || {};
         // 处理DeviceType和IoTDataType，确保传递数字类型
-        const deviceTypeValue = formValues.DeviceType || DeviceType;
+        const deviceTypeValue = currentFormValues.DeviceType || DeviceType;
         const deviceTypeNumber = deviceTypeValue
           ? Number(deviceTypeValue)
           : undefined;
 
-        const ioTDataTypeValue = formValues.IoTDataType;
+        const ioTDataTypeValue = currentFormValues.IoTDataType;
+
+        // 处理日期范围参数
+        const startCreationTime = currentFormValues.StartCreationTime ? formatDate(currentFormValues.StartCreationTime) : undefined;
+        const endCreationTime = currentFormValues.EndCreationTime ? formatDate(currentFormValues.EndCreationTime) : undefined;
 
         // 处理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) {
           finalFocusAddress = deviceInfo.focusAddress || '';
@@ -261,16 +275,6 @@ const gridOptions: VxeGridProps<any> = {
           }
         }
         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,
@@ -280,8 +284,11 @@ const gridOptions: VxeGridProps<any> = {
               DeviceId: finalDeviceId ? finalDeviceId.toString() : '',
               FocusAddress: finalFocusAddress || FocusAddress || '',
               // 添加其他表单参数
-              SystemName: formValues.SystemName || SystemName || '',
+              SystemName: currentFormValues.SystemName || SystemName,
               IoTDataType: ioTDataTypeValue || undefined,
+              // 添加日期范围参数
+              StartCreationTime: startCreationTime || undefined,
+              EndCreationTime: endCreationTime || undefined,
             },
           });
 
@@ -342,12 +349,10 @@ 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();
     }
   },
@@ -357,10 +362,8 @@ watch(
 watch(
   () => gridApi?.pagerApi?.currentPage,
   (newPage, oldPage) => {
-    console.log('当前页变化:', { newPage, oldPage });
     if (newPage !== oldPage && oldPage) {
       // 触发数据重新加载
-      console.log('当前页变化，触发重新加载');
       gridApi.reload();
     }
   },

apps/web-antd/src/views/dataManger/deviceData/schema.ts

@@ -2,7 +2,7 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 
 import { computed } from 'vue';
 
-import { getSelectResultList, postMetersPage } from '#/api-client';
+import { getSelectResultList } from '#/api-client';
 import { $t } from '#/locales';
 
 export const querySchema = computed(() => [
@@ -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 },
@@ -122,6 +146,11 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
     title: $t('abp.IoTDBBase.Timestamps'),
     minWidth: '150',
   },
+  {
+    field: 'FormattedTimestamps',
+    title: $t('abp.IoTDBBase.FormattedTimestamps'),
+    minWidth: '150',
+  },
   {
     field: 'SystemName',
     title: $t('abp.IoTDBBase.SystemName'),

apps/web-antd/src/views/dataManger/onenetLog/index.vue

@@ -2,13 +2,15 @@
 import type { VbenFormProps } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
+import { onMounted, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 
 import { Page } from '@vben/common-ui';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { postOneNETLogInfoPage } from '#/api-client';
+import { postMetersPage, postOneNETLogInfoPage } from '#/api-client';
 
+import DeviceSelect from '../deviceData/DeviceSelect.vue';
 import { querySchema, tableSchema } from './schema';
 
 defineOptions({
@@ -17,9 +19,161 @@ defineOptions({
 
 const route = useRoute();
 const { DeviceType, DeviceId, FocusAddress } = route.query;
+
+// 添加设备选择器引用
+const deviceSelectRef = ref();
+
+// 添加选中的设备信息
+const selectedDeviceInfo = ref<any>(null);
+
+// 存储设备信息选项的完整数据
+const deviceOptions = ref<any[]>();
+
+// 获取设备信息的完整数据
+const fetchDeviceOptions = async () => {
+  try {
+    const { data } = await postMetersPage({
+      body: {
+        pageIndex: 1,
+        pageSize: 1000,
+      },
+    });
+
+    if (data?.items) {
+      deviceOptions.value = data.items;
+    }
+  } catch (error) {
+    console.error('获取设备信息失败:', error);
+  }
+};
+
+// 根据设备ID获取设备信息对象
+const getDeviceInfoById = (deviceId: string) => {
+  console.log('getDeviceInfoById 调用:', { deviceId, deviceOptionsLength: deviceOptions.value?.length });
+  
+  if (!deviceId || !deviceOptions.value || deviceOptions.value.length === 0) {
+    console.log('getDeviceInfoById 返回 null - 条件不满足');
+    return null;
+  }
+  
+  // 查看前几个设备的数据结构
+  console.log('前3构:', deviceOptions.value.slice(0, 3).map(device => ({
+    id: device.id,
+    meterName: device.meterName,
+    meterId: device.meterId,
+    focusId: device.focusId,
+    systemName: device.systemName,
+    keys: Object.keys(device),
+    fullDevice: JSON.parse(JSON.stringify(device)) // 展开完整对象
+  })));
+  
+  const device = deviceOptions.value.find((device) => device.id === deviceId);
+  console.log('查找结果:', device);
+  
+  return device;
+};
+
+// 格式化日期函数
+const formatDate = (date: any) => {
+  if (!date) return '';
+  if (typeof date === 'string') return date;
+  if (date.toISOString) return date.format('YYYY-MM-DD HH:mm:ss');
+  return '';
+};
+// 从 DeviceSelect 组件获取设备信息
+const getDeviceInfoFromRef = async () => {
+  if (
+    deviceSelectRef.value &&
+    typeof deviceSelectRef.value.getSelectedDevice === 'function'
+  ) {
+    const deviceInfo = deviceSelectRef.value.getSelectedDevice();
+    console.log('从 ref 获取设备信息:', deviceInfo);
+    return deviceInfo;
+  }
+  return null;
+};
+
 const formOptions: VbenFormProps = {
   schema: querySchema.value,
+  // 禁用表单值变化时自动提交，使用自定义处理函数
+  submitOnChange: false,
+  // 添加表单值变化的处理函数
+  handleValuesChange: async (values, changedFields) => {
+    console.log('handleValuesChange 被触发:', { values, changedFields });
+    console.log('当前所有表单值:', values);
+    console.log('DeviceType:', values.DeviceType);
+    console.log('IoTDataType:', values.IoTDataType);
+    
+    // 当 DeviceId 发生变化时，更新 selectedDeviceInfo
+    if (changedFields.includes('DeviceId')) {
+      const deviceId = values.DeviceId;
+      console.log('DeviceId 变化:', deviceId);
+      
+      if (deviceId) {
+        // 先尝试从 deviceOptions 中查找（备用方案）
+        let device = deviceOptions.value.length > 0 ? deviceOptions.value.find(d => d.id === deviceId) : null;
+        
+        // 如果没找到，尝试从 DeviceSelect 组件中获取
+        if (!device && gridApi?.formApi) {
+          try {
+            // 获取 DeviceSelect 组件的实例
+            const deviceSelectRef = gridApi.formApi.getFieldComponentRef('DeviceId');
+            if (deviceSelectRef && deviceSelectRef.getSelectedDevice) {
+              device = deviceSelectRef.getSelectedDevice();
+            }
+          } catch (error) {
+            console.log('获取组件实例失败:', error);
+          }
+        }
+        
+        if (device) {
+          selectedDeviceInfo.value = device;
+          console.log('handleValuesChange 更新设备信息:', device);
+        } else {
+          // 如果还是没找到，尝试延迟获取（组件可能还没完全更新）
+          setTimeout(() => {
+            try {
+              const deviceSelectRef = gridApi.formApi.getFieldComponentRef('DeviceId');
+              if (deviceSelectRef && deviceSelectRef.getSelectedDevice) {
+                const delayedDevice = deviceSelectRef.getSelectedDevice();
+                if (delayedDevice) {
+                  selectedDeviceInfo.value = delayedDevice;
+                  console.log('延迟获取设备信息成功:', delayedDevice);
+                }
+              }
+            } catch (error) {
+              console.log('延迟获取组件实例失败:', error);
+            }
+          }, 100);
+        }
+      } else {
+        selectedDeviceInfo.value = null;
+      }
+    }
+    
+    // 当任何相关字段发生变化时，刷新表格数据
+    const relevantFields = new Set([
+      'DeviceId',
+      'DeviceType',
+      'IoTDataType',
+      'SystemName',
+      'StartCreationTime',
+      'EndCreationTime',
+    ]);
+    const hasRelevantChange = changedFields.some((field) =>
+      relevantFields.has(field),
+    );
+
+    if (hasRelevantChange) {
+      // 使用 setTimeout 确保表单值已经完全更新
+      setTimeout(async () => {
+        const latestValues = await gridApi.formApi.getValues();
+        gridApi.reload(latestValues);
+      }, 0);
+    }
+  },
 };
+
 const gridOptions: VxeGridProps<any> = {
   checkboxConfig: {
     highlight: true,
@@ -28,7 +182,19 @@ const gridOptions: VxeGridProps<any> = {
   columns: tableSchema.value,
   height: 'auto',
   keepSource: true,
-  pagerConfig: {},
+  pagerConfig: {
+    currentPage: 1,
+    pageSize: 10,
+    pageSizes: [10, 20, 100],
+    layouts: [
+      'PrevPage',
+      'JumpNumber',
+      'NextPage',
+      'FullJump',
+      'Sizes',
+      'Total',
+    ],
+  },
   toolbarConfig: {
     custom: true,
   },
@@ -38,27 +204,60 @@ const gridOptions: VxeGridProps<any> = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues) => {
-        // 构建查询参数
+        // 获取当前表单值，如果formValues为空则从表单API获取
-        const queryParams: any = {
+        const currentFormValues = formValues || (gridApi?.formApi ? await gridApi.formApi.getValues() : {}) || {};
-          pageIndex: page.currentPage,
-          pageSize: page.pageSize,
-        };
         
-        // 如果有表单值，添加到查询参数中
+        console.log('查询时的 formValues:', formValues);
-        if (formValues) {
+        console.log('查询时的 currentFormValues:', currentFormValues);
-          Object.assign(queryParams, formValues);
+        
+        // 获取选中的设备信息
+        let deviceId = currentFormValues.DeviceId || '';
+        let systemName = '';
+        const deviceType = currentFormValues.DeviceType || '';
+        
+        console.log('查询参数:', { deviceId, deviceType, currentFormValues });
+        console.log('currentFormValues.DeviceId:', currentFormValues.DeviceId);
+        console.log('currentFormValues.DeviceType:', currentFormValues.DeviceType);
+        console.log('currentFormValues.IoTDataType:', currentFormValues.IoTDataType);
+        
+        // 优先使用选中的设备信息
+        const deviceInfo = selectedDeviceInfo.value || (currentFormValues.DeviceId && deviceOptions.value.length > 0 ? getDeviceInfoById(currentFormValues.DeviceId) : null);
+        
+        if (deviceInfo) {
+          console.log('使用设备信息:', deviceInfo);
+          systemName = deviceInfo.systemName || '';
+          // 根据设备类型获取正确的 id
+          if (Number(deviceType) === 10) {
+            // 集中器类型使用 focusId
+            deviceId = deviceInfo.focusId || deviceId;
+          } else {
+            // 其他设备类型使用 meterId
+            deviceId = deviceInfo.meterId || deviceId;
+          }
+        } else {
+          console.log('没有找到设备信息，使用原始 deviceId:', deviceId);
         }
         
-        // 添加路由参数
+        // 构建查询参数
+        const queryParams = {
+          pageIndex: page.currentPage,
+          pageSize: page.pageSize,
+          SearchKeyword: currentFormValues.SearchKeyword || '',
+          DeviceType: deviceType,
+          IoTDataType: currentFormValues.IoTDataType || '',
+          DeviceId: deviceId,
+          SystemName: systemName || currentFormValues.SystemName || '',
+          StartCreationTime: formatDate(currentFormValues.StartCreationTime),
+          EndCreationTime: formatDate(currentFormValues.EndCreationTime),
+        };
+        
+        console.log('最终查询参数:', queryParams);
+        
         if (DeviceType) queryParams.DeviceType = DeviceType;
         if (DeviceId) queryParams.DeviceId = DeviceId;
-        if (FocusAddress) queryParams.FocusAddress = FocusAddress;
-
         const { data } = await postOneNETLogInfoPage({
           body: queryParams,
         });
-        
-        // 确保返回的数据包含totalCount字段
         const result = {
           items: data.items || [],
           totalCount: data.totalCount || (data.items ? data.items.length : 0),
@@ -69,11 +268,50 @@ const gridOptions: VxeGridProps<any> = {
   },
 };
 
-const [Grid] = useVbenVxeGrid({ formOptions, gridOptions });
+const [Grid, gridApi] = useVbenVxeGrid({ formOptions, gridOptions });
+
+// 监听分页器状态变化
+watch(
+  () => gridApi?.pagerApi?.pageSize,
+  (newSize, oldSize) => {
+    if (newSize !== oldSize && oldSize) {
+      gridApi.pagerApi.currentPage = 1;
+      gridApi.reload();
+    }
+  },
+);
+// 监听当前页变化
+watch(
+  () => gridApi?.pagerApi?.currentPage,
+  (newPage, oldPage) => {
+    if (newPage !== oldPage && oldPage) {
+      gridApi.reload();
+    }
+  },
+);
+// 监听DeviceId变化，自动刷新表格
+watch(
+  () => gridApi?.getFormModel?.()?.DeviceId,
+  (newVal, oldVal) => {
+    if (newVal !== oldVal) {
+      gridApi.reload();
+    }
+  },
+);
+
+// 页面初始化时获取设备信息
+onMounted(async () => {
+  await fetchDeviceOptions();
+});
 </script>
 
 <template>
   <Page auto-content-height>
-    <Grid />
+    <Grid>
+      <template #DeviceId="{ model, field }">
+        <DeviceSelect ref="deviceSelectRef" v-model:value="model[field]"
+          :placeholder="$t('common.pleaseSelect') + $t('abp.log.deviceInfo')" allow-clear />
+      </template>
+    </Grid>
   </Page>
 </template>

apps/web-antd/src/views/dataManger/onenetLog/schema.ts

@@ -4,86 +4,193 @@ import { computed } from 'vue';
 
 import dayjs from 'dayjs';
 
+import { getSelectResultList } from '#/api-client';
 import { $t } from '#/locales';
 
 export const querySchema = computed(() => [
   {
-    component: 'Input',
+    component: 'ApiSelect',
-    fieldName: 'FocusAddress',
+    fieldName: 'SystemName',
-    label: $t('abp.OneNETLog.FocusAddress'),
+    label: $t('abp.IoTDBBase.SystemName'),
+    componentProps: {
+      api: getSelectResultList,
+      params: {
+        query: {
+          TypeName: 'BusinessSystemEnum',
+        },
+      },
+      labelField: 'secondValue',
+      valueField: 'value',
+      optionsPropName: 'options',
+      immediate: true,
+      afterFetch: (res: any) => {
+        // 确保返回的是数组格式
+        if (Array.isArray(res)) {
+          return res;
+        }
+        // 如果是包装在 items 中的，提取出来
+        if (res && Array.isArray(res.items)) {
+          return res.items;
+        }
+        // 如果是包装在 data 中的，提取出来
+        if (res && Array.isArray(res.data)) {
+          return res.data;
+        }
+        // 如果都不是，返回空数组
+        return [];
+      },
+    },
   },
   {
-    component: 'Input',
+    component: 'ApiSelect',
-    fieldName: 'DeviceId',
-    label: $t('abp.IoTDBBase.DeviceId'),
-  },
-  {
-    component: 'Input',
     fieldName: 'DeviceType',
     label: $t('abp.IoTDBBase.DeviceType'),
+    componentProps: {
+      api: getSelectResultList,
+      params: {
+        query: {
+          TypeName: 'MeterTypeEnum',
+        },
+      },
+      labelField: 'value',
+      valueField: 'key',
+      optionsPropName: 'options',
+      immediate: true,
+      afterFetch: (res: any) => {
+        // 确保返回的是数组格式
+        if (Array.isArray(res)) {
+          return res;
+        }
+        // 如果是包装在 items 中的，提取出来
+        if (res && Array.isArray(res.items)) {
+          return res.items;
+        }
+        // 如果是包装在 data 中的，提取出来
+        if (res && Array.isArray(res.data)) {
+          return res.data;
+        }
+        // 如果都不是，返回空数组
+        return [];
+      },
+    },
   },
   {
-    component: 'Input',
+    component: 'ApiSelect',
-    fieldName: 'ProductId',
+    fieldName: 'IoTDataType',
-    label: $t('abp.OneNETLog.ProductId'),
+    label: $t('abp.IoTDBBase.IoTDataType'),
+    componentProps: {
+      api: getSelectResultList,
+      params: {
+        query: {
+          TypeName: 'IoTDBDataTypeConst',
+        },
+      },
+      labelField: 'value',
+      valueField: 'key',
+      optionsPropName: 'options',
+      immediate: true,
+      afterFetch: (res: any) => {
+        // 确保返回的是数组格式
+        if (Array.isArray(res)) {
+          return res;
+        }
+        // 如果是包装在 items 中的，提取出来
+        if (res && Array.isArray(res.items)) {
+          return res.items;
+        }
+        // 如果是包装在 data 中的，提取出来
+        if (res && Array.isArray(res.data)) {
+          return res.data;
+        }
+        // 如果都不是，返回空数组
+        return [];
+      },
+    },
   },
   {
-    component: 'Input',
+    component: 'DeviceSelect',
-    fieldName: 'PlatformDeviceId',
+    fieldName: 'DeviceId',
-    label: $t('abp.OneNETLog.PlatformDeviceId'),
+    label: $t('abp.log.deviceInfo'),
+    componentProps: {
+      placeholder: $t('common.pleaseSelect') + $t('abp.log.deviceInfo'),
+      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 },
+  { title: $t('common.seq'), type: 'seq', width: 50, slots: {} },
   {
     field: 'timestamps',
     title: $t('abp.IoTDBBase.Timestamps'),
     minWidth: '150',
+    slots: {},
   },
   {
     field: 'systemName',
     title: $t('abp.IoTDBBase.SystemName'),
     minWidth: '120',
+    slots: {},
   },
-  { field: 'projectId', title: $t('abp.IoTDBBase.ProjectId'), minWidth: '120' },
   {
     field: 'deviceType',
     title: $t('abp.IoTDBBase.DeviceType'),
     minWidth: '120',
+    slots: {},
   },
   {
     field: 'ioTDataType',
     title: $t('abp.IoTDBBase.IoTDataType'),
     minWidth: '120',
+    slots: {},
   },
-  { field: 'deviceId', title: $t('abp.IoTDBBase.DeviceId'), minWidth: '120' },
-  { field: 'productId', title: $t('abp.OneNETLog.ProductId'), minWidth: '120' },
   {
-    field: 'platformDeviceId',
+    field: 'deviceId',
-    title: $t('abp.OneNETLog.PlatformDeviceId'),
+    title: $t('abp.IoTDBBase.DeviceId'),
-    minWidth: '150',
+    minWidth: '120',
+    slots: {},
   },
   {
     field: 'messageType',
     title: $t('abp.OneNETLog.MessageType'),
     minWidth: '120',
-  },
+    slots: {},
-  { field: 'protocol', title: $t('abp.OneNETLog.Protocol'), minWidth: '100' },
-  {
-    field: 'focusAddress',
-    title: $t('abp.OneNETLog.FocusAddress'),
-    minWidth: '120',
   },
   {
-    field: 'meterAddress',
+    field: 'protocol',
-    title: $t('abp.OneNETLog.MeterAddress'),
+    title: $t('abp.OneNETLog.Protocol'),
-    minWidth: '120',
+    minWidth: '100',
+    slots: {},
   },
   {
     field: 'receivedTime',
     title: $t('abp.OneNETLog.ReceivedTime'),
     minWidth: '150',
+    slots: {},
     formatter: ({ cellValue }) => {
       return cellValue ? dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss') : '';
     },
@@ -92,20 +199,24 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
     field: 'isEncrypted',
     title: $t('abp.OneNETLog.IsEncrypted'),
     minWidth: '200',
+    slots: {},
   },
   {
     field: 'plaintextMessage',
     title: $t('abp.OneNETLog.PlaintextMessage'),
     minWidth: '200',
+    slots: {},
   },
   {
     field: 'rawMessage',
     title: $t('abp.OneNETLog.RawMessage'),
     minWidth: '200',
+    slots: {},
   },
   {
     field: 'receivedPayload',
     title: $t('abp.OneNETLog.ReceivedPayload'),
     minWidth: '200',
+    slots: {},
   },
 ]);