diff --git a/src/api/iot/thinkmodel/index.ts b/src/api/iot/thingmodel/index.ts
similarity index 52%
rename from src/api/iot/thinkmodel/index.ts
rename to src/api/iot/thingmodel/index.ts
index e1887048..8e2b69ad 100644
--- a/src/api/iot/thinkmodel/index.ts
+++ b/src/api/iot/thingmodel/index.ts
@@ -3,7 +3,7 @@ import request from '@/config/axios'
/**
* IoT 产品物模型
*/
-export interface ThinkModelData {
+export interface ThingModelData {
id?: number // 物模型功能编号
identifier?: string // 功能标识
name?: string // 功能名称
@@ -12,29 +12,29 @@ export interface ThinkModelData {
productKey?: string // 产品标识
dataType: string // 数据类型,与 dataSpecs 的 dataType 保持一致
type: ProductFunctionTypeEnum // 功能类型
- property: ThinkModelProperty // 属性
- event?: ThinkModelEvent // 事件
- service?: ThinkModelService // 服务
+ property: ThingModelProperty // 属性
+ event?: ThingModelEvent // 事件
+ service?: ThingModelService // 服务
}
/**
- * ThinkModelProperty 类型
+ * ThingModelProperty 类型
*/
-export interface ThinkModelProperty {
+export interface ThingModelProperty {
[key: string]: any
}
/**
- * ThinkModelEvent 类型
+ * ThingModelEvent 类型
*/
-export interface ThinkModelEvent {
+export interface ThingModelEvent {
[key: string]: any
}
/**
- * ThinkModelService 类型
+ * ThingModelService 类型
*/
-export interface ThinkModelService {
+export interface ThingModelService {
[key: string]: any
}
@@ -52,38 +52,37 @@ export enum ProductFunctionAccessModeEnum {
}
// IoT 产品物模型 API
-export const ThinkModelApi = {
+export const ThingModelApi = {
// 查询产品物模型分页
- // TODO @puhui999:product 前缀,是不是去掉哈。
- getThinkModelPage: async (params: any) => {
- return await request.get({ url: `/iot/product-think-model/page`, params })
+ getThingModelPage: async (params: any) => {
+ return await request.get({ url: `/iot/product-thing-model/page`, params })
},
// 获得产品物模型
- getThinkModelListByProductId: async (params: any) => {
+ getThingModelListByProductId: async (params: any) => {
return await request.get({
- url: `/iot/product-think-model/list-by-product-id`,
+ url: `/iot/product-thing-model/list-by-product-id`,
params
})
},
// 查询产品物模型详情
- getThinkModel: async (id: number) => {
- return await request.get({ url: `/iot/product-think-model/get?id=` + id })
+ getThingModel: async (id: number) => {
+ return await request.get({ url: `/iot/product-thing-model/get?id=` + id })
},
// 新增产品物模型
- createThinkModel: async (data: ThinkModelData) => {
- return await request.post({ url: `/iot/product-think-model/create`, data })
+ createThingModel: async (data: ThingModelData) => {
+ return await request.post({ url: `/iot/product-thing-model/create`, data })
},
// 修改产品物模型
- updateThinkModel: async (data: ThinkModelData) => {
- return await request.put({ url: `/iot/product-think-model/update`, data })
+ updateThingModel: async (data: ThingModelData) => {
+ return await request.put({ url: `/iot/product-thing-model/update`, data })
},
// 删除产品物模型
- deleteThinkModel: async (id: number) => {
- return await request.delete({ url: `/iot/product-think-model/delete?id=` + id })
+ deleteThingModel: async (id: number) => {
+ return await request.delete({ url: `/iot/product-thing-model/delete?id=` + id })
}
}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 0f57ba4e..eae50a27 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -236,7 +236,7 @@ export enum DICT_TYPE {
IOT_DATA_FORMAT = 'iot_data_format', // IOT 数据格式
IOT_PROTOCOL_TYPE = 'iot_protocol_type', // IOT 接入网关协议
IOT_DEVICE_STATUS = 'iot_device_status', // IOT 设备状态
- IOT_PRODUCT_THINK_MODEL_TYPE = 'iot_product_think_model_type', // IOT 产品功能类型
+ IOT_PRODUCT_THING_MODEL_TYPE = 'iot_product_thing_model_type', // IOT 产品功能类型
IOT_DATA_TYPE = 'iot_data_type', // IOT 数据类型
IOT_UNIT_TYPE = 'iot_unit_type', // IOT 单位类型
IOT_RW_TYPE = 'iot_rw_type', // IOT 读写类型
diff --git a/src/views/iot/product/product/detail/index.vue b/src/views/iot/product/product/detail/index.vue
index e3537642..d0c446e0 100644
--- a/src/views/iot/product/product/detail/index.vue
+++ b/src/views/iot/product/product/detail/index.vue
@@ -22,7 +22,7 @@ import { DeviceApi } from '@/api/iot/device/device'
import ProductDetailsHeader from './ProductDetailsHeader.vue'
import ProductDetailsInfo from './ProductDetailsInfo.vue'
import ProductTopic from './ProductTopic.vue'
-import IoTProductThinkModel from '@/views/iot/thinkmodel/index.vue'
+import IoTProductThinkModel from '@/views/iot/thingmodel/index.vue'
import { useTagsViewStore } from '@/store/modules/tagsView'
import { useRouter } from 'vue-router'
import { IOT_PROVIDE_KEY } from '@/views/iot/utils/constants'
diff --git a/src/views/iot/thinkmodel/ThinkModelDataSpecs.vue b/src/views/iot/thingmodel/ThingModelDataSpecs.vue
similarity index 94%
rename from src/views/iot/thinkmodel/ThinkModelDataSpecs.vue
rename to src/views/iot/thingmodel/ThingModelDataSpecs.vue
index 2683242f..45eeb3e9 100644
--- a/src/views/iot/thinkmodel/ThinkModelDataSpecs.vue
+++ b/src/views/iot/thingmodel/ThingModelDataSpecs.vue
@@ -14,7 +14,7 @@
-
-
@@ -74,7 +74,7 @@
-
@@ -104,19 +104,19 @@
import { useVModel } from '@vueuse/core'
import { DataSpecsDataType, dataTypeOptions } from './config'
import {
- ThinkModelArrayTypeDataSpecs,
- ThinkModelEnumTypeDataSpecs,
- ThinkModelNumberTypeDataSpecs
+ ThingModelArrayTypeDataSpecs,
+ ThingModelEnumTypeDataSpecs,
+ ThingModelNumberTypeDataSpecs
} from './dataSpecs'
-import { ThinkModelProperty } from '@/api/iot/thinkmodel'
+import { ThingModelProperty } from 'src/api/iot/thingmodel'
import { isEmpty } from '@/utils/is'
/** IoT 物模型数据 */
-defineOptions({ name: 'ThinkModelDataSpecs' })
+defineOptions({ name: 'ThingModelDataSpecs' })
const props = defineProps<{ modelValue: any }>()
const emits = defineEmits(['update:modelValue'])
-const property = useVModel(props, 'modelValue', emits) as Ref
+const property = useVModel(props, 'modelValue', emits) as Ref
/** 属性值的数据类型切换时初始化相关数据 */
const handleChange = (dataType: any) => {
diff --git a/src/views/iot/thinkmodel/ThinkModelForm.vue b/src/views/iot/thingmodel/ThingModelForm.vue
similarity index 90%
rename from src/views/iot/thinkmodel/ThinkModelForm.vue
rename to src/views/iot/thingmodel/ThingModelForm.vue
index 985f930f..a92495e4 100644
--- a/src/views/iot/thinkmodel/ThinkModelForm.vue
+++ b/src/views/iot/thingmodel/ThingModelForm.vue
@@ -10,7 +10,7 @@
@@ -25,7 +25,7 @@
-
@@ -40,15 +40,15 @@