diff --git a/src/api/iot/thinkmodelfunction/index.ts b/src/api/iot/thinkmodel/index.ts
similarity index 68%
rename from src/api/iot/thinkmodelfunction/index.ts
rename to src/api/iot/thinkmodel/index.ts
index 9c01cfa9..ee314790 100644
--- a/src/api/iot/thinkmodelfunction/index.ts
+++ b/src/api/iot/thinkmodel/index.ts
@@ -3,7 +3,7 @@ import request from '@/config/axios'
/**
* IoT 产品物模型
*/
-export interface ThingModelData {
+export interface ThinkModelData {
id?: number // 物模型功能编号
identifier?: string // 功能标识
name?: string // 功能名称
@@ -12,29 +12,29 @@ export interface ThingModelData {
productKey?: string // 产品标识
dataType: string // 数据类型,与 dataSpecs 的 dataType 保持一致
type: ProductFunctionTypeEnum // 功能类型
- property: ThingModelProperty // 属性
- event?: ThingModelEvent // 事件
- service?: ThingModelService // 服务
+ property: ThinkModelProperty // 属性
+ event?: ThinkModelEvent // 事件
+ service?: ThinkModelService // 服务
}
/**
- * ThingModelProperty 类型
+ * ThinkModelProperty 类型
*/
-export interface ThingModelProperty {
+export interface ThinkModelProperty {
[key: string]: any
}
/**
- * ThingModelEvent 类型
+ * ThinkModelEvent 类型
*/
-export interface ThingModelEvent {
+export interface ThinkModelEvent {
[key: string]: any
}
/**
- * ThingModelService 类型
+ * ThinkModelService 类型
*/
-export interface ThingModelService {
+export interface ThinkModelService {
[key: string]: any
}
@@ -52,14 +52,14 @@ export enum ProductFunctionAccessModeEnum {
}
// IoT 产品物模型 API
-export const ThinkModelFunctionApi = {
+export const ThinkModelApi = {
// 查询产品物模型分页
- getProductThingModelPage: async (params: any) => {
+ getProductThinkModelPage: async (params: any) => {
return await request.get({ url: `/iot/product-thing-model/page`, params })
},
// 获得产品物模型
- getProductThingModelListByProductId: async (params: any) => {
+ getProductThinkModelListByProductId: async (params: any) => {
return await request.get({
url: `/iot/product-thing-model/list-by-product-id`,
params
@@ -67,22 +67,22 @@ export const ThinkModelFunctionApi = {
},
// 查询产品物模型详情
- getProductThingModel: async (id: number) => {
+ getProductThinkModel: async (id: number) => {
return await request.get({ url: `/iot/product-thing-model/get?id=` + id })
},
// 新增产品物模型
- createProductThingModel: async (data: ThingModelData) => {
+ createProductThinkModel: async (data: ThinkModelData) => {
return await request.post({ url: `/iot/product-thing-model/create`, data })
},
// 修改产品物模型
- updateProductThingModel: async (data: ThingModelData) => {
+ updateProductThinkModel: async (data: ThinkModelData) => {
return await request.put({ url: `/iot/product-thing-model/update`, data })
},
// 删除产品物模型
- deleteProductThingModel: async (id: number) => {
+ deleteProductThinkModel: 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/dataSpecs/index.ts b/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts
deleted file mode 100644
index f2e1daaf..00000000
--- a/src/views/iot/product/product/detail/ThingModel/dataSpecs/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import ThingModelEnumTypeDataSpecs from './ThingModelEnumTypeDataSpecs.vue'
-import ThingModelNumberTypeDataSpecs from './ThingModelNumberTypeDataSpecs.vue'
-import ThingModelArrayTypeDataSpecs from './ThingModelArrayTypeDataSpecs.vue'
-
-export { ThingModelEnumTypeDataSpecs, ThingModelNumberTypeDataSpecs, ThingModelArrayTypeDataSpecs }
diff --git a/src/views/iot/product/product/detail/index.vue b/src/views/iot/product/product/detail/index.vue
index cdf3103a..c74c10a9 100644
--- a/src/views/iot/product/product/detail/index.vue
+++ b/src/views/iot/product/product/detail/index.vue
@@ -8,8 +8,8 @@
-
-
+
+
@@ -22,7 +22,7 @@ import { DeviceApi } from '@/api/iot/device'
import ProductDetailsHeader from './ProductDetailsHeader.vue'
import ProductDetailsInfo from './ProductDetailsInfo.vue'
import ProductTopic from './ProductTopic.vue'
-import IoTProductThingModel from './ThingModel/index.vue'
+import IoTProductThinkModel from '@/views/iot/thinkmodel/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/product/product/index.vue b/src/views/iot/product/product/index.vue
index db61ccfe..09fa0237 100644
--- a/src/views/iot/product/product/index.vue
+++ b/src/views/iot/product/product/index.vue
@@ -309,7 +309,7 @@ const openObjectModel = (item: ProductVO) => {
push({
name: 'IoTProductDetail',
params: { id: item.id },
- query: { tab: 'thingModel' }
+ query: { tab: 'thinkModel' }
})
}
diff --git a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue b/src/views/iot/thinkmodel/ThinkModelDataSpecs.vue
similarity index 94%
rename from src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
rename to src/views/iot/thinkmodel/ThinkModelDataSpecs.vue
index 9a920017..d352695c 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelDataSpecs.vue
+++ b/src/views/iot/thinkmodel/ThinkModelDataSpecs.vue
@@ -14,7 +14,7 @@
-
-
@@ -74,7 +74,7 @@
-
@@ -104,18 +104,18 @@
import { useVModel } from '@vueuse/core'
import { DataSpecsDataType, dataTypeOptions } from './config'
import {
- ThingModelArrayTypeDataSpecs,
- ThingModelEnumTypeDataSpecs,
- ThingModelNumberTypeDataSpecs
+ ThinkModelArrayTypeDataSpecs,
+ ThinkModelEnumTypeDataSpecs,
+ ThinkModelNumberTypeDataSpecs
} from './dataSpecs'
-import { ThingModelProperty } from '@/api/iot/thinkmodelfunction'
+import { ThinkModelProperty } from '@/api/iot/thinkmodel'
import { isEmpty } from '@/utils/is'
/** 物模型数据 */
-defineOptions({ name: 'ThingModelDataSpecs' })
+defineOptions({ name: 'IoTProductThinkModelDataSpecs' })
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/product/product/detail/ThingModel/ThingModelForm.vue b/src/views/iot/thinkmodel/ThinkModelForm.vue
similarity index 89%
rename from src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
rename to src/views/iot/thinkmodel/ThinkModelForm.vue
index b662a9eb..0674cebd 100644
--- a/src/views/iot/product/product/detail/ThingModel/ThingModelForm.vue
+++ b/src/views/iot/thinkmodel/ThinkModelForm.vue
@@ -21,7 +21,7 @@
-
@@ -36,17 +36,13 @@