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 @@ -
{{ $t('detection.detail.stage') }}1
-
-
Dns_query
-
{{ $_.get(myDetection, 'eventInfoList[0].domain', '-') || '-' }}
-
-
-
Time
-
- - {{ myDetection.startTime ? dateFormatByAppearance(myDetection.startTime) : '-' }} +
+
{{ $t('detection.detail.stage') }}{{ index + 1 }}
+
+
+
{{ fields }}
+
{{ item || '-' }}
+
-
-
{{ $t('detection.detail.stage') }}2
-
-
Decoded_as
-
{{ $_.get(myDetection, 'eventInfoList[1].client_ip', '-') || '-' }}
-
- -
-
APP
-
{{ $_.get(myDetection, 'eventInfoList[1].app_transition', '-') || '-' }}
-
- -
-
Time
-
- - {{ myDetection.startTime ? dateFormatByAppearance(myDetection.startTime) : '-' }} +
+
Time
+
+ + {{ myDetection.startTime ? dateFormatByAppearance(myDetection.startTime) : '-' }} +
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 @@
-
+
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 {