Merge branch 'fix/DEFECT-1623' into 'main_dev'

fix: 修复禁用的告警配置不显示在场景联动选择下

See merge request yunteng/thingskit-front!909

@@ -212,6 +212,7 @@
         return {
         return {
           value: item.id,
           value: item.id,
           label: item.name,
           label: item.name,
+          status: item.status,
         };
         };
       });
       });
       deviceList.value = editEntryIdData.value;
       deviceList.value = editEntryIdData.value;
@@ -576,7 +577,11 @@
     setFields(skipUnwrap.conditionItemRefs, true);
     setFields(skipUnwrap.conditionItemRefs, true);
     setFields(skipUnwrap.actionItemRefs, true);
     setFields(skipUnwrap.actionItemRefs, true);
     const data = await getOrganizationAlarmConfig({ organizationId: newValue });
     const data = await getOrganizationAlarmConfig({ organizationId: newValue });
-    alarmConfigList.value = data.map((item) => ({ label: item.name, value: item.id }));
+    alarmConfigList.value = data.map((item) => ({
+      label: item.name,
+      value: item.id,
+      status: item.status,
+    }));
     setEditAlarmConfig(skipUnwrap.actionItemRefs, alarmConfigList);
     setEditAlarmConfig(skipUnwrap.actionItemRefs, alarmConfigList);
     // setFields(skipUnwrap.actionItemRefs, true);
     // setFields(skipUnwrap.actionItemRefs, true);
     // console.log(unref(organizationIdRef));
     // console.log(unref(organizationIdRef));
@@ -587,7 +592,7 @@
     const data = await getOrganizationAlarmConfig({
     const data = await getOrganizationAlarmConfig({
       organizationId: isUpdate.value ? provideOrgid.value : addOrgId.value,
       organizationId: isUpdate.value ? provideOrgid.value : addOrgId.value,
     });
     });
-    const res = data.map((item) => ({ label: item.name, value: item.id }));
+    const res = data.map((item) => ({ label: item.name, value: item.id, status: item.status }));
     isUpdate.value ? (editAlarmConfigData.value = res) : (alarmConfigList.value = res);
     isUpdate.value ? (editAlarmConfigData.value = res) : (alarmConfigList.value = res);
     unref(skipUnwrap.actionItemRefs)?.map((item: any) => {
     unref(skipUnwrap.actionItemRefs)?.map((item: any) => {
       if (isUpdate.value) {
       if (isUpdate.value) {

@@ -356,10 +356,10 @@
   };
   };
   //FT add 2022-10-27
   //FT add 2022-10-27
   const updateEditFieldAlarmConfig = (alarmConfigList) => {
   const updateEditFieldAlarmConfig = (alarmConfigList) => {
-    alarmConfigOptions.value = alarmConfigList.value;
+    alarmConfigOptions.value = alarmConfigList.value.filter((item) => item.status);
   };
   };
   const updateFieldAlarmConfig = (alarmConfigList) => {
   const updateFieldAlarmConfig = (alarmConfigList) => {
-    alarmConfigOptions.value = alarmConfigList.value;
+    alarmConfigOptions.value = alarmConfigList.value.filter((item) => item.status);
   };
   };
   //FT add 2022-10-27
   //FT add 2022-10-27