pref:场景联动设备属性接口更换为设备接口里的获取属性

@@ -108,10 +108,10 @@ export const getOrganizationAlarmConfig = (params: { organizationId }) => {
 //     url: ScreenManagerApi.GET_ATTRBUTELIST + '/' + orgId + joinText,
 //   });
 // };
-export const getAttribute = (orgId, deviceIds) => {
+export const getAttribute = (orgId) => {
   // const joinText = deviceIds == null ? [] : '?deviceIds=' + deviceIds;
   return defHttp.get({
-    url: `${ScreenManagerApi.GET_ATTRBUTELIST}${orgId}/${deviceIds}`,
+    url: `${ScreenManagerApi.GET_ATTRBUTELIST}${orgId}`,
   });
 };
 

@@ -228,7 +228,7 @@
       // 回显触发器数据---此处是个闭包!
       triggers.forEach((trigger, index) => {
         nextTick(async () => {
-          const selectDeviceId = ref('');
+          const selectProductId = ref('');
           // 回显启用规则
           unref(skipUnwrap.triggerItemRefs)[index].currentIndex =
             map[trigger.triggerCondition.schedule.type];
@@ -245,18 +245,16 @@
             operationType: trigger?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: trigger?.triggerCondition?.alarmDetails,
             entityId: trigger?.entityId,
+            deviceProfileId: trigger?.deviceProfileId,
             replaceValue: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             time: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             timeUnit: trigger?.triggerCondition?.condition?.spec?.unit,
           });
-          if (trigger.entityId != undefined) {
-            selectDeviceId.value = trigger?.entityId;
+          if (trigger.deviceProfileId != undefined) {
+            selectProductId.value = trigger?.deviceProfileId;
           }
           //fengtao-把设备id回传给子组件
-          unref(skipUnwrap.triggerItemRefs)[index].updateFieldAttributeFunc(
-            selectDeviceId.value,
-            provideOrgid.value
-          );
+          unref(skipUnwrap.triggerItemRefs)[index].updateFieldAttributeFunc(selectProductId.value);
           //fengtao
           // 设置值operationType
           unref(skipUnwrap.triggerItemRefs)[index].operationType =
@@ -309,7 +307,7 @@
 
       doConditions.forEach((condition, index) => {
         nextTick(async () => {
-          const selectDeviceId = ref('');
+          const selectProductId = ref('');
           // 回显启用规则
           unref(skipUnwrap.conditionItemRefs)[index].currentIndex =
             map[condition.triggerCondition.schedule.type];
@@ -327,17 +325,17 @@
             operationType: condition?.triggerCondition?.condition?.condition[0]?.valueType,
             detail: condition?.triggerCondition?.alarmDetails,
             entityId: condition?.entityId,
+            deviceProfileId: condition?.deviceProfileId,
             replaceValue: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             time: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue,
             timeUnit: condition?.triggerCondition?.condition?.spec?.unit,
           });
-          if (condition?.entityId != undefined) {
-            selectDeviceId.value = condition?.entityId;
+          if (condition?.deviceProfileId != undefined) {
+            selectProductId.value = condition?.deviceProfileId;
           }
           //fengtao-把设备id回传给子组件
           unref(skipUnwrap.conditionItemRefs)[index].updateFieldAttributeFunc(
-            selectDeviceId.value,
-            provideOrgid.value
+            selectProductId.value
           );
           //fengtao
           // 设置值operationType
@@ -391,7 +389,7 @@
 
       doActions.forEach((action, index) => {
         nextTick(() => {
-          const selectDeviceId = ref('');
+          const selectProductId = ref('');
           // 设置执行动作外层值
           unref(skipUnwrap.actionItemRefs)[index].setFieldsFormValueFun({
             ...action,
@@ -439,6 +437,7 @@
                         .valueType,
                     detail: action.doContext.clearRule[index].triggerCondition.alarmDetails,
                     entityId: action.doContext.clearRule[index].entityId,
+                    deviceProfileId: action.doContext.clearRule[index]?.deviceProfileId,
                     replaceValue:
                       action.doContext.clearRule[index].triggerCondition.condition.spec.predicate
                         .defaultValue,
@@ -447,17 +446,12 @@
                     timeUnit:
                       action.doContext.clearRule[index].triggerCondition.condition.spec.unit,
                   });
-                  if (action.doContext.clearRule[index].entityId != undefined) {
-                    selectDeviceId.value = action.doContext.clearRule[index].entityId;
+                  if (action.doContext.clearRule[index]?.deviceProfileId != undefined) {
+                    selectProductId.value = action.doContext.clearRule[index]?.deviceProfileId;
                   }
                   //fengtao-把设备id回传给子组件
-                  item.updateFieldAttributeFunc(selectDeviceId.value, provideOrgid.value);
-                  // item.updateFieldDeviceId(
-                  //   deviceList.value,
-                  //   provideOrgid.value,
-                  //   isUpdate.value,
-                  //   getMasterDeviceList.value
-                  // );
+                  item.updateFieldAttributeFunc(selectProductId.value);
+                  item.updateFieldDeviceId(deviceList.value, provideOrgid.value, isUpdate.value);
                   //fengtao
                   // 单独设置operationType值 操作符类型 NUMERIC|String|Boolean|DATE_TIME
                   item.operationType =
@@ -534,12 +528,12 @@
   });
 
   // 设置设备的options
-  const setEditFields = (_linkAge, _deviceList) => {
-    // unref(linkAge).map((item) => {
-    //TODO-fengtao
-    // item.updateFieldDeviceId(deviceList, orgId, isUpdate, getMasterDeviceList);
-    //TODO-fengtao
-    // });
+  const setEditFields = (linkAge, deviceList) => {
+    unref(linkAge).map((item) => {
+      // TODO-fengtao
+      item.updateFieldDeviceId(deviceList, orgId, isUpdate);
+      // TODO-fengtao
+    });
   };
   // 设置告警配置options
   const setEditAlarmConfig = (linkAge, alarmConfigList) => {
@@ -600,7 +594,7 @@
     unref(linkAge).map((item) => {
       isOrganizationChange && item.resetFieldsValueFunc();
       //TODO fengtao
-      // item.updateFieldDeviceId(deviceList, orgId, isUpdate, getMasterDeviceList);
+      item.updateFieldDeviceId(deviceList, orgId, isUpdate);
       if (isUpdate.value) {
         item.updateEditFieldAlarmConfig(editAlarmConfigData);
       } else {

@@ -3,6 +3,7 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import {
   byOrganizationIdGetMasterDevice,
   screenLinkOrganizationGetApi,
+  getAttribute,
 } from '/@/api/ruleengine/ruleengineApi';
 import { scheduleOptions } from './formatData';
 import { copyTransFun } from '/@/utils/fnUtils';
@@ -196,6 +197,52 @@ export const trigger_condition_schema: FormSchema[] = [
     colProps: { span: 6 },
   },
   {
+    field: 'deviceProfileId',
+    label: '',
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    componentProps: ({ formActionType }) => {
+      const { updateSchema, setFieldsValue } = formActionType;
+      return {
+        api: deviceProfile,
+        placeholder: '请选择产品',
+        labelField: 'name',
+        valueField: 'id',
+        getPopupContainer: () => document.body,
+        onChange: async (e) => {
+          if (e) {
+            setFieldsValue({ type2: '' });
+            const res = await getAttribute(e);
+            let options: any = [];
+            if (Array.isArray(res)) {
+              options = res.map((m) => {
+                return {
+                  label: m?.identifier,
+                  value: m?.identifier,
+                };
+              });
+              updateSchema({
+                field: 'type2',
+                componentProps: {
+                  placeholder: '请选择属性',
+                  options,
+                },
+              });
+            } else {
+              updateSchema({
+                field: 'type2',
+                componentProps: {
+                  placeholder: '请选择属性',
+                  options,
+                },
+              });
+            }
+          }
+        },
+      };
+    },
+  },
+  {
     field: 'device',
     label: '',
     component: 'Select',
@@ -208,6 +255,7 @@ export const trigger_condition_schema: FormSchema[] = [
     },
     colProps: { span: 6 },
   },
+
   {
     field: 'entityId',
     label: '',
@@ -219,6 +267,7 @@ export const trigger_condition_schema: FormSchema[] = [
     ifShow: ({ values }) => isPart(values.device),
     colProps: { span: 6 },
   },
+
   {
     field: 'time',
     label: '',
@@ -370,17 +419,19 @@ export const actionSchema: FormSchema[] = [
     component: 'ApiSelect',
     componentProps: ({ formModel }) => {
       const deviceProfileId = formModel['deviceProfileId'];
-      return {
-        placeholder: '请选择设备',
-        mode: 'multiple',
-        api: byOrganizationIdGetMasterDevice,
-        params: {
-          organizationId: unref(organizationId),
-          deviceProfileId,
-        },
-        labelField: 'name',
-        valueField: 'id',
-      };
+      if (unref(organizationId)) {
+        return {
+          placeholder: '请选择设备',
+          mode: 'multiple',
+          api: byOrganizationIdGetMasterDevice,
+          params: {
+            organizationId: unref(organizationId),
+            deviceProfileId,
+          },
+          labelField: 'name',
+          valueField: 'id',
+        };
+      }
     },
     ifShow: ({ values }) => isPart(values.device) && isDeviceOut(values.outTarget),
     colProps: { span: 6 },
@@ -394,7 +445,7 @@ export const actionSchema: FormSchema[] = [
     colProps: {
       span: 6,
     },
-    defaultValue: '0',
+    defaultValue: 0,
     componentProps: ({ formActionType }) => {
       const { setFieldsValue } = formActionType;
       return {

@@ -17,6 +17,7 @@ export const genTriggerOrConditionData = (triggerData) => {
     time,
     timeUnit,
     replaceValue,
+    deviceProfileId,
   } = triggerData;
   const mapPredicate = predicate?.map((item) => {
     return {
@@ -40,6 +41,7 @@ export const genTriggerOrConditionData = (triggerData) => {
     };
   });
   return {
+    deviceProfileId,
     triggerType,
     entityType: device,
     entityId: entityId?.length ? entityId : null,
@@ -115,6 +117,7 @@ export const genActionData = (actionData) => {
       triggerType: item.triggerType,
       entityType: item.device,
       entityId: item.device === 'PART' ? item.entityId : null,
+      deviceProfileId: item.deviceProfileId,
       triggerCondition: {
         alarmDetails: item.detail,
         condition: {

@@ -62,10 +62,10 @@
   import { CollapseContainer } from '/@/components/Container/index';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Card, Select, Input, Tooltip } from 'ant-design-vue';
-  import { trigger_condition_schema } from '../config/config.data.ts';
+  import { trigger_condition_schema } from '../config/config.data';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
-  import { scheduleOptions, timeUnitOptions, options } from '../config/formatData.ts';
+  import { scheduleOptions, timeUnitOptions, options } from '../config/formatData';
   import { Icon } from '/@/components/Icon';
   import AlarmSchedule from './AlarmSchedule.vue';
   import { useModal } from '/@/components/Modal';
@@ -99,22 +99,12 @@
     return { ...getFieldsValue(), predicate, schedule: alarmScheduleRef.value.scheduleData };
   };
 
-  const updateFieldDeviceId = (deviceList: any[], orgId, isUpdate) => {
+  const updateFieldDeviceId = (deviceList: any[], _, isUpdate) => {
     if (isUpdate) {
       updateSchema({
         field: 'entityId',
         componentProps: {
           options: deviceList,
-          onChange(e) {
-            if (e) {
-              if (isUpdate) {
-                setFieldsValue({ type2: '' });
-              }
-              //fengtao
-              updateFieldAttributeFunc(e, orgId);
-              //fengtao
-            }
-          },
         },
       });
     }
@@ -127,53 +117,15 @@
           { label: '部分', value: 'PART' },
         ],
         async onChange(e) {
-          setFieldsValue({ type2: '' });
           setFieldsValue({ entityId: [] });
-          //部分切换-清空或者重置为初始值
-          updateSchema({
-            field: 'type2',
-            componentProps: {
-              options: [],
-            },
-          });
           if (e) {
             //fengtao
             if (e == 'ALL') {
-              if (orgId) {
-                const data = await getAttribute(orgId, null);
-                //fengtao
-                const options = data.map((m) => {
-                  return {
-                    label: m,
-                    value: m,
-                  };
-                });
-                updateSchema({
-                  field: 'type2',
-                  componentProps: {
-                    placeholder: '请选择属性',
-                    options,
-                  },
-                });
-              }
             } else {
-              const getT = getFieldsValue();
-              const entityId = getT.entityId;
-              if (entityId !== undefined && entityId.length > 0) {
-                updateFieldAttributeFunc(entityId, orgId);
-              }
               updateSchema({
                 field: 'entityId',
                 componentProps: {
                   options: deviceList,
-                  onChange(e) {
-                    if (e) {
-                      setFieldsValue({ type2: '' });
-                      //fengtao
-                      updateFieldAttributeFunc(e, orgId);
-                      //fengtao
-                    }
-                  },
                 },
               });
             }
@@ -189,30 +141,32 @@
   const setFieldsFormValueFun = (fieldsValue) => {
     setFieldsValue(fieldsValue);
   };
-  //TODO-fengtao
-  const updateFieldAttributeFunc = async (deviceId, orgId) => {
-    //TODO-fengtao
-    let data;
-    if (deviceId !== undefined && deviceId.length > 0) {
-      const joinDeviceIds = deviceId.join(',');
-      data = await getAttribute(orgId, joinDeviceIds);
+  const updateFieldAttributeFunc = async (e) => {
+    const res = await getAttribute(e);
+    let options: any = [];
+    if (Array.isArray(res)) {
+      options = res.map((m) => {
+        return {
+          label: m?.identifier,
+          value: m?.identifier,
+        };
+      });
+      updateSchema({
+        field: 'type2',
+        componentProps: {
+          placeholder: '请选择属性',
+          options,
+        },
+      });
     } else {
-      data = await getAttribute(orgId, null);
+      updateSchema({
+        field: 'type2',
+        componentProps: {
+          placeholder: '请选择属性',
+          options,
+        },
+      });
     }
-    //TODO-fengtao
-    const options = data.map((m) => {
-      return {
-        label: m,
-        value: m,
-      };
-    });
-    updateSchema({
-      field: 'type2',
-      componentProps: {
-        placeholder: '请选择属性',
-        options: options,
-      },
-    });
   };
   //TODO-fengtao
   const schedule = ref('ANY_TIME');

@@ -62,16 +62,16 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { Icon } from '/@/components/Icon';
   import { Tooltip, Card, Select, Input } from 'ant-design-vue';
-  import { trigger_condition_schema } from '../config/config.data.ts';
+  import { trigger_condition_schema } from '../config/config.data';
   import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
   import ConditionScreening from './ConditionScreening.vue';
-  import { scheduleOptions, timeUnitOptions, options } from '../config/formatData.ts';
+  import { scheduleOptions, timeUnitOptions, options } from '../config/formatData';
   import AlarmSchedule from './AlarmSchedule.vue';
   import { useModal } from '/@/components/Modal';
   import { cloneDeep } from 'lodash-es';
   import { useMessage } from '/@/hooks/web/useMessage';
 
-  const props = defineProps({
+  defineProps({
     title: {
       type: String,
       required: true,
@@ -139,23 +139,13 @@
   };
 
   //TODO-fengtao
-  const updateFieldDeviceId = (deviceList: any[], orgId, isUpdate) => {
+  const updateFieldDeviceId = (deviceList: any[], _, isUpdate) => {
     //用于编辑回显
     if (isUpdate.value) {
       updateSchema({
         field: 'entityId',
         componentProps: {
           options: deviceList,
-          onChange(e) {
-            if (e) {
-              if (isUpdate.value) {
-                setFieldsValue({ type2: '' });
-              }
-              //fengtao
-              updateFieldAttributeFunc(e, orgId.value);
-              //fengtao
-            }
-          },
         },
       });
     }
@@ -168,52 +158,15 @@
           { label: '部分', value: 'PART' },
         ],
         async onChange(e) {
-          setFieldsValue({ type2: '' });
           setFieldsValue({ entityId: [] });
-          updateSchema({
-            field: 'type2',
-            componentProps: {
-              options: [],
-            },
-          });
           if (e) {
             //fengtao
             if (e == 'ALL') {
-              if (props.provideOrgid || orgId.value) {
-                const data = await getAttribute(props.provideOrgid || orgId.value, null);
-                //fengtao
-                const options = data.map((m) => {
-                  return {
-                    label: m,
-                    value: m,
-                  };
-                });
-                updateSchema({
-                  field: 'type2',
-                  componentProps: {
-                    placeholder: '请选择属性',
-                    options,
-                  },
-                });
-              }
             } else {
-              const getT = getFieldsValue();
-              const entityId = getT.entityId;
-              if (entityId !== undefined && entityId.length > 0) {
-                updateFieldAttributeFunc(entityId, orgId.value);
-              }
               updateSchema({
                 field: 'entityId',
                 componentProps: {
                   options: deviceList,
-                  onChange(e) {
-                    if (e) {
-                      setFieldsValue({ type2: '' });
-                      //fengtao
-                      updateFieldAttributeFunc(e, orgId.value);
-                      //fengtao
-                    }
-                  },
                 },
               });
             }
@@ -233,29 +186,32 @@
     setFieldsValue(fieldsValue);
   };
   //TODO-fengtao
-  const updateFieldAttributeFunc = async (deviceId, orgId) => {
-    //TODO-fengtao
-    let data;
-    if (deviceId !== undefined && deviceId.length > 0) {
-      const joinDeviceIds = deviceId.join(',');
-      data = await getAttribute(orgId || props.provideOrgid, joinDeviceIds);
+  const updateFieldAttributeFunc = async (e) => {
+    const res = await getAttribute(e);
+    let options: any = [];
+    if (Array.isArray(res)) {
+      options = res.map((m) => {
+        return {
+          label: m?.identifier,
+          value: m?.identifier,
+        };
+      });
+      updateSchema({
+        field: 'type2',
+        componentProps: {
+          placeholder: '请选择属性',
+          options,
+        },
+      });
     } else {
-      data = await getAttribute(orgId || props.provideOrgid, null);
+      updateSchema({
+        field: 'type2',
+        componentProps: {
+          placeholder: '请选择属性',
+          options,
+        },
+      });
     }
-    //TODO-fengtao
-    const options = data.map((m) => {
-      return {
-        label: m,
-        value: m,
-      };
-    });
-    updateSchema({
-      field: 'type2',
-      componentProps: {
-        placeholder: '请选择属性',
-        options: options,
-      },
-    });
   };
   //TODO-fengtao
   const handleDelete = (params: { index: number; title: string }) => {

@@ -170,11 +170,10 @@
   const changeOutTarget = () => {
     emit('getActionFormArr');
   };
-  const [registerAction, { getFieldsValue, resetFields, updateSchema, setFieldsValue, validate }] =
-    useForm({
-      schemas: actionSchema,
-      showActionButtonGroup: false,
-    });
+  const [registerAction, { getFieldsValue, resetFields, setFieldsValue, validate }] = useForm({
+    schemas: actionSchema,
+    showActionButtonGroup: false,
+  });
 
   // 获取整个执行动作表单值
   const getFieldsValueFunc = () => {
@@ -274,26 +273,14 @@
   const isUpdateItem = ref('');
   const deviceListItem = ref([]);
 
-  //TODO-fengtao
-  const updateFieldDeviceId = (deviceList, orgId, isUpdate, getMasterDeviceList) => {
+  //update 2022-11-28
+  const updateFieldDeviceId = (deviceList, orgId, isUpdate) => {
     if (isUpdate.value) {
       orgIdItem.value = orgId.value;
     }
     orgIdItem.value = orgId.value;
     isUpdateItem.value = isUpdate.value;
-    const options = getMasterDeviceList.value.map((m) => {
-      return {
-        value: m.id,
-        label: m.name,
-      };
-    });
     deviceListItem.value = deviceList.value;
-    updateSchema({
-      field: 'deviceId',
-      componentProps: {
-        options,
-      },
-    });
   };
   //FT add 2022-10-27
   const updateEditFieldAlarmConfig = (alarmConfigList) => {