From 4c9b4de12fae565c2974b1ae741996a2c8322061 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 7 May 2024 12:01:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9C=8B=E6=9D=BF=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E5=88=9D=E5=A7=8B=E6=9F=A5=E8=AF=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/overview/hooks/useUserActivity.ts |  2 ++
 src/views/dashboard/overview/hooks/useWS.ts           | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/views/dashboard/overview/hooks/useUserActivity.ts b/src/views/dashboard/overview/hooks/useUserActivity.ts
index adbf7f27..6f573517 100644
--- a/src/views/dashboard/overview/hooks/useUserActivity.ts
+++ b/src/views/dashboard/overview/hooks/useUserActivity.ts
@@ -14,6 +14,7 @@ export function ueEventParse(item: Record<string, any>) {
   return {
     eType: 'ue',
     eId: `ue_${item.id}_${Date.now()}`,
+    eTime: +item.timestamp,
     id: item.id,
     type: item.eventType,
     data: evData,
@@ -40,6 +41,7 @@ export function cdrEventParse(item: Record<string, any>) {
   return {
     eType: 'cdr',
     eId: `cdr_${item.id}_${Date.now()}`,
+    eTime: +item.timestamp,
     id: item.id,
     data: evData,
   };
diff --git a/src/views/dashboard/overview/hooks/useWS.ts b/src/views/dashboard/overview/hooks/useWS.ts
index bc2e9a66..2e26044e 100644
--- a/src/views/dashboard/overview/hooks/useWS.ts
+++ b/src/views/dashboard/overview/hooks/useWS.ts
@@ -62,6 +62,11 @@ export default function useWS() {
               eventData.value.push(v);
             }
           }
+
+          // 有数据进行排序
+          if (eventData.value.length > 10) {
+            eventData.value.sort((a, b) => b.eTime - a.eTime);
+          }
           if (eventData.value.length > 0) {
             eventId.value = eventData.value[0].eId;
           }
@@ -77,6 +82,11 @@ export default function useWS() {
               eventData.value.push(v);
             }
           }
+
+          // 有数据进行排序
+          if (eventData.value.length > 10) {
+            eventData.value.sort((a, b) => b.eTime - a.eTime);
+          }
           if (eventData.value.length > 0) {
             eventId.value = eventData.value[0].eId;
           }