diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue index 9812d198..70e04ddf 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue @@ -96,6 +96,7 @@ export default { qbb: '' }], planName: '', + automaticInfo: {}, dcExecuteAction: [], deviceData: [], eventOptions: [ @@ -252,16 +253,32 @@ export default { return this.deviceData; }, async getTemplateAutomatic() { - request({ - url: `/business/plans/event/automatic`, + let url = ''; + let data = {}; + let plan = this.info.find(it => it.planName == this.planName); + if (this.activeName == '-1') {//感知 + url = '/business/plans/warning/confirm'; + data = { + dcEmergencyPlans: plan, + dcWarning: this.eventFormData + } + } else {//交通 + url = '/business/plans/event/automatic'; + data = { + dcEmergencyPlans: plan, + dcEvent: this.eventFormData + } + } + const result = await request({ + url: url, method: "post", - }).then((result) => { - if (result.code != 200) return Message.error(result?.msg); - this.sbOptions = result.data; - - }).catch(() => { - Message.error("查询可变信息标识失败"); + data: data }) + if (result.code != 200) { + Message.error(result?.msg); + return {}; + } + return result.data; }, changeRadio(value) { let plan = this.info.find(it => it.planName == value); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/formTable/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/formTable/index.vue index c71effe3..1733abc2 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/formTable/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/formTable/index.vue @@ -87,7 +87,8 @@ - + @@ -95,7 +96,7 @@ import Table from '@screen/components/Table.vue'; import Button from '@screen/components/Buttons/Button.vue'; import request from "@/utils/request"; -import QbbDialog from "../qbbDialog/index.vue"; +// import QbbDialog from "../qbbDialog/index.vue"; import { Message } from 'element-ui' import { planDeviceOptions } from "@screen/utils/enum.js"; @@ -105,15 +106,14 @@ export default { components: { Button, Table, - QbbDialog - }, - model: { - prop: 'visible', - event: 'update:value' + // QbbDialog }, + // model: { + // prop: 'visible', + // event: 'update:value' + // }, inject: ['loadData'], props: { - visible: Boolean, eventType: Number, type: Number, tableData: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue index 78e2c569..e0348eae 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue @@ -1,11 +1,11 @@ - + 预案内容 - + @@ -18,7 +18,7 @@ - + @@ -28,14 +28,11 @@ 情报板模版 - + {{ item.dictLabel }} - - @@ -43,7 +40,7 @@ - + --> { } @@ -102,11 +103,12 @@ export default { }, computed: { modelVisible: { - get() { + async get() { if (this.visible) { if (this.info && this.info.id) { this.radio1 = Number(this.info.id); } + // console.log('123', this.getTemplateAutomatic()); } return this.visible; }, 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 37c7c051..67bf559c 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 @@ -1,87 +1,35 @@ - + - - - + + + - - + + - - - 查询 - 重置 + + + 查询 + 重置 @@ -90,7 +38,7 @@ - + @@ -98,7 +46,7 @@ - + @@ -106,7 +54,7 @@ - + @@ -261,7 +209,7 @@ export default { ], }; }, - created() {}, + created() { }, methods: { selectProgress(item, index) { this.selectIndex = index; @@ -409,7 +357,7 @@ export default { chart1.series[0].data = numbers; } } - this.$nextTick(()=>{ + this.$nextTick(() => { this.initChart1(); }) }); @@ -423,8 +371,8 @@ export default { quarter: this.quarter, }).then((res) => { chart2.series[0].data = []; + let types = []; if (res.code == 200) { - let types = []; let numbers = []; this.chart2List = res.data; let data = res.data.warningTypeList; @@ -440,16 +388,20 @@ export default { } else if (it.warningType == 4) { types.push("停车"); } else if (it.warningType == 5) { - types.push("倒车/逆行"); + types.push("违规驾驶"); } else if (it.warningType == 6) { - types.push("烟火"); + types.push("路障"); } else if (it.warningType == 7) { - types.push("撒落物"); + types.push("道路施工"); } else if (it.warningType == 8) { types.push("异常天气"); } else if (it.warningType == 9) { types.push("护栏碰撞"); - } else { + } else if (it.warningType == 10) { + types.push("交通事故"); + } else if (it.warningType == 11) { + types.push("车辆故障"); + } else if (it.warningType == 99) { types.push("其他"); } @@ -498,8 +450,8 @@ export default { // this.myChart2.setOption(chart2); // }) } - this.$nextTick(()=>{ - this.initChart2(); + this.$nextTick(() => { + this.initChart2(types); }) }); //路段范围内桩号分布 @@ -570,8 +522,8 @@ export default { chart3.series[0].data = values1; chart3.series[1].data = values2; } - this.$nextTick(()=>{ - this.initChart3(); + this.$nextTick(() => { + this.initChart3(); }) }); // if (this.type == "day") @@ -582,109 +534,114 @@ export default { this.dateTime = moment(new Date()).format("YYYY-MM-DD"); } }, - initChart1(){ - this.myChart1 = echarts.init(document.getElementById("chart1")); - this.myChart1.setOption(chart1); - }, - initChart3(){ - this.myChart3 = echarts.init(document.getElementById("chart3")); - this.myChart3.setOption(chart3); - }, - initChart2(){ - - this.myChart2 = echarts.init(document.getElementById("chart2")); - this.myChart2.setOption(chart2); - - const domMap = document.getElementById("chart2"); - let parentDiv = domMap.firstChild; - // 创建canvas - let canvas = document.createElement("canvas"); - canvas.width = parentDiv.offsetWidth; - canvas.height = parentDiv.offsetHeight; - parentDiv.appendChild(canvas); - const context = canvas.getContext("2d"); - context.lineWidth = 1; // 设置线段宽度 - - // 填充渐变颜色 - // 颜色断点 - var gr = context.createLinearGradient(247, 63, 450, 0); - gr.addColorStop(1, "rgba(92,197,255,0)"); - gr.addColorStop(0, "rgba(92,197,255,0.5)"); - drawRoundRect(context, 357, 98, 140, 24, 12, gr); - - // // 颜色断点 - var gr = context.createLinearGradient(247, 63, 450, 0); - gr.addColorStop(1, "rgba(92,197,255,0)"); - gr.addColorStop(0, "rgba(92,197,255,0.5)"); - drawRoundRect(context, 357, 130, 140, 24, 12, gr); - - // // 颜色断点 - var gr = context.createLinearGradient(240, 63, 450, 0); - gr.addColorStop(1, "rgba(92,197,255,0)"); - gr.addColorStop(0, "rgba(92,197,255,0.5)"); - drawRoundRect(context, 357, 162, 140, 24, 12, gr); - - // // 颜色断点 - var gr = context.createLinearGradient(240, 63, 450, 0); - gr.addColorStop(1, "rgba(92,197,255,0)"); - gr.addColorStop(0, "rgba(92,197,255,0.5)"); - drawRoundRect(context, 357, 194, 140, 24, 12, gr); - - // // 颜色断点 - // var gr = context.createLinearGradient(240, 63, 450, 0); - // gr.addColorStop(1, 'rgba(92,197,255,0)'); - // gr.addColorStop(0, 'rgba(92,197,255,0.5)'); - // drawRoundRect(context, 267, 258, 140, 24, 12, gr) - - // // 颜色断点 - // var gr = context.createLinearGradient(400, 63, 450, 0); - // gr.addColorStop(1, 'rgba(92,197,255,0)'); - // gr.addColorStop(0, 'rgba(92,197,255,0.5)'); - // drawRoundRect(context, 416, 57, 140, 24, 12, gr) - - // // 颜色断点 - // var gr = context.createLinearGradient(350, 63, 450, 0); - // gr.addColorStop(1, 'rgba(92,197,255,0)'); - // gr.addColorStop(0, 'rgba(92,197,255,0.5)'); - // drawRoundRect(context, 416, 108, 140, 24, 12, gr) - - // // 颜色断点 - // var gr = context.createLinearGradient(300, 63, 450, 0); - // gr.addColorStop(1, 'rgba(92,197,255,0)'); - // gr.addColorStop(0, 'rgba(92,197,255,0.5)'); - // drawRoundRect(context, 416, 157, 140, 24, 12, gr) - - // // 颜色断点 - // var gr = context.createLinearGradient(300, 63, 450, 0); - // gr.addColorStop(1, 'rgba(92,197,255,0)'); - // gr.addColorStop(0, 'rgba(92,197,255,0.5)'); - // drawRoundRect(context, 416, 208, 140, 24, 12, gr); - }, + initChart1() { + this.myChart1 = echarts.init(document.getElementById("chart1")); + this.myChart1.setOption(chart1); + }, + initChart3() { + this.myChart3 = echarts.init(document.getElementById("chart3")); + this.myChart3.setOption(chart3); + }, + initChart2(types) { + + this.myChart2 = echarts.init(document.getElementById("chart2")); + this.myChart2.setOption(chart2); + + const domMap = document.getElementById("chart2"); + let parentDiv = domMap.firstChild; + // 创建canvas + let canvas = document.createElement("canvas"); + canvas.width = parentDiv.offsetWidth; + canvas.height = parentDiv.offsetHeight; + parentDiv.appendChild(canvas); + const context = canvas.getContext("2d"); + context.lineWidth = 1; // 设置线段宽度 + + // 填充渐变颜色 + // 颜色断点 + var gr = context.createLinearGradient(247, 63, 450, 0); + gr.addColorStop(1, "rgba(92,197,255,0)"); + gr.addColorStop(0, "rgba(92,197,255,0.5)"); + + console.log('types', types) + types.forEach((it, index) => { + drawRoundRect(context, 357, (98 + index * 32), 140, 24, 12, gr); + }) + + + // // 颜色断点 + // var gr = context.createLinearGradient(247, 63, 450, 0); + // gr.addColorStop(1, "rgba(92,197,255,0)"); + // gr.addColorStop(0, "rgba(92,197,255,0.5)"); + // drawRoundRect(context, 357, 130, 140, 24, 12, gr); + + // // // 颜色断点 + // var gr = context.createLinearGradient(240, 63, 450, 0); + // gr.addColorStop(1, "rgba(92,197,255,0)"); + // gr.addColorStop(0, "rgba(92,197,255,0.5)"); + // drawRoundRect(context, 357, 162, 140, 24, 12, gr); + + // // // 颜色断点 + // var gr = context.createLinearGradient(240, 63, 450, 0); + // gr.addColorStop(1, "rgba(92,197,255,0)"); + // gr.addColorStop(0, "rgba(92,197,255,0.5)"); + // drawRoundRect(context, 357, 194, 140, 24, 12, gr); + + // // 颜色断点 + // var gr = context.createLinearGradient(240, 63, 450, 0); + // gr.addColorStop(1, 'rgba(92,197,255,0)'); + // gr.addColorStop(0, 'rgba(92,197,255,0.5)'); + // drawRoundRect(context, 267, 258, 140, 24, 12, gr) + + // // 颜色断点 + // var gr = context.createLinearGradient(400, 63, 450, 0); + // gr.addColorStop(1, 'rgba(92,197,255,0)'); + // gr.addColorStop(0, 'rgba(92,197,255,0.5)'); + // drawRoundRect(context, 416, 57, 140, 24, 12, gr) + + // // 颜色断点 + // var gr = context.createLinearGradient(350, 63, 450, 0); + // gr.addColorStop(1, 'rgba(92,197,255,0)'); + // gr.addColorStop(0, 'rgba(92,197,255,0.5)'); + // drawRoundRect(context, 416, 108, 140, 24, 12, gr) + + // // 颜色断点 + // var gr = context.createLinearGradient(300, 63, 450, 0); + // gr.addColorStop(1, 'rgba(92,197,255,0)'); + // gr.addColorStop(0, 'rgba(92,197,255,0.5)'); + // drawRoundRect(context, 416, 157, 140, 24, 12, gr) + + // // 颜色断点 + // var gr = context.createLinearGradient(300, 63, 450, 0); + // gr.addColorStop(1, 'rgba(92,197,255,0)'); + // gr.addColorStop(0, 'rgba(92,197,255,0.5)'); + // drawRoundRect(context, 416, 208, 140, 24, 12, gr); + }, }, mounted() { - getRoadSectionList().then((res) => { - console.log(res); - if (res.code == 200) { - let rows = res.data; - this.dataList = []; - rows.forEach((it) => { - this.dataList.push({ - title: it.sectionName.split("-")[0], - id: it.id, - }); - }); - //最后一项取结束点 - if (rows.length > 1) { - this.dataList.push({ - title: rows[rows.length - 1].sectionName.split("-")[1], - id: rows[rows.length - 1].id, - }); - } - console.log("dataList", this.dataList); - } - this.searchQuery(); + getRoadSectionList().then((res) => { + console.log(res); + if (res.code == 200) { + let rows = res.data; + this.dataList = []; + rows.forEach((it) => { + this.dataList.push({ + title: it.sectionName.split("-")[0], + id: it.id, + }); }); - + //最后一项取结束点 + if (rows.length > 1) { + this.dataList.push({ + title: rows[rows.length - 1].sectionName.split("-")[1], + id: rows[rows.length - 1].id, + }); + } + console.log("dataList", this.dataList); + } + this.searchQuery(); + }); + } }; @@ -694,37 +651,44 @@ export default { position: relative; .comp_body { - width: 100%; height: 100%; + width: 100%; + height: 100%; display: flex; align-items: stretch; font-size: 14px; - > div { + >div { flex: 1; - background: linear-gradient( - 180deg, - rgba(6, 66, 88, 0.2) 0%, - #064258 100% - ); + background: linear-gradient(180deg, + rgba(6, 66, 88, 0.2) 0%, + #064258 100%); border: 1px solid; - border-image: linear-gradient( - 360deg, + border-image: linear-gradient(360deg, rgba(55, 231, 255, 0.3), - rgba(55, 231, 255, 0) - ) - 1 1; - display: flex; flex-direction: column; align-items: stretch; + rgba(55, 231, 255, 0)) 1 1; + display: flex; + flex-direction: column; + align-items: stretch; margin-right: 14px; - &:last-child{ margin-right: 0;} + + &:last-child { + margin-right: 0; + } } .unit_con { flex: 1; - margin: 95px 20px 30px; position: relative; + margin: 95px 20px 30px; + position: relative; + } + + .empty { + position: absolute; } - .empty{ position: absolute;} - .chart_div{ - width: 100%; height: 100%; + + .chart_div { + width: 100%; + height: 100%; } } @@ -816,54 +780,12 @@ export default { 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 6f95dbd8..9debfcdc 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 @@ -49,7 +49,7 @@ export default { data() { return {}; }, - created() {}, + created() { }, methods: {}, mounted() { setTimeout(() => { @@ -83,17 +83,17 @@ export default { value: 0, }, { - name: "倒车/逆行", + name: "违规驾驶", warningType: 5, value: 0, }, { - name: "烟火", + name: "路障", warningType: 6, value: 0, }, { - name: "撒落物", + name: "道路施工", warningType: 7, value: 0, }, @@ -191,20 +191,15 @@ export default { .congestion { .board { padding: 0px 20px; - background: linear-gradient( - 180deg, - rgba(6, 66, 88, 0.2) 0%, - #06425888 100% - ); + background: linear-gradient(180deg, + rgba(6, 66, 88, 0.2) 0%, + #06425888 100%); border-radius: 5px 5px 5px 5px; opacity: 1; border: 1px solid; - border-image: linear-gradient( - 360deg, + border-image: linear-gradient(360deg, rgba(55, 231, 255, 0.1), - rgba(55, 231, 255, 0) - ) - 1 1; + rgba(55, 231, 255, 0)) 1 1; display: flex; justify-content: space-between; align-items: center;
@@ -18,7 +18,7 @@ - + @@ -28,14 +28,11 @@ 情报板模版 - + {{ item.dictLabel }} - - @@ -43,7 +40,7 @@ - + -->
@@ -28,14 +28,11 @@
@@ -43,7 +40,7 @@