gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复detection一些问题

Browse Source
This commit is contained in:
chenjinsong
2022-03-04 15:46:30 +08:00
parent b640da089a
commit 5bbda24a17
3 changed files with 117 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/api.js
View File

@@ -89,7 +89,7 @@ export const api = {
}, },
performanceEvent: { performanceEvent: {
eventSeverityTrend: '/interface/detection/performance/filter/severityTrend', eventSeverityTrend: '/interface/detection/performance/filter/severityTrend',
securityType: '/interface/detection/performance/filter/eventType', eventType: '/interface/detection/performance/filter/eventType',
eventSeverity: '/interface/detection/performance/filter/severity', eventSeverity: '/interface/detection/performance/filter/severity',
activeEntity: '/interface/detection/performance/filter/activeEntity', activeEntity: '/interface/detection/performance/filter/activeEntity',
listBasic: '/interface/detection/performance/list/basic', listBasic: '/interface/detection/performance/list/basic',
@@ -139,11 +139,11 @@ export async function getData (url, params = {}, isQueryList) {
reject(response) reject(response)
} }
}) })
}catch(e) { } catch (e) {
reject(e) reject(e)
} }
}).catch(response => { }).catch(response => {
console.error(response) console.error(response)
}) })
return await request return await request
} }

166
src/views/detections/Index.vue
View File

@@ -107,7 +107,7 @@ import DetectionFilter from '@/views/detections/DetectionFilter'
import DetectionList from '@/views/detections/DetectionList' import DetectionList from '@/views/detections/DetectionList'
import Pagination from '@/components/common/Pagination' import Pagination from '@/components/common/Pagination'
import { defaultPageSize, detectionPageType } from '@/utils/constants' import { defaultPageSize, detectionPageType } from '@/utils/constants'
import { getNowTime, getSecond,rTime } from '@/utils/date-util' import { getNowTime, getSecond, rTime } from '@/utils/date-util'
import { ref } from 'vue' import { ref } from 'vue'
import * as echarts from 'echarts' import * as echarts from 'echarts'
import { multipleBarOption, pieForSeverity, activeAttackBar, getAttackColor, getSeverityColor, getSeriesIndex } from '@/views/detections/options/detectionOptions' import { multipleBarOption, pieForSeverity, activeAttackBar, getAttackColor, getSeverityColor, getSeriesIndex } from '@/views/detections/options/detectionOptions'
@@ -203,8 +203,8 @@ export default {
data: [] // 从接口动态获取，本项在获得数据后需要特殊处理左边框颜色 data: [] // 从接口动态获取，本项在获得数据后需要特殊处理左边框颜色
}, },
{ {
title: this.$t('detections.securityType'), title: this.$t('detections.eventType'),
column: 'securityType', column: 'eventType',
collapse: false, collapse: false,
value: [], value: [],
data: [] // 从接口动态获取 data: [] // 从接口动态获取
@@ -219,15 +219,15 @@ export default {
categoryPerData: [], categoryPerData: [],
activeAttackOption: null, activeAttackOption: null,
activeAttackData: [], activeAttackData: [],
eventSeverityData:[], eventSeverityData: [],
statisticsSeverityData:[], statisticsSeverityData: [],
statisticsCategoryData:[], statisticsCategoryData: [],
statisticsActiveAttackData:[], statisticsActiveAttackData: [],
isEventSeverityNoData:false, isEventSeverityNoData: false,
isStatisticsSeverityNoData:false, isStatisticsSeverityNoData: false,
isStatisticsCategoryNoData:false, isStatisticsCategoryNoData: false,
isStatisticsActiveAttackNoData:false, isStatisticsActiveAttackNoData: false,
loading: false, loading: false
} }
}, },
methods: { methods: {
@@ -235,7 +235,7 @@ export default {
initEventSeverityTrendData (params) { initEventSeverityTrendData (params) {
this.loading = true this.loading = true
getData(api.detection[this.pageType].eventSeverityTrend, params).then(data => { getData(api.detection[this.pageType].eventSeverityTrend, params).then(data => {
/*data = [ /* data = [
{ {
"stat_time": "2022-01-01T10:07:03.008Z", "stat_time": "2022-01-01T10:07:03.008Z",
"event_severity": "critical", "event_severity": "critical",
@@ -327,8 +327,8 @@ export default {
"event_severity": "info", "event_severity": "info",
"count": 27 "count": 27
}, },
]*/ ] */
/*data2 = [ /* data2 = [
{ {
legend: 'critical', legend: 'critical',
values: [[1435781430781, '999'], [1435781431781, '222'], [1435781432781, '11'], [1435781433781, '3']] values: [[1435781430781, '999'], [1435781431781, '222'], [1435781432781, '11'], [1435781433781, '3']]
@@ -346,33 +346,31 @@ export default {
legend: 'info', legend: 'info',
values: [[1435781430781, '5'], [1435781431781, '7'], [1435781432781, '5'], [1435781433781, '8']] values: [[1435781430781, '5'], [1435781431781, '7'], [1435781432781, '5'], [1435781433781, '8']]
} }
]*/ ] */
this.eventSeverityData = data this.eventSeverityData = data
if (!this.$_.isEmpty(data)) { if (!this.$_.isEmpty(data)) {
let dataMap = new Map() const dataMap = new Map()
data.forEach(item => { data.forEach(item => {
if(item.eventSeverity){ if (item.eventSeverity) {
if(!dataMap.has(item.eventSeverity)){ if (!dataMap.has(item.eventSeverity)) {
let count = [[item.statTime,item.count]] const count = [[item.statTime, item.count]]
dataMap.set(item.eventSeverity,count) dataMap.set(item.eventSeverity, count)
}else { } else {
dataMap.get(item.eventSeverity).push([item.statTime,item.count]) dataMap.get(item.eventSeverity).push([item.statTime, item.count])
} }
} }
}) })
const chartDom = document.getElementById(`eventSeverityTrendBar${this.pageType}`) const chartDom = document.getElementById(`eventSeverityTrendBar${this.pageType}`)
const eventSeverityTrendOption = this.$_.cloneDeep(multipleBarOption) const eventSeverityTrendOption = this.$_.cloneDeep(multipleBarOption)
dataMap.forEach(function(value,key){ dataMap.forEach(function (value, key) {
eventSeverityTrendOption.series[Number(getSeriesIndex(key))].data = value.map(v => Number(v[1])) eventSeverityTrendOption.series[Number(getSeriesIndex(key))].data = value.map(v => Number(v[1]))
}); })
eventSeverityTrendOption.xAxis.data = dataMap.get('critical').map(v =>rTime(v[0])) eventSeverityTrendOption.xAxis.data = dataMap.get('critical').map(v => rTime(v[0]))
const detectionChart = echarts.init(chartDom) const detectionChart = echarts.init(chartDom)
detectionChart.setOption(eventSeverityTrendOption) detectionChart.setOption(eventSeverityTrendOption)
//this.isEventSeverityNoData = false // this.isEventSeverityNoData = false
} else {
// this.isEventSeverityNoData = true
}else {
//this.isEventSeverityNoData = true
} }
}).catch(error => { }).catch(error => {
@@ -386,7 +384,7 @@ export default {
// 初始化左侧事件严重等级和小饼图 // 初始化左侧事件严重等级和小饼图
initEventSeverityData (params) { initEventSeverityData (params) {
getData(api.detection[this.pageType].eventSeverity, params).then(data => { getData(api.detection[this.pageType].eventSeverity, params).then(data => {
/*data = [ /* data = [
{ {
eventSeverity: 'critical', eventSeverity: 'critical',
count: 1048 count: 1048
@@ -403,9 +401,9 @@ export default {
eventSeverity: 'info', eventSeverity: 'info',
count: 300 count: 300
} }
]*/ ] */
this.statisticsSeverityData = data this.statisticsSeverityData = data
//this.isStatisticsSeverityNoData = true // this.isStatisticsSeverityNoData = true
if (!this.$_.isEmpty(data)) { if (!this.$_.isEmpty(data)) {
this.filterData[this.pageType][0].data = data.map(r => ({ label: r.eventSeverity, value: r.eventSeverity, count: r.count })) this.filterData[this.pageType][0].data = data.map(r => ({ label: r.eventSeverity, value: r.eventSeverity, count: r.count }))
const eventSeverityOption = this.$_.cloneDeep(pieForSeverity) const eventSeverityOption = this.$_.cloneDeep(pieForSeverity)
@@ -415,15 +413,15 @@ export default {
const chartDom = document.getElementById(`eventSeverityPie${this.pageType}`) const chartDom = document.getElementById(`eventSeverityPie${this.pageType}`)
const detectionChart = echarts.init(chartDom) const detectionChart = echarts.init(chartDom)
detectionChart.setOption(eventSeverityOption) detectionChart.setOption(eventSeverityOption)
//this.isStatisticsSeverityNoData = false // this.isStatisticsSeverityNoData = false
} }
}).catch(error => { }).catch(error => {
}) })
}, },
initSecurityTypeData (params) { initEventTypeData (params) {
getData(api.detection[this.pageType].securityType, params).then(data => { getData(api.detection[this.pageType].eventType, params).then(data => {
/*data = [ /* data = [
{ {
attackType: 'command and control', attackType: 'command and control',
count: 1048 count: 1048
@@ -443,23 +441,42 @@ export default {
attackType: 'ddos', attackType: 'ddos',
count: 50 count: 50
} }
]*/ ] */
this.statisticsCategoryData = data this.statisticsCategoryData = data
//this.isStatisticsCategoryNoData = true
if (!this.$_.isEmpty(data)) { if (!this.$_.isEmpty(data)) {
this.filterData[this.pageType][1].data = data.map(r => ({ this.filterData[this.pageType][1].data = data.map(r => ({
label: r.attackType, label: r.eventType,
value: r.attackType, value: r.eventType,
count: r.count count: r.count
})) }))
const chartDom = document.getElementById(`detectionCategoryPer${this.pageType}`) const chartDom = document.getElementById(`detectionCategoryPer${this.pageType}`)
const detectionChart = echarts.init(chartDom) const detectionChart = echarts.init(chartDom)
const securityTypeOption = this.$_.cloneDeep(pieForSeverity) const securityTypeOption = this.$_.cloneDeep(pieForSeverity)
securityTypeOption.series[0].data = data.map(d => { securityTypeOption.series[0].data = data.map(d => {
return {value: d.count, name: d.attackType, itemStyle: {color: getAttackColor(d.attackType)}} return { value: d.count, name: d.eventType, itemStyle: { color: getAttackColor(d.eventType) } }
})
detectionChart.setOption(securityTypeOption)
}
}).catch(error => {
})
},
initSecurityTypeData (params) {
getData(api.detection[this.pageType].securityType, params).then(data => {
this.statisticsCategoryData = data
if (!this.$_.isEmpty(data)) {
this.filterData[this.pageType][1].data = data.map(r => ({
label: r.securityType,
value: r.securityType,
count: r.count
}))
const chartDom = document.getElementById(`detectionCategoryPer${this.pageType}`)
const detectionChart = echarts.init(chartDom)
const securityTypeOption = this.$_.cloneDeep(pieForSeverity)
securityTypeOption.series[0].data = data.map(d => {
return { value: d.count, name: d.securityType, itemStyle: { color: getAttackColor(d.securityType) } }
}) })
detectionChart.setOption(securityTypeOption) detectionChart.setOption(securityTypeOption)
//this.isStatisticsCategoryNoData = false
} }
}).catch(error => { }).catch(error => {
@@ -467,7 +484,7 @@ export default {
}, },
initOffenderIpData (params) { initOffenderIpData (params) {
getData(api.detection[this.pageType].offenderIp, params).then(data => { getData(api.detection[this.pageType].offenderIp, params).then(data => {
/*data = [ /* data = [
{ {
offenderIp: '192.168.12.21', offenderIp: '192.168.12.21',
count: 99999 count: 99999
@@ -516,7 +533,7 @@ export default {
offenderIp: '193.168.52.21', offenderIp: '193.168.52.21',
count: 55355 count: 55355
} }
]*/ ] */
this.statisticsActiveAttackData = data this.statisticsActiveAttackData = data
if (!this.$_.isEmpty(data)) { if (!this.$_.isEmpty(data)) {
@@ -525,33 +542,33 @@ export default {
value: r.offenderIp, value: r.offenderIp,
count: r.count count: r.count
})) }))
const {showMore, showIndex} = this.computeFilterPage(this.filterData[this.pageType][4].data) const { showMore, showIndex } = this.computeFilterPage(this.filterData[this.pageType][4].data)
this.filterData[this.pageType][4].showMore = showMore this.filterData[this.pageType][4].showMore = showMore
this.filterData[this.pageType][4].showIndex = showIndex this.filterData[this.pageType][4].showIndex = showIndex
const chartDom = document.getElementById(`detectionActiveAttacker${this.pageType}`) const chartDom = document.getElementById(`detectionActiveAttacker${this.pageType}`)
const detectionChart = echarts.init(chartDom) const detectionChart = echarts.init(chartDom)
const offenderIpOption = this.$_.cloneDeep(activeAttackBar) const offenderIpOption = this.$_.cloneDeep(activeAttackBar)
data.sort(this.sortBy('count')); data.sort(this.sortBy('count'))
data = data.slice(0,5) data = data.slice(0, 5)
offenderIpOption.series[0].data = data.map(d => { offenderIpOption.series[0].data = data.map(d => {
return [d.count, d.offenderIp] return [d.count, d.offenderIp]
}).reverse() }).reverse()
detectionChart.setOption(offenderIpOption) detectionChart.setOption(offenderIpOption)
//this.isStatisticsActiveAttackNoData = false // this.isStatisticsActiveAttackNoData = false
} }
}).catch(error => { }).catch(error => {
}) })
}, },
sortBy(i) { sortBy (i) {
return function(a,b) { return function (a, b) {
return b[i] - a[i] return b[i] - a[i]
} }
}, },
initVictimIpData (params) { initVictimIpData (params) {
getData(api.detection[this.pageType].victimIp, params).then(data => { getData(api.detection[this.pageType].victimIp, params).then(data => {
/*data = [ /* data = [
{ {
victimIp: '1.2.6.8', victimIp: '1.2.6.8',
count: 50 count: 50
@@ -636,7 +653,7 @@ export default {
victimIp: '1.2.6.88', victimIp: '1.2.6.88',
count: 50 count: 50
} }
]*/ ] */
this.filterData[this.pageType][2].data = data.map(r => ({ label: r.victimIp, value: r.victimIp, count: r.count })) this.filterData[this.pageType][2].data = data.map(r => ({ label: r.victimIp, value: r.victimIp, count: r.count }))
const { showMore, showIndex } = this.computeFilterPage(this.filterData[this.pageType][2].data) const { showMore, showIndex } = this.computeFilterPage(this.filterData[this.pageType][2].data)
this.filterData[this.pageType][2].showMore = showMore this.filterData[this.pageType][2].showMore = showMore
@@ -647,12 +664,12 @@ export default {
}, },
initVictimLocationData (params) { initVictimLocationData (params) {
getData(api.detection[this.pageType].victimLocation, params).then(data => { getData(api.detection[this.pageType].victimLocation, params).then(data => {
/*data = [ /* data = [
{ {
victimLocationCountry: 'china', victimLocationCountry: 'china',
count: 50 count: 50
} }
]*/ ] */
this.filterData[this.pageType][3].data = data.map(r => ({ label: r.victimLocationCountry, value: r.victimLocationCountry, count: r.count })) this.filterData[this.pageType][3].data = data.map(r => ({ label: r.victimLocationCountry, value: r.victimLocationCountry, count: r.count }))
const { showMore, showIndex } = this.computeFilterPage(this.filterData[this.pageType][3].data) const { showMore, showIndex } = this.computeFilterPage(this.filterData[this.pageType][3].data)
this.filterData[this.pageType][3].showMore = showMore this.filterData[this.pageType][3].showMore = showMore
@@ -663,12 +680,12 @@ export default {
}, },
initOffenderLocationData (params) { initOffenderLocationData (params) {
getData(api.detection[this.pageType].offenderLocation, params).then(data => { getData(api.detection[this.pageType].offenderLocation, params).then(data => {
/*data = [ /* data = [
{ {
offenderLocationCountry: 'china', offenderLocationCountry: 'china',
count: 50 count: 50
} }
]*/ ] */
this.filterData[this.pageType][5].data = data.map(r => ({ label: r.offenderLocationCountry, value: r.offenderLocationCountry, count: r.count })) this.filterData[this.pageType][5].data = data.map(r => ({ label: r.offenderLocationCountry, value: r.offenderLocationCountry, count: r.count }))
const { showMore, showIndex } = this.computeFilterPage(this.filterData[this.pageType][5].data) const { showMore, showIndex } = this.computeFilterPage(this.filterData[this.pageType][5].data)
this.filterData[this.pageType][5].showMore = showMore this.filterData[this.pageType][5].showMore = showMore
@@ -679,7 +696,7 @@ export default {
}, },
initActiveEntity (params) { initActiveEntity (params) {
getData(api.detection[this.pageType].activeEntity, params).then(data => { getData(api.detection[this.pageType].activeEntity, params).then(data => {
/*data = [ /* data = [
{ {
name: 'csdn.net', name: 'csdn.net',
count: 250 count: 250
@@ -692,7 +709,7 @@ export default {
name: '2.3.2.2', name: '2.3.2.2',
count: 50 count: 50
} }
]*/ ] */
this.statisticsActiveAttackData = data this.statisticsActiveAttackData = data
if (!this.$_.isEmpty(data)) { if (!this.$_.isEmpty(data)) {
const chartDom = document.getElementById(`detectionActiveAttacker${this.pageType}`) const chartDom = document.getElementById(`detectionActiveAttacker${this.pageType}`)
@@ -722,7 +739,7 @@ export default {
} }
getData(api.detection[this.pageType].listBasic, params).then(data => { getData(api.detection[this.pageType].listBasic, params).then(data => {
if (this.pageType === detectionPageType.securityEvent) { if (this.pageType === detectionPageType.securityEvent) {
/*data = [ /* data = [
{ {
eventId: 1212, eventId: 1212,
securityType: 'ddos', securityType: 'ddos',
@@ -883,9 +900,9 @@ export default {
durationMs: 60000, durationMs: 60000,
startTime: 1111111111 startTime: 1111111111
} }
]*/ ] */
} else if (this.pageType === detectionPageType.performanceEvent) { } else if (this.pageType === detectionPageType.performanceEvent) {
/*data = [ /* data = [
{ {
entityType: 'ip', entityType: 'ip',
eventType: 'Dns error', eventType: 'Dns error',
@@ -1014,7 +1031,7 @@ export default {
durationMs: 60000, durationMs: 60000,
startTime: 1111111111 startTime: 1111111111
} }
]*/ ] */
} }
this.listData = data this.listData = data
@@ -1029,7 +1046,7 @@ export default {
this.$refs.dateTimeRange.quickChange(value) this.$refs.dateTimeRange.quickChange(value)
} }
}, },
initNoData(){ initNoData () {
this.isEventSeverityNoData = false this.isEventSeverityNoData = false
this.isStatisticsSeverityNoData = false this.isStatisticsSeverityNoData = false
this.isStatisticsCategoryNoData = false this.isStatisticsCategoryNoData = false
@@ -1073,14 +1090,15 @@ export default {
} }
this.initEventSeverityTrendData(params) this.initEventSeverityTrendData(params)
this.initEventSeverityData(params) this.initEventSeverityData(params)
this.initSecurityTypeData(params)
if (this.pageType === detectionPageType.securityEvent) { if (this.pageType === detectionPageType.securityEvent) {
this.initOffenderIpData(params) this.initOffenderIpData(params)
this.initOffenderLocationData(params) this.initOffenderLocationData(params)
this.initVictimIpData(params) this.initVictimIpData(params)
this.initVictimLocationData(params) this.initVictimLocationData(params)
this.initSecurityTypeData(params)
} else if (this.pageType === detectionPageType.performanceEvent) { } else if (this.pageType === detectionPageType.performanceEvent) {
this.initActiveEntity(params) this.initActiveEntity(params)
this.initEventTypeData(params)
} }
}, },
queryListTotal () { queryListTotal () {
@@ -1132,12 +1150,12 @@ export default {
if (!n || n.length === 0) { if (!n || n.length === 0) {
this.timeout = setTimeout(() => { this.timeout = setTimeout(() => {
this.isEventSeverityNoData = true this.isEventSeverityNoData = true
//this.$set(this.isEventSeverityNoData ,true) // this.$set(this.isEventSeverityNoData ,true)
this.loading = false this.loading = false
}, 500) }, 500)
} else { } else {
clearTimeout(this.timeout) clearTimeout(this.timeout)
//this.$set(this.isEventSeverityNoData ,false) // this.$set(this.isEventSeverityNoData ,false)
this.isEventSeverityNoData = false this.isEventSeverityNoData = false
this.loading = false this.loading = false
} }
@@ -1148,12 +1166,12 @@ export default {
handler (n) { handler (n) {
if (!n || n.length === 0) { if (!n || n.length === 0) {
this.timeout = setTimeout(() => { this.timeout = setTimeout(() => {
//this.$set(this.isStatisticsSeverityNoData ,true) // this.$set(this.isStatisticsSeverityNoData ,true)
this.isStatisticsSeverityNoData = true this.isStatisticsSeverityNoData = true
}, 500) }, 500)
} else { } else {
clearTimeout(this.timeout) clearTimeout(this.timeout)
//this.$set(this.isStatisticsSeverityNoData ,false) // this.$set(this.isStatisticsSeverityNoData ,false)
this.isStatisticsSeverityNoData = false this.isStatisticsSeverityNoData = false
} }
} }
@@ -1164,11 +1182,11 @@ export default {
if (!n || n.length === 0) { if (!n || n.length === 0) {
this.timeout = setTimeout(() => { this.timeout = setTimeout(() => {
this.isStatisticsCategoryNoData = true this.isStatisticsCategoryNoData = true
//this.$set(this.isStatisticsCategoryNoData ,true) // this.$set(this.isStatisticsCategoryNoData ,true)
}, 500) }, 500)
} else { } else {
clearTimeout(this.timeout) clearTimeout(this.timeout)
//this.$set(this.isStatisticsCategoryNoData ,false) // this.$set(this.isStatisticsCategoryNoData ,false)
this.isStatisticsCategoryNoData = false this.isStatisticsCategoryNoData = false
} }
} }
@@ -1179,11 +1197,11 @@ export default {
if (!n || n.length === 0) { if (!n || n.length === 0) {
this.timeout = setTimeout(() => { this.timeout = setTimeout(() => {
this.isStatisticsActiveAttackNoData = true this.isStatisticsActiveAttackNoData = true
//this.$set(this.isStatisticsActiveAttackNoData ,true) // this.$set(this.isStatisticsActiveAttackNoData ,true)
}, 500) }, 500)
} else { } else {
clearTimeout(this.timeout) clearTimeout(this.timeout)
//this.$set(this.isStatisticsActiveAttackNoData ,false) // this.$set(this.isStatisticsActiveAttackNoData ,false)
this.isStatisticsActiveAttackNoData = false this.isStatisticsActiveAttackNoData = false
} }
} }

27
src/views/detections/overview/DetectionSecurityEventOverview.vue
View File

@@ -117,7 +117,7 @@
<div class="overview__title">{{$t('detections.relatedDetections')}}</div> <div class="overview__title">{{$t('detections.relatedDetections')}}</div>
<div class="overview__row-timeline"> <div class="overview__row-timeline">
<div class="row-timeline" v-for="event in events" :key="event"> <div class="row-timeline" v-for="event in events" :key="event">
<div class="row-timeline__time-info" :style="event.startTime === basicInfo.startTime ? 'color: #333;font-weight: bold;' : ''">{{formatT0(event.startTime)}}</div> <div class="row-timeline__time-info" :style="event.startTime === basicInfo.startTime ? 'color: #333;font-weight: bold;' : ''">{{formatT0(event)}}</div>
<div class="row-timeline__line"> <div class="row-timeline__line">
<div class="line-point-larger" v-if="event.startTime === basicInfo.startTime"> <div class="line-point-larger" v-if="event.startTime === basicInfo.startTime">
<div class="line-point"></div> <div class="line-point"></div>
@@ -154,7 +154,8 @@
import { get } from '@/utils/http' import { get } from '@/utils/http'
import { api } from '@/utils/api' import { api } from '@/utils/api'
import { getMillisecond } from '@/utils/date-util' import { getMillisecond } from '@/utils/date-util'
import { eventSeverityColor } from '@/utils/constants' import { eventSeverityColor, unitTypes } from '@/utils/constants'
import unitConvert from '@/utils/unit-convert'
export default { export default {
name: 'DetectionOverview', name: 'DetectionOverview',
props: { props: {
@@ -170,8 +171,23 @@ export default {
}, },
computed: { computed: {
formatT0 () { formatT0 () {
return function (startTime) { return function (event) {
return startTime === this.basicInfo.startTime ? 'T0' : 'T0-10m' const diffSeconds = event.diffSeconds
if (diffSeconds === 0) {
return 'T0'
}
const eventStartTime = event.startTime
const entityStartTime = this.basicInfo ? this.basicInfo.startTime : ''
if (!this.$_.isEmpty(diffSeconds) && !this.$_.isEmpty(eventStartTime) && !this.$_.isEmpty(entityStartTime)) {
const suffix = unitConvert(diffSeconds, unitTypes.time, 's', null, 0).join('')
if (eventStartTime > entityStartTime) {
return `T0+${suffix}`
} else if (eventStartTime < entityStartTime) {
return `T0-${suffix}`
}
}
return ''
} }
} }
}, },
@@ -179,6 +195,7 @@ export default {
getMillisecond, getMillisecond,
query () { query () {
Promise.all([this.queryBasic(), this.queryEvent()]).then(responses => { Promise.all([this.queryBasic(), this.queryEvent()]).then(responses => {
console.info(responses)
responses[0] && (this.basicInfo = responses[0]) responses[0] && (this.basicInfo = responses[0])
responses[1] && (this.events = responses[1]) responses[1] && (this.events = responses[1])
}) })
@@ -201,7 +218,7 @@ export default {
queryEvent () { queryEvent () {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
try { try {
get(api.detection.securityEvent.overviewEvent, { eventId: this.detection.eventId, offenderIp: this.detection.offenderIp, victimIp: this.detection.victimIp }).then(response => { get(api.detection.securityEvent.overviewEvent, { startTime: this.detection.startTime, offenderIp: this.detection.offenderIp, victimIp: this.detection.victimIp }).then(response => {
if (response.code === 200) { if (response.code === 200) {
resolve(response.data.result) resolve(response.data.result)
} else { } else {