diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js index c83ffcbf..d7f43c81 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js +++ b/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}`]; }, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js index 524388bf..bbfe02d6 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js +++ b/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); ">
- 重复 + 重叠