iot产品管理问题

1.修复物模型列表无限加载的问题
2.修复物模型管理页面添加,TSL,编辑,删除,功能类型选项功能不用问题
3.修复TSL按钮物模型接口没有的问题
4.修复物模型新增编辑页面的属性不能正常编辑修改问题美化显示
iot设备管理问题
1.修复新增编辑页面缺少字段相关组件
2.修复设备详情中子页面不显示问题
3.修复设备详情子页面物模型数据页面不显示问题
4.修复模拟设备右侧不显示问题 右侧溢出,改为上下分栏

Signed-off-by: Administrator <425053404@qq.com>
This commit is contained in:
Administrator
2025-10-17 00:13:48 +08:00
parent 22bd8b8f45
commit 54afd4555d
37 changed files with 1060 additions and 822 deletions

View File

@@ -1,17 +1,19 @@
<script setup lang="ts">
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { ThingModelApi } from '#/api/iot/thingmodel';
import { onMounted, provide, ref } from 'vue';
import { message } from 'ant-design-vue';
import { Page } from '@vben/common-ui';
import { IconifyIcon } from '@vben/icons';
import { Button, message } from 'ant-design-vue';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import { deleteThingModel, getThingModelPage } from '#/api/iot/thingmodel';
import { getProduct } from '#/api/iot/product/product';
import type { IotProductApi } from '#/api/iot/product/product';
import { getDataTypeOptionsLabel } from '../utils/constants';
import { useGridColumns, useGridFormSchema } from './data';
import { getDataTypeOptionsLabel, IOT_PROVIDE_KEY } from '../utils/constants';
import ThingModelForm from './modules/ThingModelForm.vue';
import ThingModelTSL from './modules/ThingModelTSL.vue';
import { DataDefinition } from './modules/components';
defineOptions({ name: 'IoTThingModel' });
@@ -19,6 +21,16 @@ const props = defineProps<{
productId: number;
}>();
// 产品信息
const product = ref<IotProductApi.Product>({} as IotProductApi.Product);
// 提供产品信息给子组件
provide(IOT_PROVIDE_KEY.PRODUCT, product);
// 组件引用
const thingModelFormRef = ref();
const thingModelTSLRef = ref();
const [Grid, gridApi] = useVbenVxeGrid({
gridOptions: {
columns: useGridColumns(),
@@ -26,12 +38,12 @@ const [Grid, gridApi] = useVbenVxeGrid({
keepSource: true,
proxyConfig: {
ajax: {
query: async ({ page, form }) => {
query: async ({ page }: any, formValues: any) => {
return await getThingModelPage({
pageNo: page.currentPage,
pageSize: page.pageSize,
productId: props.productId,
...form,
...formValues,
});
},
},
@@ -44,7 +56,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
refresh: true,
search: true,
},
} as VxeTableGridOptions<ThingModelApi.ThingModel>,
},
formOptions: {
schema: useGridFormSchema(),
},
@@ -52,14 +64,12 @@ const [Grid, gridApi] = useVbenVxeGrid({
// 新增功能
const handleCreate = () => {
// TODO: 打开物模型表单
console.error('新增功能');
thingModelFormRef.value?.open('create');
};
// 编辑功能
const handleEdit = (row: any) => {
// TODO: 打开物模型表单
console.error('编辑功能:', row);
thingModelFormRef.value?.open('update', row.id);
};
// 删除功能
@@ -75,28 +85,58 @@ const handleDelete = async (row: any) => {
// 打开 TSL
const handleOpenTSL = () => {
// TODO: 打开 TSL 弹窗
console.error('打开 TSL');
thingModelTSLRef.value?.open();
};
// 获取数据类型标签
const getDataTypeLabel = (row: any) => {
return getDataTypeOptionsLabel(row.property?.dataType) || '-';
};
// 刷新表格
const handleRefresh = () => {
gridApi.reload();
};
// 获取产品信息
const getProductData = async () => {
try {
product.value = await getProduct(props.productId);
} catch (error) {
console.error('获取产品信息失败:', error);
}
};
// 初始化
onMounted(async () => {
await getProductData();
});
</script>
<template>
<Page
auto-content-height
description="管理产品的物模型定义,包括属性、服务和事件"
title="物模型管理"
>
<Grid>
<Grid ref="xGrid">
<template #toolbar-tools>
<Button @click="handleCreate">
<IconifyIcon icon="ant-design:plus-outlined" class="mr-1" />
添加功能
</Button>
<Button type="primary" @click="handleOpenTSL"> TSL </Button>
<TableAction
:actions="[
{
label: '添加功能',
type: 'primary',
icon: ACTION_ICON.ADD,
onClick: handleCreate,
},
{
label: 'TSL',
type: 'default',
color: 'success',
onClick: handleOpenTSL,
},
]"
/>
</template>
<!-- 数据类型列 -->
@@ -106,17 +146,38 @@ const getDataTypeLabel = (row: any) => {
<!-- 数据定义列 -->
<template #dataDefinition="{ row }">
<!-- TODO: 实现数据定义组件 -->
<span class="text-gray-400">{{ row }}</span>
<DataDefinition :data="row" />
</template>
<!-- 操作列 -->
<template #actions="{ row }">
<Button size="small" type="primary" @click="handleEdit(row)">
编辑
</Button>
<Button size="small" danger @click="handleDelete(row)"> 删除 </Button>
<TableAction
:actions="[
{
label: '编辑',
type: 'link',
icon: ACTION_ICON.EDIT,
onClick: handleEdit.bind(null, row),
},
{
label: '删除',
type: 'link',
danger: true,
icon: ACTION_ICON.DELETE,
popConfirm: {
title: '确认删除该功能吗?',
confirm: handleDelete.bind(null, row),
},
},
]"
/>
</template>
</Grid>
<!-- 物模型表单 -->
<ThingModelForm ref="thingModelFormRef" @success="handleRefresh" />
<!-- TSL 弹窗 -->
<ThingModelTSL ref="thingModelTSLRef" />
</Page>
</template>