From 3df21e1960fe03918d00192e025715d77e8c0004 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Mon, 19 Feb 2024 09:25:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BC=A0=E5=8F=82?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eventDetection/components/eventQuery/index.vue         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
index 500073ad..77ce8d43 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
@@ -147,6 +147,7 @@ export default {
     },
     searchQuery() {
       let startTime = "";
+      let qType = this.type == 'date' ? 'day' : this.type;
       if (this.type == "quarter") {
         let year = moment().year();
         if (this.quarter == 1) {
@@ -166,7 +167,7 @@ export default {
 
       //感知事件趋势
       getWarningTrend({
-        "type": this.type,
+        "type": qType,
         "sectionId": this.selectId,
         "createTime": startTime,
         "direction": this.direction,
@@ -233,7 +234,7 @@ export default {
 
       //类型占比
       getWarningSectionType({
-        "type": this.type,
+        "type": qType,
         "sectionId": this.selectId,
         "createTime": startTime,
         "direction": this.direction,
@@ -324,7 +325,7 @@ export default {
       })
       //路段范围内桩号分布
       getSectionMarkNumber({
-        "type": this.type,
+        "type": qType,
         "sectionId": this.selectId,
         "createTime": startTime,
         "direction": this.direction,

From 231d82c4695f2eb9ab10c06bb4bc67002b4aba6b Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Mon, 19 Feb 2024 10:21:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/control/event/event/FormEvent/index.vue             | 4 ++--
 .../perception/eventDetection/components/eventQuery/index.vue | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
index 8f219e30..5038ce60 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
@@ -158,8 +158,8 @@ export default {
           let endStakeMark = formData.endStakeMark;
           formData.dcEventAbnormalWeather.endStakeMark = (endStakeMark && endStakeMark.length > 0) ? ('K' + endStakeMark[0] + '+' + endStakeMark[1]) : '';
         }
-        console.log('formData',formData)
-        return;
+        // console.log('formData',formData)
+        // return;
         let stakeMark = formData.stakeMark;
 
         request({
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
index 77ce8d43..2241ecdb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
@@ -175,6 +175,7 @@ export default {
         if (res.code == 200) {
           let data = res.data;
           chart1.series[0].data = [];
+          chart1.xAxis.data = [];
           if (data.length > 0) {
             const maxObject = data.reduce((prev, current) => (current.number > prev.number ? current : prev));
             let xData = [];
@@ -332,7 +333,8 @@ export default {
       }).then(res => {
         chart3.series[0].data = [];
         chart3.series[1].data = [];
-        if (res.code == 200) {
+        chart3.xAxis.data = [];
+        if (res.code == 200 && res.data.length > 0) {
           let data = res.data;
           if (this.type != "quarter") {
             const maxObject = data.filter(it => it.sectionNumber > 0).reduce((prev, current) => (current.sectionNumber > prev.sectionNumber ? current : prev));