Commit 3a3d6a50380bc6c2be36f2f9c696e05d2dad0970
1 parent
2894acd4
DEFECT-483 修复场景联动新增成功,编辑未选设备触发和设备属性成功
Showing
2 changed files
with
6 additions
and
0 deletions
@@ -104,6 +104,7 @@ | @@ -104,6 +104,7 @@ | ||
104 | ); | 104 | ); |
105 | //TODO-fengtao-设备、属性、条件筛选验证 | 105 | //TODO-fengtao-设备、属性、条件筛选验证 |
106 | const validate = getFieldsValue(); | 106 | const validate = getFieldsValue(); |
107 | + if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式'); | ||
107 | if (validate.device == 'PART') { | 108 | if (validate.device == 'PART') { |
108 | if (validate.entityId == undefined) return createMessage.error('请选择设备'); | 109 | if (validate.entityId == undefined) return createMessage.error('请选择设备'); |
109 | } | 110 | } |
@@ -141,6 +141,7 @@ | @@ -141,6 +141,7 @@ | ||
141 | let attrIsRequired = false; | 141 | let attrIsRequired = false; |
142 | let predicateIsRequired = false; | 142 | let predicateIsRequired = false; |
143 | let predicateDoubleIsRequired = false; | 143 | let predicateDoubleIsRequired = false; |
144 | + let triggerTypeIsRequired = false; | ||
144 | if (clearRule) { | 145 | if (clearRule) { |
145 | clearRule.some((s) => { | 146 | clearRule.some((s) => { |
146 | if (s.device == 'PART') { | 147 | if (s.device == 'PART') { |
@@ -151,6 +152,9 @@ | @@ -151,6 +152,9 @@ | ||
151 | if (s.type2 == '' || s.type2 == null) { | 152 | if (s.type2 == '' || s.type2 == null) { |
152 | attrIsRequired = true; | 153 | attrIsRequired = true; |
153 | } | 154 | } |
155 | + if (s.triggerType == '' || s.triggerType == null || s.triggerType == undefined) { | ||
156 | + triggerTypeIsRequired = true; | ||
157 | + } | ||
154 | if (s.predicate == undefined) { | 158 | if (s.predicate == undefined) { |
155 | predicateIsRequired = true; | 159 | predicateIsRequired = true; |
156 | } | 160 | } |
@@ -174,6 +178,7 @@ | @@ -174,6 +178,7 @@ | ||
174 | if (attrIsRequired) return createMessage.error('请选择属性'); | 178 | if (attrIsRequired) return createMessage.error('请选择属性'); |
175 | if (predicateIsRequired) return createMessage.error('请填写条件筛选'); | 179 | if (predicateIsRequired) return createMessage.error('请填写条件筛选'); |
176 | if (predicateDoubleIsRequired) return createMessage.error('请填写条件筛选'); | 180 | if (predicateDoubleIsRequired) return createMessage.error('请填写条件筛选'); |
181 | + if (triggerTypeIsRequired) return createMessage.error('请选择设备触发方式'); | ||
177 | //TODO-fengtao-清除告警验证 | 182 | //TODO-fengtao-清除告警验证 |
178 | //TODO-fengtao-设备验证 | 183 | //TODO-fengtao-设备验证 |
179 | const validate = getFieldsValue(); | 184 | const validate = getFieldsValue(); |