From 65dd5e2879497e1c5a43318496eea17c3f6bb34a Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Mon, 7 Mar 2022 16:03:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=97=B6=E9=97=B4=E8=BD=B4=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98=EF=BC=9B=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=BB=84=E4=BB=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/detections/detection-overview.scss  |  1 +
 src/views/charts/charts/ChartMap.vue          | 86 ++++++++++++++++++-
 .../DetectionSecurityEventOverview.vue        |  3 +-
 3 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/src/assets/css/components/views/detections/detection-overview.scss b/src/assets/css/components/views/detections/detection-overview.scss
index 53c0e4e5..ebca7d50 100644
--- a/src/assets/css/components/views/detections/detection-overview.scss
+++ b/src/assets/css/components/views/detections/detection-overview.scss
@@ -62,6 +62,7 @@
       display: flex;
       justify-content: center;
       align-items: center;
+      flex-basis: 16px;
       font-size: 12px;
       color: #666666;
     }
diff --git a/src/views/charts/charts/ChartMap.vue b/src/views/charts/charts/ChartMap.vue
index a0f01a43..7e377e1f 100644
--- a/src/views/charts/charts/ChartMap.vue
+++ b/src/views/charts/charts/ChartMap.vue
@@ -1,6 +1,24 @@
 <template>
-  <div class="map-back" v-show="showMapBackButton" @click="mapBack">&lt; back</div>
-  <div class="chart-drawing" :id="`chart${chartInfo.id}`"></div>
+  <div class="cn-chart__map">
+    <div class="map-back" v-show="showMapBackButton" @click="mapBack">&lt; back</div>
+    <div class="map-drawing" :id="`chart${chartInfo.id}`"></div>
+    <div class="map-chart__legends" v-if="chartInfo.params.hasLegend">
+      <div
+          class="map-chart__legend"
+          :class="`${currentLegendIndex === index ? 'map-chart__legend--active' : ''}`"
+          v-for="(legend, index) in legends"
+          :key="index"
+          @click="changeLegend(index)"
+      >
+        <div
+            class="legend__circle-marker"
+            :style="`background-color:${markerColors[index].background};border: 1px solid ${markerColors[index].border};`"
+        ></div>
+        <div class="legend__value">{{legend.value}}</div>
+        <div class="legend__name">{{legend.name}}</div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -22,7 +40,64 @@ export default {
       mapPictureUrl: '/Tiles/{z}/{x}/{y}.png',
       showMapBackButton: false,
       polygonSeries: null, // 世界地图series
-      countrySeries: null // 下钻国家series
+      countrySeries: null, // 下钻国家series
+      currentLegendIndex: 0,
+      legends: [
+        {
+          name: this.$t('dns.rootDomainServers'),
+          type: dnsServerRole.RTDNS,
+          value: 0
+        },
+        {
+          name: this.$t('dns.topLevelDomainServers'),
+          type: dnsServerRole.TLDNS,
+          value: 0
+        },
+        {
+          name: this.$t('dns.authoritativeDomainServers'),
+          type: dnsServerRole.ADNS,
+          value: 0
+        },
+        {
+          name: this.$t('dns.publicRecursiveDomainServers'),
+          type: dnsServerRole.OPRDNS,
+          value: 0
+        }/*,
+        {
+          name: this.$t('dns.rootDomainServers'),
+          value: 0
+        },
+        {
+          name: this.$t('dns.rootDomainServers'),
+          value: 0
+        }*/
+      ],
+      markerColors: [
+        {
+          background: '#C0DEFE',
+          border: '#68AFFC'
+        },
+        {
+          background: '#DBCFFA',
+          border: '#AA8CF2'
+        },
+        {
+          background: '#A0E8E0',
+          border: '#1CC9B5'
+        },
+        {
+          background: '#FFE1B5',
+          border: '#FFB84E'
+        },
+        {
+          background: '#FDC6C6',
+          border: '#FA7777'
+        },
+        {
+          background: '#ECC6F7',
+          border: '#B620E0'
+        }
+      ]
     }
   },
   mixins: [chartMixin],
@@ -156,7 +231,6 @@ export default {
               border: this.circleColor[d.dnsServerRole].border
             })
           })
-          console.info(seriesData)
           const imageSeries = this.myChart.series.push(new am4Maps.MapImageSeries())
           imageSeries.data = seriesData
           imageSeries.dataFields.value = 'count'
@@ -212,6 +286,10 @@ export default {
         this.myChart.goHome()
       })
     },
+    changeLegend (index) {
+      this.currentLegendIndex = index
+      this.$emit('query', { dnsServerRole: this.legends[index].type })
+    },
     dnsTypeI18n (role) {
       let i18n = ''
       switch (role) {
diff --git a/src/views/detections/overview/DetectionSecurityEventOverview.vue b/src/views/detections/overview/DetectionSecurityEventOverview.vue
index 123133c8..c9524d1e 100644
--- a/src/views/detections/overview/DetectionSecurityEventOverview.vue
+++ b/src/views/detections/overview/DetectionSecurityEventOverview.vue
@@ -156,6 +156,7 @@ import { api } from '@/utils/api'
 import { getMillisecond } from '@/utils/date-util'
 import { eventSeverityColor, unitTypes } from '@/utils/constants'
 import unitConvert from '@/utils/unit-convert'
+import _ from 'lodash'
 export default {
   name: 'DetectionOverview',
   props: {
@@ -179,7 +180,7 @@ export default {
         const eventStartTime = event.startTime
         const entityStartTime = this.basicInfo ? this.basicInfo.startTime : ''
 
-        if (!this.$_.isEmpty(diffSeconds) && !this.$_.isEmpty(eventStartTime) && !this.$_.isEmpty(entityStartTime)) {
+        if (!_.isEmpty(diffSeconds) && !_.isEmpty(eventStartTime) && !_.isEmpty(entityStartTime)) {
           const suffix = unitConvert(diffSeconds, unitTypes.time, 's', null, 0).join('')
           if (eventStartTime > entityStartTime) {
             return `T0+${suffix}`