Commit 28998d89682068cb72aeecc7389f33a70878418d

Authored by fengtao
1 parent f2feff52

fix:修改场景联动获取设备和属性后端接口和属性不可选择问题

@@ -212,7 +212,7 @@ @@ -212,7 +212,7 @@
212 unref(skipUnwrap.triggerItemRefs)[index].isUpdate = true; 212 unref(skipUnwrap.triggerItemRefs)[index].isUpdate = true;
213 unref(skipUnwrap.triggerItemRefs)[index].alarmScheduleRef.scheduleData = 213 unref(skipUnwrap.triggerItemRefs)[index].alarmScheduleRef.scheduleData =
214 trigger.triggerCondition.schedule; 214 trigger.triggerCondition.schedule;
215 - const getAttrKeyOption = trigger?.triggerCondition?.condition?.condition.map( 215 + const getAttrKeyOption = trigger?.triggerCondition?.condition?.condition?.map(
216 (m) => m.key.key 216 (m) => m.key.key
217 ); 217 );
218 unref(skipUnwrap.triggerItemRefs)[index].setFieldsFormValueFun({ 218 unref(skipUnwrap.triggerItemRefs)[index].setFieldsFormValueFun({
@@ -287,7 +287,7 @@ @@ -287,7 +287,7 @@
287 unref(skipUnwrap.conditionItemRefs)[index].isUpdate = true; 287 unref(skipUnwrap.conditionItemRefs)[index].isUpdate = true;
288 unref(skipUnwrap.conditionItemRefs)[index].alarmScheduleRef.scheduleData = 288 unref(skipUnwrap.conditionItemRefs)[index].alarmScheduleRef.scheduleData =
289 condition.triggerCondition.schedule; 289 condition.triggerCondition.schedule;
290 - const getAttrKeyOption = condition?.triggerCondition?.condition?.condition.map( 290 + const getAttrKeyOption = condition?.triggerCondition?.condition?.condition?.map(
291 (m) => m.key.key 291 (m) => m.key.key
292 ); 292 );
293 unref(skipUnwrap.conditionItemRefs)[index].setFieldsFormValueFun({ 293 unref(skipUnwrap.conditionItemRefs)[index].setFieldsFormValueFun({
@@ -521,7 +521,7 @@ @@ -521,7 +521,7 @@
521 unref(linkAge).map((item) => { 521 unref(linkAge).map((item) => {
522 isOrganizationChange && item.resetFieldsValueFunc(); 522 isOrganizationChange && item.resetFieldsValueFunc();
523 item.updateFieldDeviceId(deviceList); 523 item.updateFieldDeviceId(deviceList);
524 - item.updateFieldAttr(watchAttrList); 524 + // item.updateFieldAttr(watchAttrList);
525 }); 525 });
526 } 526 }
527 function setAlarmConfig(linkAge, isOrganizationChange = false) { 527 function setAlarmConfig(linkAge, isOrganizationChange = false) {