From fdc971dd03287c2381722db09c1de4a86e69370c Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 11 Dec 2024 13:14:47 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E3=80=91IOT:=20=E4=BA=A7=E5=93=81=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=8C20%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/ThingModel/ThingModelDataSpecs.vue |  98 ++++
 .../detail/ThingModel/ThingModelDataType.vue  |  29 +
 .../ThingModelForm.vue}                       |  56 +-
 .../ThingModelNumberTypeDataSpecs.vue         |  59 ++
 .../index.vue}                                |  65 ++-
 .../iot/product/product/detail/index.vue      |   9 +-
 src/views/iot/utils/constants.ts              | 535 ++++++++++++++++++
 7 files changed, 778 insertions(+), 73 deletions(-)
 create mode 100644 src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
 create mode 100644 src/views/iot/product/product/detail/ThingModel/ThingModelDataType.vue
 rename src/views/iot/product/product/detail/{ThinkModelFunctionForm.vue => ThingModel/ThingModelForm.vue} (72%)
 create mode 100644 src/views/iot/product/product/detail/ThingModel/ThingModelNumberTypeDataSpecs.vue
 rename src/views/iot/product/product/detail/{ThinkModelFunction.vue => ThingModel/index.vue} (73%)
 create mode 100644 src/views/iot/utils/constants.ts

diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
new file mode 100644
index 00000000..5d5ff7e1
--- /dev/null
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
@@ -0,0 +1,98 @@
+<template>
+  <el-select
+    v-model="formData.property.dataType.type"
+    :disabled="!!formData.id"
+    placeholder="请选择数据类型"
+  >
+    <el-option key="int" label="int32 (整数型)" value="int" />
+    <el-option key="float" label="float (单精度浮点型)" value="float" />
+    <el-option key="double" label="double (双精度浮点型)" value="double" />
+    <el-option key="enum" label="enum(枚举型)" value="enum" />
+    <el-option key="bool" label="bool (布尔型)" value="bool" />
+    <el-option key="text" label="text (文本型)" value="text" />
+    <el-option key="date" label="date (时间型)" value="date" />
+    <el-option key="struct" label="struct (结构体)" value="struct" />
+    <el-option key="array" label="array (数组)" value="array" />
+  </el-select>
+  <!-- 情况一：数值型 -->
+</template>
+
+<script lang="ts" setup>
+import { useVModel } from '@vueuse/core'
+
+/** 物模型数据类型 */
+defineOptions({ name: 'ThingModelDataSpecs' })
+const props = defineProps<{ modelValue: any }>()
+const emits = defineEmits(['update:modelValue'])
+const formData = useVModel(props, 'modelValue', emits)
+
+// dataType为INT的dataSpecs示例：
+//
+// {
+//   "dataSpecs": {
+//   "custom": true,
+//       "dataType": "INT",
+//       "defaultValue": "30",
+//       "max": "1440",
+//       "min": "0",
+//       "step": "10",
+//       "unit": "min"
+// }
+// }
+// dataType为TEXT的dataSpecs示例：
+//
+// {
+//   "dataSpecs": {
+//   "custom": true,
+//       "dataType": "TEXT",
+//       "id": 2412127,
+//       "length": 2048
+// }
+// }
+// dataType为ARRAY的dataSpecs示例：
+//
+// {
+//   "dataSpecs": {
+//   "childDataType": "INT",
+//       "custom": true,
+//       "dataType": "ARRAY",
+//       "size": 1
+// }
+// }
+// dataType为ENUM的dataSpecsList示例：
+//
+// {
+//   "dataSpecsList": [
+//   {
+//     "custom": false,
+//     "dataType": "ENUM",
+//     "defaultValue": "true",
+//     "name": "打开",
+//     "value": 1
+//   },
+//   {
+//     "custom": false,
+//     "dataType": "ENUM",
+//     "defaultValue": "false",
+//     "name": "关闭",
+//     "value": 0
+//   }
+// ]
+// }
+// dataType为STRUCT的dataSpecsList示例：
+//
+// {
+//   "childDataType": "TEXT",
+//     "childName": "卡编号",
+//     "dataSpecs": {
+//   "custom": true,
+//       "dataType": "TEXT",
+//       "length": 128
+// },
+//   "dataType": "STRUCT",
+//     "identifier": "CardNo",
+//     "name": "NVR所拥有的芯片信息"
+// }
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelDataType.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelDataType.vue
new file mode 100644
index 00000000..206d8909
--- /dev/null
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelDataType.vue
@@ -0,0 +1,29 @@
+<template>
+  <el-select
+    v-model="formData.property.dataType.type"
+    :disabled="!!formData.id"
+    placeholder="请选择数据类型"
+  >
+    <el-option key="int" label="int32 (整数型)" value="int" />
+    <el-option key="float" label="float (单精度浮点型)" value="float" />
+    <el-option key="double" label="double (双精度浮点型)" value="double" />
+    <el-option key="enum" label="enum(枚举型)" value="enum" />
+    <el-option key="bool" label="bool (布尔型)" value="bool" />
+    <el-option key="text" label="text (文本型)" value="text" />
+    <el-option key="date" label="date (时间型)" value="date" />
+    <el-option key="struct" label="struct (结构体)" value="struct" />
+    <el-option key="array" label="array (数组)" value="array" />
+  </el-select>
+</template>
+
+<script lang="ts" setup>
+import { useVModel } from '@vueuse/core'
+
+/** 物模型数据类型 */
+defineOptions({ name: 'ThingModelDataType' })
+const props = defineProps<{ modelValue: any }>()
+const emits = defineEmits(['update:modelValue'])
+const formData = useVModel(props, 'modelValue', emits)
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/iot/product/product/detail/ThinkModelFunctionForm.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
similarity index 72%
rename from src/views/iot/product/product/detail/ThinkModelFunctionForm.vue
rename to src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
index 963d86b2..a2beb91f 100644
--- a/src/views/iot/product/product/detail/ThinkModelFunctionForm.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
@@ -1,17 +1,17 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
     <el-form
       ref="formRef"
+      v-loading="formLoading"
       :model="formData"
       :rules="formRules"
       label-width="100px"
-      v-loading="formLoading"
     >
       <el-form-item label="功能类型" prop="type">
         <el-radio-group v-model="formData.type">
-          <el-radio-button :value="1"> 属性 </el-radio-button>
-          <el-radio-button :value="2"> 服务 </el-radio-button>
-          <el-radio-button :value="3"> 事件 </el-radio-button>
+          <el-radio-button :value="1"> 属性</el-radio-button>
+          <el-radio-button :value="2"> 服务</el-radio-button>
+          <el-radio-button :value="3"> 事件</el-radio-button>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="功能名称" prop="name">
@@ -20,38 +20,14 @@
       <el-form-item label="标识符" prop="identifier">
         <el-input
           v-model="formData.identifier"
-          placeholder="请输入标识符"
           :disabled="formType === 'update'"
+          placeholder="请输入标识符"
         />
       </el-form-item>
       <el-form-item label="数据类型" prop="type">
-        <el-select
-          v-model="formData.property.dataType.type"
-          placeholder="请选择数据类型"
-          :disabled="formType === 'update'"
-        >
-          <el-option key="int" label="int32 (整数型)" value="int" />
-          <el-option key="float" label="float (单精度浮点型)" value="float" />
-          <el-option key="double" label="double (双精度浮点型)" value="double" />
-          <!--          <el-option key="text" label="text (文本型)" value="text" />-->
-          <!--          <el-option key="date" label="date (日期型)" value="date" />-->
-          <!--          <el-option key="bool" label="bool (布尔型)" value="bool" />-->
-          <!--          <el-option key="enum" label="enum (枚举型)" value="enum" />-->
-          <!--          <el-option key="struct" label="struct (结构体)" value="struct" />-->
-          <!--          <el-option key="array" label="array (数组)" value="array" />-->
-        </el-select>
-      </el-form-item>
-      <el-form-item label="取值范围" prop="max">
-        <el-input v-model="formData.property.dataType.specs.min" placeholder="请输入最小值" />
-        <span class="mx-2">~</span>
-        <el-input v-model="formData.property.dataType.specs.max" placeholder="请输入最大值" />
-      </el-form-item>
-      <el-form-item label="步长" prop="step">
-        <el-input v-model="formData.property.dataType.specs.step" placeholder="请输入步长" />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input v-model="formData.property.dataType.specs.unit" placeholder="请输入单位" />
+        <ThingModelDataType v-model="formData" />
       </el-form-item>
+      <ThingModelNumberTypeDataSpecs v-model="formData" />
       <el-form-item label="读写类型" prop="accessMode">
         <el-radio-group v-model="formData.property.accessMode">
           <el-radio label="rw">读写</el-radio>
@@ -60,21 +36,22 @@
       </el-form-item>
       <el-form-item label="属性描述" prop="property.description">
         <el-input
-          type="textarea"
           v-model="formData.property.description"
           placeholder="请输入属性描述"
+          type="textarea"
         />
       </el-form-item>
     </el-form>
 
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
 </template>
 
-<script setup lang="ts">
+<script lang="ts" setup>
+import ThingModelNumberTypeDataSpecs from './ThingModelNumberTypeDataSpecs.vue'
 import { ProductVO } from '@/api/iot/product/product'
 import {
   ProductFunctionAccessModeEnum,
@@ -82,10 +59,11 @@ import {
   ThinkModelFunctionApi,
   ThinkModelFunctionVO
 } from '@/api/iot/thinkmodelfunction'
+import { IOT_PROVIDE_KEY } from '@/views/iot/utils/constants'
 
-const props = defineProps<{ product: ProductVO }>()
+defineOptions({ name: 'IoTProductThingModelForm' })
 
-defineOptions({ name: 'ThinkModelFunctionForm' })
+const product = inject<Ref<ProductVO>>(IOT_PROVIDE_KEY.PRODUCT) // 注入产品信息
 
 const { t } = useI18n()
 const message = useMessage()
@@ -184,8 +162,8 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = formData.value as unknown as ThinkModelFunctionVO
-    data.productId = props.product.id
-    data.productKey = props.product.productKey
+    data.productId = product!.value.id
+    data.productKey = product!.value.productKey
     if (formType.value === 'create') {
       await ThinkModelFunctionApi.createThinkModelFunction(data)
       message.success(t('common.createSuccess'))
diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelNumberTypeDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelNumberTypeDataSpecs.vue
new file mode 100644
index 00000000..65bd1fc9
--- /dev/null
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelNumberTypeDataSpecs.vue
@@ -0,0 +1,59 @@
+<template>
+  <el-form-item label="取值范围" prop="max">
+    <div class="flex items-center justify-between">
+      <el-input v-model="formData.min" placeholder="请输入最小值" />
+      <span class="mx-2">~</span>
+      <el-input v-model="formData.max" placeholder="请输入最大值" />
+    </div>
+  </el-form-item>
+  <el-form-item label="步长" prop="step">
+    <el-input v-model="formData.step" placeholder="请输入步长" />
+  </el-form-item>
+  <el-form-item label="单位" prop="unit">
+    <el-select
+      :model-value="formData.unit ? formData.unitName + '-' + formData.unit : ''"
+      filterable
+      placeholder="请选择单位"
+      style="width: 240px"
+      @change="unitChange"
+    >
+      <el-option
+        v-for="(item, index) in UnifyUnitSpecsDTO"
+        :key="index"
+        :label="item.Name + '-' + item.Symbol"
+        :value="item.Name + '-' + item.Symbol"
+      />
+    </el-select>
+  </el-form-item>
+</template>
+
+<script lang="ts" setup>
+import { useVModel } from '@vueuse/core'
+import { UnifyUnitSpecsDTO } from '@/views/iot/utils/constants'
+
+defineOptions({ name: 'ThingModelNumberTypeDataSpecs' })
+const props = defineProps<{ modelValue: any }>()
+const emits = defineEmits(['update:modelValue'])
+const formData = useVModel(props, 'modelValue', emits) as Ref<DataConfig>
+type DataType = 'INT' | 'FLOAT' | 'DOUBLE'
+
+interface DataConfig {
+  dataType: DataType // 数据类型，取值为 INT、FLOAT 或 DOUBLE
+  max: string // 最大值，必须与 dataType 设置一致，且为 STRING 类型
+  min: string // 最小值，必须与 dataType 设置一致，且为 STRING 类型
+  step: string // 步长，必须与 dataType 设置一致，且为 STRING 类型
+  precise?: string // 精度，当 dataType 为 FLOAT 或 DOUBLE 时可选
+  defaultValue?: string // 默认值，可选
+  unit: string // 单位的符号
+  unitName: string // 单位的名称
+}
+
+/** 单位发生变化时触发 */
+const unitChange = (UnitSpecs: string) => {
+  const [unitName, unit] = UnitSpecs.split('-')
+  formData.value.unitName = unitName
+  formData.value.unit = unit
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/iot/product/product/detail/ThinkModelFunction.vue b/src/views/iot/product/product/detail/ThingModel/index.vue
similarity index 73%
rename from src/views/iot/product/product/detail/ThinkModelFunction.vue
rename to src/views/iot/product/product/detail/ThingModel/index.vue
index 4f10ad06..286fe12d 100644
--- a/src/views/iot/product/product/detail/ThinkModelFunction.vue
+++ b/src/views/iot/product/product/detail/ThingModel/index.vue
@@ -2,18 +2,18 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
-      class="-mb-15px"
-      :model="queryParams"
       ref="queryFormRef"
       :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
       label-width="68px"
     >
       <el-form-item label="功能类型" prop="name">
         <el-select
           v-model="queryParams.type"
-          placeholder="请选择功能类型"
-          clearable
           class="!w-240px"
+          clearable
+          placeholder="请选择功能类型"
         >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.IOT_PRODUCT_FUNCTION_TYPE)"
@@ -24,46 +24,48 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['iot:think-model-function:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 添加功能
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button plain type="primary" @click="openForm('create')">
+          <Icon class="mr-5px" icon="ep:plus" />
+          添加功能
         </el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
   <ContentWrap>
     <el-tabs>
-      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-        <el-table-column label="功能类型" align="center" prop="type">
+      <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+        <el-table-column align="center" label="功能类型" prop="type">
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.IOT_PRODUCT_FUNCTION_TYPE" :value="scope.row.type" />
           </template>
         </el-table-column>
-        <el-table-column label="功能名称" align="center" prop="name" />
-        <el-table-column label="标识符" align="center" prop="identifier" />
-        <el-table-column label="数据类型" align="center" prop="identifier" />
-        <el-table-column label="数据定义" align="center" prop="identifier" />
-        <el-table-column label="操作" align="center">
+        <el-table-column align="center" label="功能名称" prop="name" />
+        <el-table-column align="center" label="标识符" prop="identifier" />
+        <el-table-column align="center" label="数据类型" prop="identifier" />
+        <el-table-column align="center" label="数据定义" prop="identifier" />
+        <el-table-column align="center" label="操作">
           <template #default="scope">
             <el-button
+              v-hasPermi="[`iot:think-model-function:update`]"
               link
               type="primary"
               @click="openForm('update', scope.row.id)"
-              v-hasPermi="[`iot:think-model-function:update`]"
             >
               编辑
             </el-button>
             <el-button
+              v-hasPermi="['iot:think-model-function:delete']"
               link
               type="danger"
               @click="handleDelete(scope.row.id)"
-              v-hasPermi="['iot:think-model-function:delete']"
             >
               删除
             </el-button>
@@ -72,23 +74,24 @@
       </el-table>
       <!-- 分页 -->
       <Pagination
-        :total="total"
-        v-model:page="queryParams.pageNo"
         v-model:limit="queryParams.pageSize"
+        v-model:page="queryParams.pageNo"
+        :total="total"
         @pagination="getList"
       />
     </el-tabs>
   </ContentWrap>
   <!-- 表单弹窗：添加/修改 -->
-  <ThinkModelFunctionForm ref="formRef" :product="product" @success="getList" />
+  <ThingModelForm ref="formRef" @success="getList" />
 </template>
-<script setup lang="ts">
-import { ProductVO } from '@/api/iot/product/product'
+<script lang="ts" setup>
 import { ThinkModelFunctionApi, ThinkModelFunctionVO } from '@/api/iot/thinkmodelfunction'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import ThinkModelFunctionForm from './ThinkModelFunctionForm.vue'
+import ThingModelForm from './ThingModelForm.vue'
+import { ProductVO } from '@/api/iot/product/product'
+import { IOT_PROVIDE_KEY } from '@/views/iot/utils/constants'
 
-const props = defineProps<{ product: ProductVO }>()
+defineOptions({ name: 'IoTProductThingModel' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -104,12 +107,12 @@ const queryParams = reactive({
 })
 
 const queryFormRef = ref() // 搜索的表单
-
+const product = inject<Ref<ProductVO>>(IOT_PROVIDE_KEY.PRODUCT) // 注入产品信息
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
-    queryParams.productId = props.product.id
+    queryParams.productId = product?.value?.id || -1
     const data = await ThinkModelFunctionApi.getThinkModelFunctionPage(queryParams)
     list.value = data.list
     total.value = data.total
diff --git a/src/views/iot/product/product/detail/index.vue b/src/views/iot/product/product/detail/index.vue
index 5c4a32f6..e520ced1 100644
--- a/src/views/iot/product/product/detail/index.vue
+++ b/src/views/iot/product/product/detail/index.vue
@@ -8,8 +8,8 @@
       <el-tab-pane label="Topic 类列表" name="topic">
         <ProductTopic v-if="activeTab === 'topic'" :product="product" />
       </el-tab-pane>
-      <el-tab-pane label="功能定义" name="function">
-        <ThinkModelFunction v-if="activeTab === 'function'" :product="product" />
+      <el-tab-pane label="功能定义" lazy name="function">
+        <IoTProductThingModel ref="thingModelRef" />
       </el-tab-pane>
       <el-tab-pane label="消息解析" name="message" />
       <el-tab-pane label="服务端订阅" name="subscription" />
@@ -22,9 +22,10 @@ import { DeviceApi } from '@/api/iot/device'
 import ProductDetailsHeader from './ProductDetailsHeader.vue'
 import ProductDetailsInfo from './ProductDetailsInfo.vue'
 import ProductTopic from './ProductTopic.vue'
-import ThinkModelFunction from './ThinkModelFunction.vue'
+import IoTProductThingModel from './ThingModel/index.vue'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { useRouter } from 'vue-router'
+import { IOT_PROVIDE_KEY } from '@/views/iot/utils/constants'
 
 defineOptions({ name: 'IoTProductDetail' })
 
@@ -38,6 +39,8 @@ const loading = ref(true) // 加载中
 const product = ref<ProductVO>({} as ProductVO) // 详情
 const activeTab = ref('info') // 默认激活的标签页
 
+provide(IOT_PROVIDE_KEY.PRODUCT, product) // 提供产品信息给产品信息详情页的所有子组件
+
 /** 获取详情 */
 const getProductData = async (id: number) => {
   loading.value = true
diff --git a/src/views/iot/utils/constants.ts b/src/views/iot/utils/constants.ts
new file mode 100644
index 00000000..e6ef25a8
--- /dev/null
+++ b/src/views/iot/utils/constants.ts
@@ -0,0 +1,535 @@
+/** iot 依赖注入 KEY */
+export const IOT_PROVIDE_KEY = {
+  PRODUCT: 'IOT_PRODUCT'
+}
+// TODO puhui999: 物模型数字数据类型单位类型，后面改成字典获取
+export const UnifyUnitSpecsDTO = [
+  {
+    Symbol: 'L/min',
+    Name: '升每分钟'
+  },
+  {
+    Symbol: 'mg/kg',
+    Name: '毫克每千克'
+  },
+  {
+    Symbol: 'NTU',
+    Name: '浊度'
+  },
+  {
+    Symbol: 'pH',
+    Name: 'PH值'
+  },
+  {
+    Symbol: 'dS/m',
+    Name: '土壤EC值'
+  },
+  {
+    Symbol: 'W/㎡',
+    Name: '太阳总辐射'
+  },
+  {
+    Symbol: 'mm/hour',
+    Name: '降雨量'
+  },
+  {
+    Symbol: 'var',
+    Name: '乏'
+  },
+  {
+    Symbol: 'cP',
+    Name: '厘泊'
+  },
+  {
+    Symbol: 'aw',
+    Name: '饱和度'
+  },
+  {
+    Symbol: 'pcs',
+    Name: '个'
+  },
+  {
+    Symbol: 'cst',
+    Name: '厘斯'
+  },
+  {
+    Symbol: 'bar',
+    Name: '巴'
+  },
+  {
+    Symbol: 'ppt',
+    Name: '纳克每升'
+  },
+  {
+    Symbol: 'ppb',
+    Name: '微克每升'
+  },
+  {
+    Symbol: 'uS/cm',
+    Name: '微西每厘米'
+  },
+  {
+    Symbol: 'N/C',
+    Name: '牛顿每库仑'
+  },
+  {
+    Symbol: 'V/m',
+    Name: '伏特每米'
+  },
+  {
+    Symbol: 'ml/min',
+    Name: '滴速'
+  },
+  {
+    Symbol: 'mmHg',
+    Name: '毫米汞柱'
+  },
+  {
+    Symbol: 'mmol/L',
+    Name: '血糖'
+  },
+  {
+    Symbol: 'mm/s',
+    Name: '毫米每秒'
+  },
+  {
+    Symbol: 'turn/m',
+    Name: '转每分钟'
+  },
+  {
+    Symbol: 'count',
+    Name: '次'
+  },
+  {
+    Symbol: 'gear',
+    Name: '档'
+  },
+  {
+    Symbol: 'stepCount',
+    Name: '步'
+  },
+  {
+    Symbol: 'Nm3/h',
+    Name: '标准立方米每小时'
+  },
+  {
+    Symbol: 'kV',
+    Name: '千伏'
+  },
+  {
+    Symbol: 'kVA',
+    Name: '千伏安'
+  },
+  {
+    Symbol: 'kVar',
+    Name: '千乏'
+  },
+  {
+    Symbol: 'uw/cm2',
+    Name: '微瓦每平方厘米'
+  },
+  {
+    Symbol: '只',
+    Name: '只'
+  },
+  {
+    Symbol: '%RH',
+    Name: '相对湿度'
+  },
+  {
+    Symbol: 'm³/s',
+    Name: '立方米每秒'
+  },
+  {
+    Symbol: 'kg/s',
+    Name: '公斤每秒'
+  },
+  {
+    Symbol: 'r/min',
+    Name: '转每分钟'
+  },
+  {
+    Symbol: 't/h',
+    Name: '吨每小时'
+  },
+  {
+    Symbol: 'KCL/h',
+    Name: '千卡每小时'
+  },
+  {
+    Symbol: 'L/s',
+    Name: '升每秒'
+  },
+  {
+    Symbol: 'Mpa',
+    Name: '兆帕'
+  },
+  {
+    Symbol: 'm³/h',
+    Name: '立方米每小时'
+  },
+  {
+    Symbol: 'kvarh',
+    Name: '千乏时'
+  },
+  {
+    Symbol: 'μg/L',
+    Name: '微克每升'
+  },
+  {
+    Symbol: 'kcal',
+    Name: '千卡路里'
+  },
+  {
+    Symbol: 'GB',
+    Name: '吉字节'
+  },
+  {
+    Symbol: 'MB',
+    Name: '兆字节'
+  },
+  {
+    Symbol: 'KB',
+    Name: '千字节'
+  },
+  {
+    Symbol: 'B',
+    Name: '字节'
+  },
+  {
+    Symbol: 'μg/(d㎡·d)',
+    Name: '微克每平方分米每天'
+  },
+  {
+    Symbol: '',
+    Name: '无'
+  },
+  {
+    Symbol: 'ppm',
+    Name: '百万分率'
+  },
+  {
+    Symbol: 'pixel',
+    Name: '像素'
+  },
+  {
+    Symbol: 'Lux',
+    Name: '照度'
+  },
+  {
+    Symbol: 'grav',
+    Name: '重力加速度'
+  },
+  {
+    Symbol: 'dB',
+    Name: '分贝'
+  },
+  {
+    Symbol: '%',
+    Name: '百分比'
+  },
+  {
+    Symbol: 'lm',
+    Name: '流明'
+  },
+  {
+    Symbol: 'bit',
+    Name: '比特'
+  },
+  {
+    Symbol: 'g/mL',
+    Name: '克每毫升'
+  },
+  {
+    Symbol: 'g/L',
+    Name: '克每升'
+  },
+  {
+    Symbol: 'mg/L',
+    Name: '毫克每升'
+  },
+  {
+    Symbol: 'μg/m³',
+    Name: '微克每立方米'
+  },
+  {
+    Symbol: 'mg/m³',
+    Name: '毫克每立方米'
+  },
+  {
+    Symbol: 'g/m³',
+    Name: '克每立方米'
+  },
+  {
+    Symbol: 'kg/m³',
+    Name: '千克每立方米'
+  },
+  {
+    Symbol: 'nF',
+    Name: '纳法'
+  },
+  {
+    Symbol: 'pF',
+    Name: '皮法'
+  },
+  {
+    Symbol: 'μF',
+    Name: '微法'
+  },
+  {
+    Symbol: 'F',
+    Name: '法拉'
+  },
+  {
+    Symbol: 'Ω',
+    Name: '欧姆'
+  },
+  {
+    Symbol: 'μA',
+    Name: '微安'
+  },
+  {
+    Symbol: 'mA',
+    Name: '毫安'
+  },
+  {
+    Symbol: 'kA',
+    Name: '千安'
+  },
+  {
+    Symbol: 'A',
+    Name: '安培'
+  },
+  {
+    Symbol: 'mV',
+    Name: '毫伏'
+  },
+  {
+    Symbol: 'V',
+    Name: '伏特'
+  },
+  {
+    Symbol: 'ms',
+    Name: '毫秒'
+  },
+  {
+    Symbol: 's',
+    Name: '秒'
+  },
+  {
+    Symbol: 'min',
+    Name: '分钟'
+  },
+  {
+    Symbol: 'h',
+    Name: '小时'
+  },
+  {
+    Symbol: 'day',
+    Name: '日'
+  },
+  {
+    Symbol: 'week',
+    Name: '周'
+  },
+  {
+    Symbol: 'month',
+    Name: '月'
+  },
+  {
+    Symbol: 'year',
+    Name: '年'
+  },
+  {
+    Symbol: 'kn',
+    Name: '节'
+  },
+  {
+    Symbol: 'km/h',
+    Name: '千米每小时'
+  },
+  {
+    Symbol: 'm/s',
+    Name: '米每秒'
+  },
+  {
+    Symbol: '″',
+    Name: '秒'
+  },
+  {
+    Symbol: '′',
+    Name: '分'
+  },
+  {
+    Symbol: '°',
+    Name: '度'
+  },
+  {
+    Symbol: 'rad',
+    Name: '弧度'
+  },
+  {
+    Symbol: 'Hz',
+    Name: '赫兹'
+  },
+  {
+    Symbol: 'μW',
+    Name: '微瓦'
+  },
+  {
+    Symbol: 'mW',
+    Name: '毫瓦'
+  },
+  {
+    Symbol: 'kW',
+    Name: '千瓦特'
+  },
+  {
+    Symbol: 'W',
+    Name: '瓦特'
+  },
+  {
+    Symbol: 'cal',
+    Name: '卡路里'
+  },
+  {
+    Symbol: 'kW·h',
+    Name: '千瓦时'
+  },
+  {
+    Symbol: 'Wh',
+    Name: '瓦时'
+  },
+  {
+    Symbol: 'eV',
+    Name: '电子伏'
+  },
+  {
+    Symbol: 'kJ',
+    Name: '千焦'
+  },
+  {
+    Symbol: 'J',
+    Name: '焦耳'
+  },
+  {
+    Symbol: '℉',
+    Name: '华氏度'
+  },
+  {
+    Symbol: 'K',
+    Name: '开尔文'
+  },
+  {
+    Symbol: 't',
+    Name: '吨'
+  },
+  {
+    Symbol: '°C',
+    Name: '摄氏度'
+  },
+  {
+    Symbol: 'mPa',
+    Name: '毫帕'
+  },
+  {
+    Symbol: 'hPa',
+    Name: '百帕'
+  },
+  {
+    Symbol: 'kPa',
+    Name: '千帕'
+  },
+  {
+    Symbol: 'Pa',
+    Name: '帕斯卡'
+  },
+  {
+    Symbol: 'mg',
+    Name: '毫克'
+  },
+  {
+    Symbol: 'g',
+    Name: '克'
+  },
+  {
+    Symbol: 'kg',
+    Name: '千克'
+  },
+  {
+    Symbol: 'N',
+    Name: '牛'
+  },
+  {
+    Symbol: 'mL',
+    Name: '毫升'
+  },
+  {
+    Symbol: 'L',
+    Name: '升'
+  },
+  {
+    Symbol: 'mm³',
+    Name: '立方毫米'
+  },
+  {
+    Symbol: 'cm³',
+    Name: '立方厘米'
+  },
+  {
+    Symbol: 'km³',
+    Name: '立方千米'
+  },
+  {
+    Symbol: 'm³',
+    Name: '立方米'
+  },
+  {
+    Symbol: 'h㎡',
+    Name: '公顷'
+  },
+  {
+    Symbol: 'c㎡',
+    Name: '平方厘米'
+  },
+  {
+    Symbol: 'm㎡',
+    Name: '平方毫米'
+  },
+  {
+    Symbol: 'k㎡',
+    Name: '平方千米'
+  },
+  {
+    Symbol: '㎡',
+    Name: '平方米'
+  },
+  {
+    Symbol: 'nm',
+    Name: '纳米'
+  },
+  {
+    Symbol: 'μm',
+    Name: '微米'
+  },
+  {
+    Symbol: 'mm',
+    Name: '毫米'
+  },
+  {
+    Symbol: 'cm',
+    Name: '厘米'
+  },
+  {
+    Symbol: 'dm',
+    Name: '分米'
+  },
+  {
+    Symbol: 'km',
+    Name: '千米'
+  },
+  {
+    Symbol: 'm',
+    Name: '米'
+  }
+]

From 94d74f1a098b90e69885c9ee72b422ae000f126c Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 13 Dec 2024 17:36:20 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E3=80=91IOT:=20=E4=BA=A7=E5=93=81=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=8C30%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/ThingModel/ThingModelDataSpecs.vue | 48 ++++++++------
 .../detail/ThingModel/ThingModelDataType.vue  | 29 ---------
 .../detail/ThingModel/ThingModelForm.vue      | 62 ++++---------------
 .../product/detail/ThingModel/config.ts       | 38 ++++++++++++
 .../dataSpecs/ThingModelDataType.vue          | 38 ++++++++++++
 .../dataSpecs/ThingModelEnumTypeDataSpecs.vue | 26 ++++++++
 .../ThingModelNumberTypeDataSpecs.vue         | 16 +----
 .../detail/ThingModel/dataSpecs/index.ts      |  5 ++
 8 files changed, 153 insertions(+), 109 deletions(-)
 delete mode 100644 src/views/iot/product/product/detail/ThingModel/ThingModelDataType.vue
 create mode 100644 src/views/iot/product/product/detail/ThingModel/config.ts
 create mode 100644 src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelDataType.vue
 create mode 100644 src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue
 rename src/views/iot/product/product/detail/ThingModel/{ => dataSpecs}/ThingModelNumberTypeDataSpecs.vue (72%)
 create mode 100644 src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts

diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
index 5d5ff7e1..33816a80 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
@@ -1,31 +1,43 @@
 <template>
-  <el-select
-    v-model="formData.property.dataType.type"
-    :disabled="!!formData.id"
-    placeholder="请选择数据类型"
-  >
-    <el-option key="int" label="int32 (整数型)" value="int" />
-    <el-option key="float" label="float (单精度浮点型)" value="float" />
-    <el-option key="double" label="double (双精度浮点型)" value="double" />
-    <el-option key="enum" label="enum(枚举型)" value="enum" />
-    <el-option key="bool" label="bool (布尔型)" value="bool" />
-    <el-option key="text" label="text (文本型)" value="text" />
-    <el-option key="date" label="date (时间型)" value="date" />
-    <el-option key="struct" label="struct (结构体)" value="struct" />
-    <el-option key="array" label="array (数组)" value="array" />
-  </el-select>
-  <!-- 情况一：数值型 -->
+  <el-form-item label="数据类型" prop="dataType">
+    <ThingModelDataType v-model="formData.dataType" @change="handleChange" />
+  </el-form-item>
+  <!-- 数值型配置 -->
+  <ThingModelNumberTypeDataSpecs
+    v-if="
+      [DataSpecsDataType.INT, DataSpecsDataType.DOUBLE, DataSpecsDataType.FLOAT].includes(
+        formData.dataType || ''
+      )
+    "
+    v-model="formData.dataSpecs"
+  />
+  <!-- 枚举型配置 -->
+  <ThingModelEnumTypeDataSpecs
+    v-if="formData.dataType === DataSpecsDataType.ENUM"
+    v-model="formData.dataSpecsList"
+  />
 </template>
 
 <script lang="ts" setup>
 import { useVModel } from '@vueuse/core'
+import { DataSpecsDataType } from './config'
+import {
+  ThingModelDataType,
+  ThingModelEnumTypeDataSpecs,
+  ThingModelNumberTypeDataSpecs
+} from './dataSpecs'
 
-/** 物模型数据类型 */
+/** 物模型数据 */
 defineOptions({ name: 'ThingModelDataSpecs' })
 const props = defineProps<{ modelValue: any }>()
 const emits = defineEmits(['update:modelValue'])
-const formData = useVModel(props, 'modelValue', emits)
+const formData = useVModel(props, 'modelValue', emits) as Ref<any>
 
+/** 属性值的数据类型切换时 */
+const handleChange = () => {
+  formData.value.dataSpecsList = []
+  formData.value.dataSpecs = {}
+}
 // dataType为INT的dataSpecs示例：
 //
 // {
diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelDataType.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelDataType.vue
deleted file mode 100644
index 206d8909..00000000
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelDataType.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<template>
-  <el-select
-    v-model="formData.property.dataType.type"
-    :disabled="!!formData.id"
-    placeholder="请选择数据类型"
-  >
-    <el-option key="int" label="int32 (整数型)" value="int" />
-    <el-option key="float" label="float (单精度浮点型)" value="float" />
-    <el-option key="double" label="double (双精度浮点型)" value="double" />
-    <el-option key="enum" label="enum(枚举型)" value="enum" />
-    <el-option key="bool" label="bool (布尔型)" value="bool" />
-    <el-option key="text" label="text (文本型)" value="text" />
-    <el-option key="date" label="date (时间型)" value="date" />
-    <el-option key="struct" label="struct (结构体)" value="struct" />
-    <el-option key="array" label="array (数组)" value="array" />
-  </el-select>
-</template>
-
-<script lang="ts" setup>
-import { useVModel } from '@vueuse/core'
-
-/** 物模型数据类型 */
-defineOptions({ name: 'ThingModelDataType' })
-const props = defineProps<{ modelValue: any }>()
-const emits = defineEmits(['update:modelValue'])
-const formData = useVModel(props, 'modelValue', emits)
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
index a2beb91f..d551cd4d 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
@@ -18,28 +18,17 @@
         <el-input v-model="formData.name" placeholder="请输入功能名称" />
       </el-form-item>
       <el-form-item label="标识符" prop="identifier">
-        <el-input
-          v-model="formData.identifier"
-          :disabled="formType === 'update'"
-          placeholder="请输入标识符"
-        />
+        <el-input v-model="formData.identifier" placeholder="请输入标识符" />
       </el-form-item>
-      <el-form-item label="数据类型" prop="type">
-        <ThingModelDataType v-model="formData" />
-      </el-form-item>
-      <ThingModelNumberTypeDataSpecs v-model="formData" />
+      <ThingModelDataSpecs v-model="formData" />
       <el-form-item label="读写类型" prop="accessMode">
-        <el-radio-group v-model="formData.property.accessMode">
+        <el-radio-group v-model="formData.accessMode">
           <el-radio label="rw">读写</el-radio>
           <el-radio label="r">只读</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="属性描述" prop="property.description">
-        <el-input
-          v-model="formData.property.description"
-          placeholder="请输入属性描述"
-          type="textarea"
-        />
+        <el-input v-model="formData.description" placeholder="请输入属性描述" type="textarea" />
       </el-form-item>
     </el-form>
 
@@ -51,10 +40,9 @@
 </template>
 
 <script lang="ts" setup>
-import ThingModelNumberTypeDataSpecs from './ThingModelNumberTypeDataSpecs.vue'
 import { ProductVO } from '@/api/iot/product/product'
+import ThingModelDataSpecs from './ThingModelDataSpecs.vue'
 import {
-  ProductFunctionAccessModeEnum,
   ProductFunctionTypeEnum,
   ThinkModelFunctionApi,
   ThinkModelFunctionVO
@@ -80,22 +68,10 @@ const formData = ref({
   name: undefined,
   description: undefined,
   type: ProductFunctionTypeEnum.PROPERTY,
-  property: {
-    identifier: undefined,
-    name: undefined,
-    accessMode: ProductFunctionAccessModeEnum.READ_WRITE,
-    required: true,
-    dataType: {
-      type: undefined,
-      specs: {
-        min: undefined,
-        max: undefined,
-        step: undefined,
-        unit: undefined
-      }
-    },
-    description: undefined // 添加这一行
-  }
+  dataType: undefined,
+  dataSpecsList: [],
+  dataSpecs: undefined,
+  accessMode: undefined
 })
 const formRules = reactive({
   name: [
@@ -188,22 +164,10 @@ const resetForm = () => {
     name: undefined,
     description: undefined,
     type: ProductFunctionTypeEnum.PROPERTY,
-    property: {
-      identifier: undefined,
-      name: undefined,
-      accessMode: ProductFunctionAccessModeEnum.READ_WRITE,
-      required: true,
-      dataType: {
-        type: undefined,
-        specs: {
-          min: undefined,
-          max: undefined,
-          step: undefined,
-          unit: undefined
-        }
-      },
-      description: undefined // 确保重置 description 字段
-    }
+    dataType: undefined,
+    dataSpecsList: [],
+    dataSpecs: undefined,
+    accessMode: undefined
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/iot/product/product/detail/ThingModel/config.ts b/src/views/iot/product/product/detail/ThingModel/config.ts
new file mode 100644
index 00000000..fa89b9d3
--- /dev/null
+++ b/src/views/iot/product/product/detail/ThingModel/config.ts
@@ -0,0 +1,38 @@
+/** dataSpecs 数值型数据结构 */
+export interface DataSpecsNumberDataVO {
+  dataType: 'INT' | 'FLOAT' | 'DOUBLE' // 数据类型，取值为 INT、FLOAT 或 DOUBLE
+  max: string // 最大值，必须与 dataType 设置一致，且为 STRING 类型
+  min: string // 最小值，必须与 dataType 设置一致，且为 STRING 类型
+  step: string // 步长，必须与 dataType 设置一致，且为 STRING 类型
+  precise?: string // 精度，当 dataType 为 FLOAT 或 DOUBLE 时可选
+  defaultValue?: string // 默认值，可选
+  unit: string // 单位的符号
+  unitName: string // 单位的名称
+}
+
+/** dataSpecs 文本型数据结构 */
+export interface DataSpecsTextDataVO {
+  dataType: 'TEXT'
+  length: number
+}
+
+/** dataSpecs 枚举型数据结构 */
+export interface DataSpecsEnumDataVO {
+  dataType: 'ENUM' | 'BOOL'
+  defaultValue?: string // 默认值，可选
+  name: string // 枚举项的名称
+  value: number // 枚举值
+}
+
+/** 属性值的数据类型 */
+export const DataSpecsDataType = {
+  INT: 'int',
+  FLOAT: 'float',
+  DOUBLE: 'double',
+  ENUM: 'enum',
+  BOOL: 'bool',
+  TEXT: 'text',
+  DATE: 'date',
+  STRUCT: 'struct',
+  ARRAY: 'array'
+}
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelDataType.vue b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelDataType.vue
new file mode 100644
index 00000000..8c9e950c
--- /dev/null
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelDataType.vue
@@ -0,0 +1,38 @@
+<template>
+  <el-select v-model="dataType" placeholder="请选择数据类型" @change="handleChange">
+    <el-option
+      v-for="option in dataTypeOptions"
+      :key="option.value"
+      :label="option.label"
+      :value="option.value"
+    />
+  </el-select>
+</template>
+
+<script lang="ts" setup>
+import { useVModel } from '@vueuse/core'
+import { DataSpecsDataType } from '../config'
+
+/** 物模型数据类型 */
+defineOptions({ name: 'ThingModelDataType' })
+const props = defineProps<{ modelValue: any }>()
+const emits = defineEmits(['update:modelValue', 'change'])
+const dataType = useVModel(props, 'modelValue', emits)
+
+const dataTypeOptions = [
+  { value: DataSpecsDataType.INT, label: 'int32 (整数型)' },
+  { value: DataSpecsDataType.FLOAT, label: 'float (单精度浮点型)' },
+  { value: DataSpecsDataType.DOUBLE, label: 'double (双精度浮点型)' },
+  { value: DataSpecsDataType.ENUM, label: 'enum(枚举型)' },
+  { value: DataSpecsDataType.BOOL, label: 'bool (布尔型)' },
+  { value: DataSpecsDataType.TEXT, label: 'text (文本型)' },
+  { value: DataSpecsDataType.DATE, label: 'date (时间型)' },
+  { value: DataSpecsDataType.STRUCT, label: 'struct (结构体)' },
+  { value: DataSpecsDataType.ARRAY, label: 'array (数组)' }
+]
+const handleChange = () => {
+  emits('change')
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue
new file mode 100644
index 00000000..db0a58b2
--- /dev/null
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue
@@ -0,0 +1,26 @@
+<template>
+  <el-form-item label="枚举项" prop="enumItem">
+    <div class="flex items-center justify-between">
+      <span> 参数值 </span>
+      <span> 参数描述 </span>
+    </div>
+    <div v-for="(item, index) in formData" :key="index" class="flex items-center justify-between">
+      <el-input v-model="item.value" placeholder="请输入参数值" />
+      <span class="mx-2">~</span>
+      <el-input v-model="item.name" placeholder="请输入参数描述" />
+    </div>
+    <el-button link type="primary">+添加枚举项</el-button>
+  </el-form-item>
+</template>
+
+<script lang="ts" setup>
+import { useVModel } from '@vueuse/core'
+
+/** 枚举型的 dataSpecs 配置组件 */
+defineOptions({ name: 'ThingModelEnumTypeDataSpecs' })
+const props = defineProps<{ modelValue: any }>()
+const emits = defineEmits(['update:modelValue'])
+const formData = useVModel(props, 'modelValue', emits)
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelNumberTypeDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelNumberTypeDataSpecs.vue
similarity index 72%
rename from src/views/iot/product/product/detail/ThingModel/ThingModelNumberTypeDataSpecs.vue
rename to src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelNumberTypeDataSpecs.vue
index 65bd1fc9..7de57631 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelNumberTypeDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelNumberTypeDataSpecs.vue
@@ -30,23 +30,13 @@
 <script lang="ts" setup>
 import { useVModel } from '@vueuse/core'
 import { UnifyUnitSpecsDTO } from '@/views/iot/utils/constants'
+import { DataSpecsNumberDataVO } from '../config'
 
+/** 数值型的 dataSpecs 配置组件 */
 defineOptions({ name: 'ThingModelNumberTypeDataSpecs' })
 const props = defineProps<{ modelValue: any }>()
 const emits = defineEmits(['update:modelValue'])
-const formData = useVModel(props, 'modelValue', emits) as Ref<DataConfig>
-type DataType = 'INT' | 'FLOAT' | 'DOUBLE'
-
-interface DataConfig {
-  dataType: DataType // 数据类型，取值为 INT、FLOAT 或 DOUBLE
-  max: string // 最大值，必须与 dataType 设置一致，且为 STRING 类型
-  min: string // 最小值，必须与 dataType 设置一致，且为 STRING 类型
-  step: string // 步长，必须与 dataType 设置一致，且为 STRING 类型
-  precise?: string // 精度，当 dataType 为 FLOAT 或 DOUBLE 时可选
-  defaultValue?: string // 默认值，可选
-  unit: string // 单位的符号
-  unitName: string // 单位的名称
-}
+const formData = useVModel(props, 'modelValue', emits) as Ref<DataSpecsNumberDataVO>
 
 /** 单位发生变化时触发 */
 const unitChange = (UnitSpecs: string) => {
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts b/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts
new file mode 100644
index 00000000..6e0da102
--- /dev/null
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts
@@ -0,0 +1,5 @@
+import ThingModelDataType from './ThingModelDataType.vue'
+import ThingModelEnumTypeDataSpecs from './ThingModelEnumTypeDataSpecs.vue'
+import ThingModelNumberTypeDataSpecs from './ThingModelNumberTypeDataSpecs.vue'
+
+export { ThingModelDataType, ThingModelEnumTypeDataSpecs, ThingModelNumberTypeDataSpecs }

From e1b2cb106a61bc727c2da7e18b773259e33e4f09 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Fri, 13 Dec 2024 18:08:11 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E3=80=91IOT:=20=E4=BA=A7=E5=93=81=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=8C30%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/ThingModel/ThingModelDataSpecs.vue | 13 +++++--
 .../detail/ThingModel/ThingModelForm.vue      |  9 ++---
 .../product/detail/ThingModel/config.ts       |  2 +-
 .../dataSpecs/ThingModelDataType.vue          |  4 +--
 .../dataSpecs/ThingModelEnumTypeDataSpecs.vue | 35 +++++++++++++------
 .../ThingModelNumberTypeDataSpecs.vue         | 14 ++++----
 6 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
index 33816a80..07005b00 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
@@ -33,10 +33,19 @@ const props = defineProps<{ modelValue: any }>()
 const emits = defineEmits(['update:modelValue'])
 const formData = useVModel(props, 'modelValue', emits) as Ref<any>
 
-/** 属性值的数据类型切换时 */
-const handleChange = () => {
+/** 属性值的数据类型切换时初始化相关数据 */
+const handleChange = (dataType: any) => {
   formData.value.dataSpecsList = []
   formData.value.dataSpecs = {}
+
+  switch (dataType) {
+    case DataSpecsDataType.ENUM:
+      formData.value.dataSpecsList.push({
+        dataType: 'ENUM',
+        name: '', // 枚举项的名称
+        value: undefined // 枚举值
+      })
+  }
 }
 // dataType为INT的dataSpecs示例：
 //
diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
index d551cd4d..bc23dbeb 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
@@ -48,6 +48,7 @@ import {
   ThinkModelFunctionVO
 } from '@/api/iot/thinkmodelfunction'
 import { IOT_PROVIDE_KEY } from '@/views/iot/utils/constants'
+import { DataSpecsDataType } from './config'
 
 defineOptions({ name: 'IoTProductThingModelForm' })
 
@@ -68,9 +69,9 @@ const formData = ref({
   name: undefined,
   description: undefined,
   type: ProductFunctionTypeEnum.PROPERTY,
-  dataType: undefined,
+  dataType: DataSpecsDataType.INT,
   dataSpecsList: [],
-  dataSpecs: undefined,
+  dataSpecs: {},
   accessMode: undefined
 })
 const formRules = reactive({
@@ -164,9 +165,9 @@ const resetForm = () => {
     name: undefined,
     description: undefined,
     type: ProductFunctionTypeEnum.PROPERTY,
-    dataType: undefined,
+    dataType: DataSpecsDataType.INT,
     dataSpecsList: [],
-    dataSpecs: undefined,
+    dataSpecs: {},
     accessMode: undefined
   }
   formRef.value?.resetFields()
diff --git a/src/views/iot/product/product/detail/ThingModel/config.ts b/src/views/iot/product/product/detail/ThingModel/config.ts
index fa89b9d3..e75fc082 100644
--- a/src/views/iot/product/product/detail/ThingModel/config.ts
+++ b/src/views/iot/product/product/detail/ThingModel/config.ts
@@ -21,7 +21,7 @@ export interface DataSpecsEnumDataVO {
   dataType: 'ENUM' | 'BOOL'
   defaultValue?: string // 默认值，可选
   name: string // 枚举项的名称
-  value: number // 枚举值
+  value: number | undefined // 枚举值
 }
 
 /** 属性值的数据类型 */
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelDataType.vue b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelDataType.vue
index 8c9e950c..cf26e5eb 100644
--- a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelDataType.vue
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelDataType.vue
@@ -30,8 +30,8 @@ const dataTypeOptions = [
   { value: DataSpecsDataType.STRUCT, label: 'struct (结构体)' },
   { value: DataSpecsDataType.ARRAY, label: 'array (数组)' }
 ]
-const handleChange = () => {
-  emits('change')
+const handleChange = (value: any) => {
+  emits('change', value)
 }
 </script>
 
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue
index db0a58b2..7b977ae6 100644
--- a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue
@@ -1,26 +1,41 @@
 <template>
   <el-form-item label="枚举项" prop="enumItem">
-    <div class="flex items-center justify-between">
-      <span> 参数值 </span>
-      <span> 参数描述 </span>
+    <div class="flex flex-col">
+      <div class="flex items-center justify-between">
+        <span> 参数值 </span>
+        <span> 参数描述 </span>
+      </div>
+      <div
+        v-for="(item, index) in dataSpecsList"
+        :key="index"
+        class="flex items-center justify-between mb-5px"
+      >
+        <el-input v-model="item.value" placeholder="请输入枚举值,如'0'" />
+        <span class="mx-2">~</span>
+        <el-input v-model="item.name" placeholder="对该枚举项的描述" />
+      </div>
+      <el-button link type="primary" @click="addEnum">+添加枚举项</el-button>
     </div>
-    <div v-for="(item, index) in formData" :key="index" class="flex items-center justify-between">
-      <el-input v-model="item.value" placeholder="请输入参数值" />
-      <span class="mx-2">~</span>
-      <el-input v-model="item.name" placeholder="请输入参数描述" />
-    </div>
-    <el-button link type="primary">+添加枚举项</el-button>
   </el-form-item>
 </template>
 
 <script lang="ts" setup>
 import { useVModel } from '@vueuse/core'
+import { DataSpecsEnumDataVO } from '@/views/iot/product/product/detail/ThingModel/config'
 
 /** 枚举型的 dataSpecs 配置组件 */
 defineOptions({ name: 'ThingModelEnumTypeDataSpecs' })
 const props = defineProps<{ modelValue: any }>()
 const emits = defineEmits(['update:modelValue'])
-const formData = useVModel(props, 'modelValue', emits)
+const dataSpecsList = useVModel(props, 'modelValue', emits) as Ref<DataSpecsEnumDataVO[]>
+
+const addEnum = () => {
+  dataSpecsList.value.push({
+    dataType: 'ENUM',
+    name: '', // 枚举项的名称
+    value: undefined // 枚举值
+  })
+}
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelNumberTypeDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelNumberTypeDataSpecs.vue
index 7de57631..3920a0f5 100644
--- a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelNumberTypeDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelNumberTypeDataSpecs.vue
@@ -1,17 +1,17 @@
 <template>
   <el-form-item label="取值范围" prop="max">
     <div class="flex items-center justify-between">
-      <el-input v-model="formData.min" placeholder="请输入最小值" />
+      <el-input v-model="dataSpecs.min" placeholder="请输入最小值" />
       <span class="mx-2">~</span>
-      <el-input v-model="formData.max" placeholder="请输入最大值" />
+      <el-input v-model="dataSpecs.max" placeholder="请输入最大值" />
     </div>
   </el-form-item>
   <el-form-item label="步长" prop="step">
-    <el-input v-model="formData.step" placeholder="请输入步长" />
+    <el-input v-model="dataSpecs.step" placeholder="请输入步长" />
   </el-form-item>
   <el-form-item label="单位" prop="unit">
     <el-select
-      :model-value="formData.unit ? formData.unitName + '-' + formData.unit : ''"
+      :model-value="dataSpecs.unit ? dataSpecs.unitName + '-' + dataSpecs.unit : ''"
       filterable
       placeholder="请选择单位"
       style="width: 240px"
@@ -36,13 +36,13 @@ import { DataSpecsNumberDataVO } from '../config'
 defineOptions({ name: 'ThingModelNumberTypeDataSpecs' })
 const props = defineProps<{ modelValue: any }>()
 const emits = defineEmits(['update:modelValue'])
-const formData = useVModel(props, 'modelValue', emits) as Ref<DataSpecsNumberDataVO>
+const dataSpecs = useVModel(props, 'modelValue', emits) as Ref<DataSpecsNumberDataVO>
 
 /** 单位发生变化时触发 */
 const unitChange = (UnitSpecs: string) => {
   const [unitName, unit] = UnitSpecs.split('-')
-  formData.value.unitName = unitName
-  formData.value.unit = unit
+  dataSpecs.value.unitName = unitName
+  dataSpecs.value.unit = unit
 }
 </script>
 

From 5209318bb2c08da543abd5bfd9934b9f0bff925a Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 14 Dec 2024 22:47:17 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91IOT:=20=E7=89=A9=E6=A8=A1=E5=9E=8B=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/modules/remaining.ts               |  2 +-
 .../product/detail/ThingModel/config.ts       |  6 ++---
 .../dataSpecs/ThingModelEnumTypeDataSpecs.vue | 27 ++++++++++++++-----
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 335f5270..8b4bbe0e 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -637,7 +637,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
           hidden: true,
           activeMenu: '/iot/device'
         },
-        component: () => import('@/views/iot/device/detail/index.vue')
+        component: () => import('@/views/iot/device/device/detail/index.vue')
       }
     ]
   }
diff --git a/src/views/iot/product/product/detail/ThingModel/config.ts b/src/views/iot/product/product/detail/ThingModel/config.ts
index e75fc082..6ba56515 100644
--- a/src/views/iot/product/product/detail/ThingModel/config.ts
+++ b/src/views/iot/product/product/detail/ThingModel/config.ts
@@ -1,6 +1,6 @@
 /** dataSpecs 数值型数据结构 */
 export interface DataSpecsNumberDataVO {
-  dataType: 'INT' | 'FLOAT' | 'DOUBLE' // 数据类型，取值为 INT、FLOAT 或 DOUBLE
+  dataType: 'int' | 'float' | 'double' // 数据类型，取值为 INT、FLOAT 或 DOUBLE
   max: string // 最大值，必须与 dataType 设置一致，且为 STRING 类型
   min: string // 最小值，必须与 dataType 设置一致，且为 STRING 类型
   step: string // 步长，必须与 dataType 设置一致，且为 STRING 类型
@@ -18,7 +18,7 @@ export interface DataSpecsTextDataVO {
 
 /** dataSpecs 枚举型数据结构 */
 export interface DataSpecsEnumDataVO {
-  dataType: 'ENUM' | 'BOOL'
+  dataType: 'enum' | 'bool'
   defaultValue?: string // 默认值，可选
   name: string // 枚举项的名称
   value: number | undefined // 枚举值
@@ -35,4 +35,4 @@ export const DataSpecsDataType = {
   DATE: 'date',
   STRUCT: 'struct',
   ARRAY: 'array'
-}
+} as const
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue
index 7b977ae6..75adebdb 100644
--- a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue
@@ -1,9 +1,9 @@
 <template>
-  <el-form-item label="枚举项" prop="enumItem">
+  <el-form-item label="枚举项" prop="enum">
     <div class="flex flex-col">
-      <div class="flex items-center justify-between">
-        <span> 参数值 </span>
-        <span> 参数描述 </span>
+      <div class="flex items-center">
+        <span class="flex-1"> 参数值 </span>
+        <span class="flex-1"> 参数描述 </span>
       </div>
       <div
         v-for="(item, index) in dataSpecsList"
@@ -13,6 +13,7 @@
         <el-input v-model="item.value" placeholder="请输入枚举值,如'0'" />
         <span class="mx-2">~</span>
         <el-input v-model="item.name" placeholder="对该枚举项的描述" />
+        <el-button link type="primary" class="ml-10px" @click="deleteEnum(index)">删除</el-button>
       </div>
       <el-button link type="primary" @click="addEnum">+添加枚举项</el-button>
     </div>
@@ -21,21 +22,35 @@
 
 <script lang="ts" setup>
 import { useVModel } from '@vueuse/core'
-import { DataSpecsEnumDataVO } from '@/views/iot/product/product/detail/ThingModel/config'
+import {
+  DataSpecsDataType,
+  DataSpecsEnumDataVO
+} from '@/views/iot/product/product/detail/ThingModel/config'
 
 /** 枚举型的 dataSpecs 配置组件 */
 defineOptions({ name: 'ThingModelEnumTypeDataSpecs' })
 const props = defineProps<{ modelValue: any }>()
 const emits = defineEmits(['update:modelValue'])
 const dataSpecsList = useVModel(props, 'modelValue', emits) as Ref<DataSpecsEnumDataVO[]>
+const message = useMessage()
 
+/** 添加枚举项 */
 const addEnum = () => {
   dataSpecsList.value.push({
-    dataType: 'ENUM',
+    dataType: DataSpecsDataType.ENUM,
     name: '', // 枚举项的名称
     value: undefined // 枚举值
   })
 }
+
+/** 删除枚举项 */
+const deleteEnum = (index: number) => {
+  if (dataSpecsList.value.length === 1) {
+    message.warning('至少需要一个枚举项')
+    return
+  }
+  dataSpecsList.value.splice(index, 1)
+}
 </script>
 
 <style lang="scss" scoped></style>

From c7d9a7fe52cd7bc10fce1b3cd0827a0626c4169c Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 14 Dec 2024 23:09:14 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91IOT:=20=E7=89=A9=E6=A8=A1=E5=9E=8B=E5=B8=83?=
 =?UTF-8?q?=E5=B0=94=E5=80=BC=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/ThingModel/ThingModelDataSpecs.vue | 25 ++++++++++++++++++-
 .../product/detail/ThingModel/config.ts       |  2 +-
 .../dataSpecs/ThingModelEnumTypeDataSpecs.vue |  4 +--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
index 07005b00..036c0f5d 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
@@ -16,6 +16,20 @@
     v-if="formData.dataType === DataSpecsDataType.ENUM"
     v-model="formData.dataSpecsList"
   />
+  <!-- 布尔型配置 -->
+  <el-form-item label="布尔值" prop="bool" v-if="formData.dataType === DataSpecsDataType.BOOL">
+    <template v-for="item in formData.dataSpecsList" :key="item.value">
+      <div class="flex items-center justify-start w-1/1 mb-5px">
+        <span>{{ item.value }}</span>
+        <span class="mx-2">-</span>
+        <el-input
+          v-model="item.name"
+          class="w-255px!"
+          :placeholder="`如：${item.value === 0 ? '关' : '开'}`"
+        />
+      </div>
+    </template>
+  </el-form-item>
 </template>
 
 <script lang="ts" setup>
@@ -41,10 +55,19 @@ const handleChange = (dataType: any) => {
   switch (dataType) {
     case DataSpecsDataType.ENUM:
       formData.value.dataSpecsList.push({
-        dataType: 'ENUM',
+        dataType: DataSpecsDataType.ENUM,
         name: '', // 枚举项的名称
         value: undefined // 枚举值
       })
+      break
+    case DataSpecsDataType.BOOL:
+      for (let i = 0; i < 2; i++) {
+        formData.value.dataSpecsList.push({
+          dataType: DataSpecsDataType.BOOL,
+          name: '', // 布尔值的名称
+          value: i // 布尔值
+        })
+      }
   }
 }
 // dataType为INT的dataSpecs示例：
diff --git a/src/views/iot/product/product/detail/ThingModel/config.ts b/src/views/iot/product/product/detail/ThingModel/config.ts
index 6ba56515..d19de37c 100644
--- a/src/views/iot/product/product/detail/ThingModel/config.ts
+++ b/src/views/iot/product/product/detail/ThingModel/config.ts
@@ -17,7 +17,7 @@ export interface DataSpecsTextDataVO {
 }
 
 /** dataSpecs 枚举型数据结构 */
-export interface DataSpecsEnumDataVO {
+export interface DataSpecsEnumOrBoolDataVO {
   dataType: 'enum' | 'bool'
   defaultValue?: string // 默认值，可选
   name: string // 枚举项的名称
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue
index 75adebdb..0c67358a 100644
--- a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelEnumTypeDataSpecs.vue
@@ -24,14 +24,14 @@
 import { useVModel } from '@vueuse/core'
 import {
   DataSpecsDataType,
-  DataSpecsEnumDataVO
+  DataSpecsEnumOrBoolDataVO
 } from '@/views/iot/product/product/detail/ThingModel/config'
 
 /** 枚举型的 dataSpecs 配置组件 */
 defineOptions({ name: 'ThingModelEnumTypeDataSpecs' })
 const props = defineProps<{ modelValue: any }>()
 const emits = defineEmits(['update:modelValue'])
-const dataSpecsList = useVModel(props, 'modelValue', emits) as Ref<DataSpecsEnumDataVO[]>
+const dataSpecsList = useVModel(props, 'modelValue', emits) as Ref<DataSpecsEnumOrBoolDataVO[]>
 const message = useMessage()
 
 /** 添加枚举项 */

From 23ef9f68ea9ab3379132bd1505be44b0d8f0ace5 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 14 Dec 2024 23:15:00 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91IOT:=20=E7=89=A9=E6=A8=A1=E5=9E=8B=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/detail/ThingModel/ThingModelDataSpecs.vue       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
index 036c0f5d..59d65587 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
@@ -30,6 +30,12 @@
       </div>
     </template>
   </el-form-item>
+  <!-- 文本型配置 -->
+  <el-form-item label="数据长度" prop="text" v-if="formData.dataType === DataSpecsDataType.TEXT">
+    <el-input v-model="formData.length" class="w-255px!" placeholder="请输入文本字节长度">
+      <template #append>字节</template>
+    </el-input>
+  </el-form-item>
 </template>
 
 <script lang="ts" setup>

From 1d112d56632322f89f256545ee46e50f8d226dfd Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sat, 14 Dec 2024 23:27:27 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91IOT:=20=E7=89=A9=E6=A8=A1=E5=9E=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=BB=84=E4=BB=B6=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/ThingModel/ThingModelDataSpecs.vue | 98 +++++--------------
 .../product/detail/ThingModel/config.ts       | 13 +++
 .../dataSpecs/ThingModelDataType.vue          | 38 -------
 .../detail/ThingModel/dataSpecs/index.ts      |  3 +-
 4 files changed, 38 insertions(+), 114 deletions(-)
 delete mode 100644 src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelDataType.vue

diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
index 59d65587..5a92fb2e 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
@@ -1,6 +1,13 @@
 <template>
   <el-form-item label="数据类型" prop="dataType">
-    <ThingModelDataType v-model="formData.dataType" @change="handleChange" />
+    <el-select v-model="formData.dataType" placeholder="请选择数据类型" @change="handleChange">
+      <el-option
+        v-for="option in dataTypeOptions"
+        :key="option.value"
+        :label="option.label"
+        :value="option.value"
+      />
+    </el-select>
   </el-form-item>
   <!-- 数值型配置 -->
   <ThingModelNumberTypeDataSpecs
@@ -36,16 +43,16 @@
       <template #append>字节</template>
     </el-input>
   </el-form-item>
+  <!-- 时间型配置 -->
+  <el-form-item label="时间格式" prop="date" v-if="formData.dataType === DataSpecsDataType.DATE">
+    <el-input disabled class="w-255px!" placeholder="String类型的UTC时间戳（毫秒）" />
+  </el-form-item>
 </template>
 
 <script lang="ts" setup>
 import { useVModel } from '@vueuse/core'
-import { DataSpecsDataType } from './config'
-import {
-  ThingModelDataType,
-  ThingModelEnumTypeDataSpecs,
-  ThingModelNumberTypeDataSpecs
-} from './dataSpecs'
+import { DataSpecsDataType, dataTypeOptions } from './config'
+import { ThingModelEnumTypeDataSpecs, ThingModelNumberTypeDataSpecs } from './dataSpecs'
 
 /** 物模型数据 */
 defineOptions({ name: 'ThingModelDataSpecs' })
@@ -59,6 +66,15 @@ const handleChange = (dataType: any) => {
   formData.value.dataSpecs = {}
 
   switch (dataType) {
+    case DataSpecsDataType.INT:
+      formData.value.dataSpecs.dataType = DataSpecsDataType.INT
+      break
+    case DataSpecsDataType.DOUBLE:
+      formData.value.dataSpecs.dataType = DataSpecsDataType.DOUBLE
+      break
+    case DataSpecsDataType.FLOAT:
+      formData.value.dataSpecs.dataType = DataSpecsDataType.FLOAT
+      break
     case DataSpecsDataType.ENUM:
       formData.value.dataSpecsList.push({
         dataType: DataSpecsDataType.ENUM,
@@ -74,75 +90,9 @@ const handleChange = (dataType: any) => {
           value: i // 布尔值
         })
       }
+      break
   }
 }
-// dataType为INT的dataSpecs示例：
-//
-// {
-//   "dataSpecs": {
-//   "custom": true,
-//       "dataType": "INT",
-//       "defaultValue": "30",
-//       "max": "1440",
-//       "min": "0",
-//       "step": "10",
-//       "unit": "min"
-// }
-// }
-// dataType为TEXT的dataSpecs示例：
-//
-// {
-//   "dataSpecs": {
-//   "custom": true,
-//       "dataType": "TEXT",
-//       "id": 2412127,
-//       "length": 2048
-// }
-// }
-// dataType为ARRAY的dataSpecs示例：
-//
-// {
-//   "dataSpecs": {
-//   "childDataType": "INT",
-//       "custom": true,
-//       "dataType": "ARRAY",
-//       "size": 1
-// }
-// }
-// dataType为ENUM的dataSpecsList示例：
-//
-// {
-//   "dataSpecsList": [
-//   {
-//     "custom": false,
-//     "dataType": "ENUM",
-//     "defaultValue": "true",
-//     "name": "打开",
-//     "value": 1
-//   },
-//   {
-//     "custom": false,
-//     "dataType": "ENUM",
-//     "defaultValue": "false",
-//     "name": "关闭",
-//     "value": 0
-//   }
-// ]
-// }
-// dataType为STRUCT的dataSpecsList示例：
-//
-// {
-//   "childDataType": "TEXT",
-//     "childName": "卡编号",
-//     "dataSpecs": {
-//   "custom": true,
-//       "dataType": "TEXT",
-//       "length": 128
-// },
-//   "dataType": "STRUCT",
-//     "identifier": "CardNo",
-//     "name": "NVR所拥有的芯片信息"
-// }
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/iot/product/product/detail/ThingModel/config.ts b/src/views/iot/product/product/detail/ThingModel/config.ts
index d19de37c..1a028ac9 100644
--- a/src/views/iot/product/product/detail/ThingModel/config.ts
+++ b/src/views/iot/product/product/detail/ThingModel/config.ts
@@ -36,3 +36,16 @@ export const DataSpecsDataType = {
   STRUCT: 'struct',
   ARRAY: 'array'
 } as const
+
+/** 物体模型数据类型配置项 */
+export const dataTypeOptions = [
+  { value: DataSpecsDataType.INT, label: 'int32 (整数型)' },
+  { value: DataSpecsDataType.FLOAT, label: 'float (单精度浮点型)' },
+  { value: DataSpecsDataType.DOUBLE, label: 'double (双精度浮点型)' },
+  { value: DataSpecsDataType.ENUM, label: 'enum(枚举型)' },
+  { value: DataSpecsDataType.BOOL, label: 'bool (布尔型)' },
+  { value: DataSpecsDataType.TEXT, label: 'text (文本型)' },
+  { value: DataSpecsDataType.DATE, label: 'date (时间型)' },
+  { value: DataSpecsDataType.STRUCT, label: 'struct (结构体)' },
+  { value: DataSpecsDataType.ARRAY, label: 'array (数组)' }
+]
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelDataType.vue b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelDataType.vue
deleted file mode 100644
index cf26e5eb..00000000
--- a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelDataType.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <el-select v-model="dataType" placeholder="请选择数据类型" @change="handleChange">
-    <el-option
-      v-for="option in dataTypeOptions"
-      :key="option.value"
-      :label="option.label"
-      :value="option.value"
-    />
-  </el-select>
-</template>
-
-<script lang="ts" setup>
-import { useVModel } from '@vueuse/core'
-import { DataSpecsDataType } from '../config'
-
-/** 物模型数据类型 */
-defineOptions({ name: 'ThingModelDataType' })
-const props = defineProps<{ modelValue: any }>()
-const emits = defineEmits(['update:modelValue', 'change'])
-const dataType = useVModel(props, 'modelValue', emits)
-
-const dataTypeOptions = [
-  { value: DataSpecsDataType.INT, label: 'int32 (整数型)' },
-  { value: DataSpecsDataType.FLOAT, label: 'float (单精度浮点型)' },
-  { value: DataSpecsDataType.DOUBLE, label: 'double (双精度浮点型)' },
-  { value: DataSpecsDataType.ENUM, label: 'enum(枚举型)' },
-  { value: DataSpecsDataType.BOOL, label: 'bool (布尔型)' },
-  { value: DataSpecsDataType.TEXT, label: 'text (文本型)' },
-  { value: DataSpecsDataType.DATE, label: 'date (时间型)' },
-  { value: DataSpecsDataType.STRUCT, label: 'struct (结构体)' },
-  { value: DataSpecsDataType.ARRAY, label: 'array (数组)' }
-]
-const handleChange = (value: any) => {
-  emits('change', value)
-}
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts b/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts
index 6e0da102..076dcc50 100644
--- a/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts
@@ -1,5 +1,4 @@
-import ThingModelDataType from './ThingModelDataType.vue'
 import ThingModelEnumTypeDataSpecs from './ThingModelEnumTypeDataSpecs.vue'
 import ThingModelNumberTypeDataSpecs from './ThingModelNumberTypeDataSpecs.vue'
 
-export { ThingModelDataType, ThingModelEnumTypeDataSpecs, ThingModelNumberTypeDataSpecs }
+export { ThingModelEnumTypeDataSpecs, ThingModelNumberTypeDataSpecs }

From 488800b304fbf71eb67bcf6abc717dfbb0dfddf6 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 15 Dec 2024 00:21:40 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91IOT:=20=E7=89=A9=E6=A8=A1=E5=9E=8B=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/ThingModel/ThingModelDataSpecs.vue | 14 +++++++-
 .../product/detail/ThingModel/config.ts       |  6 ----
 .../ThingModelArrayTypeDataSpecs.vue          | 34 +++++++++++++++++++
 .../detail/ThingModel/dataSpecs/index.ts      |  3 +-
 4 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelArrayTypeDataSpecs.vue

diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
index 5a92fb2e..ac585611 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
@@ -47,12 +47,21 @@
   <el-form-item label="时间格式" prop="date" v-if="formData.dataType === DataSpecsDataType.DATE">
     <el-input disabled class="w-255px!" placeholder="String类型的UTC时间戳（毫秒）" />
   </el-form-item>
+  <!-- 数组型配置-->
+  <ThingModelArrayTypeDataSpecs
+    v-model="formData.dataSpecs"
+    v-if="formData.dataType === DataSpecsDataType.ARRAY"
+  />
 </template>
 
 <script lang="ts" setup>
 import { useVModel } from '@vueuse/core'
 import { DataSpecsDataType, dataTypeOptions } from './config'
-import { ThingModelEnumTypeDataSpecs, ThingModelNumberTypeDataSpecs } from './dataSpecs'
+import {
+  ThingModelArrayTypeDataSpecs,
+  ThingModelEnumTypeDataSpecs,
+  ThingModelNumberTypeDataSpecs
+} from './dataSpecs'
 
 /** 物模型数据 */
 defineOptions({ name: 'ThingModelDataSpecs' })
@@ -91,6 +100,9 @@ const handleChange = (dataType: any) => {
         })
       }
       break
+    case DataSpecsDataType.ARRAY:
+      formData.value.dataSpecs.dataType = DataSpecsDataType.ARRAY
+      break
   }
 }
 </script>
diff --git a/src/views/iot/product/product/detail/ThingModel/config.ts b/src/views/iot/product/product/detail/ThingModel/config.ts
index 1a028ac9..cd9d059d 100644
--- a/src/views/iot/product/product/detail/ThingModel/config.ts
+++ b/src/views/iot/product/product/detail/ThingModel/config.ts
@@ -10,12 +10,6 @@ export interface DataSpecsNumberDataVO {
   unitName: string // 单位的名称
 }
 
-/** dataSpecs 文本型数据结构 */
-export interface DataSpecsTextDataVO {
-  dataType: 'TEXT'
-  length: number
-}
-
 /** dataSpecs 枚举型数据结构 */
 export interface DataSpecsEnumOrBoolDataVO {
   dataType: 'enum' | 'bool'
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelArrayTypeDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelArrayTypeDataSpecs.vue
new file mode 100644
index 00000000..d96bd7fc
--- /dev/null
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelArrayTypeDataSpecs.vue
@@ -0,0 +1,34 @@
+<template>
+  <el-form-item label="元素类型" prop="childDataType">
+    <el-radio-group v-model="dataSpecs.childDataType">
+      <template v-for="item in dataTypeOptions" :key="item.value">
+        <el-radio
+          :value="item.value"
+          v-if="
+            !(
+              [DataSpecsDataType.ENUM, DataSpecsDataType.ARRAY, DataSpecsDataType.DATE] as any[]
+            ).includes(item.value)
+          "
+        >
+          {{ item.label }}
+        </el-radio>
+      </template>
+    </el-radio-group>
+  </el-form-item>
+  <el-form-item label="元素个数" prop="size">
+    <el-input v-model="dataSpecs.size" placeholder="请输入数组中的元素个数" />
+  </el-form-item>
+</template>
+
+<script lang="ts" setup>
+import { useVModel } from '@vueuse/core'
+import { DataSpecsDataType, dataTypeOptions } from '../config'
+
+/** 数值型的 dataSpecs 配置组件 */
+defineOptions({ name: 'ThingModelArrayTypeDataSpecs' })
+const props = defineProps<{ modelValue: any }>()
+const emits = defineEmits(['update:modelValue'])
+const dataSpecs = useVModel(props, 'modelValue', emits) as Ref<any>
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts b/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts
index 076dcc50..f2e1daaf 100644
--- a/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts
@@ -1,4 +1,5 @@
 import ThingModelEnumTypeDataSpecs from './ThingModelEnumTypeDataSpecs.vue'
 import ThingModelNumberTypeDataSpecs from './ThingModelNumberTypeDataSpecs.vue'
+import ThingModelArrayTypeDataSpecs from './ThingModelArrayTypeDataSpecs.vue'
 
-export { ThingModelEnumTypeDataSpecs, ThingModelNumberTypeDataSpecs }
+export { ThingModelEnumTypeDataSpecs, ThingModelNumberTypeDataSpecs, ThingModelArrayTypeDataSpecs }

From 187b5b03eeaa58f02ee977e53596d00c71a421c8 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 15 Dec 2024 23:15:51 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91IOT:=20=E7=89=A9=E6=A8=A1=E5=9E=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=BB=84=E4=BB=B6=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/thinkmodelfunction/index.ts       | 56 ++++++++++++-------
 .../detail/ThingModel/ThingModelDataSpecs.vue | 52 ++++++++++-------
 .../detail/ThingModel/ThingModelForm.vue      | 51 ++++++-----------
 .../ThingModelArrayTypeDataSpecs.vue          |  2 +-
 4 files changed, 87 insertions(+), 74 deletions(-)

diff --git a/src/api/iot/thinkmodelfunction/index.ts b/src/api/iot/thinkmodelfunction/index.ts
index 1fce8137..012ba190 100644
--- a/src/api/iot/thinkmodelfunction/index.ts
+++ b/src/api/iot/thinkmodelfunction/index.ts
@@ -1,17 +1,40 @@
 import request from '@/config/axios'
 
-// IoT 产品物模型 VO
-export interface ThinkModelFunctionVO {
-  id: number // 物模型功能编号
-  identifier: string // 功能标识
-  name: string // 功能名称
-  description: string // 功能描述
-  productId: number // 产品编号
-  productKey: string // 产品标识
-  type: number // 功能类型
-  property: string // 属性
-  event: string // 事件
-  service: string // 服务
+/**
+ * IoT 产品物模型
+ */
+export interface ThingModelData {
+  id?: number // 物模型功能编号
+  identifier?: string // 功能标识
+  name?: string // 功能名称
+  description?: string // 功能描述
+  productId?: number // 产品编号
+  productKey?: string // 产品标识
+  type: ProductFunctionTypeEnum // 功能类型
+  property: ThingModelProperty // 属性
+  event?: ThingModelEvent // 事件
+  service?: ThingModelService // 服务
+}
+
+/**
+ * ThingModelProperty 类型
+ */
+export interface ThingModelProperty {
+  [key: string]: any
+}
+
+/**
+ * ThingModelEvent 类型
+ */
+export interface ThingModelEvent {
+  [key: string]: any
+}
+
+/**
+ * ThingModelService 类型
+ */
+export interface ThingModelService {
+  [key: string]: any
 }
 
 // IOT 产品功能（物模型）类型枚举类
@@ -47,22 +70,17 @@ export const ThinkModelFunctionApi = {
   },
 
   // 新增产品物模型
-  createThinkModelFunction: async (data: ThinkModelFunctionVO) => {
+  createThinkModelFunction: async (data: ThingModelData) => {
     return await request.post({ url: `/iot/think-model-function/create`, data })
   },
 
   // 修改产品物模型
-  updateThinkModelFunction: async (data: ThinkModelFunctionVO) => {
+  updateThinkModelFunction: async (data: ThingModelData) => {
     return await request.put({ url: `/iot/think-model-function/update`, data })
   },
 
   // 删除产品物模型
   deleteThinkModelFunction: async (id: number) => {
     return await request.delete({ url: `/iot/think-model-function/delete?id=` + id })
-  },
-
-  // 导出产品物模型 Excel
-  exportThinkModelFunction: async (params) => {
-    return await request.download({ url: `/iot/think-model-function/export-excel`, params })
   }
 }
diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
index ac585611..a672baab 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form-item label="数据类型" prop="dataType">
-    <el-select v-model="formData.dataType" placeholder="请选择数据类型" @change="handleChange">
+    <el-select v-model="property.dataType" placeholder="请选择数据类型" @change="handleChange">
       <el-option
         v-for="option in dataTypeOptions"
         :key="option.value"
@@ -13,19 +13,19 @@
   <ThingModelNumberTypeDataSpecs
     v-if="
       [DataSpecsDataType.INT, DataSpecsDataType.DOUBLE, DataSpecsDataType.FLOAT].includes(
-        formData.dataType || ''
+        property.dataType || ''
       )
     "
-    v-model="formData.dataSpecs"
+    v-model="property.dataSpecs"
   />
   <!-- 枚举型配置 -->
   <ThingModelEnumTypeDataSpecs
-    v-if="formData.dataType === DataSpecsDataType.ENUM"
-    v-model="formData.dataSpecsList"
+    v-if="property.dataType === DataSpecsDataType.ENUM"
+    v-model="property.dataSpecsList"
   />
   <!-- 布尔型配置 -->
-  <el-form-item label="布尔值" prop="bool" v-if="formData.dataType === DataSpecsDataType.BOOL">
-    <template v-for="item in formData.dataSpecsList" :key="item.value">
+  <el-form-item label="布尔值" prop="bool" v-if="property.dataType === DataSpecsDataType.BOOL">
+    <template v-for="item in property.dataSpecsList" :key="item.value">
       <div class="flex items-center justify-start w-1/1 mb-5px">
         <span>{{ item.value }}</span>
         <span class="mx-2">-</span>
@@ -38,20 +38,29 @@
     </template>
   </el-form-item>
   <!-- 文本型配置 -->
-  <el-form-item label="数据长度" prop="text" v-if="formData.dataType === DataSpecsDataType.TEXT">
-    <el-input v-model="formData.length" class="w-255px!" placeholder="请输入文本字节长度">
+  <el-form-item label="数据长度" prop="text" v-if="property.dataType === DataSpecsDataType.TEXT">
+    <el-input v-model="property.length" class="w-255px!" placeholder="请输入文本字节长度">
       <template #append>字节</template>
     </el-input>
   </el-form-item>
   <!-- 时间型配置 -->
-  <el-form-item label="时间格式" prop="date" v-if="formData.dataType === DataSpecsDataType.DATE">
+  <el-form-item label="时间格式" prop="date" v-if="property.dataType === DataSpecsDataType.DATE">
     <el-input disabled class="w-255px!" placeholder="String类型的UTC时间戳（毫秒）" />
   </el-form-item>
   <!-- 数组型配置-->
   <ThingModelArrayTypeDataSpecs
-    v-model="formData.dataSpecs"
-    v-if="formData.dataType === DataSpecsDataType.ARRAY"
+    v-model="property.dataSpecs"
+    v-if="property.dataType === DataSpecsDataType.ARRAY"
   />
+  <el-form-item label="读写类型" prop="accessMode">
+    <el-radio-group v-model="property.accessMode">
+      <el-radio label="rw">读写</el-radio>
+      <el-radio label="r">只读</el-radio>
+    </el-radio-group>
+  </el-form-item>
+  <el-form-item label="属性描述" prop="description">
+    <el-input v-model="property.description" placeholder="请输入属性描述" type="textarea" />
+  </el-form-item>
 </template>
 
 <script lang="ts" setup>
@@ -62,30 +71,31 @@ import {
   ThingModelEnumTypeDataSpecs,
   ThingModelNumberTypeDataSpecs
 } from './dataSpecs'
+import { ThingModelProperty } from '@/api/iot/thinkmodelfunction'
 
 /** 物模型数据 */
 defineOptions({ name: 'ThingModelDataSpecs' })
 const props = defineProps<{ modelValue: any }>()
 const emits = defineEmits(['update:modelValue'])
-const formData = useVModel(props, 'modelValue', emits) as Ref<any>
+const property = useVModel(props, 'modelValue', emits) as Ref<ThingModelProperty>
 
 /** 属性值的数据类型切换时初始化相关数据 */
 const handleChange = (dataType: any) => {
-  formData.value.dataSpecsList = []
-  formData.value.dataSpecs = {}
+  property.value.dataSpecsList = []
+  property.value.dataSpecs = {}
 
   switch (dataType) {
     case DataSpecsDataType.INT:
-      formData.value.dataSpecs.dataType = DataSpecsDataType.INT
+      property.value.dataSpecs.dataType = DataSpecsDataType.INT
       break
     case DataSpecsDataType.DOUBLE:
-      formData.value.dataSpecs.dataType = DataSpecsDataType.DOUBLE
+      property.value.dataSpecs.dataType = DataSpecsDataType.DOUBLE
       break
     case DataSpecsDataType.FLOAT:
-      formData.value.dataSpecs.dataType = DataSpecsDataType.FLOAT
+      property.value.dataSpecs.dataType = DataSpecsDataType.FLOAT
       break
     case DataSpecsDataType.ENUM:
-      formData.value.dataSpecsList.push({
+      property.value.dataSpecsList.push({
         dataType: DataSpecsDataType.ENUM,
         name: '', // 枚举项的名称
         value: undefined // 枚举值
@@ -93,7 +103,7 @@ const handleChange = (dataType: any) => {
       break
     case DataSpecsDataType.BOOL:
       for (let i = 0; i < 2; i++) {
-        formData.value.dataSpecsList.push({
+        property.value.dataSpecsList.push({
           dataType: DataSpecsDataType.BOOL,
           name: '', // 布尔值的名称
           value: i // 布尔值
@@ -101,7 +111,7 @@ const handleChange = (dataType: any) => {
       }
       break
     case DataSpecsDataType.ARRAY:
-      formData.value.dataSpecs.dataType = DataSpecsDataType.ARRAY
+      property.value.dataSpecs.dataType = DataSpecsDataType.ARRAY
       break
   }
 }
diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
index bc23dbeb..78a39695 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
@@ -20,16 +20,11 @@
       <el-form-item label="标识符" prop="identifier">
         <el-input v-model="formData.identifier" placeholder="请输入标识符" />
       </el-form-item>
-      <ThingModelDataSpecs v-model="formData" />
-      <el-form-item label="读写类型" prop="accessMode">
-        <el-radio-group v-model="formData.accessMode">
-          <el-radio label="rw">读写</el-radio>
-          <el-radio label="r">只读</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="属性描述" prop="property.description">
-        <el-input v-model="formData.description" placeholder="请输入属性描述" type="textarea" />
-      </el-form-item>
+      <!-- 属性配置 -->
+      <ThingModelDataSpecs
+        v-model="formData.property"
+        v-if="formData.type === ProductFunctionTypeEnum.PROPERTY"
+      />
     </el-form>
 
     <template #footer>
@@ -45,7 +40,7 @@ import ThingModelDataSpecs from './ThingModelDataSpecs.vue'
 import {
   ProductFunctionTypeEnum,
   ThinkModelFunctionApi,
-  ThinkModelFunctionVO
+  ThingModelData
 } from '@/api/iot/thinkmodelfunction'
 import { IOT_PROVIDE_KEY } from '@/views/iot/utils/constants'
 import { DataSpecsDataType } from './config'
@@ -61,18 +56,13 @@ const dialogVisible = ref(false)
 const dialogTitle = ref('')
 const formLoading = ref(false)
 const formType = ref('')
-const formData = ref({
-  id: undefined,
-  productId: undefined,
-  productKey: undefined,
-  identifier: undefined,
-  name: undefined,
-  description: undefined,
+const formData = ref<ThingModelData>({
   type: ProductFunctionTypeEnum.PROPERTY,
-  dataType: DataSpecsDataType.INT,
-  dataSpecsList: [],
-  dataSpecs: {},
-  accessMode: undefined
+  property: {
+    dataType: DataSpecsDataType.INT,
+    dataSpecsList: [],
+    dataSpecs: {}
+  }
 })
 const formRules = reactive({
   name: [
@@ -138,7 +128,7 @@ const submitForm = async () => {
   await formRef.value.validate()
   formLoading.value = true
   try {
-    const data = formData.value as unknown as ThinkModelFunctionVO
+    const data = formData.value as unknown as ThingModelData
     data.productId = product!.value.id
     data.productKey = product!.value.productKey
     if (formType.value === 'create') {
@@ -158,17 +148,12 @@ const submitForm = async () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    id: undefined,
-    productId: undefined,
-    productKey: undefined,
-    identifier: undefined,
-    name: undefined,
-    description: undefined,
     type: ProductFunctionTypeEnum.PROPERTY,
-    dataType: DataSpecsDataType.INT,
-    dataSpecsList: [],
-    dataSpecs: {},
-    accessMode: undefined
+    property: {
+      dataType: DataSpecsDataType.INT,
+      dataSpecsList: [],
+      dataSpecs: {}
+    }
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelArrayTypeDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelArrayTypeDataSpecs.vue
index d96bd7fc..3b309d68 100644
--- a/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelArrayTypeDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/dataSpecs/ThingModelArrayTypeDataSpecs.vue
@@ -24,7 +24,7 @@
 import { useVModel } from '@vueuse/core'
 import { DataSpecsDataType, dataTypeOptions } from '../config'
 
-/** 数值型的 dataSpecs 配置组件 */
+/** 数组型的 dataSpecs 配置组件 */
 defineOptions({ name: 'ThingModelArrayTypeDataSpecs' })
 const props = defineProps<{ modelValue: any }>()
 const emits = defineEmits(['update:modelValue'])

From e36e48586e78853aaf9b018a53f088336116a3bc Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Mon, 16 Dec 2024 17:47:02 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E3=80=91IOT:=20=E4=BA=A7=E5=93=81=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B-=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/iot/thinkmodelfunction/index.ts       |  26 ++--
 .../detail/ThingModel/ThingModelDataSpecs.vue |  28 ++--
 .../detail/ThingModel/ThingModelForm.vue      |  33 +++--
 .../product/detail/ThingModel/config.ts       |   5 +
 .../product/detail/ThingModel/index.vue       |  35 +++--
 .../iot/product/product/detail/index.vue      |   2 +-
 src/views/iot/product/product/index.vue       | 124 ++++++++++--------
 7 files changed, 143 insertions(+), 110 deletions(-)

diff --git a/src/api/iot/thinkmodelfunction/index.ts b/src/api/iot/thinkmodelfunction/index.ts
index 012ba190..9c01cfa9 100644
--- a/src/api/iot/thinkmodelfunction/index.ts
+++ b/src/api/iot/thinkmodelfunction/index.ts
@@ -10,6 +10,7 @@ export interface ThingModelData {
   description?: string // 功能描述
   productId?: number // 产品编号
   productKey?: string // 产品标识
+  dataType: string // 数据类型，与 dataSpecs 的 dataType 保持一致
   type: ProductFunctionTypeEnum // 功能类型
   property: ThingModelProperty // 属性
   event?: ThingModelEvent // 事件
@@ -53,34 +54,35 @@ export enum ProductFunctionAccessModeEnum {
 // IoT 产品物模型 API
 export const ThinkModelFunctionApi = {
   // 查询产品物模型分页
-  getThinkModelFunctionPage: async (params: any) => {
-    return await request.get({ url: `/iot/think-model-function/page`, params })
+  getProductThingModelPage: async (params: any) => {
+    return await request.get({ url: `/iot/product-thing-model/page`, params })
   },
+
   // 获得产品物模型
-  getThinkModelFunctionListByProductId: async (params: any) => {
+  getProductThingModelListByProductId: async (params: any) => {
     return await request.get({
-      url: `/iot/think-model-function/list-by-product-id`,
+      url: `/iot/product-thing-model/list-by-product-id`,
       params
     })
   },
 
   // 查询产品物模型详情
-  getThinkModelFunction: async (id: number) => {
-    return await request.get({ url: `/iot/think-model-function/get?id=` + id })
+  getProductThingModel: async (id: number) => {
+    return await request.get({ url: `/iot/product-thing-model/get?id=` + id })
   },
 
   // 新增产品物模型
-  createThinkModelFunction: async (data: ThingModelData) => {
-    return await request.post({ url: `/iot/think-model-function/create`, data })
+  createProductThingModel: async (data: ThingModelData) => {
+    return await request.post({ url: `/iot/product-thing-model/create`, data })
   },
 
   // 修改产品物模型
-  updateThinkModelFunction: async (data: ThingModelData) => {
-    return await request.put({ url: `/iot/think-model-function/update`, data })
+  updateProductThingModel: async (data: ThingModelData) => {
+    return await request.put({ url: `/iot/product-thing-model/update`, data })
   },
 
   // 删除产品物模型
-  deleteThinkModelFunction: async (id: number) => {
-    return await request.delete({ url: `/iot/think-model-function/delete?id=` + id })
+  deleteProductThingModel: async (id: number) => {
+    return await request.delete({ url: `/iot/product-thing-model/delete?id=` + id })
   }
 }
diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
index a672baab..38819105 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
@@ -24,34 +24,35 @@
     v-model="property.dataSpecsList"
   />
   <!-- 布尔型配置 -->
-  <el-form-item label="布尔值" prop="bool" v-if="property.dataType === DataSpecsDataType.BOOL">
+  <el-form-item v-if="property.dataType === DataSpecsDataType.BOOL" label="布尔值" prop="bool">
     <template v-for="item in property.dataSpecsList" :key="item.value">
       <div class="flex items-center justify-start w-1/1 mb-5px">
         <span>{{ item.value }}</span>
         <span class="mx-2">-</span>
         <el-input
           v-model="item.name"
-          class="w-255px!"
           :placeholder="`如：${item.value === 0 ? '关' : '开'}`"
+          class="w-255px!"
         />
       </div>
     </template>
   </el-form-item>
   <!-- 文本型配置 -->
-  <el-form-item label="数据长度" prop="text" v-if="property.dataType === DataSpecsDataType.TEXT">
-    <el-input v-model="property.length" class="w-255px!" placeholder="请输入文本字节长度">
+  <el-form-item v-if="property.dataType === DataSpecsDataType.TEXT" label="数据长度" prop="text">
+    <el-input v-model="property.dataSpecs.length" class="w-255px!" placeholder="请输入文本字节长度">
       <template #append>字节</template>
     </el-input>
   </el-form-item>
   <!-- 时间型配置 -->
-  <el-form-item label="时间格式" prop="date" v-if="property.dataType === DataSpecsDataType.DATE">
-    <el-input disabled class="w-255px!" placeholder="String类型的UTC时间戳（毫秒）" />
+  <el-form-item v-if="property.dataType === DataSpecsDataType.DATE" label="时间格式" prop="date">
+    <el-input class="w-255px!" disabled placeholder="String类型的UTC时间戳（毫秒）" />
   </el-form-item>
   <!-- 数组型配置-->
   <ThingModelArrayTypeDataSpecs
-    v-model="property.dataSpecs"
     v-if="property.dataType === DataSpecsDataType.ARRAY"
+    v-model="property.dataSpecs"
   />
+  <!-- TODO puhui999: Struct 属性待完善 -->
   <el-form-item label="读写类型" prop="accessMode">
     <el-radio-group v-model="property.accessMode">
       <el-radio label="rw">读写</el-radio>
@@ -84,16 +85,8 @@ const handleChange = (dataType: any) => {
   property.value.dataSpecsList = []
   property.value.dataSpecs = {}
 
+  property.value.dataSpecs.dataType = dataType
   switch (dataType) {
-    case DataSpecsDataType.INT:
-      property.value.dataSpecs.dataType = DataSpecsDataType.INT
-      break
-    case DataSpecsDataType.DOUBLE:
-      property.value.dataSpecs.dataType = DataSpecsDataType.DOUBLE
-      break
-    case DataSpecsDataType.FLOAT:
-      property.value.dataSpecs.dataType = DataSpecsDataType.FLOAT
-      break
     case DataSpecsDataType.ENUM:
       property.value.dataSpecsList.push({
         dataType: DataSpecsDataType.ENUM,
@@ -110,9 +103,6 @@ const handleChange = (dataType: any) => {
         })
       }
       break
-    case DataSpecsDataType.ARRAY:
-      property.value.dataSpecs.dataType = DataSpecsDataType.ARRAY
-      break
   }
 }
 </script>
diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue b/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
index 78a39695..f3d55d49 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
+++ b/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
@@ -22,8 +22,8 @@
       </el-form-item>
       <!-- 属性配置 -->
       <ThingModelDataSpecs
-        v-model="formData.property"
         v-if="formData.type === ProductFunctionTypeEnum.PROPERTY"
+        v-model="formData.property"
       />
     </el-form>
 
@@ -39,11 +39,12 @@ import { ProductVO } from '@/api/iot/product/product'
 import ThingModelDataSpecs from './ThingModelDataSpecs.vue'
 import {
   ProductFunctionTypeEnum,
-  ThinkModelFunctionApi,
-  ThingModelData
+  ThingModelData,
+  ThinkModelFunctionApi
 } from '@/api/iot/thinkmodelfunction'
 import { IOT_PROVIDE_KEY } from '@/views/iot/utils/constants'
 import { DataSpecsDataType } from './config'
+import { cloneDeep } from 'lodash-es'
 
 defineOptions({ name: 'IoTProductThingModelForm' })
 
@@ -58,12 +59,15 @@ const formLoading = ref(false)
 const formType = ref('')
 const formData = ref<ThingModelData>({
   type: ProductFunctionTypeEnum.PROPERTY,
+  dataType: DataSpecsDataType.INT,
   property: {
     dataType: DataSpecsDataType.INT,
-    dataSpecsList: [],
-    dataSpecs: {}
+    dataSpecs: {
+      dataType: DataSpecsDataType.INT
+    }
   }
 })
+// TODO puhui999: 表单校验待完善
 const formRules = reactive({
   name: [
     { required: true, message: '功能名称不能为空', trigger: 'blur' },
@@ -114,7 +118,7 @@ const open = async (type: string, id?: number) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await ThinkModelFunctionApi.getThinkModelFunction(id)
+      formData.value = await ThinkModelFunctionApi.getProductThingModel(id)
     } finally {
       formLoading.value = false
     }
@@ -128,14 +132,19 @@ const submitForm = async () => {
   await formRef.value.validate()
   formLoading.value = true
   try {
-    const data = formData.value as unknown as ThingModelData
+    const data = cloneDeep(formData.value) as ThingModelData
+    // 信息补全
     data.productId = product!.value.id
     data.productKey = product!.value.productKey
+    data.description = data.property.description
+    data.dataType = data.property.dataType
+    data.property.identifier = data.identifier
+    data.property.name = data.name
     if (formType.value === 'create') {
-      await ThinkModelFunctionApi.createThinkModelFunction(data)
+      await ThinkModelFunctionApi.createProductThingModel(data)
       message.success(t('common.createSuccess'))
     } else {
-      await ThinkModelFunctionApi.updateThinkModelFunction(data)
+      await ThinkModelFunctionApi.updateProductThingModel(data)
       message.success(t('common.updateSuccess'))
     }
   } finally {
@@ -149,10 +158,12 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     type: ProductFunctionTypeEnum.PROPERTY,
+    dataType: DataSpecsDataType.INT,
     property: {
       dataType: DataSpecsDataType.INT,
-      dataSpecsList: [],
-      dataSpecs: {}
+      dataSpecs: {
+        dataType: DataSpecsDataType.INT
+      }
     }
   }
   formRef.value?.resetFields()
diff --git a/src/views/iot/product/product/detail/ThingModel/config.ts b/src/views/iot/product/product/detail/ThingModel/config.ts
index cd9d059d..eb651960 100644
--- a/src/views/iot/product/product/detail/ThingModel/config.ts
+++ b/src/views/iot/product/product/detail/ThingModel/config.ts
@@ -43,3 +43,8 @@ export const dataTypeOptions = [
   { value: DataSpecsDataType.STRUCT, label: 'struct (结构体)' },
   { value: DataSpecsDataType.ARRAY, label: 'array (数组)' }
 ]
+
+/** 获得物体模型数据类型配置项名称 */
+export const getDataTypeOptionsLabel = (value: string) => {
+  return dataTypeOptions.find((option) => option.value === value)?.label
+}
diff --git a/src/views/iot/product/product/detail/ThingModel/index.vue b/src/views/iot/product/product/detail/ThingModel/index.vue
index 286fe12d..41cbb39d 100644
--- a/src/views/iot/product/product/detail/ThingModel/index.vue
+++ b/src/views/iot/product/product/detail/ThingModel/index.vue
@@ -32,7 +32,12 @@
           <Icon class="mr-5px" icon="ep:refresh" />
           重置
         </el-button>
-        <el-button plain type="primary" @click="openForm('create')">
+        <el-button
+          v-hasPermi="[`iot:product-thing-model:create`]"
+          plain
+          type="primary"
+          @click="openForm('create')"
+        >
           <Icon class="mr-5px" icon="ep:plus" />
           添加功能
         </el-button>
@@ -49,12 +54,21 @@
         </el-table-column>
         <el-table-column align="center" label="功能名称" prop="name" />
         <el-table-column align="center" label="标识符" prop="identifier" />
-        <el-table-column align="center" label="数据类型" prop="identifier" />
-        <el-table-column align="center" label="数据定义" prop="identifier" />
+        <el-table-column align="center" label="数据类型" prop="identifier">
+          <template #default="{ row }">
+            {{ dataTypeOptionsLabel(row.property.dataType) ?? '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="数据定义" prop="identifier">
+          <template #default="{ row }">
+            <!-- TODO puhui999: 数据定义展示待完善 -->
+            {{ row.property.dataSpecs ?? row.property.dataSpecsList }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="操作">
           <template #default="scope">
             <el-button
-              v-hasPermi="[`iot:think-model-function:update`]"
+              v-hasPermi="[`iot:product-thing-model:update`]"
               link
               type="primary"
               @click="openForm('update', scope.row.id)"
@@ -62,7 +76,7 @@
               编辑
             </el-button>
             <el-button
-              v-hasPermi="['iot:think-model-function:delete']"
+              v-hasPermi="['iot:product-thing-model:delete']"
               link
               type="danger"
               @click="handleDelete(scope.row.id)"
@@ -85,11 +99,12 @@
   <ThingModelForm ref="formRef" @success="getList" />
 </template>
 <script lang="ts" setup>
-import { ThinkModelFunctionApi, ThinkModelFunctionVO } from '@/api/iot/thinkmodelfunction'
+import { ThingModelData, ThinkModelFunctionApi } from '@/api/iot/thinkmodelfunction'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import ThingModelForm from './ThingModelForm.vue'
 import { ProductVO } from '@/api/iot/product/product'
 import { IOT_PROVIDE_KEY } from '@/views/iot/utils/constants'
+import { getDataTypeOptionsLabel } from '@/views/iot/product/product/detail/ThingModel/config'
 
 defineOptions({ name: 'IoTProductThingModel' })
 
@@ -97,7 +112,7 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const loading = ref(true) // 列表的加载中
-const list = ref<ThinkModelFunctionVO[]>([]) // 列表的数据
+const list = ref<ThingModelData[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
@@ -108,12 +123,14 @@ const queryParams = reactive({
 
 const queryFormRef = ref() // 搜索的表单
 const product = inject<Ref<ProductVO>>(IOT_PROVIDE_KEY.PRODUCT) // 注入产品信息
+const dataTypeOptionsLabel = computed(() => (value: string) => getDataTypeOptionsLabel(value)) // 解析数据类型
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
     queryParams.productId = product?.value?.id || -1
-    const data = await ThinkModelFunctionApi.getThinkModelFunctionPage(queryParams)
+    const data = await ThinkModelFunctionApi.getProductThingModelPage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -145,7 +162,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await ThinkModelFunctionApi.deleteThinkModelFunction(id)
+    await ThinkModelFunctionApi.deleteProductThingModel(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
diff --git a/src/views/iot/product/product/detail/index.vue b/src/views/iot/product/product/detail/index.vue
index 22d6af73..cdf3103a 100644
--- a/src/views/iot/product/product/detail/index.vue
+++ b/src/views/iot/product/product/detail/index.vue
@@ -8,7 +8,7 @@
       <el-tab-pane label="Topic 类列表" name="topic">
         <ProductTopic v-if="activeTab === 'topic'" :product="product" />
       </el-tab-pane>
-      <el-tab-pane label="功能定义" lazy name="function">
+      <el-tab-pane label="功能定义" lazy name="thingModel">
         <IoTProductThingModel ref="thingModelRef" />
       </el-tab-pane>
       <el-tab-pane label="消息解析" name="message" />
diff --git a/src/views/iot/product/product/index.vue b/src/views/iot/product/product/index.vue
index 1e48a594..db61ccfe 100644
--- a/src/views/iot/product/product/index.vue
+++ b/src/views/iot/product/product/index.vue
@@ -2,49 +2,57 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
-      class="-mb-15px"
-      :model="queryParams"
       ref="queryFormRef"
       :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
       label-width="68px"
     >
       <el-form-item label="产品名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入产品名称"
-          clearable
-          @keyup.enter="handleQuery"
           class="!w-240px"
+          clearable
+          placeholder="请输入产品名称"
+          @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="ProductKey" prop="productKey">
         <el-input
           v-model="queryParams.productKey"
-          placeholder="请输入产品标识"
-          clearable
-          @keyup.enter="handleQuery"
           class="!w-240px"
+          clearable
+          placeholder="请输入产品标识"
+          @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['iot:product:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
         </el-button>
         <el-button
-          type="success"
+          v-hasPermi="['iot:product:create']"
           plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['iot:product:export']"
+          type="primary"
+          @click="openForm('create')"
         >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+        <el-button
+          v-hasPermi="['iot:product:export']"
+          :loading="exportLoading"
+          plain
+          type="success"
+          @click="handleExport"
+        >
+          <Icon class="mr-5px" icon="ep:download" />
+          导出
         </el-button>
       </el-form-item>
       <!-- 视图切换按钮 -->
@@ -64,8 +72,8 @@
   <!-- 卡片视图 -->
   <ContentWrap>
     <el-row v-if="viewMode === 'card'" :gutter="16">
-      <el-col v-for="item in list" :key="item.id" :xs="24" :sm="12" :md="12" :lg="6" class="mb-4">
-        <el-card class="h-full transition-colors" :body-style="{ padding: '0' }">
+      <el-col v-for="item in list" :key="item.id" :lg="6" :md="12" :sm="12" :xs="24" class="mb-4">
+        <el-card :body-style="{ padding: '0' }" class="h-full transition-colors">
           <!-- 内容区域 -->
           <div class="p-4">
             <!-- 标题区域 -->
@@ -103,41 +111,41 @@
             <!-- 按钮组 -->
             <div class="flex items-center px-0">
               <el-button
-                class="flex-1 !px-2 !h-[32px] text-[13px]"
-                type="primary"
-                plain
-                @click="openForm('update', item.id)"
                 v-hasPermi="['iot:product:update']"
+                class="flex-1 !px-2 !h-[32px] text-[13px]"
+                plain
+                type="primary"
+                @click="openForm('update', item.id)"
               >
-                <Icon icon="ep:edit-pen" class="mr-1" />
+                <Icon class="mr-1" icon="ep:edit-pen" />
                 编辑
               </el-button>
               <el-button
                 class="flex-1 !px-2 !h-[32px] !ml-[10px] text-[13px]"
-                type="warning"
                 plain
+                type="warning"
                 @click="openDetail(item.id)"
               >
-                <Icon icon="ep:view" class="mr-1" />
+                <Icon class="mr-1" icon="ep:view" />
                 详情
               </el-button>
               <el-button
                 class="flex-1 !px-2 !h-[32px] !ml-[10px] text-[13px]"
-                type="success"
                 plain
+                type="success"
                 @click="openObjectModel(item)"
               >
-                <Icon icon="ep:scale-to-original" class="mr-1" />
+                <Icon class="mr-1" icon="ep:scale-to-original" />
                 物模型
               </el-button>
               <div class="mx-[10px] h-[20px] w-[1px] bg-[#dcdfe6]"></div>
               <el-button
-                class="!px-2 !h-[32px] text-[13px]"
-                type="danger"
-                plain
-                @click="handleDelete(item.id)"
                 v-hasPermi="['iot:product:delete']"
                 :disabled="item.status === 1"
+                class="!px-2 !h-[32px] text-[13px]"
+                plain
+                type="danger"
+                @click="handleDelete(item.id)"
               >
                 <Icon icon="ep:delete" />
               </el-button>
@@ -148,68 +156,68 @@
     </el-row>
 
     <!-- 列表视图 -->
-    <el-table v-else v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="ProductKey" align="center" prop="productKey" />
-      <el-table-column label="品类" align="center" prop="categoryName" />
-      <el-table-column label="设备类型" align="center" prop="deviceType">
+    <el-table v-else v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="ID" prop="id" />
+      <el-table-column align="center" label="ProductKey" prop="productKey" />
+      <el-table-column align="center" label="品类" prop="categoryName" />
+      <el-table-column align="center" label="设备类型" prop="deviceType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE" :value="scope.row.deviceType" />
         </template>
       </el-table-column>
-      <el-table-column label="产品图标" align="center" prop="icon">
+      <el-table-column align="center" label="产品图标" prop="icon">
         <template #default="scope">
           <el-image
             v-if="scope.row.icon"
+            :preview-src-list="[scope.row.icon]"
             :src="scope.row.icon"
             class="w-40px h-40px"
-            :preview-src-list="[scope.row.icon]"
           />
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="产品图片" align="center" prop="picture">
+      <el-table-column align="center" label="产品图片" prop="picture">
         <template #default="scope">
           <el-image
             v-if="scope.row.picUrl"
+            :preview-src-list="[scope.row.picture]"
             :src="scope.row.picUrl"
             class="w-40px h-40px"
-            :preview-src-list="[scope.row.picture]"
           />
           <span v-else>-</span>
         </template>
       </el-table-column>
       <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
         :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
         width="180px"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column align="center" label="操作">
         <template #default="scope">
           <el-button
+            v-hasPermi="['iot:product:query']"
             link
             type="primary"
             @click="openDetail(scope.row.id)"
-            v-hasPermi="['iot:product:query']"
           >
             查看
           </el-button>
           <el-button
+            v-hasPermi="['iot:product:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['iot:product:update']"
           >
             编辑
           </el-button>
           <el-button
+            v-hasPermi="['iot:product:delete']"
+            :disabled="scope.row.status === 1"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['iot:product:delete']"
-            :disabled="scope.row.status === 1"
           >
             删除
           </el-button>
@@ -219,9 +227,9 @@
 
     <!-- 分页 -->
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
     />
   </ContentWrap>
@@ -230,7 +238,7 @@
   <ProductForm ref="formRef" @success="getList" />
 </template>
 
-<script setup lang="ts">
+<script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import { ProductApi, ProductVO } from '@/api/iot/product/product'
 import ProductForm from './ProductForm.vue'
@@ -301,7 +309,7 @@ const openObjectModel = (item: ProductVO) => {
   push({
     name: 'IoTProductDetail',
     params: { id: item.id },
-    query: { tab: 'function' }
+    query: { tab: 'thingModel' }
   })
 }