From 8a2c69a83ae1c7b7c84a67929636221955d52473 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 16:41:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=BC=A9=E7=95=A5?=
=?UTF-8?q?=E5=9B=BE=E8=B7=9F=20=E5=9C=B0=E5=9B=BE=E7=9B=B8=E6=9C=BA?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../RoadAndEvents/utils/buttonEvent.js | 23 +++++++++++++++++++
.../components/RoadAndEvents/utils/map.js | 2 +-
.../pages/Home/components/Thumbnail/index.vue | 2 +-
3 files changed, 25 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 bdc236ca..30bd10fd 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
@@ -34,6 +34,29 @@ export const eventMap = {
// };
const data = await getDeviceList(1);
+ // const data = [
+ // {
+ // longitude: 116.268564,
+ // latitude: 35.73115,
+ // },
+ // {
+ // longitude: 116.258178,
+ // latitude: 35.720996,
+ // },
+ // {
+ // longitude: 116.255542,
+ // latitude: 35.717335,
+ // },
+ // {
+ // longitude: 116.252883,
+ // latitude: 35.713114,
+ // },
+ // {
+ // longitude: 116.249416,
+ // latitude: 35.707627,
+ // ptzCtrl: 0,
+ // },
+ // ];
if (!data) return;
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 4dab5b53..a9f8ef5f 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 async function setMarkerCluster(map, points, markerFun) {
* @param {*} _markerClick marker 点击
* @returns
*/
-export async function setMarkToMap(item, data, _markerClick) {
+export async function setMarkToMap(item, data, _markerClick, content) {
const { mapIns } = this.getMap();
if (!mapIns) return Message.error("地图加载失败!");
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
index 00cc794c..e14b42cb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
@@ -1,5 +1,5 @@
-
+