diff --git a/src/api/iot/rule/scene/index.ts b/src/api/iot/rule/scene/index.ts index 7cbb438b7..9789e275b 100644 --- a/src/api/iot/rule/scene/index.ts +++ b/src/api/iot/rule/scene/index.ts @@ -26,5 +26,10 @@ export const RuleSceneApi = { // 删除场景联动 deleteRuleScene: async (id: number) => { return await request.delete({ url: `/iot/rule-scene/delete?id=` + id }) + }, + + // 获取场景联动简单列表 + getSimpleRuleSceneList: async () => { + return await request.get({ url: `/iot/rule-scene/simple-list` }) } } diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 202c5335e..aa7176931 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -240,5 +240,6 @@ export enum DICT_TYPE { IOT_DATA_SINK_TYPE_ENUM = 'iot_data_sink_type_enum', // IoT 数据流转目的类型 IOT_RULE_SCENE_TRIGGER_TYPE_ENUM = 'iot_rule_scene_trigger_type_enum', // IoT 场景流转的触发类型枚举 IOT_RULE_SCENE_ACTION_TYPE_ENUM = 'iot_rule_scene_action_type_enum', // IoT 规则场景的触发类型枚举 - IOT_ALERT_LEVEL = 'iot_alert_level' // IoT 告警级别 + IOT_ALERT_LEVEL = 'iot_alert_level', // IoT 告警级别 + IOT_ALERT_RECEIVE_TYPE = 'iot_alert_receive_type' // IoT 告警接收类型 } diff --git a/src/views/iot/alert/config/AlertConfigForm.vue b/src/views/iot/alert/config/AlertConfigForm.vue index b53856e2e..bece0fffb 100644 --- a/src/views/iot/alert/config/AlertConfigForm.vue +++ b/src/views/iot/alert/config/AlertConfigForm.vue @@ -4,17 +4,24 @@ ref="formRef" :model="formData" :rules="formRules" - label-width="100px" + label-width="140px" v-loading="formLoading" > - + - + + + @@ -26,14 +33,50 @@ /> - - + + + + - - + + + + - - + + + +