fix: merge

Next wzy

src/pages/device/DashBoard/index.less

@@ -46,4 +46,16 @@
       }
     }
   }
+
+  .amap-marker-label {
+    top: -26px !important;
+    padding: 3px;
+    font-size: 14px;
+    line-height: 18px;
+    background-color: #666;
+    border: none;
+    .amap {
+      color: #e3e3e3;
+    }
+  }
 }

src/pages/device/DashBoard/index.tsx

@@ -607,22 +607,14 @@ const DeviceBoard = () => {
                       longitude: item.geometry.coordinates?.[0],
                       latitude: item.geometry.coordinates?.[1],
                     }}
-                    offset={[-10, -34]}
+                    offset={[-10, -20]}
+                    label={{
+                      content: `<div class='amap'>${item.properties.deviceName}</div>`,
+                      direction: 'top',
+                    }}
+                    // icon={''}
                   >
-                    <div>
-                      <div
-                        style={{
-                          backgroundColor: '#666666',
-                          color: 'white',
-                          textAlign: 'center',
-                        }}
-                      >
-                        {item.properties.deviceName}
-                      </div>
-                      <div>
-                        <EnvironmentOutlined style={{ color: 'blue', fontSize: 22 }} />
-                      </div>
-                    </div>
+                    <EnvironmentOutlined style={{ color: 'blue', fontSize: 22 }} />
                   </Marker>
                 ))}
               </AMap>