diff --git a/ruoyi-ui/src/api/event/perceiveEvent.js b/ruoyi-ui/src/api/event/perceiveEvent.js index ed8a01aa..7a147f24 100644 --- a/ruoyi-ui/src/api/event/perceiveEvent.js +++ b/ruoyi-ui/src/api/event/perceiveEvent.js @@ -78,13 +78,13 @@ export function geTwarningTotal(query) { //感知事件源分析 export function getWarningSourceGroup(query) { return request({ - // url: '/perceivedEvents/warning/warningSourceGroup', - // method: 'post', - url: '/business/warning/list', - method: 'get', - // params: { - // ...query, - // } + url: '/perceivedEvents/warning/warningSourceGroup', + method: 'post', + // url: '/business/warning/list', + // method: 'get', + params: { + ...query, + } }) } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue index af8a36b3..04a31ad7 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue @@ -90,10 +90,19 @@ export default { label: '工作模式', key: "workMode", }, + { + label: '上行工作状态', + key: "onWorkStatus", + }, + { + label: '下行工作状态', + key: "inWorkStatus", + }, ] } }, async created() { + console.log(333,this.dialogData,444) this.data = { ...this.dialogData, roadName: null } getProduct(this.dialogData.productId) @@ -107,6 +116,8 @@ export default { this.requestURL(52) .then((result) => { this.data.workMode = { "00": "手动控制", "01": "自动控制", "02": "万年历" }[result.mode]; + this.data.onWorkStatus = result.onWorkStatus + this.data.inWorkStatus = result.inWorkStatus }) .catch((err) => { @@ -123,7 +134,6 @@ export default { request.post(`business/device/functions/${this.dialogData.iotDeviceId}/${functionId}`, options) .then((result) => { if (result.code != 200) return reject(); - resolve(result.data[0]); }) .catch((err) => { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue index 735a1a83..57e87140 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue @@ -23,6 +23,7 @@ import Video from "@screen/components/Video"; import Form from '@screen/components/FormConfig'; import request from "@/utils/request"; import { Message } from "element-ui"; +import moment from "moment"; import { WarningTypeList, WarningSubclassList } from "@screen/utils/enum.js" // import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js" @@ -128,7 +129,7 @@ export default { }, { label: "持续时长:", - key: "parseOtherConfig.duration", + key: "duration", type: "text", }, { @@ -164,6 +165,14 @@ export default { }); }, + convertSecToHHmmss(sec) { + let currentTime = moment.duration(sec, "seconds"); + return moment({ + h: currentTime.hours(), + m: currentTime.minutes(), + s: currentTime.seconds(), + }).format("HH:mm:ss"); + }, getDetails() { request({ url: `/perceivedEvents/warning/getWarningById`, @@ -204,17 +213,17 @@ export default { // "longitude": "116.493888", // "latitude": "36.291145" // }; - + data.duration = this.convertSecToHHmmss(data.duration); this.data = { ...data, roadName: null, lane: data.lane?.split(",") || [] }; - + this.formList[4].options.options = WarningSubclassList[data.warningType] || []; setTimeout(() => { this.$refs.FormConfigRef.reset(true); }); }) - .catch(() => { - Message.error("详情获取失败"); + .catch((e) => { + Message.error("详情获取失败"+e); }) .finally(() => { this.loading = false; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue index 8f2328dd..2181248f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue @@ -74,6 +74,15 @@ function getMockData() { })); } +const warningSourceMapping = { + 1: '视频AI', + 2: '雷达识别', + 3: '锥桶', + 4: '护栏碰撞', + 5: '扫码报警', + 6: '非机预警', +} + export default { name: "RoadNetworkMonitoring2", components: { @@ -145,10 +154,15 @@ export default { request({ url: `/perceivedEvents/warning/perceivedEventsList`, method: "post", - data: this.searchData, + params: this.searchData, + data: {} }).then((result) => { if (result.code != 200) return Message.error(result?.msg); + result.rows.forEach(it => { + it.stringEventSource = warningSourceMapping[it.warningSource]; + }) this.data = result.rows; + this.total = result.total; }); } else { @@ -234,15 +248,43 @@ export default { }, firstBtnClick(id) { console.log("id", id); - request({ - url: `/dc/system/event/${id}`, - method: "get", - }).then((result) => { - if (result.code != 200) return Message.error(result?.msg); - this.detailDialogFormData = result.data; - - this.eventDetailDialogVisible = true; - }); + if (this.activeName == '-1') { + request({ + url: `/perceivedEvents/warning/getWarningById`, + method: "post", + data: { id } + }).then((result) => { + if (result.code != 200) return Message.error(result?.msg); + data = result.data; + const directionMapping = { + 1: '上行', + 2: '中', + 3: '下行' + } + data.stringEventSource = warningSourceMapping[data.warningSource]; + data.stringDirection = directionMapping[data.direction] || data.direction; + + + this.detailDialogFormData = data; + console.log('data', this.detailDialogFormData) + + this.eventDetailDialogVisible = true; + }); + } else { + request({ + url: `/dc/system/event/${id}`, + method: "get", + }).then((result) => { + if (result.code != 200) return Message.error(result?.msg); + let data = result.data; + data.stringDirection = directionMapping[data.direction] || data.direction; + + this.detailDialogFormData = data; + + this.eventDetailDialogVisible = true; + }); + } + }, handleClose() { this.eventDetailDialogVisible = false; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue index 4a178653..cbdf451a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue @@ -56,8 +56,8 @@ export default { getWarningSourceGroup().then((res) => { if (res.code == 200) { - let data = res.rows; - let total = 0; + let data = res.data.warningSourceList; + let total = res.data.total; if (data.length > 0) { let chartData = [ @@ -90,24 +90,24 @@ export default { ] data.forEach(it => { if (it.warningSource == 1) { - chartData[0].average++; + chartData[0].average += it.number; } if (it.warningSource == 2) { - chartData[1].average++; + chartData[1].average += it.number; } if (it.warningSource == 3) { - chartData[2].average++; + chartData[2].average += it.number; } if (it.warningSource == 4) { - chartData[3].average++; + chartData[3].average += it.number; } if (it.warningSource == 5) { - chartData[4].average++; + chartData[4].average += it.number; } if (it.warningSource == 6) { - chartData[5].average ++; + chartData[5].average += it.number; } - total ++; + // total ++; // drawRoundRect(context, 231, 37 + (index * 27), 138, 20, 12, gr); }) // console.log('data',chartData)