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 5d068257..3fe4e4c2 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
@@ -5,7 +5,7 @@
-
+
@@ -59,6 +59,7 @@ import EventDetailDialog from "./EventDetailDialog/index";
import FormEvent from "./FormEvent/index";
import { tabMap, gjSearchFormList, gzSearchFormList } from "./data";
import request from "@/utils/request";
+import { Message } from "element-ui";
import { Loading } from 'element-ui';
function getRandomData(min = 1, max = 15) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/data.js
index d605840d..e5324981 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/data.js
@@ -27,7 +27,7 @@ export const searchFormList = [
{
label: "时间范围:",
key: "time",
- required: true,
+ // required: true,
type: "datePicker",
options: {
format:"yyyy-MM-dd",
@@ -35,9 +35,9 @@ export const searchFormList = [
},
},
{
- label: "型号类型:",
+ label: "设备类型:",
key: "type",
- required: true,
+ // required: true,
type: "select",
options: {
options: [
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/data.js
new file mode 100644
index 00000000..ceb40be9
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/data.js
@@ -0,0 +1,43 @@
+export const searchFormList = [
+ {
+ label: "路段名称:",
+ key: "ld",
+ // required: true,
+ type: "select",
+ options: {
+ options: [],
+ },
+ },
+ {
+ label: "指标名称:",
+ key: "type",
+ // required: true,
+ type: "select",
+ options: {
+ options: [
+ {
+ value: "1",
+ label: "拥挤度",
+ },
+ {
+ value: "2",
+ label: "饱和度",
+ },
+ {
+ value: "3",
+ label: "交通组成特征指数",
+ },
+ ],
+ },
+ },
+ {
+ label: "时间范围:",
+ key: "time",
+ // required: true,
+ type: "datePicker",
+ options: {
+ format: "yyyy-MM-dd",
+ type: "daterange",
+ },
+ },
+];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue
index 39244c3f..e365ea3e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorQuery/index.vue
@@ -1,12 +1,19 @@
@@ -29,8 +36,7 @@
@@ -38,11 +44,18 @@