From c40ee9c8cc994a45982107d4f60f2e849811da26 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 27 Dec 2024 19:06:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9C=8B=E6=9D=BF=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96UE=E4=BF=AE=E5=A4=8D=E5=92=8CAMF-UE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=93=E6=9E=84=E5=8F=98=E6=9B=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/UserActivity/index.vue         | 22 +++++++------------
 src/views/dashboard/overview/hooks/useWS.ts   | 12 +++++-----
 src/views/dashboard/overview/index.vue        |  2 +-
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/views/dashboard/overview/components/UserActivity/index.vue b/src/views/dashboard/overview/components/UserActivity/index.vue
index 1cb9d6c9..a5aaa9c9 100644
--- a/src/views/dashboard/overview/components/UserActivity/index.vue
+++ b/src/views/dashboard/overview/components/UserActivity/index.vue
@@ -137,18 +137,12 @@ onMounted(() => {
           </div>
           <div>
             {{ t('views.dashboard.overview.userActivity.time') }}:
-            <span
-              v-if="item.type === 'auth-result'"
-              :title="item.data.authTime"
-            >
-              {{ item.data.authTime }}
-            </span>
-            <span v-if="item.type === 'detach'" :title="item.data.detachTime">
-              {{ item.data.detachTime }}
-            </span>
-            <span v-if="item.type === 'cm-state'" :title="item.data.changeTime">
-              {{ item.data.changeTime }}
-            </span>
+            <template v-if="item.data?.time">
+              {{ item.data.time }}
+            </template>
+            <template v-else>
+              {{ parseDateToStr(+item.data.timestamp * 1000) }}
+            </template>
           </div>
         </div>
 
@@ -167,7 +161,7 @@ onMounted(() => {
         <div v-if="item.type === 'auth-result'">
           {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
           <span>
-            <DictTag :options="dict.ueAauthCode" :value="item.data.authCode" />
+            <DictTag :options="dict.ueAauthCode" :value="item.data.result" />
           </span>
         </div>
         <div v-if="item.type === 'detach'">
@@ -177,7 +171,7 @@ onMounted(() => {
         <div class="card-ue-w33" v-if="item.type === 'cm-state'">
           {{ t('views.dashboard.overview.userActivity.result') }}:&nbsp;
           <span>
-            <DictTag :options="dict.ueEventCmState" :value="item.data.status" />
+            <DictTag :options="dict.ueEventCmState" :value="item.data.result" />
           </span>
         </div>
       </div>
diff --git a/src/views/dashboard/overview/hooks/useWS.ts b/src/views/dashboard/overview/hooks/useWS.ts
index bd3e5f4f..62268578 100644
--- a/src/views/dashboard/overview/hooks/useWS.ts
+++ b/src/views/dashboard/overview/hooks/useWS.ts
@@ -49,7 +49,7 @@ export default function useWS() {
     // 普通信息
     switch (requestId) {
       // AMF_UE会话事件
-      case 'amf_1010':
+      case 'amf_1010_001':
         if (Array.isArray(data.rows)) {
           eventListParse('amf_ue', data);
         }
@@ -95,13 +95,13 @@ export default function useWS() {
         }
         break;
       // MME_UE会话事件
-      case '1011_001':
+      case '1011':
         if (data.data) {
           queue.add(() => eventItemParseAndPush('mme_ue', data.data));
         }
         break;
       // IMS_CDR会话事件
-      case '1005_001':
+      case '1005':
         if (data.data) {
           queue.add(() => eventItemParseAndPush('ims_cdr', data.data));
         }
@@ -132,7 +132,7 @@ export default function useWS() {
   function userActivitySend() {
     // AMF_UE会话事件
     ws.send({
-      requestId: 'amf_1010',
+      requestId: 'amf_1010_001',
       type: 'amf_ue',
       data: {
         neType: 'AMF',
@@ -189,11 +189,11 @@ export default function useWS() {
         /**订阅通道组
          *
          * 指标UPF (GroupID:12_neId)
-         * AMF_UE会话事件(GroupID:1010)
+         * AMF_UE会话事件(GroupID:1010_neId)
          * MME_UE会话事件(GroupID:1011_neId)
          * IMS_CDR会话事件(GroupID:1005_neId)
          */
-        subGroupID: '12_' + rmUid + ',1010,1011_001,1005_001',
+        subGroupID: '12_' + rmUid + ',1010,1011,1005',
       },
       onmessage: wsMessage,
       onerror: (ev: any) => {
diff --git a/src/views/dashboard/overview/index.vue b/src/views/dashboard/overview/index.vue
index 46b5ce37..81545c12 100644
--- a/src/views/dashboard/overview/index.vue
+++ b/src/views/dashboard/overview/index.vue
@@ -252,7 +252,7 @@ function fnSelectNe(value: any, option: any) {
   for (var key in upfTotalFlow.value) {
     upfTotalFlow.value[key].requestFlag = false;
   }
-  loadData();
+  // loadData();
 }
 
 // 定义一个方法返回 views 容器