diff --git a/src/views/iot/rule/scene/RuleSceneForm.vue b/src/views/iot/rule/scene/RuleSceneForm.vue index e18834249..034c52549 100644 --- a/src/views/iot/rule/scene/RuleSceneForm.vue +++ b/src/views/iot/rule/scene/RuleSceneForm.vue @@ -44,8 +44,9 @@ - - 添加触发器 + + 添加触发器 + 执行动作配置 diff --git a/src/views/iot/rule/scene/components/DeviceListener.vue b/src/views/iot/rule/scene/components/DeviceListener.vue index 5a3feb63b..1c5d32f45 100644 --- a/src/views/iot/rule/scene/components/DeviceListener.vue +++ b/src/views/iot/rule/scene/components/DeviceListener.vue @@ -17,13 +17,19 @@ /> -
+
产品 {{ product ? product.name : '选择产品' }}
-
+
设备 {{ isEmpty(deviceList) ? '选择设备' : triggerConfig.deviceNames.join(',') }} @@ -36,71 +42,89 @@
- -
-
- - - - - -
-
- - + + + +
+ CRON 表达式 +
- 添加触发条件 + + + 添加触发条件 +
@@ -126,6 +150,7 @@ import { ThingModelApi } from '@/api/iot/thingmodel' import { IotDeviceMessageIdentifierEnum, IotDeviceMessageTypeEnum, + IotRuleSceneTriggerTypeEnum, TriggerCondition, TriggerConditionParameter, TriggerConfig