From 9bb99673532e69bcc774fb14abb85087b0245a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Tue, 24 Oct 2023 18:11:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84detection=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E8=AF=A6=E6=83=85=E7=9A=84=E5=9C=B0=E5=9D=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=85=B3=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=88=9D=E5=A7=8B=E5=8C=96=E4=B8=80=E7=9B=B4=E4=B8=BA?=
 =?UTF-8?q?text=E6=A8=A1=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/detections/DetectionSearch.vue      | 11 +++++
 .../DetectionSecurityEventOverview.vue        | 47 ++++++++++++++++---
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/views/detections/DetectionSearch.vue b/src/views/detections/DetectionSearch.vue
index 739a96e1..885ad3a7 100644
--- a/src/views/detections/DetectionSearch.vue
+++ b/src/views/detections/DetectionSearch.vue
@@ -6,6 +6,7 @@
             ref="search"
             :column-list="columnList[pageType]"
             :connection-list="connectionList"
+            :default-mode="defaultMode"
             class="advanced-search--show-list"
             :full-text="true"
             :show-list="showList"
@@ -22,6 +23,8 @@
 <script>
 import AdvancedSearch from '@/components/advancedSearch/Index'
 import { schemaDetectionSecurity } from '@/utils/static-data'
+import { useRoute } from 'vue-router'
+import { ref } from 'vue'
 export default {
   name: 'DetectionSearch',
   props: {
@@ -96,6 +99,14 @@ export default {
     }
   },
   emits: ['search'],
+  setup () {
+    // 根据地址栏添加mode，即text和tag模式，默认text
+    const { query } = useRoute()
+    const defaultMode = ref(query.mode || 'text')
+    return {
+      defaultMode
+    }
+  },
   methods: {
     /* search (metaList, formatSql) {
       let sql = formatSql
diff --git a/src/views/detections/overview/DetectionSecurityEventOverview.vue b/src/views/detections/overview/DetectionSecurityEventOverview.vue
index aad60502..10ccce55 100644
--- a/src/views/detections/overview/DetectionSecurityEventOverview.vue
+++ b/src/views/detections/overview/DetectionSecurityEventOverview.vue
@@ -29,7 +29,13 @@
       </div>
       <div class="overview__row">
         <div class="row__label">{{ $t('detections.victimLocation') }}</div>
-        <div class="row__content">{{ $_.get(basicInfo, 'victimInfo.location.country', '-') || '-' }}</div>
+        <div class="row__content">
+          <div v-if="$_.get(basicInfo, 'victimInfo.location.country')">
+            <img v-if="basicInfo.victimInfo.location.country===countryNameIdMapping.Unknown || !countryNameIdMapping[basicInfo.victimInfo.location.country]" src="../../../../public/images/flag/Unknown.svg" class="filter-country-flag">
+            <img v-else :src="require(`../../../../public/images/flag/${countryNameIdMapping[basicInfo.victimInfo.location.country]}.png`)" class="filter-country-flag" >
+          </div>
+          {{ locationRegion(basicInfo.victimInfo) }}
+        </div>
       </div>
       <div class="overview__row">
         <div class="row__label">{{ $t('detections.victimAsn') }}</div>
@@ -41,7 +47,13 @@
       </div>
       <div class="overview__row">
         <div class="row__label">{{ $t('detections.offenderLocation') }}</div>
-        <div class="row__content">{{ $_.get(basicInfo, 'offenderInfo.location.country', '-') || '-' }}</div>
+        <div class="row__content">
+          <div v-if="$_.get(basicInfo, 'offenderInfo.location.country')">
+            <img v-if="basicInfo.offenderInfo.location.country===countryNameIdMapping.Unknown || !countryNameIdMapping[basicInfo.offenderInfo.location.country]" src="../../../../public/images/flag/Unknown.svg" class="filter-country-flag">
+            <img v-else :src="require(`../../../../public/images/flag/${countryNameIdMapping[basicInfo.offenderInfo.location.country]}.png`)" class="filter-country-flag" >
+          </div>
+          {{ locationRegion(basicInfo.offenderInfo) }}
+        </div>
       </div>
       <div class="overview__row">
         <div class="row__label">{{ $t('detections.offenderAsn') }}</div>
@@ -336,7 +348,7 @@
 import axios from 'axios'
 import { api } from '@/utils/api'
 import { getMillisecond, dateFormatByAppearance } from '@/utils/date-util'
-import { eventSeverityColor, unitTypes, riskLevelMapping, riskLevelColor } from '@/utils/constants'
+import { eventSeverityColor, unitTypes, countryNameIdMapping, riskLevelMapping, riskLevelColor } from '@/utils/constants'
 import unitConvert from '@/utils/unit-convert'
 import _ from 'lodash'
 export default {
@@ -350,18 +362,19 @@ export default {
       riskLevelColor,
       basicInfo: {},
       events: [],
-      reference: 'https://attack.mitre.org'
+      reference: 'https://attack.mitre.org',
+      countryNameIdMapping
     }
   },
   computed: {
     formatT0 () {
       const vm = this
       return function (event) {
-        const diffSeconds = vm.detection.startTime - event.startTime
+        const diffSeconds = parseInt(event.diffSeconds)
         if (diffSeconds === 0) {
           return 'T0'
         }
-        const eventStartTime = event.startTime
+        const eventStartTime = parseInt(event.startTime)
         const entityStartTime = vm.detection.startTime
 
         if (_.isNumber(diffSeconds) && _.isNumber(eventStartTime) && _.isNumber(entityStartTime)) {
@@ -382,6 +395,28 @@ export default {
         })
         return (m && m.name) || level
       }
+    },
+    locationRegion (info) {
+      return function (info) {
+        if (!info) {
+          return '-'
+        }
+        let result = ''
+        if (info.location.country) {
+          result += `${info.location.country},`
+        }
+        if (info.location.province) {
+          result += `${info.location.province},`
+        }
+        if (info.location.city) {
+          result += `${info.location.city},`
+        }
+        result = result.substr(0, result.length - 1)
+        if (!result) {
+          result = '-'
+        }
+        return result
+      }
     }
   },
   methods: {