From 2b01d1e3a8f88eb1f25ecb46b67f24b6e71a4b41 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Fri, 22 Mar 2024 21:32:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/DeviceControlDialog.vue | 4 +-
.../pages/control/event/event/data.js | 60 ++++++++++++++++++-
.../pages/control/event/event/index.vue | 1 +
3 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
index a562d58c..d72620c8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
@@ -238,7 +238,7 @@ export default {
modelVisible: {
get() {
if (this.visible) {
- this.deviceId = 'K82+285';
+ // this.deviceId = 'K82+285';
this.initData();
}
return this.visible
@@ -360,7 +360,7 @@ export default {
}
- }
+ },
},
}
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 026e67f5..f5ceb632 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
@@ -108,13 +108,71 @@ export const gjSearchFormList = [
],
},
},
+ {
+ label: "事件主类:",
+ key: "warningType",
+ type: "select",
+ options: {
+ clearable: true,
+ options: [
+ {
+ value: 1,
+ label: "交通拥堵",
+ },
+ {
+ value: 2,
+ label: "行人",
+ },
+ {
+ value: 3,
+ label: "非机动车",
+ },
+ {
+ value: 4,
+ label: "停车",
+ },
+ {
+ value: 5,
+ label: "违规驾驶",
+ },
+ {
+ value: 6,
+ label: "路障",
+ },
+ {
+ value: 7,
+ label: "道路施工",
+ },
+ {
+ value: 8,
+ label: "异常天气",
+ },
+ {
+ value: 9,
+ label: "护栏碰撞",
+ },
+ {
+ value: 10,
+ label: "交通事故",
+ },
+ {
+ value: 11,
+ label: "车辆故障",
+ },
+ {
+ value: 99,
+ label: "其他事件",
+ },
+ ],
+ },
+ },
{
label: "时间范围:",
key: "daterange",
required: false,
type: "datePicker",
options: {
- style: 'width: auto',
+ style: "width: auto",
type: "datetimerange",
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
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 1def4b6a..aec6be1c 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
@@ -343,6 +343,7 @@ export default {
this.searchData = {
...this.searchData,
eventType: data.eventType,
+ warningType: data.warningType,
eventSource: data.eventSource,
warningSource: data?.warningSource || '',
direction: data.direction,