Merge branch 'ww' into 'main'

ix: DEFECT-793 device location page not found data

See merge request huang/yun-teng-iot-front!372

@@ -149,45 +149,47 @@
           showSizeChanger: true,
           showSizeChanger: true,
         },
         },
         afterFetch: async (data: DeviceInfo[]) => {
         afterFetch: async (data: DeviceInfo[]) => {
-          const BMap = (window as any).BMap;
-          unref(BMapInstance).clearOverlays();
-          const markerList: MarkerList[] = [];
-          data.forEach((item) => {
-            const {
-              name,
-              deviceState,
-              deviceInfo: { longitude, latitude },
-            } = item;
-            const point = new BMap.Point(longitude, latitude);
-            const rivet = deviceState === 'INACTIVE' ? djx : deviceState === 'ONLINE' ? zx : lx;
-            const myIcon = new BMap.Icon(rivet, new BMap.Size(20, 30));
-            const marker = new BMap.Marker(point, { icon: myIcon });
-            const label = new BMap.Label(name, {
-              position: point,
-              offset: new BMap.Size(-15, -45),
+          Promise.resolve().then(() => {
+            const BMap = (window as any).BMap;
+            unref(BMapInstance).clearOverlays();
+            const markerList: MarkerList[] = [];
+            data.forEach((item) => {
+              const {
+                name,
+                deviceState,
+                deviceInfo: { longitude, latitude },
+              } = item;
+              const point = new BMap.Point(longitude, latitude);
+              const rivet = deviceState === 'INACTIVE' ? djx : deviceState === 'ONLINE' ? zx : lx;
+              const myIcon = new BMap.Icon(rivet, new BMap.Size(20, 30));
+              const marker = new BMap.Marker(point, { icon: myIcon });
+              const label = new BMap.Label(name, {
+                position: point,
+                offset: new BMap.Size(-15, -45),
+              });
+              label.setStyle({
+                color: '#000',
+                borderRadius: '5px',
+                borderColor: '#ccc',
+                padding: '5px',
+              });
+              markerList.push({ ...item, marker, label });
             });
             });
-            label.setStyle({
-              color: '#000',
-              borderRadius: '5px',
-              borderColor: '#ccc',
-              padding: '5px',
-            });
-            markerList.push({ ...item, marker, label });
-          });
-
-          markerList.forEach((record) => {
-            unref(BMapInstance).addOverlay(record.marker);
-            unref(BMapInstance).addOverlay(record.label);
-            const isAlarmStatus = !!record.alarmStatus;
-            if (isAlarmStatus) {
-              const alarmStatusClassName = 'device-status__alarm';
-              const className = record.marker.Ec.getAttribute('class');
-              record.marker.Ec.setAttribute('class', `${className} ${alarmStatusClassName}`);
-            }
 
 
-            //标注监听事件
-            record.marker.addEventListener('click', function () {
-              createDeviceInfoWindow(record);
+            markerList.forEach((record) => {
+              unref(BMapInstance).addOverlay(record.marker);
+              unref(BMapInstance).addOverlay(record.label);
+              const isAlarmStatus = !!record.alarmStatus;
+              if (isAlarmStatus) {
+                const alarmStatusClassName = 'device-status__alarm';
+                const className = record.marker.Ec.getAttribute('class');
+                record.marker.Ec.setAttribute('class', `${className} ${alarmStatusClassName}`);
+              }
+
+              //标注监听事件
+              record.marker.addEventListener('click', function () {
+                createDeviceInfoWindow(record);
+              });
             });
             });
           });
           });
 
 

@@ -96,12 +96,15 @@ export function useSocketConnect(dataSourceRef: Ref<DataBoardLayoutInfo[]>) {
     const messageList: SocketMessageItem[] = [];
     const messageList: SocketMessageItem[] = [];
     let cmdId = 0;
     let cmdId = 0;
     groupMapping.forEach((value, key) => {
     groupMapping.forEach((value, key) => {
-      const message = generateMessage(key, cmdId, value.map((item) => item.attribute).join(','));
+      const message = generateMessage(
+        key,
+        cmdId,
+        Array.from(new Set(value.map((item) => item.attribute))).join(',')
+      );
       messageList.push(message);
       messageList.push(message);
       setCmdId(cmdId, value);
       setCmdId(cmdId, value);
       cmdId++;
       cmdId++;
     });
     });
-    console.log(cmdIdMapping);
     return messageList;
     return messageList;
   }
   }