Commit fb9cf3be8ff83550373c4302017bc69c7993198d
Merge branch 'fix/DEFECT-1623' into 'main_dev'
fix: 修复禁用的告警配置不显示在场景联动选择下 See merge request yunteng/thingskit-front!909
Showing
2 changed files
with
9 additions
and
4 deletions
... | ... | @@ -212,6 +212,7 @@ |
212 | 212 | return { |
213 | 213 | value: item.id, |
214 | 214 | label: item.name, |
215 | + status: item.status, | |
215 | 216 | }; |
216 | 217 | }); |
217 | 218 | deviceList.value = editEntryIdData.value; |
... | ... | @@ -576,7 +577,11 @@ |
576 | 577 | setFields(skipUnwrap.conditionItemRefs, true); |
577 | 578 | setFields(skipUnwrap.actionItemRefs, true); |
578 | 579 | const data = await getOrganizationAlarmConfig({ organizationId: newValue }); |
579 | - alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id })); | |
580 | + alarmConfigList.value = data.map((item) => ({ | |
581 | + label: item.name, | |
582 | + value: item.id, | |
583 | + status: item.status, | |
584 | + })); | |
580 | 585 | setEditAlarmConfig(skipUnwrap.actionItemRefs, alarmConfigList); |
581 | 586 | // setFields(skipUnwrap.actionItemRefs, true); |
582 | 587 | // console.log(unref(organizationIdRef)); |
... | ... | @@ -587,7 +592,7 @@ |
587 | 592 | const data = await getOrganizationAlarmConfig({ |
588 | 593 | organizationId: isUpdate.value ? provideOrgid.value : addOrgId.value, |
589 | 594 | }); |
590 | - const res = data.map((item) => ({ label: item.name, value: item.id })); | |
595 | + const res = data.map((item) => ({ label: item.name, value: item.id, status: item.status })); | |
591 | 596 | isUpdate.value ? (editAlarmConfigData.value = res) : (alarmConfigList.value = res); |
592 | 597 | unref(skipUnwrap.actionItemRefs)?.map((item: any) => { |
593 | 598 | if (isUpdate.value) { | ... | ... |
... | ... | @@ -356,10 +356,10 @@ |
356 | 356 | }; |
357 | 357 | //FT add 2022-10-27 |
358 | 358 | const updateEditFieldAlarmConfig = (alarmConfigList) => { |
359 | - alarmConfigOptions.value = alarmConfigList.value; | |
359 | + alarmConfigOptions.value = alarmConfigList.value.filter((item) => item.status); | |
360 | 360 | }; |
361 | 361 | const updateFieldAlarmConfig = (alarmConfigList) => { |
362 | - alarmConfigOptions.value = alarmConfigList.value; | |
362 | + alarmConfigOptions.value = alarmConfigList.value.filter((item) => item.status); | |
363 | 363 | }; |
364 | 364 | //FT add 2022-10-27 |
365 | 365 | ... | ... |