修复下面的问题和其他页面中的类似问题

1.apps/web-antd/src/views/iot/device/device/modules/DeviceForm.vue type 是和方法分离的 2.apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsMessage.vue const getMessageList = async () => { 方法使用function 不要用const，保持一致 3.apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsMessage.vue <script setup lang="ts"> 文件结构是 4.apps/web-antd/src/views/iot/rule/data/rule/index.vue handleRefresh 统一命名 Signed-off-by: Administrator <425053404@qq.com>
2025-10-17 18:06:58 +08:00
parent 1190121773
commit cec1cc7590
18 changed files with 232 additions and 233 deletions
--- a/apps/web-antd/src/views/iot/device/device/modules/DeviceForm.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/DeviceForm.vue
@@ -8,8 +8,8 @@ import {
  createDevice,
  getDevice,
  updateDevice,
-  type IotDeviceApi
 } from '#/api/iot/device/device';
+import type { IotDeviceApi } from '#/api/iot/device/device';
 import { $t } from '#/locales';

 import { useFormSchema } from '../data';
--- a/apps/web-antd/src/views/iot/device/device/modules/DeviceImportForm.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/DeviceImportForm.vue
@@ -111,14 +111,14 @@ const [Modal, modalApi] = useVbenModal({
 });

 /** 下载模板 */
-const handleDownloadTemplate = async () => {
+async function handleDownloadTemplate() {
  try {
    const res = await importDeviceTemplate();
    downloadFileFromBlobPart({ fileName: '设备导入模版.xls', source: res });
  } catch (error: any) {
    message.error(error.message || '下载失败');
  }
-};
+}
 </script>

 <template>
--- a/apps/web-antd/src/views/iot/device/device/modules/components/DeviceTableSelect.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/components/DeviceTableSelect.vue
@@ -139,7 +139,7 @@ const rowSelection = computed(() => ({
 }));

 /** 查询列表 */
-const getList = async () => {
+async function getList() {
  loading.value = true;
  try {
    if (props.productId) {
@@ -151,22 +151,22 @@ const getList = async () => {
  } finally {
    loading.value = false;
  }
-};
+}

 /** 搜索按钮操作 */
-const handleQuery = () => {
+function handleQuery() {
  queryParams.pageNo = 1;
  getList();
-};
+}

 /** 重置按钮操作 */
-const resetQuery = () => {
+function resetQuery() {
  queryFormRef.value.resetFields();
  handleQuery();
-};
+}

 /** 打开弹窗 */
-const open = async () => {
+async function open() {
  dialogVisible.value = true;
  // 重置选择状态
  selectedDevices.value = [];
@@ -178,7 +178,7 @@ const open = async () => {
  }
  // 获取设备列表
  await getList();
-};
+}
 defineExpose({ open });

 /** 处理行点击事件 */
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsMessage.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsMessage.vue
@@ -1,4 +1,164 @@
-<!-- 设备消息列表 -->
+<script setup lang="ts">
+import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue';
+
+import { ContentWrap } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { IconifyIcon } from '@vben/icons';
+import { formatDate } from '@vben/utils';
+
+import { Button, Form, Pagination, Select, Switch, Table, Tag } from 'ant-design-vue';
+
+import { getDeviceMessagePage } from '#/api/iot/device/device';
+import { DictTag } from '#/components/dict-tag';
+import { IotDeviceMessageMethodEnum } from '#/views/iot/utils/constants';
+
+const props = defineProps<{
+  deviceId: number;
+}>();
+
+// 查询参数
+const queryParams = reactive({
+  deviceId: props.deviceId,
+  method: undefined,
+  upstream: undefined,
+  pageNo: 1,
+  pageSize: 10,
+});
+
+// 列表数据
+const loading = ref(false);
+const total = ref(0);
+const list = ref<any[]>([]);
+const autoRefresh = ref(false); // 自动刷新开关
+let autoRefreshTimer: any = null; // 自动刷新定时器
+
+// 消息方法选项
+const methodOptions = computed(() => {
+  return Object.values(IotDeviceMessageMethodEnum).map((item) => ({
+    label: item.name,
+    value: item.method,
+  }));
+});
+
+// 表格列定义
+const columns = [
+  {
+    title: '时间',
+    dataIndex: 'ts',
+    key: 'ts',
+    align: 'center' as const,
+    width: 180,
+  },
+  {
+    title: '上行/下行',
+    dataIndex: 'upstream',
+    key: 'upstream',
+    align: 'center' as const,
+    width: 140,
+  },
+  {
+    title: '是否回复',
+    dataIndex: 'reply',
+    key: 'reply',
+    align: 'center' as const,
+    width: 140,
+  },
+  {
+    title: '请求编号',
+    dataIndex: 'requestId',
+    key: 'requestId',
+    align: 'center' as const,
+    width: 300,
+  },
+  {
+    title: '请求方法',
+    dataIndex: 'method',
+    key: 'method',
+    align: 'center' as const,
+    width: 140,
+  },
+  {
+    title: '请求/响应数据',
+    dataIndex: 'params',
+    key: 'params',
+    align: 'center' as const,
+    ellipsis: true,
+  },
+];
+
+/** 查询消息列表 */
+async function getMessageList() {
+  if (!props.deviceId) return;
+  loading.value = true;
+  try {
+    const data = await getDeviceMessagePage(queryParams);
+    total.value = data.total;
+    list.value = data.list;
+  } finally {
+    loading.value = false;
+  }
+}
+
+/** 搜索操作 */
+function handleQuery() {
+  queryParams.pageNo = 1;
+  getMessageList();
+}
+
+/** 监听自动刷新 */
+watch(autoRefresh, (newValue) => {
+  if (newValue) {
+    autoRefreshTimer = setInterval(() => {
+      getMessageList();
+    }, 5000);
+  } else {
+    clearInterval(autoRefreshTimer);
+    autoRefreshTimer = null;
+  }
+});
+
+/** 监听设备标识变化 */
+watch(
+  () => props.deviceId,
+  (newValue) => {
+    if (newValue) {
+      handleQuery();
+    }
+  },
+);
+
+/** 组件卸载时清除定时器 */
+onBeforeUnmount(() => {
+  if (autoRefreshTimer) {
+    clearInterval(autoRefreshTimer);
+    autoRefreshTimer = null;
+  }
+});
+
+/** 初始化 */
+onMounted(() => {
+  if (props.deviceId) {
+    getMessageList();
+  }
+});
+
+/** 刷新消息列表 */
+function refresh(delay = 0) {
+  if (delay > 0) {
+    setTimeout(() => {
+      handleQuery();
+    }, delay);
+  } else {
+    handleQuery();
+  }
+}
+
+/** 暴露方法给父组件 */
+defineExpose({
+  refresh,
+});
+</script>
+
 <template>
  <ContentWrap>
    <!-- 搜索区域 -->
@@ -94,164 +254,3 @@
    </div>
  </ContentWrap>
 </template>
-
-<script setup lang="ts">
-import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue';
-
-import { ContentWrap } from '@vben/common-ui';
-import { DICT_TYPE } from '@vben/constants';
-import { IconifyIcon } from '@vben/icons';
-import { formatDate } from '@vben/utils';
-
-import { Button, Form, Pagination, Select, Switch, Table, Tag } from 'ant-design-vue';
-
-import { getDeviceMessagePage } from '#/api/iot/device/device';
-import { DictTag } from '#/components/dict-tag';
-import { IotDeviceMessageMethodEnum } from '#/views/iot/utils/constants';
-
-const props = defineProps<{
-  deviceId: number;
-}>();
-
-// 查询参数
-const queryParams = reactive({
-  deviceId: props.deviceId,
-  method: undefined,
-  upstream: undefined,
-  pageNo: 1,
-  pageSize: 10,
-});
-
-// 列表数据
-const loading = ref(false);
-const total = ref(0);
-const list = ref<any[]>([]);
-const autoRefresh = ref(false); // 自动刷新开关
-let autoRefreshTimer: any = null; // 自动刷新定时器
-
-// 消息方法选项
-const methodOptions = computed(() => {
-  return Object.values(IotDeviceMessageMethodEnum).map((item) => ({
-    label: item.name,
-    value: item.method,
-  }));
-});
-
-// 表格列定义
-const columns = [
-  {
-    title: '时间',
-    dataIndex: 'ts',
-    key: 'ts',
-    align: 'center' as const,
-    width: 180,
-  },
-  {
-    title: '上行/下行',
-    dataIndex: 'upstream',
-    key: 'upstream',
-    align: 'center' as const,
-    width: 140,
-  },
-  {
-    title: '是否回复',
-    dataIndex: 'reply',
-    key: 'reply',
-    align: 'center' as const,
-    width: 140,
-  },
-  {
-    title: '请求编号',
-    dataIndex: 'requestId',
-    key: 'requestId',
-    align: 'center' as const,
-    width: 300,
-  },
-  {
-    title: '请求方法',
-    dataIndex: 'method',
-    key: 'method',
-    align: 'center' as const,
-    width: 140,
-  },
-  {
-    title: '请求/响应数据',
-    dataIndex: 'params',
-    key: 'params',
-    align: 'center' as const,
-    ellipsis: true,
-  },
-];
-
-/** 查询消息列表 */
-const getMessageList = async () => {
-  if (!props.deviceId) return;
-  loading.value = true;
-  try {
-    const data = await getDeviceMessagePage(queryParams);
-    total.value = data.total;
-    list.value = data.list;
-  } finally {
-    loading.value = false;
-  }
-};
-
-/** 搜索操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1;
-  getMessageList();
-};
-
-/** 监听自动刷新 */
-watch(autoRefresh, (newValue) => {
-  if (newValue) {
-    autoRefreshTimer = setInterval(() => {
-      getMessageList();
-    }, 5000);
-  } else {
-    clearInterval(autoRefreshTimer);
-    autoRefreshTimer = null;
-  }
-});
-
-/** 监听设备标识变化 */
-watch(
-  () => props.deviceId,
-  (newValue) => {
-    if (newValue) {
-      handleQuery();
-    }
-  },
-);
-
-/** 组件卸载时清除定时器 */
-onBeforeUnmount(() => {
-  if (autoRefreshTimer) {
-    clearInterval(autoRefreshTimer);
-    autoRefreshTimer = null;
-  }
-});
-
-/** 初始化 */
-onMounted(() => {
-  if (props.deviceId) {
-    getMessageList();
-  }
-});
-
-/** 刷新消息列表 */
-const refresh = (delay = 0) => {
-  if (delay > 0) {
-    setTimeout(() => {
-      handleQuery();
-    }, delay);
-  } else {
-    handleQuery();
-  }
-};
-
-/** 暴露方法给父组件 */
-defineExpose({
-  refresh,
-});
-</script>
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelService.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelService.vue
@@ -52,7 +52,7 @@ const serviceThingModels = computed(() => {
 });

 /** 查询列表 */
-const getList = async () => {
+async function getList() {
  if (!props.deviceId) return;
  loading.value = true;
  try {
@@ -62,43 +62,43 @@ const getList = async () => {
  } finally {
    loading.value = false;
  }
-};
+}

 /** 搜索按钮操作 */
-const handleQuery = () => {
+function handleQuery() {
  queryParams.pageNo = 1;
  getList();
-};
+}

 /** 重置按钮操作 */
-const resetQuery = () => {
+function resetQuery() {
  queryFormRef.value?.resetFields();
  queryParams.identifier = '';
  queryParams.times = [];
  handleQuery();
-};
+}

 /** 获取服务名称 */
-const getServiceName = (identifier: string | undefined) => {
+function getServiceName(identifier: string | undefined) {
  if (!identifier) return '-';
  const service = serviceThingModels.value.find(
    (item: ThingModelData) => item.identifier === identifier,
  );
  return service?.name || identifier;
-};
+}

 /** 获取调用方式 */
-const getCallType = (identifier: string | undefined) => {
+function getCallType(identifier: string | undefined) {
  if (!identifier) return '-';
  const service = serviceThingModels.value.find(
    (item: ThingModelData) => item.identifier === identifier,
  );
  if (!service?.service?.callType) return '-';
  return getThingModelServiceCallTypeLabel(service.service.callType) || '-';
-};
+}

 /** 解析参数 */
-const parseParams = (params: string) => {
+function parseParams(params: string) {
  if (!params) return '-';
  try {
    const parsed = JSON.parse(params);
@@ -109,7 +109,7 @@ const parseParams = (params: string) => {
  } catch {
    return params;
  }
-};
+}

 /** 初始化 */
 onMounted(() => {
--- a/apps/web-antd/src/views/iot/device/group/index.vue
+++ b/apps/web-antd/src/views/iot/device/group/index.vue
@@ -22,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });

 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
  gridApi.query();
 }

@@ -47,7 +47,7 @@ async function handleDelete(row: IotDeviceGroupApi.DeviceGroup) {
    message.success({
      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
    });
-    onRefresh();
+    handleRefresh();
  } finally {
    hideLoading();
  }
@@ -97,7 +97,7 @@ const [Grid, gridApi] = useVbenVxeGrid({

 <template>
  <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
    <Grid table-title="设备分组列表">
      <template #toolbar-tools>
        <TableAction