Merge branch 'main_dev' into feat/account-role-manage

# Conflicts:
#	src/views/dataview/config.ts

@@ -20,7 +20,7 @@ export enum ConfigurationPermission {
   // DESIGN = 'api:yt:dataview:center:get_configuration_info:design',
   DESIGN = 'api:yt:dataview:center:get_dataview_info:design',
   PREVIEW = 'api:yt:dataview:center:get_configuration_info:preview',
-  DATAVIEW_PREVIEW = 'api:yt:dataview:center:get_dataview_info:preview',
+  DATAVIEW_PREVIEW = 'api:yt:dataview:center:get_dataview_info:preview', //大屏预览
   PUBLISH = 'api:yt:dataview:center:publish',
   // CANCEL_PUBLISH = 'api:yt:dataview:center:cancel_publish',
   PUBLISH_INTERFACE = 'api:yt:dataview:center:public_interface',

@@ -20,10 +20,12 @@
   import { BasicTable, useTable } from '/@/components/Table';
   import { viewDeviceColumn } from '../config';
   import { reportEditDetailPage } from '/@/api/report/reportManager';
+  import { getDeviceDetail } from '/@/api/device/deviceManager';
+  import { getAttribute } from '/@/api/ruleengine/ruleengineApi';
 
   const tableData = ref([]);
 
-  const [registerTable] = useTable({
+  const [registerTable, { setLoading }] = useTable({
     columns: viewDeviceColumn,
     showIndexColumn: false,
     clickToRowSelect: false,
@@ -32,18 +34,68 @@
   });
 
   const [register] = useModalInner((data) => {
+    setLoading(true);
+    tableData.value = [];
     const getTableData = async () => {
       const res = (await reportEditDetailPage(data.record?.id)) as any;
-      const resMap = res?.data?.executeAttributes?.map((item) => ({
-        device: item.name,
-        attribute: item.attributes.join(','),
-      }));
-      tableData.value = resMap;
+      const deviceInfo = res?.data?.executeAttributes || [];
+      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 {
+          device: item.name,
+          attribute: attributesList.map((item: Recordable) => item.label).join(','),
+        };
+      });
+      tableData.value = (await Promise.all(reflectDeviceList)) as any;
+      if (tableData.value) {
+        setLoading(false);
+      }
     };
     nextTick(() => {
       getTableData();
     });
   });
+
+  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,
+    };
+  };
 </script>
 <style lang="less" scoped>
   :deep(.ant-table-body) {

@@ -117,10 +117,12 @@
     );
   };
 
-  const getChartsOption = (result: ResponsData) => {
+  const getChartsOption = (result: ResponsData, thingsModel: Recordable) => {
+    const { attribute } = thingsModel;
     const generateInfo = Object.entries(result).map((item) => {
       const [attr, val] = item;
-      return { attr, val } as { attr: string; val: { ts: number; value: string }[] };
+      const findAttrName = attribute.find((attrItem) => attrItem.identifier === attr)?.name;
+      return { attr: findAttrName, val } as { attr: string; val: { ts: number; value: string }[] };
     });
     const chartDataConfig =
       generateInfo.map((item) => {
@@ -216,9 +218,13 @@
             },
           };
 
+          const thingsModel = (await handleDeviceProfileAttributes(device)) as Recordable;
           const result = await exportViewChartApi(device, sendParams);
           item.notFoundData = validateHasData(result);
-          const { xAxisData, series } = getChartsOption(result as unknown as ResponsData);
+          const { xAxisData, series } = getChartsOption(
+            result as unknown as ResponsData,
+            thingsModel as unknown as Recordable
+          );
 
           await nextTick();
           chartsInstance[device] = echarts.init(
@@ -320,7 +326,8 @@
       const result = await exportViewChartApi(device, sendParams);
 
       item.notFoundData = validateHasData(result);
-      const { xAxisData, series } = getChartsOption(result as unknown as ResponsData);
+      const thingsModel = (await handleDeviceProfileAttributes(device)) as Recordable;
+      const { xAxisData, series } = getChartsOption(result as unknown as ResponsData, thingsModel);
 
       chartsInstance[device].setOption({
         series,