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 @@
-
+
+
+
+
+
{{ activeTab == 'first' ? WarningType[scope.row.warningType] : scope.row.stringEventType }}
+
+ {{ scope.row.remark }}
+
+
+
@@ -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 @@
+