Merge branch 'local_dev_branch_by_ft' into 'main_dev'

fix: DEFECT-1741 修改报表导出点击报表查看趋势图里属性映射成物模型的标识符名

See merge request yunteng/thingskit-front!991

@@ -34,7 +34,12 @@
                   @change="(value) => handleChangeChars(value, item.device, item)"
                   @change="(value) => handleChangeChars(value, item.device, item)"
                   v-bind="createPickerSearch()"
                   v-bind="createPickerSearch()"
                   placeholder="请选择设备属性"
                   placeholder="请选择设备属性"
-                  :options="item?.attributes?.map((item1) => ({ label: item1, value: item1 }))"
+                  :options="
+                    item?.attributes?.map((attrItem: any) => ({
+                      label: attrItem.label,
+                      value: attrItem.value,
+                    }))
+                  "
                 />
                 />
               </div>
               </div>
               <div class="w-full h-full flex justify-center items-center">
               <div class="w-full h-full flex justify-center items-center">
@@ -64,6 +69,8 @@
   import { ExecuteReportRecord } from '/@/api/export/model/exportModel';
   import { ExecuteReportRecord } from '/@/api/export/model/exportModel';
   import { Select, Spin, Empty } from 'ant-design-vue';
   import { Select, Spin, Empty } from 'ant-design-vue';
   import { createPickerSearch } from '/@/utils/pickerSearch';
   import { createPickerSearch } from '/@/utils/pickerSearch';
+  import { getDeviceDetail } from '/@/api/device/deviceManager';
+  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
 
 
   interface ResponsData {
   interface ResponsData {
     attr: string;
     attr: string;
@@ -141,20 +148,66 @@
     return chartOption;
     return chartOption;
   };
   };
 
 
+  const handleDeviceProfileAttributes = async (entityId: string) => {
+    const deviceDetailRes = await getDeviceDetail(entityId);
+    const { deviceProfileId } = deviceDetailRes;
+    if (!deviceProfileId) return;
+    const attributeRes = await getAttribute(deviceProfileId);
+    return handleDataFormat(deviceDetailRes, attributeRes);
+  };
+
+  const handleDataFormat = (deviceDetail: any, attributes: any) => {
+    const { name, tbDeviceId } = deviceDetail;
+    const attribute = attributes.map((item: any) => ({
+      identifier: item.identifier,
+      name: item.name,
+      detail: item.detail,
+    }));
+    return {
+      name,
+      tbDeviceId,
+      attribute,
+    };
+  };
+
   const [register, { setModalProps }] = useModalInner(
   const [register, { setModalProps }] = useModalInner(
     async (data: { record: ExecuteReportRecord }) => {
     async (data: { record: ExecuteReportRecord }) => {
       setModalProps({ loading: true });
       setModalProps({ loading: true });
       try {
       try {
         currentRecord = data.record;
         currentRecord = data.record;
         const deviceInfo = data.record.executeCondition.executeAttributes || [];
         const deviceInfo = data.record.executeCondition.executeAttributes || [];
-        chartInstance.value = deviceInfo.map((item) => ({
-          ...item,
-          active: item.attributes.at(0),
-        }));
+        let attributesList: Recordable[] = [];
+        // 处理为物模型里的标识符名
+        const reflectDeviceList = deviceInfo.map(async (item) => {
+          const { device, attributes } = item as Recordable;
+          if (!device) return;
+          const thingsModel = (await handleDeviceProfileAttributes(item.device)) as Recordable;
+          const { tbDeviceId, attribute } = thingsModel as Recordable;
+          if (!tbDeviceId) return;
+          if (device === tbDeviceId) {
+            attributesList = attributes.reduce((acc, curr) => {
+              attribute.forEach((item: Recordable) => {
+                if (item.identifier === curr) {
+                  acc.push({
+                    label: item.name,
+                    value: item.identifier,
+                  });
+                }
+              });
+              return [...acc];
+            }, []);
+          }
+          return {
+            ...item,
+            active: attributes.at(0),
+            attributes: attributesList,
+          };
+        });
+        chartInstance.value = (await Promise.all(reflectDeviceList)) as any as ChartInstance[];
         for (const item of unref(chartInstance)) {
         for (const item of unref(chartInstance)) {
           const { attributes, device } = item;
           const { attributes, device } = item;
 
 
-          const keys = attributes.length ? attributes.at(0) : '';
+          const keys = attributes.length ? (attributes as any[]).at(0)?.value : '';
 
 
           const sendParams = {
           const sendParams = {
             ...data.record.executeCondition.executeCondition,
             ...data.record.executeCondition.executeCondition,