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

@@ -8,7 +8,7 @@ import { useRoute } from 'vue-router';
 import { Page } from '@vben/common-ui';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { postCTWingLogInfoPage, postMetersPage } from '#/api-client';
+import { postMetersPage, postCTWingLogInfoPage } from '#/api-client';
 
 import DeviceSelect from '../deviceData/DeviceSelect.vue';
 import { querySchema, tableSchema } from './schema';
@@ -89,21 +89,17 @@ const formOptions: VbenFormProps = {
       
       if (deviceId) {
         // 先尝试从 deviceOptions 中查找（备用方案）
-        let device =
+        let device = deviceOptions.value.length > 0 ? deviceOptions.value.find(d => d.id === deviceId) : null;
-          deviceOptions.value.length > 0
-            ? deviceOptions.value.find((d) => d.id === deviceId)
-            : null;
         
         // 如果没找到，尝试从 DeviceSelect 组件中获取
         if (!device && gridApi?.formApi) {
           try {
             // 获取 DeviceSelect 组件的实例
-            const deviceSelectRef =
+            const deviceSelectRef = gridApi.formApi.getFieldComponentRef('DeviceId');
-              gridApi.formApi.getFieldComponentRef('DeviceId');
             if (deviceSelectRef && deviceSelectRef.getSelectedDevice) {
               device = deviceSelectRef.getSelectedDevice();
             }
-          } catch {
+          } catch (error) {
             // 静默处理错误
           }
         }
@@ -114,15 +110,14 @@ const formOptions: VbenFormProps = {
           // 如果还是没找到，尝试延迟获取（组件可能还没完全更新）
           setTimeout(() => {
             try {
-              const deviceSelectRef =
+              const deviceSelectRef = gridApi.formApi.getFieldComponentRef('DeviceId');
-                gridApi.formApi.getFieldComponentRef('DeviceId');
               if (deviceSelectRef && deviceSelectRef.getSelectedDevice) {
                 const delayedDevice = deviceSelectRef.getSelectedDevice();
                 if (delayedDevice) {
                   selectedDeviceInfo.value = delayedDevice;
                 }
               }
-            } catch {
+            } catch (error) {
               // 静默处理错误
             }
           }, 100);
@@ -136,10 +131,10 @@ const formOptions: VbenFormProps = {
     const relevantFields = new Set([
       'DeviceId',
       'DeviceType',
-      'EndCreationTime',
       'IoTDataType',
-      'StartCreationTime',
       'SystemName',
+      'StartCreationTime',
+      'EndCreationTime',
     ]);
     const hasRelevantChange = changedFields.some((field) =>
       relevantFields.has(field),
@@ -178,8 +173,8 @@ const gridOptions: VxeGridProps<any> = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues) => {
-        // 总是从表单API获取最新的表单值，确保分页时参数完整
+        // 获取当前表单值，如果formValues为空则从表单API获取
-        const currentFormValues = gridApi?.formApi ? await gridApi.formApi.getValues() : {};
+        const currentFormValues = formValues || (gridApi?.formApi ? await gridApi.formApi.getValues() : {}) || {};
         
         // 获取选中的设备信息
         let deviceId = currentFormValues.DeviceId || '';
@@ -187,14 +182,10 @@ const gridOptions: VxeGridProps<any> = {
         const deviceType = currentFormValues.DeviceType || '';
         
         // 优先使用选中的设备信息
-        const deviceInfo =
+        const deviceInfo = selectedDeviceInfo.value || (currentFormValues.DeviceId && deviceOptions.value.length > 0 ? getDeviceInfoById(currentFormValues.DeviceId) : null);
-          selectedDeviceInfo.value ||
-          (currentFormValues.DeviceId && deviceOptions.value.length > 0
-            ? getDeviceInfoById(currentFormValues.DeviceId)
-            : null);
         
         if (deviceInfo) {
-          systemName = deviceInfo.businessSystemName || '';
+          systemName = deviceInfo.systemName || '';
           // 根据设备类型获取正确的 id
           if (Number(deviceType) === 10) {
             // 集中器类型使用 focusId
@@ -204,6 +195,7 @@ const gridOptions: VxeGridProps<any> = {
             deviceId = deviceInfo.meterId || deviceId;
           }
         }
+        
         // 构建查询参数
         const queryParams = {
           pageIndex: page.currentPage,

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

@@ -4,7 +4,7 @@ import { computed } from 'vue';
 
 import dayjs from 'dayjs';
 
-import { getSelectResultList } from '#/api-client';
+import { getSelectResultList, postMetersPage } from '#/api-client';
 import { $t } from '#/locales';
 
 export const querySchema = computed(() => [
@@ -150,20 +150,7 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
     minWidth: 150,
     slots: {},
   },
-  {
+  { field: 'systemName', title: $t('abp.IoTDBBase.SystemName'), minWidth: 150, slots: {} },
-    field: 'formattedTimestamps',
-    title: $t('abp.IoTDBBase.FormattedTimestamps'),
-    minWidth: '150',
-    formatter: ({ cellValue }) => {
-      return cellValue ? dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss') : '';
-    },
-  },
-  {
-    field: 'systemName',
-    title: $t('abp.IoTDBBase.SystemName'),
-    minWidth: 150,
-    slots: {},
-  },
   {
     field: 'deviceType',
     title: $t('abp.IoTDBBase.DeviceType'),

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

@@ -1,9 +1,4 @@
-import type {
+import type { FieldMapping, FieldTypeConfig, ColumnConfig, DynamicDeviceData } from './types';
-  ColumnConfig,
-  DynamicDeviceData,
-  FieldMapping,
-  FieldTypeConfig,
-} from './types';
 
 // 字段名映射配置
 export const fieldNameMapping: FieldMapping = {
@@ -39,14 +34,11 @@ const FIXED_FIELDS = [
   'DeviceType',
   'IoTDataType',
   'DeviceId',
-  'Timestamps',
+  'Timestamps'
-  'FormattedTimestamps',
 ];
 
 // 动态生成表格列
-export const generateDynamicColumns = (
+export const generateDynamicColumns = (data: DynamicDeviceData[]): ColumnConfig[] => {
-  data: DynamicDeviceData[],
-): ColumnConfig[] => {
   if (!data || data.length === 0) return [];
   
   // 获取第一条数据的所有字段
@@ -55,11 +47,11 @@ export const generateDynamicColumns = (
   const fields = Object.keys(firstRow);
   
   // 过滤掉不需要显示的字段和固定字段
-  const excludeFields = new Set(['__typename', 'id', 'key', ...FIXED_FIELDS]);
+  const excludeFields = ['id', 'key', '__typename', ...FIXED_FIELDS];
   
   return fields
-    .filter((field) => !excludeFields.has(field))
+    .filter(field => !excludeFields.includes(field))
-    .map((field) => {
+    .map(field => {
       // 确保字段名是有效的字符串
       const safeField = String(field || '').trim();
       if (!safeField) return null;
@@ -75,10 +67,7 @@ export const generateDynamicColumns = (
       // 应用字段类型配置，确保配置是安全的
       if (fieldTypeConfig[safeField]) {
         const typeConfig = fieldTypeConfig[safeField];
-        if (
+        if (typeConfig.formatter && typeof typeConfig.formatter === 'function') {
-          typeConfig.formatter &&
-          typeof typeConfig.formatter === 'function'
-        ) {
           columnConfig.formatter = typeConfig.formatter;
         }
         if (typeConfig.width !== undefined) {
@@ -105,7 +94,7 @@ export const getAllPossibleFields = () => {
 
 // 预定义列配置（可选）
 export const getPredefinedColumns = () => {
-  return getAllPossibleFields().map((field) => ({
+  return getAllPossibleFields().map(field => ({
     field,
     title: fieldNameMapping[field] || field,
     minWidth: 150,

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

@@ -2,7 +2,7 @@
 import type { VbenFormProps } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
-import { computed, nextTick, onMounted, ref, watch } from 'vue';
+import { computed, nextTick, ref, watch, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 
 import { Page } from '@vben/common-ui';
@@ -66,6 +66,7 @@ const formatDate = (date: Date | string) => {
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 };
 
+
 const route = useRoute();
 const { DeviceType, DeviceId, FocusAddress, SystemName } = route.query;
 
@@ -75,41 +76,11 @@ const dynamicColumns = ref<any[]>([]);
 // 固定列定义（始终显示）- 基于 IoTDBTreeModelDeviceDataDto 类型
 const fixedColumns = [
   { title: '序号', type: 'seq', width: 50, field: 'seq', slots: {} },
-  {
+  { field: 'Timestamps', title: $t('abp.IoTDBBase.Timestamps'), minWidth: 150, showOverflow: true, slots: {} },
-    field: 'Timestamps',
+  { field: 'FormattedTimestamps', title: $t('abp.IoTDBBase.FormattedTimestamps'), minWidth: 150, showOverflow: true, slots: {} },
-    title: $t('abp.IoTDBBase.Timestamps'),
+  { field: 'SystemName', title: $t('abp.IoTDBBase.SystemName'), minWidth: 150, showOverflow: true, slots: {} },
-    minWidth: 150,
+  { field: 'ProjectId', title: $t('abp.IoTDBBase.ProjectId'), minWidth: 150, showOverflow: true, slots: {} },
-    showOverflow: true,
+  { field: 'DeviceType', title: $t('abp.IoTDBBase.DeviceType'), minWidth: 150, showOverflow: true, slots: {} },
-    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: {},
-  },
   {
     field: 'IoTDataType',
     title: $t('abp.IoTDBBase.IoTDataType'),
@@ -117,13 +88,7 @@ const fixedColumns = [
     showOverflow: true,
     slots: {},
   },
-  {
+  { field: 'DeviceId', title: $t('abp.IoTDBBase.DeviceId'), minWidth: 150, showOverflow: true, slots: {} },
-    field: 'DeviceId',
-    title: $t('abp.IoTDBBase.DeviceId'),
-    minWidth: 150,
-    showOverflow: true,
-    slots: {},
-  },
 ];
 
 // 合并固定列和动态列 - 使用计算属性确保响应式
@@ -137,11 +102,11 @@ const allColumns = computed(() => {
   
   // 安全地添加动态列
   if (dynamicColumns.value && Array.isArray(dynamicColumns.value)) {
-    const validDynamicColumns = dynamicColumns.value
+    const validDynamicColumns = dynamicColumns.value.filter(col => 
-      .filter((col) => col && typeof col === 'object' && col.field && col.title)
+      col && typeof col === 'object' && col.field && col.title
-      .map((col) => ({
+    ).map(col => ({
       ...col,
-        slots: col.slots || {}, // 确保每个列都有slots属性
+      slots: col.slots || {} // 确保每个列都有slots属性
     }));
     columns.push(...validDynamicColumns);
   }
@@ -179,11 +144,11 @@ const formOptions: VbenFormProps = {
     const relevantFields = new Set([
       'DeviceId',
       'DeviceType',
-      'EndCreationTime',
       'FocusAddress',
       'IoTDataType',
-      'StartCreationTime',
       'SystemName',
+      'StartCreationTime',
+      'EndCreationTime',
     ]);
     const hasRelevantChange = changedFields.some((field) =>
       relevantFields.has(field),
@@ -195,21 +160,17 @@ const formOptions: VbenFormProps = {
       
       if (deviceId) {
         // 先尝试从 deviceOptions 中查找（备用方案）
-        let device =
+        let device = deviceOptions.value.length > 0 ? deviceOptions.value.find(d => d.id === deviceId) : null;
-          deviceOptions.value.length > 0
-            ? deviceOptions.value.find((d) => d.id === deviceId)
-            : null;
         
         // 如果没找到，尝试从 DeviceSelect 组件中获取
         if (!device && gridApi?.formApi) {
           try {
             // 获取 DeviceSelect 组件的实例
-            const deviceSelectRef =
+            const deviceSelectRef = gridApi.formApi.getFieldComponentRef('DeviceId');
-              gridApi.formApi.getFieldComponentRef('DeviceId');
             if (deviceSelectRef && deviceSelectRef.getSelectedDevice) {
               device = deviceSelectRef.getSelectedDevice();
             }
-          } catch {
+          } catch (error) {
             // 静默处理错误
           }
         }
@@ -220,15 +181,14 @@ const formOptions: VbenFormProps = {
           // 如果还是没找到，尝试延迟获取（组件可能还没完全更新）
           setTimeout(() => {
             try {
-              const deviceSelectRef =
+              const deviceSelectRef = gridApi.formApi.getFieldComponentRef('DeviceId');
-                gridApi.formApi.getFieldComponentRef('DeviceId');
               if (deviceSelectRef && deviceSelectRef.getSelectedDevice) {
                 const delayedDevice = deviceSelectRef.getSelectedDevice();
                 if (delayedDevice) {
                   selectedDeviceInfo.value = delayedDevice;
                 }
               }
-            } catch {
+            } catch (error) {
               // 静默处理错误
             }
           }, 100);
@@ -279,10 +239,7 @@ const gridOptions: VxeGridProps<any> = {
           return { items: [], totalCount: 0 };
         }
         // 获取当前表单值，如果formValues为空则从表单API获取
-        const currentFormValues =
+        const currentFormValues = formValues || (gridApi?.formApi ? await gridApi.formApi.getValues() : {}) || {};
-          formValues ||
-          (gridApi?.formApi ? await gridApi.formApi.getValues() : {}) ||
-          {};
         // 处理DeviceType和IoTDataType，确保传递数字类型
         const deviceTypeValue = currentFormValues.DeviceType || DeviceType;
         const deviceTypeNumber = deviceTypeValue
@@ -292,23 +249,15 @@ const gridOptions: VxeGridProps<any> = {
         const ioTDataTypeValue = currentFormValues.IoTDataType;
 
         // 处理日期范围参数
-        const startCreationTime = currentFormValues.StartCreationTime
+        const startCreationTime = currentFormValues.StartCreationTime ? formatDate(currentFormValues.StartCreationTime) : undefined;
-          ? formatDate(currentFormValues.StartCreationTime)
+        const endCreationTime = currentFormValues.EndCreationTime ? formatDate(currentFormValues.EndCreationTime) : undefined;
-          : undefined;
-        const endCreationTime = currentFormValues.EndCreationTime
-          ? formatDate(currentFormValues.EndCreationTime)
-          : undefined;
 
         // 处理DeviceId，当设备类型为集中器(10)时，使用focusId
         let finalDeviceId = currentFormValues.DeviceId || DeviceId || '';
         let finalFocusAddress = currentFormValues.FocusAddress || '';
         
         // 优先使用选中的设备信息
-        const deviceInfo =
+        const deviceInfo = selectedDeviceInfo.value || (currentFormValues.DeviceId && deviceOptions.value.length > 0 ? getDeviceInfoById(currentFormValues.DeviceId) : null);
-          selectedDeviceInfo.value ||
-          (currentFormValues.DeviceId && deviceOptions.value.length > 0
-            ? getDeviceInfoById(currentFormValues.DeviceId)
-            : null);
         
         if (deviceInfo) {
           finalFocusAddress = deviceInfo.focusAddress || '';
@@ -343,6 +292,8 @@ const gridOptions: VxeGridProps<any> = {
             },
           });
 
+
+
           // 简化处理逻辑，直接使用接口返回的数据
           if (data?.items && data.items.length > 0) {
             try {
@@ -460,14 +411,14 @@ watch(
   () => [DeviceType, DeviceId, FocusAddress, SystemName],
   async (newValues, oldValues) => {
     // 如果有路由参数，等待设备信息加载完成后自动触发查询
-    if (newValues.some(Boolean) && gridApi && isGridInitialized.value) {
+    if (newValues.some(val => val) && gridApi && isGridInitialized.value) {
       // 延迟一下确保表单值已经设置
       setTimeout(() => {
         gridApi.reload();
       }, 100);
     }
   },
-  { immediate: false }, // 改为false，避免立即触发
+  { immediate: false } // 改为false，避免立即触发
 );
 
 // 页面初始化时，延迟初始化表格

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

@@ -146,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

@@ -88,21 +88,17 @@ const formOptions: VbenFormProps = {
       
       if (deviceId) {
         // 先尝试从 deviceOptions 中查找（备用方案）
-        let device =
+        let device = deviceOptions.value.length > 0 ? deviceOptions.value.find(d => d.id === deviceId) : null;
-          deviceOptions.value.length > 0
-            ? deviceOptions.value.find((d) => d.id === deviceId)
-            : null;
         
         // 如果没找到，尝试从 DeviceSelect 组件中获取
         if (!device && gridApi?.formApi) {
           try {
             // 获取 DeviceSelect 组件的实例
-            const deviceSelectRef =
+            const deviceSelectRef = gridApi.formApi.getFieldComponentRef('DeviceId');
-              gridApi.formApi.getFieldComponentRef('DeviceId');
             if (deviceSelectRef && deviceSelectRef.getSelectedDevice) {
               device = deviceSelectRef.getSelectedDevice();
             }
-          } catch {
+          } catch (error) {
             // 静默处理错误
           }
         }
@@ -113,15 +109,14 @@ const formOptions: VbenFormProps = {
           // 如果还是没找到，尝试延迟获取（组件可能还没完全更新）
           setTimeout(() => {
             try {
-              const deviceSelectRef =
+              const deviceSelectRef = gridApi.formApi.getFieldComponentRef('DeviceId');
-                gridApi.formApi.getFieldComponentRef('DeviceId');
               if (deviceSelectRef && deviceSelectRef.getSelectedDevice) {
                 const delayedDevice = deviceSelectRef.getSelectedDevice();
                 if (delayedDevice) {
                   selectedDeviceInfo.value = delayedDevice;
                 }
               }
-            } catch {
+            } catch (error) {
               // 静默处理错误
             }
           }, 100);
@@ -135,10 +130,10 @@ const formOptions: VbenFormProps = {
     const relevantFields = new Set([
       'DeviceId',
       'DeviceType',
-      'EndCreationTime',
       'IoTDataType',
-      'StartCreationTime',
       'SystemName',
+      'StartCreationTime',
+      'EndCreationTime',
     ]);
     const hasRelevantChange = changedFields.some((field) =>
       relevantFields.has(field),
@@ -162,6 +157,7 @@ const gridOptions: VxeGridProps<any> = {
   columns: tableSchema.value,
   height: 'auto',
   keepSource: true,
+  // 确保分页功能正常工作
   pager: true,
   pagerConfig: {
     currentPage: 1,
@@ -176,8 +172,8 @@ const gridOptions: VxeGridProps<any> = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues) => {
-        // 总是从表单API获取最新的表单值，确保分页时参数完整
+        // 获取当前表单值，如果formValues为空则从表单API获取
-        const currentFormValues = gridApi?.formApi ? await gridApi.formApi.getValues() : {};
+        const currentFormValues = formValues || (gridApi?.formApi ? await gridApi.formApi.getValues() : {}) || {};
         
         // 获取选中的设备信息
         let deviceId = currentFormValues.DeviceId || '';
@@ -185,14 +181,10 @@ const gridOptions: VxeGridProps<any> = {
         const deviceType = currentFormValues.DeviceType || '';
         
         // 优先使用选中的设备信息
-        const deviceInfo =
+        const deviceInfo = selectedDeviceInfo.value || (currentFormValues.DeviceId && deviceOptions.value.length > 0 ? getDeviceInfoById(currentFormValues.DeviceId) : null);
-          selectedDeviceInfo.value ||
-          (currentFormValues.DeviceId && deviceOptions.value.length > 0
-            ? getDeviceInfoById(currentFormValues.DeviceId)
-            : null);
         
         if (deviceInfo) {
-          systemName = deviceInfo.businessSystemName || '';
+          systemName = deviceInfo.systemName || '';
           // 根据设备类型获取正确的 id
           if (Number(deviceType) === 10) {
             // 集中器类型使用 focusId
@@ -259,6 +251,7 @@ watch(
   },
 );
 
+
 // 页面初始化时获取设备信息
 onMounted(async () => {
   await fetchDeviceOptions();

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

@@ -150,14 +150,6 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
     minWidth: '150',
     slots: {},
   },
-  {
-    field: 'formattedTimestamps',
-    title: $t('abp.IoTDBBase.FormattedTimestamps'),
-    minWidth: '150',
-    formatter: ({ cellValue }) => {
-      return cellValue ? dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss') : '';
-    },
-  },
   {
     field: 'systemName',
     title: $t('abp.IoTDBBase.SystemName'),