fix: 1.新增报告时间范围添加国际化;2.detection跳转实体详情缺少参数
This commit is contained in:
@@ -25,7 +25,7 @@
|
|||||||
@change="timeConfigTypeChange"
|
@change="timeConfigTypeChange"
|
||||||
>
|
>
|
||||||
<template v-for="time in timeRuleList" :key="time.value">
|
<template v-for="time in timeRuleList" :key="time.value">
|
||||||
<el-option :label="time.name" :value="time.value"></el-option>
|
<el-option :label="$t(time.name)" :value="time.value"></el-option>
|
||||||
</template>
|
</template>
|
||||||
</el-select>
|
</el-select>
|
||||||
<template v-if="editObject.config.timeConfig.type === 'this'">
|
<template v-if="editObject.config.timeConfig.type === 'this'">
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
size="small"
|
size="small"
|
||||||
@change="()=>{ this.$forceUpdate() }">
|
@change="()=>{ this.$forceUpdate() }">
|
||||||
<template v-for="time in timeUnitList" :key="time.value">
|
<template v-for="time in timeUnitList" :key="time.value">
|
||||||
<el-option :label="time.name" :value="time.value"></el-option>
|
<el-option :label="$t(time.name)" :value="time.value"></el-option>
|
||||||
</template>
|
</template>
|
||||||
</el-select>
|
</el-select>
|
||||||
</template>
|
</template>
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
size="small"
|
size="small"
|
||||||
@change="()=>{ this.$forceUpdate() }">
|
@change="()=>{ this.$forceUpdate() }">
|
||||||
<template v-for="time in timeUnitList" :key="time.value">
|
<template v-for="time in timeUnitList" :key="time.value">
|
||||||
<el-option :label="time.name" :value="time.value"></el-option>
|
<el-option :label="$t(time.name)" :value="time.value"></el-option>
|
||||||
</template>
|
</template>
|
||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -2470,20 +2470,20 @@ export const reg = {
|
|||||||
|
|
||||||
export const report = {
|
export const report = {
|
||||||
timeRuleList: [
|
timeRuleList: [
|
||||||
{ name: 'today', value: 'today' },
|
{ name: 'overall.today', value: 'today' },
|
||||||
{ name: 'yesterday', value: 'yesterday' },
|
{ name: 'overall.yesterday', value: 'yesterday' },
|
||||||
{ name: 'this', value: 'this' },
|
{ name: 'overall.this', value: 'this' },
|
||||||
{ name: 'last', value: 'last' },
|
{ name: 'overall.last', value: 'last' },
|
||||||
{ name: 'previous', value: 'previous' },
|
{ name: 'overall.previous', value: 'previous' },
|
||||||
{ name: 'customize', value: 'customize' }
|
{ name: 'overall.customize', value: 'customize' }
|
||||||
],
|
],
|
||||||
timeUnitList: [
|
timeUnitList: [
|
||||||
{ name: 'minute', value: 'minute' },
|
{ name: 'overall.minute', value: 'minute' },
|
||||||
{ name: 'hour', value: 'hour' },
|
{ name: 'overall.hour', value: 'hour' },
|
||||||
{ name: 'day', value: 'day' },
|
{ name: 'overall.day', value: 'day' },
|
||||||
{ name: 'week', value: 'week' },
|
{ name: 'overall.week', value: 'week' },
|
||||||
{ name: 'month', value: 'month' },
|
{ name: 'overall.month', value: 'month' },
|
||||||
{ name: 'year', value: 'year' }
|
{ name: 'overall.year', value: 'year' }
|
||||||
],
|
],
|
||||||
scheduleTypeList: [
|
scheduleTypeList: [
|
||||||
{ name: 'report.daily', value: 'day' },
|
{ name: 'report.daily', value: 'day' },
|
||||||
|
|||||||
@@ -4,10 +4,10 @@
|
|||||||
<div class="overview__title">{{ $t('overall.remark') }}</div>
|
<div class="overview__title">{{ $t('overall.remark') }}</div>
|
||||||
<div class="overview__row">
|
<div class="overview__row">
|
||||||
<div class="row__content1" v-if="detection.eventType === 'Command and Control' && detection.isBuiltin == 1">
|
<div class="row__content1" v-if="detection.eventType === 'Command and Control' && detection.isBuiltin == 1">
|
||||||
<span class="row__content--link">{{detection.victimIp}}</span> communicated with <span class="row__content--link">{{detection.offenderIp}}</span> that was associated with the indicator of {{detection.eventName}} activity, {{$_.get(detection, 'eventInfoObj.ioc_value', '') || ''}}.
|
<span>{{detection.victimIp}}</span> communicated with <span>{{detection.offenderIp}}</span> that was associated with the indicator of {{detection.eventName}} activity, {{$_.get(detection, 'eventInfoObj.ioc_value', '') || ''}}.
|
||||||
</div>
|
</div>
|
||||||
<div class="row__content1" v-else-if="detection.eventType === 'Anonymity' && detection.isBuiltin == 1">
|
<div class="row__content1" v-else-if="detection.eventType === 'Anonymity' && detection.isBuiltin == 1">
|
||||||
<span class="row__content--link">{{detection.victimIp}}</span> communicated with <span class="row__content--link">{{detection.offenderIp}}</span> that was associated with the indicator of {{detection.eventName}}.
|
<span>{{detection.victimIp}}</span> communicated with <span>{{detection.offenderIp}}</span> that was associated with the indicator of {{detection.eventName}}.
|
||||||
</div>
|
</div>
|
||||||
<div class="row__content1" v-else>
|
<div class="row__content1" v-else>
|
||||||
{{ $_.get(basicInfo, 'ruleInfo.description', '-') || '-' }}
|
{{ $_.get(basicInfo, 'ruleInfo.description', '-') || '-' }}
|
||||||
@@ -364,7 +364,8 @@ import { changeI18nOfSeverity } from '@/utils/tools'
|
|||||||
export default {
|
export default {
|
||||||
name: 'DetectionOverview',
|
name: 'DetectionOverview',
|
||||||
props: {
|
props: {
|
||||||
detection: Object
|
detection: Object,
|
||||||
|
timeFilter: Object
|
||||||
},
|
},
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
@@ -504,7 +505,8 @@ export default {
|
|||||||
path: '/entity/detail',
|
path: '/entity/detail',
|
||||||
query: {
|
query: {
|
||||||
entityType: type,
|
entityType: type,
|
||||||
entityName: name
|
entityName: name,
|
||||||
|
range: this.timeFilter.dateRangeValue
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
window.open(href, '_blank')
|
window.open(href, '_blank')
|
||||||
|
|||||||
Reference in New Issue
Block a user