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 @@ + + + + + + + + + + + + + + + + + + + + + + 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; } 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`, 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 || [];