...
|
...
|
@@ -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) {
|
...
|
...
|
|