yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yudao/feature/iot' into feature/iot 

# Conflicts:
#	src/views/iot/rule/scene/form/configs/DeviceControlConfig.vue
#	src/views/iot/rule/scene/form/inputs/JsonParamsInput.vue
#	src/views/iot/rule/scene/form/sections/TriggerSection.vue
pull/808/head
puhui999 2025-08-07 22:02:05 +08:00
parent 250fc66c98 18573d6206
commit e109f3b1c8
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/iot/rule/scene/form/configs/MainConditionInnerConfig.vue
View File

@ -77,6 +77,7 @@
</el-col> </el-col>
<!-- 值输入 --> <!-- 值输入 -->
<!-- TODO @puhui999：这种用 include 更简洁 -->
<el-col <el-col
:span=" :span="
triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE || triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE ||
@ -94,6 +95,7 @@
required required
> >
<!-- 服务调用参数配置 --> <!-- 服务调用参数配置 -->
<!-- TODO @puhui999：中英文之间，有个空格哈？ -->
<JsonParamsInput <JsonParamsInput
v-if="triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE" v-if="triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE"
v-model="condition.value" v-model="condition.value"
@ -148,6 +150,7 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- TODO @puhui999：这个是不是跟阿里云，还是一致一点哈？ -->
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="操作符" required> <el-form-item label="操作符" required>