From a57e4832493564a43ea4494e617b4d388890a2b0 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Mon, 26 Sep 2022 15:56:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E5=9B=BE=20=E8=8A=82=E7=82=B9=E5=BC=B9=E6=A1=86=E4=B8=A5?=
 =?UTF-8?q?=E9=87=8D=E7=AD=89=E7=BA=A7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/charts/charts/ChartRelationShip.vue |  2 +-
 .../charts/charts/chart-relation-ship.js      | 34 ++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/views/charts/charts/ChartRelationShip.vue b/src/views/charts/charts/ChartRelationShip.vue
index 0c94f9b4..66bcdba8 100644
--- a/src/views/charts/charts/ChartRelationShip.vue
+++ b/src/views/charts/charts/ChartRelationShip.vue
@@ -102,7 +102,7 @@
           <template v-if="shipSeverity.length > 0">
             <span v-for="ship in shipSeverity" class="ship-severity">
               <span class="ship-body-list-security-alert" :class="iconClass(ship)">{{ ship.eventSeverity }}</span>
-              <span class="ship-body-list-security-length">{{ ship.length }}</span>
+              <span class="ship-body-list-security-length">{{ ship.totalNumberOfEvents }}</span>
             </span>
           </template>
           <span v-else-if="!loadingAlert && shipSeverity.length <= 0" class="no-recent-alerts"><i style="font-size: 14px;" class="el-icon-success"></i>{{$t('relationShip.noRecentAlerts')}}</span>
diff --git a/src/views/charts/charts/chart-relation-ship.js b/src/views/charts/charts/chart-relation-ship.js
index fc440f6e..2c8ed62b 100644
--- a/src/views/charts/charts/chart-relation-ship.js
+++ b/src/views/charts/charts/chart-relation-ship.js
@@ -171,20 +171,30 @@ export default {
       const performance = get(urlObj.performanceUrl, queryParams)
       const security = get(urlObj.securityUrl, queryParams)
       Promise.all([performance, security]).then(res => {
-        const alertEventSeverity = ['critical', 'high', 'medium', 'info', 'low']
+        // const alertEventSeverity = ['critical', 'high', 'medium', 'info', 'low']
         const alertAll = [...res[0].data.result, ...res[1].data.result]
-        alertEventSeverity.forEach(d => {
-          const eventArray = alertAll.filter(p => d === p.eventSeverity)
-          const eventArrayMap = eventArray.map(t => { return { eventSeverity: t.eventSeverity } })
-          if (eventArrayMap) {
-            const eventObject = eventArrayMap.find(e => e.eventSeverity === d)
-            const eventObjectMap = object.keys(eventObject).map(m => {
-              return {
-                eventSeverity: eventObject[m],
-                length: eventArray.length
-              }
+        // alertEventSeverity.forEach(d => {
+        //   const eventArray = alertAll.filter(p => d === p.eventSeverity)
+        //   const eventArrayMap = eventArray.map(t => { return { eventSeverity: t.eventSeverity } })
+        //   if (eventArrayMap) {
+        //     const eventObject = eventArrayMap.find(e => e.eventSeverity === d)
+        //     const eventObjectMap = object.keys(eventObject).map(m => {
+        //       return {
+        //         eventSeverity: eventObject[m],
+        //         length: eventArray.length
+        //       }
+        //     })
+        //     this.shipSeverity.push(...eventObjectMap)
+        //   }
+        // })
+        alertAll.forEach(t => {
+          const hit = this.shipSeverity.find(e => e.eventSeverity === t.eventSeverity)
+          if (hit) {
+            this.shipSeverity.forEach(d => {
+              d.totalNumberOfEvents++
             })
-            this.shipSeverity.push(...eventObjectMap)
+          } else {
+            this.shipSeverity.push({ eventSeverity: t.eventSeverity, totalNumberOfEvents: 1 })
           }
         })
         this.loadingAlert = false