Commit 07534f38ec1127896d1d761f036aa70b616eb7b1

Authored by xp.Huang
2 parents 71245d2c 00d87788

Merge branch 'f-dev' into 'main'

fix:修改Temanition上的问题

See merge request huang/yun-teng-iot-front!239
... ... @@ -104,6 +104,7 @@
104 104 );
105 105 //TODO-fengtao-设备、属性、条件筛选验证
106 106 const validate = getFieldsValue();
  107 + if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式');
107 108 if (validate.device == 'PART') {
108 109 if (validate.entityId == undefined) return createMessage.error('请选择设备');
109 110 }
... ...
... ... @@ -141,6 +141,7 @@
141 141 let attrIsRequired = false;
142 142 let predicateIsRequired = false;
143 143 let predicateDoubleIsRequired = false;
  144 + let triggerTypeIsRequired = false;
144 145 if (clearRule) {
145 146 clearRule.some((s) => {
146 147 if (s.device == 'PART') {
... ... @@ -151,6 +152,9 @@
151 152 if (s.type2 == '' || s.type2 == null) {
152 153 attrIsRequired = true;
153 154 }
  155 + if (s.triggerType == '' || s.triggerType == null || s.triggerType == undefined) {
  156 + triggerTypeIsRequired = true;
  157 + }
154 158 if (s.predicate == undefined) {
155 159 predicateIsRequired = true;
156 160 }
... ... @@ -174,6 +178,7 @@
174 178 if (attrIsRequired) return createMessage.error('请选择属性');
175 179 if (predicateIsRequired) return createMessage.error('请填写条件筛选');
176 180 if (predicateDoubleIsRequired) return createMessage.error('请填写条件筛选');
  181 + if (triggerTypeIsRequired) return createMessage.error('请选择设备触发方式');
177 182 //TODO-fengtao-清除告警验证
178 183 //TODO-fengtao-设备验证
179 184 const validate = getFieldsValue();
... ...