From 5dd8ad6edf0e8f6f66d5d9c3a59884cf3539a4b4 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Thu, 18 Jan 2024 11:28:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=20=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Home/components/FocusedMonitoring/index.vue | 7 +++++--
.../components/RoadAndEvents/utils/buttonEvent.js | 13 ++++++++++---
.../Home/components/RoadAndEvents/utils/map.js | 2 +-
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/FocusedMonitoring/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/FocusedMonitoring/index.vue
index 780dde0f..c314b90f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/FocusedMonitoring/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/FocusedMonitoring/index.vue
@@ -13,8 +13,11 @@
当前在途车辆
-
4618
-
当前在途车辆
+
+ 0
+ /0
+
+
交通事件
0
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 40f6b3fc..522d3a85 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
@@ -41,7 +41,14 @@ export const eventMap = {
.get("/system/camera/camList")
// .get("/system/dept/camTreeselect")
.catch(() => ({}));
- // const { code, data } = { code: 200, data: [] };
+ // const { code, data } = {
+ // code: 200,
+ // data: [
+ // {
+ // pileNum: "K55+565",
+ // },
+ // ],
+ // };
if (code != 200) return Message.error("摄像机加载失败!");
@@ -87,7 +94,7 @@ export const eventMap = {
// code: 200,
// data: [
// {
- // pileNum: "K55+0",
+ // stakeMarkId: "K176+167",
// },
// ],
// };
@@ -119,7 +126,7 @@ export const eventMap = {
}
);
- if (noneLocation) Message.warning("匹配到诱导设备位置!");
+ if (noneLocation) Message.warning("未能匹配到诱导设备位置!");
// cacheRemoveFunc.DriveTestEquipment_Camera_Remove?.();
},
};
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 7f14a0fc..f0eb8de0 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
@@ -25,7 +25,7 @@ export async function setMarkerCluster(map, points, markerFun) {
let hasClick = false;
- if (!points.length) Message.warning("匹配到对应坐标点");
+ if (!points.length) Message.warning("未能匹配到对应坐标点");
const markerCluster = new AMap.MarkerCluster(map, points, {
// gridSize: 15,