diff --git a/src/assets/css/components/views/detections/detection-list/row.scss b/src/assets/css/components/views/detections/detection-list/row.scss index 4082d3d9..e00bfde4 100644 --- a/src/assets/css/components/views/detections/detection-list/row.scss +++ b/src/assets/css/components/views/detections/detection-list/row.scss @@ -59,6 +59,7 @@ width: 5px; height: 20px; border-radius: 12px; + margin-top: 2px; } .cn-detection__row { @@ -88,6 +89,7 @@ margin-left: 12px; font-size: xx-small; font-weight: bold; + margin-top: -1px; } .circle { @@ -95,7 +97,7 @@ height: 10px; border: 2px solid #da5656; border-radius: 10px; - margin-top: 4px; + margin-top: 1px; margin-right: 12px; } @@ -119,10 +121,12 @@ margin-right: 12px; } .detection-event-severity-block { + height: 20px; + line-height: 20px; font-size: 12px; color: #046EC9; font-weight: 500; - padding: 2px 10px; + padding: 0 10px; background: rgba(56,172,210,0.10); border: 1px solid #ADC7DB; box-shadow: 0 2px 4px 0 rgba(51,51,51,0.02); @@ -262,3 +266,8 @@ color: #FFD82D !important; } } + +.detection-list-icon { + margin-top: 1px; + font-size: 16px !important; +} diff --git a/src/components/common/TimeRange/DateTimeRange.vue b/src/components/common/TimeRange/DateTimeRange.vue index d78e2497..d492f65e 100644 --- a/src/components/common/TimeRange/DateTimeRange.vue +++ b/src/components/common/TimeRange/DateTimeRange.vue @@ -254,12 +254,14 @@ export default { const returnValue = () => { store.commit('setTimeFilter', { startTime: myStartTime.value, endTime: myEndTime.value, range: dateRangeValue.value }) cancelHttp() - const obj = rangeHistory.value.find(d => d.start === myStartTime.value && d.end === myEndTime.value) - if (!obj) { - rangeHistory.value.unshift({ - start: myStartTime.value, - end: myEndTime.value - }) + if (rangeHistory.value[0]) { + const d = rangeHistory.value[0] + if (d.start !== myStartTime.value || d.end !== myEndTime.value) { + rangeHistory.value.unshift({ + start: myStartTime.value, + end: myEndTime.value + }) + } } if (!rangeHistory.value[0]) { rangeHistory.value.unshift({ diff --git a/src/utils/static-data.js b/src/utils/static-data.js index 1741767f..b32ef407 100644 --- a/src/utils/static-data.js +++ b/src/utils/static-data.js @@ -476,9 +476,13 @@ export const detectionUnitList = { { value: 'library name2', knowledgeId: 9, label: 'Library name2' } ], intervalList: [ - { value: 'days', label: 'days' }, { value: 'hours', label: 'hours' }, { value: 'minutes', label: 'minutes' }, { value: 'seconds', label: 'seconds' } + ], + intervalListCN: [ + { value: 'hours', label: '小时' }, + { value: 'minutes', label: '分钟' }, + { value: 'seconds', label: '秒' } ] } diff --git a/src/views/detections/DetectionRow.vue b/src/views/detections/DetectionRow.vue index d7181a2b..b24a443a 100644 --- a/src/views/detections/DetectionRow.vue +++ b/src/views/detections/DetectionRow.vue @@ -17,11 +17,11 @@ :style="`background-color: ${eventSeverityColor[detection.eventSeverity]}`"> {{ detection.eventName || '-' }} - {{detection.offenderIp || '-'}} + {{detection.offenderIp || '-'}}
{{detection.domain}}
------- - {{detection.victimIp || '-'}} + {{detection.victimIp || '-'}}