修改 首页地图 图标展示

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js

@@ -29,6 +29,7 @@ export const DeviceForMap = {
          * 1 枪机 不可控
          */
         const type = JSON.parse(item.otherConfig || "{}")?.ptzCtrl || 1;
+
         return cameraIcon[`${type}${+!bool}`];
       },
     },

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js

@@ -97,7 +97,7 @@ export class MarkerCluster {
 
     const deviceIcon =
       typeof config.iconCallback === "function" &&
-      config.iconCallback(currentState, config.item);
+      config.iconCallback(currentState, extData, config.item);
 
     return deviceIcon ? deviceIcon : currentState ? normal : fault;
   }
@@ -179,7 +179,7 @@ export class MarkerCluster {
       border: 1px solid rgba(42,217,253,0.6);
     ">
       <div style="height: 26px; width: 100%; display: flex;align-items: center; justify-content: space-between; padding: 0 15px; background: linear-gradient(90deg, #237E9B 0%, rgba(23,145,184,0) 100%);">
-        <span>重复</span>
+        <span>重叠</span>
         <img class="info-close" style="width: 12px;cursor: pointer;" src="${require("@screen/images/dialog/icon-close.svg")}" />
       </div>
       <div style="padding: 15px 9px;flex: 1; overflow: auto;" class="info-window-content">