From fa0da7cf4892bc0861a5a62c236b273e4c0eafb3 Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 26 Apr 2024 11:27:57 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JiHeExpressway/pages/control/event/event/index.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 501dd3be..47e9849b 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 @@ -199,8 +199,16 @@ export default { if (result.code != 200) return Message.error(result?.msg); result.rows.forEach(it => { it.stringDirection = gzDirectionMapping[it.direction] || it.direction; - it.startTime = it?.occurrenceTime || ''; it.stringEventType = it.stringEventType + (it.eventSubclass ? `(${it.eventSubclass})` : ''); + + if (this.activeName == '0') { + it.startTime = it?.occurrenceTime || ''; + } else if (this.activeName == '1') { + + } else if (this.activeName == '2') { + it.startTime = it?.endTime || ''; + } + // if (it.otherConfig) { // let otherConfig = JSON.parse(it.otherConfig); // it.pictures = otherConfig.pictures || []; From 0e5737da83db47c333a154ddfadf71f500ffe538 Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 26 Apr 2024 11:28:17 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/HeaderMenu/WarningList.vue | 50 +++++++++++++++++-- .../images/event/交通拥堵.svg | 24 +++++++++ .../JiHeExpressway/images/event/行人.svg | 7 +++ .../images/event/非机动车.svg | 22 ++++++++ 4 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/event/交通拥堵.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/event/行人.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/event/非机动车.svg diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue index 629c8935..a34ae34c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue @@ -7,7 +7,17 @@
- + + + +
@@ -24,10 +34,13 @@ import request from "@/utils/request"; import Table from '@screen/components/Table.vue'; import Pagination from '@screen/components/Pagination.vue'; +import { WarningType } from "@screen/utils/enum.js"; + export default { data() { return { activeTab: "first", + WarningType, tableData: [], total: 10, searchData: { @@ -53,9 +66,12 @@ export default { getMainData() { if (this.activeTab == 'first') { request({ - url: `perceivedEvents/warning/perceivedEventsList?pageNum=${this.searchData.pageNum}&pageSize=${this.searchData.pageSize}`, + url: `/perceivedEvents/warning/warningListPage?pageNum=${this.searchData.pageNum}&pageSize=${this.searchData.pageSize}`, method: "POST", - data: {} + data: { + warningState: 1, + pageNum: 1, pageSize: 10 + } }) .then((result) => { if (result.code != 200) return; @@ -71,7 +87,8 @@ export default { .then((result) => { if (result.code != 200) return; result.rows.forEach(item => { - item.remark = item.occurrenceTime + " " + item.stakeMark + " " + item.direction + " 发生" + item.stringEventType + "( " + item.eventSubclass + ")事件" + item.remark = (item.occurrenceTime || '') + " " + (item.stakeMark || '') + " " + (item.direction || '') + " 发生" + (item.stringEventType || '') + "( " + (item.eventSubclass || '') + ")事件" + // item.remark = item.stakeMark + " " + item.direction + " 发生" + item.stringEventType + "( " + item.eventSubclass + ")事件" }) this.tableData = result.rows; this.total = result.total; @@ -87,5 +104,28 @@ export default { diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/event/交通拥堵.svg b/ruoyi-ui/src/views/JiHeExpressway/images/event/交通拥堵.svg new file mode 100644 index 00000000..db8d76cb --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/event/交通拥堵.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/event/行人.svg b/ruoyi-ui/src/views/JiHeExpressway/images/event/行人.svg new file mode 100644 index 00000000..c43719a5 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/event/行人.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/event/非机动车.svg b/ruoyi-ui/src/views/JiHeExpressway/images/event/非机动车.svg new file mode 100644 index 00000000..e21639bd --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/images/event/非机动车.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + From 95f8c1c28dc8644aca2d75d0aa1a0e764487b3d8 Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 26 Apr 2024 11:35:34 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=84=9F=E7=9F=A5?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RoadAndEvents/utils/httpList.js | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) 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 68a48f72..209fa293 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 @@ -371,24 +371,24 @@ export function getEventTopicList(eventType, options = {}) { */ export function getPerceiveEventList(data = {}, options = {}) { return new Promise((resolve, reject) => { - const completeTime = moment().add(1, "d").format("YYYY-MM-DD"); - const startTime = moment().add(-7, "d").format("YYYY-MM-DD"); - data.startTime = startTime; - data.completeTime = completeTime; - - const { endStakeMark, startStakeMark } = options; - if (endStakeMark) { - let formatEndStakeMark = `K${padZero(endStakeMark[0])}+${padZero( - endStakeMark[1] - )}`; - data.endStakeMark = formatEndStakeMark; - } - if (startStakeMark) { - let formatStartStakeMark = `K${padZero(startStakeMark[0])}+${padZero( - startStakeMark[1] - )}`; - data.startStakeMark = formatStartStakeMark; - } + // const completeTime = moment().add(1, "d").format("YYYY-MM-DD"); + // const startTime = moment().add(-7, "d").format("YYYY-MM-DD"); + // data.startTime = startTime; + // data.completeTime = completeTime; + + // const { endStakeMark, startStakeMark } = options; + // if (endStakeMark) { + // let formatEndStakeMark = `K${padZero(endStakeMark[0])}+${padZero( + // endStakeMark[1] + // )}`; + // data.endStakeMark = formatEndStakeMark; + // } + // if (startStakeMark) { + // let formatStartStakeMark = `K${padZero(startStakeMark[0])}+${padZero( + // startStakeMark[1] + // )}`; + // data.startStakeMark = formatStartStakeMark; + // } request({ url: `/perceivedEvents/warning/warningList`, From 49c9b00d57ac8212d216e1237cc6c5899f12aa44 Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 26 Apr 2024 14:04:21 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E8=B7=AF=E7=BD=91=E8=AE=BE=E6=96=BD?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=BB=9A=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Dialogs/RoadNetworkFacilities/index.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue index 866028f1..7c17759d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue @@ -79,6 +79,13 @@ export default { flex-direction: column; gap: 12px; + ::v-deep { + .el-tabs__content { + overflow-y: auto; + max-height: 220px; + } + } + .camera-video { flex: 1.5; } From eeb1ac0146432da0854e3f7e530871f25b74811c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=92=A6?= <360013221@qq.com> Date: Fri, 26 Apr 2024 14:30:16 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=8B=93=E6=89=91=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/perception/topology/index.vue | 417 ++++++++++++++++-- .../perception/topology/left-bg-action.png | Bin 0 -> 11779 bytes .../pages/perception/topology/left-bg.png | Bin 11779 -> 12469 bytes .../pages/perception/topology/switch0.png | Bin 0 -> 10451 bytes .../pages/perception/topology/switch1.png | Bin 0 -> 10361 bytes .../pages/perception/topology/t10.png | Bin 0 -> 699 bytes .../pages/perception/topology/t11.png | Bin 0 -> 710 bytes 7 files changed, 392 insertions(+), 25 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/left-bg-action.png create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/switch0.png create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/switch1.png create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t10.png create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/t11.png diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue index ac4d64f9..e2d9baf0 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/topology/index.vue @@ -1,13 +1,127 @@