From c020598678948afdb31767b8f872b3cc03c24a4c Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 7 Aug 2025 15:49:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9C=8B=E6=9D=BF=E5=88=87=E6=8D=A2upf?=
 =?UTF-8?q?=E7=9A=84=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/overview/hooks/useWS.ts  | 17 +++++++----------
 src/views/dashboard/overview2/hooks/useWS.ts | 20 +++++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/views/dashboard/overview/hooks/useWS.ts b/src/views/dashboard/overview/hooks/useWS.ts
index eefa91f2..b91da409 100644
--- a/src/views/dashboard/overview/hooks/useWS.ts
+++ b/src/views/dashboard/overview/hooks/useWS.ts
@@ -19,9 +19,6 @@ import PQueue from 'p-queue';
 /**UPF-的Id */
 export const upfWhoId = ref<any>('');
 
-/**UPF-的RmUid */
-export const upfWhoRmUid = ref<any>('');
-
 /**websocket连接 */
 export default function useWS() {
   const ws = new WS();
@@ -71,13 +68,13 @@ export default function useWS() {
         }
         break;
       //UPF-总流量数
-      case 'upf_001_0':
+      case `upf_${upfWhoId.value}_0`:
         upfTFParse('0', data);
         break;
-      case 'upf_001_7':
+      case `upf_${upfWhoId.value}_7`:
         upfTFParse('7', data);
         break;
-      case 'upf_001_30':
+      case `upf_${upfWhoId.value}_30`:
         upfTFParse('30', data);
         break;
     }
@@ -87,7 +84,7 @@ export default function useWS() {
     }
     switch (data.groupId) {
       // kpiEvent 指标UPF
-      case '10_UPF_' + upfWhoId.value:
+      case `10_UPF_${upfWhoId.value}`:
         if (data.data) {
           upfFlowParse(data.data);
         }
@@ -122,11 +119,11 @@ export default function useWS() {
     upfTotalFlow.value[day].requestFlag = true;
 
     ws.send({
-      requestId: `upf_001_${day}`,
+      requestId: `upf_${upfWhoId.value}_${day}`,
       type: 'upf_tf',
       data: {
         neType: 'UPF',
-        neId: '001',
+        neId: upfWhoId.value,
         day: Number(day),
       },
     });
@@ -197,7 +194,7 @@ export default function useWS() {
          * MME_UE会话事件(GroupID:1011_neId)
          * IMS_CDR会话事件(GroupID:1005_neId)
          */
-        subGroupID: '10_UPF_' + neId + ',1010_001,1011_001,1005_001',
+        subGroupID: `10_UPF_${neId},1010_001,1011_001,1005_001`,
       },
       onmessage: wsMessage,
       onerror: (ev: any) => {
diff --git a/src/views/dashboard/overview2/hooks/useWS.ts b/src/views/dashboard/overview2/hooks/useWS.ts
index 6b589dd1..c926e44f 100644
--- a/src/views/dashboard/overview2/hooks/useWS.ts
+++ b/src/views/dashboard/overview2/hooks/useWS.ts
@@ -19,9 +19,6 @@ import PQueue from 'p-queue';
 /**UPF-的Id */
 export const upfWhoId = ref<any>('');
 
-/**UPF-的RmUid */
-export const upfWhoRmUid = ref<any>('');
-
 /**websocket连接 */
 export default function useWS() {
   const ws = new WS();
@@ -34,6 +31,7 @@ export default function useWS() {
 
   /**接收数据后回调 */
   function wsMessage(res: Record<string, any>) {
+    //console.log(res);
     const { code, requestId, data } = res;
     if (code === RESULT_CODE_ERROR) {
       console.warn(res.msg);
@@ -71,13 +69,13 @@ export default function useWS() {
         }
         break;
       //UPF-总流量数
-      case 'upf_001_0':
+      case `upf_${upfWhoId.value}_0`:
         upfTFParse('0', data);
         break;
-      case 'upf_001_7':
+      case `upf_${upfWhoId.value}_7`:
         upfTFParse('7', data);
         break;
-      case 'upf_001_30':
+      case `upf_${upfWhoId.value}_30`:
         upfTFParse('30', data);
         break;
     }
@@ -87,7 +85,7 @@ export default function useWS() {
     }
     switch (data.groupId) {
       // kpiEvent 指标UPF
-      case '10_UPF_' + upfWhoId.value:
+      case `10_UPF_${upfWhoId.value}`:
         if (data.data) {
           upfFlowParse(data.data);
         }
@@ -122,11 +120,11 @@ export default function useWS() {
     upfTotalFlow.value[day].requestFlag = true;
 
     ws.send({
-      requestId: `upf_001_${day}`,
+      requestId: `upf_${upfWhoId.value}_${day}`,
       type: 'upf_tf',
       data: {
         neType: 'UPF',
-        neId: '001',
+        neId: upfWhoId.value,
         day: Number(day),
       },
     });
@@ -197,7 +195,7 @@ export default function useWS() {
          * MME_UE会话事件(GroupID:1011_neId)
          * IMS_CDR会话事件(GroupID:1005_neId)
          */
-        subGroupID: '10_UPF_' + neId + ',1010_001,1011_001,1005_001',
+        subGroupID: `10_UPF_${neId},1010_001,1011_001,1005_001`,
       },
       onmessage: wsMessage,
       onerror: (ev: any) => {
@@ -212,7 +210,7 @@ export default function useWS() {
     userActivityReset();
     upfTotalFlowReset();
     topologyReset();
-    upfWhoRmUid.value = '';
+    upfWhoId.value = '';
   });
 
   return {