From 6ed9c4f5fe9864ba8723b2b5eb2c809081cc14b9 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 10 Feb 2023 14:20:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddetection=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E6=9F=B1=E7=8A=B6=E5=9B=BE=E6=95=B0=E6=8D=AE=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=8C=89=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8Dapp=E5=9B=BE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts2/charts/networkOverview/NetworkOverviewApps.vue   | 2 +-
 src/views/detections/Index.vue                               | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
index aebbad7f..0182bfc5 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
@@ -247,7 +247,7 @@ export default {
     handleData (prevRequest, request, _t) {
       this.toggleLoading(true)
       Promise.all([prevRequest, request]).then(res => {
-        this.isNoData = (res[0].data.result.length && res[1].data.result.length) === 0
+        this.isNoData = res[0].data.result.length === 0 && res[1].data.result.length === 0
         if (this.isNoData) {
           this.appData = this.appData.map(t => {
             return {
diff --git a/src/views/detections/Index.vue b/src/views/detections/Index.vue
index 3c30171e..257fcb11 100644
--- a/src/views/detections/Index.vue
+++ b/src/views/detections/Index.vue
@@ -294,7 +294,7 @@ export default {
           const chartDom = document.getElementById(`eventSeverityTrendBar${this.pageType}`)
           const eventSeverityTrendOption = this.$_.cloneDeep(multipleBarOption)
 
-          const xData = []
+          let xData = []
           dataMap.forEach(function (value) {
             // eventSeverityTrendOption.series[Number(getSeriesIndex(key))].data = value.map(v => Number(v[1]))
             value.forEach(item => {
@@ -303,6 +303,9 @@ export default {
               }
             })
           })
+          xData = xData.sort((a, b) => {
+            return new Date(a) - new Date(b)
+          })
           eventSeverityTrendOption.series.forEach(serie => {
             const seriesData = []
             xData.forEach(item => {