From 653e42e649d8897983513a47cde36a6dc0611970 Mon Sep 17 00:00:00 2001 From: zhoule Date: Tue, 27 Feb 2024 10:11:47 +0800 Subject: [PATCH] =?UTF-8?q?Bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/event/event/FormEvent/data.js | 9 ++++++- .../pages/control/event/event/data.js | 18 ++++++++----- .../pages/control/event/event/index.vue | 1 + .../components/eventQuery/assets/charts2.js | 4 +-- .../components/eventQuery/index.vue | 26 +++++++------------ .../components/eventSource/assets/charts.js | 25 ++---------------- .../components/eventSource/index.vue | 25 ++++++++++++------ .../components/typeAnalysis/index.vue | 2 ++ .../src/views/JiHeExpressway/utils/enum.js | 3 +++ 9 files changed, 56 insertions(+), 57 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js index 2f1098d2..cde4113d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js @@ -422,7 +422,14 @@ export const tabConfigList = [ }, }, PresetFormItems.direction, - PresetFormItems.station, + { ...PresetFormItems.station, + visible: (data) => { + if (data.dcEventVehicleAccident && data.dcEventVehicleAccident.locationType != 1) { + return false; + } + return true; + }, + }, PresetFormItems.eventHappenTime, PresetFormItems.aEstimatedReleaseTime, { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js index a5423158..775dc18d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js @@ -83,6 +83,10 @@ export const gjSearchFormList = [ key: "6", label: "非机预警", }, + { + key: "7", + label: "气象监测器", + }, ], }, }, @@ -145,17 +149,17 @@ export const gzSearchFormList = [ options: { options: [ { - key: "济南方向", - label: "济南方向", - }, - { - key: "菏泽方向", + key: "1", label: "菏泽方向", }, { - key: "双向", - label: "双向", + key: "3", + label: "济南方向", }, + // { + // key: "双向", + // label: "双向", + // }, ], }, }, 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 6a44b764..f8d6184c 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 @@ -81,6 +81,7 @@ const warningSourceMapping = { 4: '护栏碰撞', 5: '扫码报警', 6: '非机预警', + 7: '气象监测器' } const directionMapping = { '1': '上行', diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js index 221623b2..86fa33f2 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js @@ -51,8 +51,8 @@ let chartData = [], "#50EED3", "#5DEF9E", "#29B3FF", - "#FB5C38", - "#FB5C38", + "#29A1AF", + "#2D5CA8", "#FCBB14", ]; for (let i = 0; i < data.length; i++) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue index 9abb5d86..8f5bcb92 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue @@ -400,30 +400,24 @@ export default { data.forEach((it) => { if (it.warningType == 1) { types.push("交通拥堵"); - } - if (it.warningType == 2) { + }else if (it.warningType == 2) { types.push("行人"); - } - if (it.warningType == 3) { + }else if (it.warningType == 3) { types.push("非机动车"); - } - if (it.warningType == 4) { + }else if (it.warningType == 4) { types.push("停车"); - } - if (it.warningType == 5) { + }else if (it.warningType == 5) { types.push("倒车/逆行"); - } - if (it.warningType == 6) { + }else if (it.warningType == 6) { types.push("烟火"); - } - if (it.warningType == 7) { + }else if (it.warningType == 7) { types.push("撒落物"); - } - if (it.warningType == 8) { + }else if (it.warningType == 8) { types.push("异常天气"); - } - if (it.warningType == 9) { + }else if (it.warningType == 9) { types.push("护栏碰撞"); + } else { + types.push("其他"); } numbers.push({ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js index 6ea73b0c..7bfe5e2e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js @@ -1,25 +1,4 @@ -let data = [ - { - average: 30, - name: "视频识别", - percent: 0.2, - }, - { - average: 25, - name: "雷达识别", - percent: 0.25, - }, - { - average: 15, - name: "锥桶", - percent: 0.3, - }, - { - average: 30, - name: "护栏碰撞", - percent: 0.25, - }, -]; +let data = []; window.mainData = data; @@ -115,7 +94,7 @@ var options = { right: 0, orient: "vertical", //改变排列方式 icon: "circle", //改变legend小图标形状 - itemGap: 15, // 设置legend的间距 + itemGap: 10, // 设置legend的间距 itemWidth: 8, // 设置宽度 // itemHeight: 15, // 设置高度 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 4ec2128f..28ee8693 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 @@ -86,7 +86,7 @@ export default { { average: 0, name: "护栏碰撞", - percent: 0.2, + percent: 0.1, }, { average: 0, @@ -98,6 +98,11 @@ export default { name: "非机预警", percent: 0.1, }, + { + average: 0, + name: "气象监测器", + percent: 0.1, + }, ]; data.forEach((it) => { if (it.warningSource == 1) { @@ -118,6 +123,9 @@ export default { if (it.warningSource == 6) { chartData[5].average += it.number; } + if (it.warningSource == 7) { + chartData[6].average += it.number; + } // total ++; // drawRoundRect(context, 231, 37 + (index * 27), 138, 20, 12, gr); }); @@ -148,7 +156,7 @@ export default { }); } window.mainData = mainData; - console.log("mainData", mainData); + // console.log("mainData", mainData); chartsStatistics.title.text = `{tb|${total}}`; chartsStatistics.title.subtext = "{zb|总数}"; @@ -208,12 +216,13 @@ export default { let gr = context.createLinearGradient(230, 0, 360, 0); gr.addColorStop(1, "rgba(92,197,255,0)"); gr.addColorStop(0, "rgba(92,197,255,0.3)"); - drawRoundRect(context, 214, 15, 134, 21, 12, gr); - drawRoundRect(context, 214, 42, 134, 21, 12, gr); - drawRoundRect(context, 214, 69, 134, 21, 12, gr); - drawRoundRect(context, 214, 96, 134, 21, 12, gr); - drawRoundRect(context, 214, 123, 134, 21, 12, gr); - drawRoundRect(context, 214, 150, 134, 21, 12, gr); + drawRoundRect(context, 218, 16, 134, 18, 12, gr); + drawRoundRect(context, 218, 39, 134, 18, 12, gr); + drawRoundRect(context, 218, 61, 134, 18, 12, gr); + drawRoundRect(context, 218, 83, 134, 18, 12, gr); + drawRoundRect(context, 218, 105, 134, 18, 12, gr); + drawRoundRect(context, 218, 127, 134, 18, 12, gr); + drawRoundRect(context, 218, 149, 134, 18, 12, gr); context.lineWidth = 1; // 设置线段宽度 diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue index a31445f2..42826cd2 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue @@ -117,6 +117,8 @@ export default { }); } + } + for (var i = 0; i < typeAnalysisData.length; i++) { drawRoundRect(context, 250, 8 + i * 28, 120, 24, 12, gr) } diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js index 33c2c982..cad7cfc3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js @@ -129,6 +129,9 @@ export const InfoWarningSource = { 6: { text: "非机预警", }, + 7: { + text: "气象监测器", + } }; // 事件主类 warningType