From 4c4e798c1571dce1dbe68f2fc796f615d5c8d08a Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 26 Aug 2022 11:30:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Dashboard=20-=20npm=20-=20=E8=BF=91?=
 =?UTF-8?q?=E6=9C=9F=E4=BA=8B=E4=BB=B6=E4=B8=8B=E9=92=BB=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/views/charts2/npmRecentEvents.scss   |  5 +++++
 src/views/charts2/charts/npm/NpmRecentEvents.vue    | 13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/assets/css/components/views/charts2/npmRecentEvents.scss b/src/assets/css/components/views/charts2/npmRecentEvents.scss
index 04a287b6..5d6709ef 100644
--- a/src/assets/css/components/views/charts2/npmRecentEvents.scss
+++ b/src/assets/css/components/views/charts2/npmRecentEvents.scss
@@ -86,6 +86,11 @@
       border-radius: 4px;
       padding: 0 6px;
     }
+    span {
+      font-size: 12px;
+      color: #353636;
+      font-weight: 400;
+    }
   }
   .el-table--group::after,.el-table--border::after, .el-table::before {
     height: 0px;
diff --git a/src/views/charts2/charts/npm/NpmRecentEvents.vue b/src/views/charts2/charts/npm/NpmRecentEvents.vue
index 3e0aa02f..c8837fd6 100644
--- a/src/views/charts2/charts/npm/NpmRecentEvents.vue
+++ b/src/views/charts2/charts/npm/NpmRecentEvents.vue
@@ -45,9 +45,8 @@
 <script>
 import { get } from '@/utils/http'
 import { api } from '@/utils/api'
-import { getSecond } from '@/utils/date-util'
+import { getSecond, dateFormatByAppearance } from '@/utils/date-util'
 import chartMixin from '@/views/charts2/chart-mixin'
-import _ from 'lodash'
 
 export default {
   name: 'NpmRecentEvents',
@@ -85,6 +84,11 @@ export default {
         params.type = type
         params.limit = 10
         url = api.npm.events.recentEventsD
+        this.customTableTitles = [
+          { label: 'network.severity', prop: 'eventSeverity' },
+          { label: 'detections.eventType', prop: 'eventType' },
+          { label: 'detection.list.startTime', prop: 'startTime' }
+        ]
       } else {
         url = api.npm.events.recentEvents
       }
@@ -94,6 +98,11 @@ export default {
           if (res.data.result.length === 0) {
             this.isNoData = true
           }
+          res.data.result.forEach(e => {
+            if (e.startTime) {
+              e.startTime = dateFormatByAppearance(e.startTime)
+            }
+          })
           this.tableData = res.data.result
         } else {
           this.isNoData = true