diff --git a/apps/web-antd/src/api/iot/rule/scene/index.ts b/apps/web-antd/src/api/iot/rule/scene/index.ts index 59c8255a7..9a8acf758 100644 --- a/apps/web-antd/src/api/iot/rule/scene/index.ts +++ b/apps/web-antd/src/api/iot/rule/scene/index.ts @@ -3,7 +3,7 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; export namespace RuleSceneApi { - /** IoT 场景联动规则 VO */ + /** 场景联动规则 */ export interface SceneRule { id?: number; name: string; @@ -14,7 +14,7 @@ export namespace RuleSceneApi { createTime?: Date; } - /** IoT 场景联动规则触发器 */ + /** 场景联动规则的触发器 */ export interface Trigger { type?: string; productId?: number; @@ -26,13 +26,13 @@ export namespace RuleSceneApi { conditionGroups?: TriggerConditionGroup[]; } - /** IoT 场景联动规则触发条件组 */ + /** 场景联动规则的触发条件组 */ export interface TriggerConditionGroup { conditions?: TriggerCondition[]; operator?: string; } - /** IoT 场景联动规则触发条件 */ + /** 场景联动规则的触发条件 */ export interface TriggerCondition { productId?: number; deviceId?: number; @@ -42,7 +42,7 @@ export namespace RuleSceneApi { type?: string; } - /** IoT 场景联动规则动作 */ + /** 场景联动规则的动作 */ export interface Action { type?: string; productId?: number; @@ -53,6 +53,7 @@ export namespace RuleSceneApi { } } +// TODO @haohao:貌似下面的,和 RuleSceneApi 重复了。 /** IoT 场景联动规则 */ export interface IotSceneRule { id?: number; @@ -135,6 +136,7 @@ export function deleteSceneRule(id: number) { } /** 批量删除场景联动规则 */ +// TODO @haohao:貌似用上。 export function deleteSceneRuleList(ids: number[]) { return requestClient.delete('/iot/scene-rule/delete-list', { params: { ids: ids.join(',') }, diff --git a/apps/web-antd/src/views/iot/rule/data/data.ts b/apps/web-antd/src/views/iot/rule/data/data.ts index 6c94b2792..efebb92d0 100644 --- a/apps/web-antd/src/views/iot/rule/data/data.ts +++ b/apps/web-antd/src/views/iot/rule/data/data.ts @@ -67,12 +67,6 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { title: '规则名称', minWidth: 150, }, - { - field: 'productId', - title: '所属产品', - minWidth: 150, - slots: { default: 'product' }, - }, { field: 'description', title: '规则描述', @@ -87,6 +81,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { props: { type: DICT_TYPE.COMMON_STATUS }, }, }, + // TODO @haohao:这里是【数据源】【数据目的】 { field: 'sinkCount', title: '数据流转数', diff --git a/apps/web-antd/src/views/iot/rule/data/index.vue b/apps/web-antd/src/views/iot/rule/data/index.vue index 294eb881f..f6eb38168 100644 --- a/apps/web-antd/src/views/iot/rule/data/index.vue +++ b/apps/web-antd/src/views/iot/rule/data/index.vue @@ -1,4 +1,5 @@ - -