pref:报表配置设备属性接口更换为设备接口里的获取属性

@@ -18,7 +18,8 @@ enum ScreenManagerApi {
   SCREEN_ORGANIZATION_URL = '/organization/me/list',
   SCREEN_ORGANIZATION_URL = '/organization/me/list',
   SCREEN_CHANGE_STATUS = '/convert/update/scene',
   SCREEN_CHANGE_STATUS = '/convert/update/scene',
   SCREEN_GET_BY_DEPTID = '/scene_linkage/device/',
   SCREEN_GET_BY_DEPTID = '/scene_linkage/device/',
-  GET_ATTRBUTELIST = '/device/keys',
+  // GET_ATTRBUTELIST = '/device/keys',
+  GET_ATTRBUTELIST = '/device/attributes/',
   ALARM_PROFILE = '/alarm/profile/',
   ALARM_PROFILE = '/alarm/profile/',
   MASTER_GET_DEVICE = '/device/list/master',
   MASTER_GET_DEVICE = '/device/list/master',
 }
 }
@@ -101,10 +102,16 @@ export const getOrganizationAlarmConfig = (params: { organizationId }) => {
 /**
 /**
  * 获取设备属性列表
  * 获取设备属性列表
  */
  */
+// export const getAttribute = (orgId, deviceIds) => {
+//   const joinText = deviceIds == null ? [] : '?deviceIds=' + deviceIds;
+//   return defHttp.get({
+//     url: ScreenManagerApi.GET_ATTRBUTELIST + '/' + orgId + joinText,
+//   });
+// };
 export const getAttribute = (orgId, deviceIds) => {
 export const getAttribute = (orgId, deviceIds) => {
-  const joinText = deviceIds == null ? [] : '?deviceIds=' + deviceIds;
+  // const joinText = deviceIds == null ? [] : '?deviceIds=' + deviceIds;
   return defHttp.get({
   return defHttp.get({
-    url: ScreenManagerApi.GET_ATTRBUTELIST + '/' + orgId + joinText,
+    url: `${ScreenManagerApi.GET_ATTRBUTELIST}${orgId}/${deviceIds}`,
   });
   });
 };
 };
 
 

@@ -55,7 +55,6 @@
   import { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
   import { screenLinkPageByDeptIdGetDevice } from '/@/api/ruleengine/ruleengineApi';
   import { Select } from 'ant-design-vue';
   import { Select } from 'ant-design-vue';
   import DeviceAttrCpns from './cpns/DeviceAttrCpns.vue';
   import DeviceAttrCpns from './cpns/DeviceAttrCpns.vue';
-  import { SelectTypes } from 'ant-design-vue/es/select';
   import { SchemaFiled } from './config.data';
   import { SchemaFiled } from './config.data';
   import { QueryWay } from '../../device/localtion/cpns/TimePeriodForm/config';
   import { QueryWay } from '../../device/localtion/cpns/TimePeriodForm/config';
   import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
   import { AggregateDataEnum } from '../../device/localtion/cpns/TimePeriodForm/config';
@@ -68,6 +67,14 @@
     device?: string;
     device?: string;
     name?: string;
     name?: string;
     attributes?: string | undefined;
     attributes?: string | undefined;
+    deviceProfileId?: string;
+    id?: string;
+  };
+  type TSelectOption = {
+    value?: string;
+    label?: string;
+    deviceProfileId?: string;
+    id?: string;
   };
   };
   const emit = defineEmits(['success', 'register']);
   const emit = defineEmits(['success', 'register']);
   const bindDeviceRefObj = {
   const bindDeviceRefObj = {
@@ -76,7 +83,7 @@
   const isUpdate = ref(true);
   const isUpdate = ref(true);
   const editId = ref('');
   const editId = ref('');
   const orgId = ref('');
   const orgId = ref('');
-  const selectOptions: Ref<SelectTypes['options']> = ref([]);
+  const selectOptions: Ref<TSelectOption[]> = ref([]);
   const selectDevice = ref([]);
   const selectDevice = ref([]);
   const deviceList: Ref<TDeviceList[]> = ref([]);
   const deviceList: Ref<TDeviceList[]> = ref([]);
   const editDeviceList: Ref<TDeviceList[]> = ref([]);
   const editDeviceList: Ref<TDeviceList[]> = ref([]);
@@ -126,18 +133,20 @@
             return {
             return {
               label: item.name,
               label: item.name,
               value: item.tbDeviceId,
               value: item.tbDeviceId,
+              id: item.id,
+              deviceProfileId: item.deviceProfileId,
             };
             };
         });
         });
       }
       }
     }
     }
   );
   );
   //设备Select选中
   //设备Select选中
-  const handleDeviceChange = (e) => {
+  const handleDeviceChange = (_, o) => {
     if (unref(isUpdate)) {
     if (unref(isUpdate)) {
       //编辑
       //编辑
       let temp: any = [];
       let temp: any = [];
       editDeviceAttr.value.forEach((f) => {
       editDeviceAttr.value.forEach((f) => {
-        temp = [f, ...e];
+        temp = [f, ...o];
       });
       });
       let deWeightThree = () => {
       let deWeightThree = () => {
         let map = new Map();
         let map = new Map();
@@ -150,11 +159,11 @@
       };
       };
       temp = deWeightThree();
       temp = deWeightThree();
       deviceList.value = temp;
       deviceList.value = temp;
-      if (e.length !== 0) {
-        deviceList.value = e;
+      if (o.length !== 0) {
+        deviceList.value = o;
       }
       }
     } else {
     } else {
-      deviceList.value = e;
+      deviceList.value = o;
     }
     }
   };
   };
   //设备取消删除
   //设备取消删除
@@ -284,6 +293,8 @@
           return {
           return {
             label: item.name,
             label: item.name,
             value: item.tbDeviceId,
             value: item.tbDeviceId,
+            id: item.id,
+            deviceProfileId: item.deviceProfileId,
           };
           };
       });
       });
       const deviceIds = editResData.data.executeAttributes.map((m) => {
       const deviceIds = editResData.data.executeAttributes.map((m) => {
@@ -295,7 +306,16 @@
       selectDevice.value = deviceIds;
       selectDevice.value = deviceIds;
       //回显设备属性
       //回显设备属性
       editDeviceAttr.value = editResData.data.executeAttributes?.map((item) => {
       editDeviceAttr.value = editResData.data.executeAttributes?.map((item) => {
+        const T = selectOptions.value.find((o) => {
+          if (item.device === o.value) {
+            return {
+              id: o.id,
+              deviceProfileId: o.deviceProfileId,
+            };
+          }
+        });
         return {
         return {
+          ...T,
           label: item.name,
           label: item.name,
           value: item.device,
           value: item.device,
           attributes: item.attributes,
           attributes: item.attributes,

@@ -45,19 +45,21 @@
   //获取对应设备属性
   //获取对应设备属性
   const getAttr = async (orgId, deviceId) => {
   const getAttr = async (orgId, deviceId) => {
     const res = await getAttribute(orgId, deviceId);
     const res = await getAttribute(orgId, deviceId);
-    selectOptions.value = res.map((o) => {
-      let obj: any = {};
-      if (o !== null) {
-        obj = {
-          label: o,
-          value: o,
-        };
-        return obj;
-      }
-    });
-    //如果服务端返回的数组里含有null 过滤null值
-    const excludeNull = selectOptions.value.filter(Boolean);
-    selectOptions.value = excludeNull;
+    if (Array.isArray(res)) {
+      selectOptions.value = res.map((o) => {
+        let obj: any = {};
+        if (o?.identifier !== null) {
+          obj = {
+            label: o?.identifier,
+            value: o?.identifier,
+          };
+          return obj;
+        }
+      });
+      //如果服务端返回的数组里含有null 过滤null值
+      const excludeNull = selectOptions.value.filter(Boolean);
+      selectOptions.value = excludeNull;
+    }
   };
   };
   //动态数据
   //动态数据
   const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
   const dynamicInput: UnwrapRef<{ params: Params[] }> = reactive({ params: [] });
@@ -69,12 +71,12 @@
    * 初始化数值
    * 初始化数值
    */
    */
   async function initVal() {
   async function initVal() {
-    if (props.orgId && props.value.value) {
-      await getAttr(props.orgId, props.value.value);
+    if (props.value) {
+      await getAttr(props.value?.deviceProfileId, props.value?.id);
       dynamicInput.params.push({
       dynamicInput.params.push({
         name: props.value.label,
         name: props.value.label,
         device: props.value.value,
         device: props.value.value,
-        attributes: props.value.attributes == [] ? [] : props.value.attributes,
+        attributes: props.value?.attributes == [] ? [] : props.value.attributes,
       });
       });
     }
     }
   }
   }