-
设备筛选
- ∏
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 62e498dd..5a0d5255 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -43,6 +43,8 @@ import Bg1 from "@screen/components/Decorations/bg-1.vue"
import DrivingGuidance from "./../Dialogs/DrivingGuidance/index.vue"
import Camera from "./../Dialogs/Camera/index.vue";
import Broadcast from "./../Dialogs/Broadcast/index.vue";
+import TrafficIncidents from "./../Dialogs/TrafficIncidents/index.vue";
+import PerceiveEvent from "./../Dialogs/PerceiveEvent/index.vue";
import InfoBoard from "./../InfoBoard"
export default {
@@ -53,6 +55,8 @@ export default {
DrivingGuidance,
InfoBoard,
Broadcast,
+ TrafficIncidents,
+ PerceiveEvent,
Bg1
},
data() {
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 e7b4812f..465400fa 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
@@ -1,4 +1,8 @@
-import { getDeviceList, getEventTopicList } from "./httpList";
+import {
+ getDeviceList,
+ getEventTopicList,
+ getPerceiveEventList,
+} from "./httpList";
import { delay } from "@screen/utils/common";
import { Message } from "element-ui";
import { EventTopics } from "@screen/utils/enum.js";
@@ -7,7 +11,7 @@ import { setMarkToMap } from "./map";
const cameraIcon = {
// 球机
- "00": require("@screen/images/deviceType/ball.svg"),
+ "00": require("@screen/images/deviceType/ball_active.svg"),
"01": require("@screen/images/deviceType/ball_fault.svg"),
};
@@ -69,7 +73,7 @@ export const eventMap = {
.finally(() => loadingMessage.close());
if (!data) return;
- if (!data.length) return Message.warning(`没有${item.title}设备数据!`);
+ if (!data.length) return Message.warning(`没有${item.title}事件数据!`);
eventMap[`地图路测设备/map_close`](item);
@@ -92,6 +96,7 @@ export const eventMap = {
"地图路测设备/map_close"(item) {
cacheRemoveFunc[`地图路测设备/${item.title}`]?.();
},
+
// 事件 需要在地图显示的
async "地图事件专题/map"(item) {
const loadingMessage = Message.info({
@@ -121,12 +126,16 @@ export const eventMap = {
data,
(extData) => {
this.dialogConfig = {
- component: null,
+ component: "TrafficIncidents",
data: {
...extData,
parseOtherConfig: JSON.parse(extData.otherConfig || "{}"),
+ _itemData: item,
},
};
+ },
+ {
+ stateCallback: () => true,
}
// config.options
);
@@ -134,4 +143,50 @@ export const eventMap = {
"地图事件专题/map_close"(item) {
cacheRemoveFunc[`地图事件专题/${item.title}`]?.();
},
+
+ // 感知事件
+ async "事件专题/感知事件"(item) {
+ const loadingMessage = Message.info({
+ message: `${item.title}位置加载中...`,
+ duration: 0,
+ customClass: "loading-message",
+ iconClass: "el-icon-loading",
+ });
+
+ const data = await getPerceiveEventList()
+ .then(async (data) => {
+ await delay(600);
+ return data;
+ })
+ .catch(() => {})
+ .finally(() => loadingMessage.close());
+
+ if (!data) return;
+
+ if (!data?.length) return Message.warning(`没有${item.title}数据!`);
+
+ eventMap[`事件专题/感知事件_close`](item);
+
+ cacheRemoveFunc[`事件专题/${item.title}`] = await setMarkToMap.call(
+ this,
+ item,
+ data,
+ (extData) => {
+ this.dialogConfig = {
+ component: "PerceiveEvent",
+ data: {
+ ...extData,
+ parseOtherConfig: JSON.parse(extData.otherConfig || "{}"),
+ },
+ };
+ },
+ {
+ stateCallback: () => true,
+ }
+ // config.options
+ );
+ },
+ "事件专题/感知事件_close"(item) {
+ cacheRemoveFunc[`事件专题/${item.title}`]?.();
+ },
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
index e32a51ed..84345360 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
@@ -175,7 +175,10 @@ const DeviceTypeMap = {
*/
export function getDeviceList(deviceType) {
return new Promise((resolve, reject) => {
- if (!deviceType) return reject();
+ if (!deviceType) {
+ Message.error(`${DeviceTypeMap[deviceType]}设备加载失败!`);
+ return reject();
+ }
request({
url: "/business/device/query",
@@ -250,11 +253,15 @@ export function getProduct(productId) {
}
/**
+ * 交通事件 列表 根据类型获取
* @param {number} eventType
*/
export function getEventTopicList(eventType) {
return new Promise((resolve, reject) => {
- if (!eventType) return reject();
+ if (!eventType) {
+ Message.error(`事件加载失败!`);
+ return reject();
+ }
request({
url: `/business/trafficIncidents/getEventList/${eventType}`,
@@ -263,13 +270,39 @@ export function getEventTopicList(eventType) {
.then(({ code, data }) => {
if (code != 200) {
reject();
- return Message.error(`${DeviceTypeMap[deviceType]}事件加载失败!`);
+ return Message.error(`事件加载失败!`);
}
resolve(data);
})
.catch(() => {
- Message.error(`${DeviceTypeMap[deviceType]}事件加载失败!`);
+ Message.error(`事件加载失败!`);
+ reject();
+ });
+ });
+}
+
+/**
+ * 感知事件根据类型获取
+ * @param {number} eventType
+ */
+export function getPerceiveEventList() {
+ return new Promise((resolve, reject) => {
+ request({
+ url: `/perceivedEvents/warning/perceivedEventsList`,
+ method: "POST",
+ data: {},
+ })
+ .then(({ code, rows }) => {
+ if (code != 200) {
+ reject();
+ return Message.error(`事件加载失败!`);
+ }
+
+ resolve(rows);
+ })
+ .catch(() => {
+ Message.error(`事件加载失败!`);
reject();
});
});
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/layerImages.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/layerImages.js
index 2d2b4aae..7762a9bb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/layerImages.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/layerImages.js
@@ -11,10 +11,15 @@ export function getLayerData() {
const resultData = [];
layerData.keys().forEach((item) => {
- const [_, topic, title] = item.match(/[^/]+/g);
+ const [_, topic, file] = item.match(/[^/]+/g);
+ const fileName = file.match(/[^._]+/)[0];
switch (topic) {
case "事件专题":
- if (!EventTopics[title.match(/[^._]+/)[0]]) return;
+ if (
+ !EventTopics[fileName.match(/[^._]+/)[0]] &&
+ !["感知事件"].includes(fileName)
+ )
+ return;
break;
}
if (!layerDatas[topic]) {
@@ -29,7 +34,7 @@ export function getLayerData() {
layerDatas[topic].children.push({
id: item,
- title: title.replace(".svg", ""),
+ title: fileName,
status: "",
});
});
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 2786c2f1..29d0aa38 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
@@ -98,7 +98,7 @@ export async function setMarkToMap(
item,
data,
_markerClick,
- { iconCallback, content } = {}
+ { iconCallback, content, stateCallback } = {}
) {
const { mapIns } = this.getMap();
@@ -108,18 +108,18 @@ export async function setMarkToMap(
normal ||
require(`@screen/images/layer${item.id.replace(
/^\.|[^/]+(?=.svg$)/g,
- (data) => (data === "." ? "" : `${data}`)
+ (data) => (data === "." ? "" : `${data}_active`)
)}`);
const fault =
fault ||
require(`@screen/images/layer${item.id.replace(
/^\.|[^/]+(?=.svg$)/g,
- (data) => (data === "." ? "" : `${data}_fault`)
+ (data) => (data === "." ? `` : `${data}_fault`)
)}`);
const faultBg = require(`@screen/images/mapBg/fault.svg`);
- const normalBg = require(`@screen/images/mapBg/normal.svg`);
+ const normalBg = require(`@screen/images/mapBg/active.svg`);
const markerClick = (e) => {
const extData = e.target.getExtData();
@@ -130,9 +130,13 @@ export async function setMarkToMap(
const markerCluster = await setMarkerCluster(
mapIns,
data.map((item) => {
+ const currentState =
+ typeof stateCallback === "function"
+ ? stateCallback(item)
+ : item.deviceState == 1;
+
const deviceIcon =
- typeof iconCallback === "function" &&
- iconCallback(item.deviceState == 1, item);
+ typeof iconCallback === "function" && iconCallback(currentState, item);
return {
weight: 1,
@@ -142,26 +146,21 @@ export async function setMarkToMap(
content:
content ||
`
`,
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
index 8786420b..b5c77361 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@@ -85,3 +85,99 @@ export const EventTopics = {
异常天气: 10,
其他事件: 11,
};
+
+// 事件类型 eventType
+export const EventType = {
+ 0: "待确认",
+ 1: "处理中",
+ 2: "已完成",
+};
+
+// 信息来源 warningSource
+export const InfoWarningSource = {
+ 1: {
+ text: "视频AI",
+ },
+ 2: {
+ text: "雷达识别",
+ },
+ 3: {
+ text: "锥桶",
+ },
+ 4: {
+ text: "护栏碰撞",
+ },
+ 5: {
+ text: "扫码报警",
+ },
+ 6: {
+ text: "非机预警",
+ },
+};
+
+// 事件主类 warningType
+export const WarningType = {
+ 1: "交通拥堵",
+ 2: "行人",
+ 3: "非机动车",
+ 4: "停车",
+ 5: "倒车/逆行",
+ 6: "烟火",
+ 7: "撒落物",
+ 8: "异常天气",
+ 9: "护栏碰撞",
+};
+
+// 事件主类的子类(上方) warningSubclass
+export const WarningSubclass = {
+ 1: {
+ "1-1": "拥堵",
+ "1-2": "缓行",
+ },
+ 2: {
+ "2-1": "普通行人",
+ "2-2": "工作人员",
+ },
+ 3: {
+ "3-1": "摩托车",
+ "3-2": "自行车",
+ "3-3": "三轮车",
+ },
+ 4: {
+ "4-1": "非工程车",
+ "4-2": "工程车",
+ "4-3": "主路有车",
+ "4-4": "匝道有车",
+ "4-5": "车辆故障",
+ "4-6": "交通事故",
+ "4-7": "应急车道被占用",
+ "4-8": "车离开应急车道",
+ "4-9": "其他",
+ },
+ 5: {
+ "5-1": "倒车_逆行",
+ },
+ 6: {
+ "6-1": "烟火",
+ },
+ 7: {
+ "7-1": "撒落物",
+ },
+ 8: {
+ "8-1": "雨",
+ "8-2": "冰雹",
+ "8-3": "风",
+ "8-4": "雾",
+ "8-5": "高温",
+ "8-6": "积水",
+ "8-7": "路面湿滑",
+ "8-8": "路面结冰",
+ "8-9": "道路能见度低",
+ "8-10": "道路团雾",
+ },
+ 9: {
+ "9-1": "只碰撞不倾斜",
+ "9-2": "只倾斜无碰撞",
+ "9-3": "碰撞后倾斜",
+ },
+};