From 062af9b53d77ee3b3a1f7b08277a93e3e1a877f6 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 24 Mar 2022 16:46:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddetection=E3=80=81enti?=
 =?UTF-8?q?ty=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/detections/detection-list/row.scss  |  5 +--
 src/store/modules/user.js                     |  2 +-
 src/views/detections/DetectionRow.vue         |  2 +-
 .../DetectionPerformanceEventAppOverview.vue  |  3 +-
 ...etectionPerformanceEventDomainOverview.vue |  9 +++--
 .../DetectionPerformanceEventIpOverview.vue   |  4 +-
 .../DetectionSecurityEventOverview.vue        | 40 +++++++++----------
 .../entityList/detailOverview/App.vue         |  4 +-
 .../entityList/detailOverview/Domain.vue      |  4 +-
 .../entityList/detailOverview/Ip.vue          |  4 +-
 10 files changed, 38 insertions(+), 39 deletions(-)

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 78146c32..66bb1bdb 100644
--- a/src/assets/css/components/views/detections/detection-list/row.scss
+++ b/src/assets/css/components/views/detections/detection-list/row.scss
@@ -93,12 +93,11 @@
         .domain {
           background: #EFF2F5;
           border-radius: 2px;
-          font-family: Roboto-Italic;
           font-size: 14px;
           color: #333333;
           letter-spacing: 0;
           line-height: 14px;
-          font-weight: 400;
+          margin-left: 5px;
         }
       }
 
@@ -164,4 +163,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d17c7416..de4600a0 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -67,7 +67,7 @@ const user = {
             }
           })
         } else {
-          ElMessage.error('No menu') // TODO 国际化
+          ElMessage.error('No menu')
         }
       })
     },
diff --git a/src/views/detections/DetectionRow.vue b/src/views/detections/DetectionRow.vue
index 6db4ad01..e4d38a2d 100644
--- a/src/views/detections/DetectionRow.vue
+++ b/src/views/detections/DetectionRow.vue
@@ -9,9 +9,9 @@
       <div class="cn-detection__row">
         <div class="cn-detection__header" v-if="pageType === detectionPageType.securityEvent">
           <i class="cn-icon cn-icon-attacker" ></i>{{detection.offenderIp || '-'}}
+          <div v-if="detection.domain" class="domain">{{detection.domain}}</div>
           <span class="line">-------</span>
           <span class="circle"></span>
-          <span class="domain">{{detection.domain }}</span>
           <i class="cn-icon cn-icon-attacked" ></i>{{detection.victimIp || '-'}}
         </div>
         <div class="cn-detection__header" v-else-if="pageType === detectionPageType.performanceEvent">
diff --git a/src/views/detections/overview/DetectionPerformanceEventAppOverview.vue b/src/views/detections/overview/DetectionPerformanceEventAppOverview.vue
index 9fba4d89..f2e2f619 100644
--- a/src/views/detections/overview/DetectionPerformanceEventAppOverview.vue
+++ b/src/views/detections/overview/DetectionPerformanceEventAppOverview.vue
@@ -61,7 +61,7 @@
         <div class="metric__column">
           <div class="overview__title">{{$t('detections.metric')}}</div>
           <div class="overview__row">
-            <div class="row__content--metric ">{{detection.appName  || '-'}}</div>
+            <div class="row__content--metric ">{{detection.eventType  || '-'}}</div>
           </div>
         </div>
         <div class="metric__column">
@@ -194,6 +194,7 @@ export default {
             domain: this.detection.domain,
             startTime: this.searchStartTime,
             endTime: this.searchEndTime,
+            eventType: this.detection.eventType
           }).then((response) => {
             if (response.code === 200) {
               resolve(response.data.result[0])
diff --git a/src/views/detections/overview/DetectionPerformanceEventDomainOverview.vue b/src/views/detections/overview/DetectionPerformanceEventDomainOverview.vue
index 2e9e7259..5ebf67d4 100644
--- a/src/views/detections/overview/DetectionPerformanceEventDomainOverview.vue
+++ b/src/views/detections/overview/DetectionPerformanceEventDomainOverview.vue
@@ -7,7 +7,7 @@
             <span
                     class="row__content--link"
                     @click="goDetail('domain', computeSecondaryDomain(detection.domain))"
-            >{{ computeSecondaryDomain(detection.domain) }}</span>
+            >{{detection.domain}}</span>
           <template v-if="detection.eventType === 'dns error'">
             <span>
               {{$t('detections.dnsQueryError')}}
@@ -52,7 +52,7 @@
           <span>{{ $t('detections.viewDetailOf') }}</span> &nbsp;
           <span
                   class="row__content--link"
-                  @click="goDetail('domain', computeSecondaryDomain(detection.domain))">{{computeSecondaryDomain(detection.domain)}}</span>
+                  @click="goDetail('domain', computeSecondaryDomain(detection.domain))">{{detection.domain}}</span>
         </div>
       </div>
       <div class="overview__title">{{$t('detections.goToHunt')}}</div>
@@ -63,7 +63,7 @@
         <div class="metric__column">
           <div class="overview__title">{{$t('detections.metric')}}</div>
           <div class="overview__row">
-            <div class="row__content--metric ">{{detection.domain  || '-'}}</div>
+            <div class="row__content--metric ">{{detection.eventType  || '-'}}</div>
           </div>
         </div>
         <div class="metric__column">
@@ -226,6 +226,7 @@
               domain: this.detection.domain,
               startTime: this.searchStartTime,
               endTime: this.searchEndTime,
+              eventType: this.detection.eventType
             }).then((response) => {
               if (response.code === 200) {
                 resolve(response.data.result[0])
@@ -271,4 +272,4 @@
       }
     },
   }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/detections/overview/DetectionPerformanceEventIpOverview.vue b/src/views/detections/overview/DetectionPerformanceEventIpOverview.vue
index f3a458a6..2f75bb96 100644
--- a/src/views/detections/overview/DetectionPerformanceEventIpOverview.vue
+++ b/src/views/detections/overview/DetectionPerformanceEventIpOverview.vue
@@ -54,7 +54,7 @@
         <div class="metric__column">
           <div class="overview__title">{{$t('detections.metric')}}</div>
           <div class="overview__row">
-            <div class="row__content--metric ">{{detection.serverIp  || '-'}}</div>
+            <div class="row__content--metric ">{{detection.eventType  || '-'}}</div>
           </div>
         </div>
         <div class="metric__column">
@@ -76,7 +76,6 @@
           </div>
         </div>
       </div>
-
     </div>
   </div>
 </template>
@@ -191,6 +190,7 @@ export default {
             domain: this.detection.domain,
             startTime: this.searchStartTime,
             endTime: this.searchEndTime,
+            eventType: this.detection.eventType
           }).then((response) => {
             if (response.code === 200) {
               resolve(response.data.result[0])
diff --git a/src/views/detections/overview/DetectionSecurityEventOverview.vue b/src/views/detections/overview/DetectionSecurityEventOverview.vue
index 68df03a3..3bf49462 100644
--- a/src/views/detections/overview/DetectionSecurityEventOverview.vue
+++ b/src/views/detections/overview/DetectionSecurityEventOverview.vue
@@ -8,14 +8,11 @@
             <span
               class="row__content--link"
               @click="goDetail('ip', detection.victimIp)"
-              >{{ detection.victimIp }}</span
-            >&nbsp;
+              >{{ detection.victimIp }}</span>&nbsp;
             <span>
               {{$t('detection.commandAndControl')}}
             </span>
-            <span class="row__content--link">{{
-              detection.iocValue
-            }}</span></template
+            <span class="row__content--link" @click="goDetail('ip', basicInfo.iocValue)">{{basicInfo.iocValue || '-'}}</span></template
           >
           <template v-else>
             <span
@@ -26,10 +23,11 @@
             <span>
               {{$t('detection.payloadAndDelivery')}}
             </span>
-            <span class="row__content--link">{{
-              detection.iocValue
-            }}</span></template
-          >
+            <span class="row__content--link"
+                  @click="goDetail('ip', basicInfo.iocValue)"
+            >{{
+                basicInfo.iocValue
+            }}</span></template>
         </div>
       </div>
       <div class="overview__title">Fields</div>
@@ -96,9 +94,7 @@
         <div class="row__content">
           <div
             class="row__tag"
-            :style="`background-color:${
-              eventSeverityColor[basicInfo.domainReputationLevel]
-            }`"
+            :style="`background-color:${eventSeverityColor[basicInfo.domainReputationLevel]}`"
           >
             {{ basicInfo.domainReputationLevel || '-' }}
           </div>
@@ -184,7 +180,7 @@
             class="row__content--link"
             @click="goDetail('ip', basicInfo.offenderIp)"
             >{{ basicInfo.offenderIp }}</span
-          >
+          >&nbsp;&nbsp;
           <span
             class="row__content--link"
             @click="goDetail('domain', basicInfo.domain)"
@@ -378,14 +374,16 @@ export default {
       })
     },
     goDetail (type, name) {
-      const { href } = this.$router.resolve({
-        path: '/entityDetail',
-        query: {
-          entityType: type,
-          name: name
-        }
-      })
-      window.open(href, '_blank')
+      if (name) {
+        const { href } = this.$router.resolve({
+          path: '/entityDetail',
+          query: {
+            entityType: type,
+            name: name
+          }
+        })
+        window.open(href, '_blank')
+      }
     }
   },
   mounted () {
diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue
index 151f88ba..73778785 100644
--- a/src/views/entityExplorer/entityList/detailOverview/App.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/App.vue
@@ -135,7 +135,7 @@
     <div class="overview__content">
       <div class="overview__row">
         <div class="row__label">{{$t('entities.recentAlert')}}</div>
-        <div class="row__content">{{entityData.performanceNum || '-'}}</div>
+        <div class="row__content">{{entityData.performanceNum}}</div>
       </div>
       <div class="overview__row overview__row--small-font"   v-for="(performance, index) in entityData.performanceList" :key="index">
         <div class="row__label row__label--width160">{{dayJs.tz(getMillisecond(performance.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
@@ -155,7 +155,7 @@
     <div class="overview__content">
       <div class="overview__row">
         <div class="row__label">{{$t('entities.recentSecurity')}}</div>
-        <div class="row__content">{{entityData.securityNum || '-'}}</div>
+        <div class="row__content">{{entityData.securityNum}}</div>
       </div>
       <div class="overview__row overview__row--small-font"   v-for="(security, index) in entityData.securityList" :key="index">
         <div class="row__label row__label--width160">{{dayJs.tz(getMillisecond(security.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue
index 81ca371d..3cd0f74d 100644
--- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue
@@ -139,7 +139,7 @@
     <div class="overview__content">
       <div class="overview__row">
         <div class="row__label">{{$t('entities.recentAlert')}}</div>
-        <div class="row__content">{{entityData.performanceNum || '-'}}</div>
+        <div class="row__content">{{entityData.performanceNum}}</div>
       </div>
       <div class="overview__row overview__row--small-font" v-for="(performance, index) in entityData.performanceList" :key="index">
         <div class="row__label row__label--width160">{{dayJs.tz(getMillisecond(performance.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
@@ -159,7 +159,7 @@
     <div class="overview__content">
       <div class="overview__row">
         <div class="row__label">{{$t('entities.recentSecurity')}}</div>
-        <div class="row__content">{{entityData.securityNum || '-'}}</div>
+        <div class="row__content">{{entityData.securityNum}}</div>
       </div>
       <div class="overview__row overview__row--small-font" v-for="(security, i) in entityData.securityList" :key="i">
         <div class="row__label row__label--width160">{{dayJs.tz(getMillisecond(security.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue
index 9bb16f0d..f7ac70b3 100644
--- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue
+++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue
@@ -123,7 +123,7 @@
     <div class="overview__content">
       <div class="overview__row">
         <div class="row__label">{{$t('entities.recentAlert')}}</div>
-        <div class="row__content">{{entityData.performanceNum || '-'}}</div>
+        <div class="row__content">{{entityData.performanceNum}}</div>
       </div>
       <div class="overview__row overview__row--small-font" v-for="(performance, index) in entityData.performanceList" :key="index">
         <div class="row__label row__label--width160">{{dayJs.tz(getMillisecond(performance.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>
@@ -143,7 +143,7 @@
     <div class="overview__content">
       <div class="overview__row">
         <div class="row__label">{{$t('entities.recentSecurity')}}</div>
-        <div class="row__content">{{entityData.securityNum || '-'}}</div>
+        <div class="row__content">{{entityData.securityNum}}</div>
       </div>
       <div class="overview__row overview__row--small-font" v-for="(security, index) in entityData.securityList" :key="index">
         <div class="row__label row__label--width160">{{dayJs.tz(getMillisecond(security.startTime)).format('YYYY-MM-DD HH:mm:ss') || '-'}}</div>