Commit cdc35de9051df643c930518d1558a3e98f2fa95d
1 parent
331ad431
fix:修复场景联动 执行动作设备、属性、条件筛选、 清除告警如果有则必填验证
Showing
1 changed file
with
34 additions
and
0 deletions
... | ... | @@ -136,6 +136,40 @@ |
136 | 136 | schedule: item.alarmScheduleRef.scheduleData, |
137 | 137 | }; |
138 | 138 | }); |
139 | + //TODO-fengtao-清除告警验证 | |
140 | + let deviceIdIsRequired = false; | |
141 | + let attrIsRequired = false; | |
142 | + let predicateIsRequired = false; | |
143 | + let predicateDoubleIsRequired = false; | |
144 | + if (clearRule) { | |
145 | + console.log('clearRule', clearRule); | |
146 | + clearRule.some((s) => { | |
147 | + if (s.device == 'PART') { | |
148 | + if (s.entityId == undefined) { | |
149 | + deviceIdIsRequired = true; | |
150 | + } | |
151 | + } | |
152 | + if (s.type2 == '' || s.type2 == null) { | |
153 | + attrIsRequired = true; | |
154 | + } | |
155 | + if (s.predicate == undefined) { | |
156 | + predicateIsRequired = true; | |
157 | + } | |
158 | + if (s?.predicate) { | |
159 | + s?.predicate.some((f) => { | |
160 | + let arr = Object.keys(f); | |
161 | + if (arr.length == 0) { | |
162 | + predicateDoubleIsRequired = true; | |
163 | + } | |
164 | + }); | |
165 | + } | |
166 | + }); | |
167 | + } | |
168 | + if (deviceIdIsRequired) return createMessage.error('请选择设备'); | |
169 | + if (attrIsRequired) return createMessage.error('请选择属性'); | |
170 | + if (predicateIsRequired) return createMessage.error('请填写条件筛选'); | |
171 | + if (predicateDoubleIsRequired) return createMessage.error('请填写条件筛选'); | |
172 | + //TODO-fengtao-清除告警验证 | |
139 | 173 | //TODO-fengtao-设备验证 |
140 | 174 | const validate = getFieldsValue(); |
141 | 175 | if (validate.device == 'PART') { | ... | ... |