Commit 28dd094a908372c60fb68c6aa37f73b0fc1e8d54
Merge branch 'ww' into 'main'
fix: DEFECT-957 open linkedge show detail action form not echo data See merge request huang/yun-teng-iot-front!431
Showing
2 changed files
with
11 additions
and
10 deletions
... | ... | @@ -571,7 +571,8 @@ |
571 | 571 | setFields(skipUnwrap.actionItemRefs, true); |
572 | 572 | const data = await getOrganizationAlarmConfig({ organizationId: newValue }); |
573 | 573 | alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id })); |
574 | - setAlarmConfig(skipUnwrap.actionItemRefs, true); | |
574 | + // console.log(unref(organizationIdRef)); | |
575 | + // setAlarmConfig(skipUnwrap.actionItemRefs, true); | |
575 | 576 | }); |
576 | 577 | //FT add 2022-10-27 |
577 | 578 | const handleDynamicChangeAlarmConfig = async () => { |
... | ... | @@ -603,12 +604,12 @@ |
603 | 604 | //TODO fengtao |
604 | 605 | }); |
605 | 606 | } |
606 | - function setAlarmConfig(linkAge, isOrganizationChange = false) { | |
607 | - unref(linkAge).map((item) => { | |
608 | - isOrganizationChange && item.resetFieldsValueFunc(); | |
609 | - item.updateFieldAlarmConfig(alarmConfigList); | |
610 | - }); | |
611 | - } | |
607 | + // function setAlarmConfig(linkAge, isOrganizationChange = false) { | |
608 | + // unref(linkAge).map((item) => { | |
609 | + // isOrganizationChange && item.resetFieldsValueFunc(); | |
610 | + // item.updateFieldAlarmConfig(alarmConfigList); | |
611 | + // }); | |
612 | + // } | |
612 | 613 | // 添加触发器 |
613 | 614 | const addTrigger = () => { |
614 | 615 | unref(triggerData).push(Date.now()); | ... | ... |
... | ... | @@ -145,9 +145,9 @@ |
145 | 145 | }; |
146 | 146 | |
147 | 147 | //TODO-fengtao |
148 | - const updateFieldDeviceId = (deviceList: any[], _, isUpdate) => { | |
149 | - console.log(deviceList); | |
150 | - console.log(isUpdate); | |
148 | + const updateFieldDeviceId = (_deviceList: any[], _, _isUpdate) => { | |
149 | + // console.log(deviceList); | |
150 | + // console.log(isUpdate); | |
151 | 151 | }; |
152 | 152 | //TODO-fengtao |
153 | 153 | const resetFieldsValueFunc = () => { | ... | ... |