From 0a89f6cb2005d7fafcbc251f4140f27ba9b201a5 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Tue, 6 Feb 2024 09:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=A6=96=E9=A1=B5?=
=?UTF-8?q?=E5=9C=B0=E5=9B=BE=20=E5=9B=BE=E6=A0=87=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/Home/components/RoadAndEvents/utils/buttonEvent.js | 1 +
.../pages/Home/components/RoadAndEvents/utils/map.js | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
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);
">
-
重复
+
重叠
