From bae690704ddd81b3c2c957b4ce01fd7c121c3d32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Mon, 12 Aug 2024 17:29:50 +0800
Subject: [PATCH] =?UTF-8?q?CN-1676=20fix:=201=E3=80=81=E4=BF=AE=E5=A4=8Dde?=
 =?UTF-8?q?tection=E7=9A=84ruleType=E4=B8=BAthreshold=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8A=98=E7=BA=BF=E5=9B=BE=E5=8D=95=E4=B8=AA?=
 =?UTF-8?q?=E7=82=B9=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81ruleType=E4=B8=BAsequence=E6=97=B6stage?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E8=AF=A6=E6=83=85=E7=9A=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/detections/detection-overview.scss  |  3 ++
 src/components/layout/Header.vue              | 15 ++++---
 .../detections/options/detectionOptions.js    |  7 +++-
 .../detections/overview/SequenceOverview.vue  | 40 ++++++-------------
 .../detections/overview/ThresholdOverview.vue |  2 +-
 .../overview/detectionDetailMixin.js          | 15 ++++++-
 6 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/src/assets/css/components/views/detections/detection-overview.scss b/src/assets/css/components/views/detections/detection-overview.scss
index 044dba4d..a485ec24 100644
--- a/src/assets/css/components/views/detections/detection-overview.scss
+++ b/src/assets/css/components/views/detections/detection-overview.scss
@@ -57,6 +57,9 @@ $color-regular: var(--el-text-color-regular);
         line-height: 14px;
         word-break: normal;
       }
+      .row__label__capitalize {
+        text-transform: capitalize;
+      }
 
       .row__charts {
         height: 20px;
diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue
index 9e101864..3b8de2dc 100644
--- a/src/components/layout/Header.vue
+++ b/src/components/layout/Header.vue
@@ -500,12 +500,15 @@ export default {
     generateBreadcrumb (breadcrumb, menus, tab) {
       const menu = menus.find(m => m.route === this.route)
       if (menu) {
-        breadcrumb.unshift({
-          code: menu.code,
-          value: menu.i18n ? this.$t(menu.i18n) : menu.name,
-          route: menu.route,
-          type: menu.type
-        })
+        if (menu.code !== 'securityEvents') {
+          breadcrumb.unshift({
+            code: menu.code,
+            value: menu.i18n ? this.$t(menu.i18n) : menu.name,
+            route: menu.route,
+            type: menu.type
+          })
+        }
+
         return true
       } else {
         for (let i = 0; i < menus.length; i++) {
diff --git a/src/views/detections/options/detectionOptions.js b/src/views/detections/options/detectionOptions.js
index 8da9f82f..be2bbcbf 100644
--- a/src/views/detections/options/detectionOptions.js
+++ b/src/views/detections/options/detectionOptions.js
@@ -467,7 +467,7 @@ export const lineOption = {
     }
   },
   yAxis: {
-    max: 100
+    // max: 100
   },
   grid: {
     top: '12px',
@@ -482,5 +482,8 @@ export const lineOption = {
       color: '#ff9a79',
       symbol: 'none'
     }
-  ]
+  ],
+  tooltip: {
+    trigger: 'axis'
+  }
 }
diff --git a/src/views/detections/overview/SequenceOverview.vue b/src/views/detections/overview/SequenceOverview.vue
index 8f3216f2..ae54f04a 100644
--- a/src/views/detections/overview/SequenceOverview.vue
+++ b/src/views/detections/overview/SequenceOverview.vue
@@ -8,34 +8,20 @@
         </div>
       </div>
 
-      <div class="overview__title">{{ $t('detection.detail.stage') }}1</div>
-      <div class="overview__row">
-        <div class="row__label">Dns_query</div>
-        <div class="row__content">{{ $_.get(myDetection, 'eventInfoList[0].domain', '-') || '-' }}</div>
-      </div>
-      <div class="overview__row">
-        <div class="row__label">Time</div>
-        <div class="row__content">
-          <i class="cn-icon cn-icon-time2 row__content__icon"></i>
-          {{ myDetection.startTime ? dateFormatByAppearance(myDetection.startTime) : '-' }}
+      <div v-for="(obj, index) in myDetection.eventInfoList" :key="obj.stage_id">
+        <div class="overview__title margin-t-18">{{ $t('detection.detail.stage') }}{{ index + 1 }}</div>
+        <div v-for="(item, fields) in obj" :key="fields">
+          <div class="overview__row" v-if="fields !== 'stage_id'">
+            <div class="row__label row__label__capitalize">{{ fields }}</div>
+            <div class="row__content">{{ item || '-' }}</div>
+          </div>
         </div>
-      </div>
-      <div class="overview__title">{{ $t('detection.detail.stage') }}2</div>
-      <div class="overview__row">
-        <div class="row__label">Decoded_as</div>
-        <div class="row__content">{{ $_.get(myDetection, 'eventInfoList[1].client_ip', '-') || '-' }}</div>
-      </div>
-
-      <div class="overview__row">
-        <div class="row__label">APP</div>
-        <div class="row__content">{{ $_.get(myDetection, 'eventInfoList[1].app_transition', '-') || '-' }}</div>
-      </div>
-
-      <div class="overview__row">
-        <div class="row__label">Time</div>
-        <div class="row__content">
-          <i class="cn-icon cn-icon-time2 row__content__icon"></i>
-          {{ myDetection.startTime ? dateFormatByAppearance(myDetection.startTime) : '-' }}
+        <div class="overview__row">
+          <div class="row__label">Time</div>
+          <div class="row__content">
+            <i class="cn-icon cn-icon-time2 row__content__icon"></i>
+            {{ myDetection.startTime ? dateFormatByAppearance(myDetection.startTime) : '-' }}
+          </div>
         </div>
       </div>
 
diff --git a/src/views/detections/overview/ThresholdOverview.vue b/src/views/detections/overview/ThresholdOverview.vue
index cd17ebcd..87806635 100644
--- a/src/views/detections/overview/ThresholdOverview.vue
+++ b/src/views/detections/overview/ThresholdOverview.vue
@@ -12,7 +12,7 @@
         <div class="row__content1">
           <div class="row__content__charts" :id="`myChart${detection.eventId}`"></div>
         </div>
-        <div class="row__content1">
+        <div class="row__content1" v-if="seriesDataNum>1">
           <div class="charts__visual__map"></div>
         </div>
       </div>
diff --git a/src/views/detections/overview/detectionDetailMixin.js b/src/views/detections/overview/detectionDetailMixin.js
index 647f5457..1e555d34 100644
--- a/src/views/detections/overview/detectionDetailMixin.js
+++ b/src/views/detections/overview/detectionDetailMixin.js
@@ -2,7 +2,7 @@ import { detectionEventType, detectionRuleType } from '@/utils/constants'
 import { getMillisecond, getSecond } from '@/utils/date-util'
 import axios from 'axios'
 import { api } from '@/utils/api'
-import { lineOption } from '@/views/detections/options/detectionOptions'
+import { getSeverityColor, lineOption } from '@/views/detections/options/detectionOptions'
 import { markRaw } from 'vue'
 import * as echarts from 'echarts'
 
@@ -21,7 +21,8 @@ export default {
       timeData: [],
       isGroup: 0,
       myChart: null,
-      lineOption: lineOption
+      lineOption: lineOption,
+      seriesDataNum: 0
     }
   },
   mounted () {
@@ -72,6 +73,16 @@ export default {
               seriesData.push([getMillisecond(JSON.parse(item.statTime)), item.recordsNums])
             })
             this.lineOption.series[0].data = seriesData
+            this.lineOption.series[0].color = getSeverityColor(res.data.data.result[0].severity) || '#ff9a79'
+
+            this.seriesDataNum = seriesData.length
+            if (this.seriesDataNum <= 1) {
+              this.lineOption.series[0].symbol = 'circle'
+              this.lineOption.series[0].symbolSize = 9
+            } else {
+              this.lineOption.series[0].symbol = 'none'
+            }
+
             this.myChart = markRaw(echarts.init(document.getElementById('myChart' + this.detection.eventId)))
             this.myChart.setOption(this.lineOption)
           } else {