Merge remote-tracking branch 'origin/main' into multi-tenant

src/views/dashboard/overview/hooks/useWS.ts

@@ -83,7 +83,7 @@ export default function useWS() {
     }
     switch (data.groupId) {
       // kpiEvent 指标UPF
-      case '12_' + upfWhoRmUid.value:
+      case '12_' + upfWhoId.value:
         if (data.data) {
           upfFlowParse(data.data);
         }
@@ -172,9 +172,9 @@ export default function useWS() {
     });
   }
 
-  /**重新发送至UPF 12_rmUid */
-  function reSendUPF(rmUid: string) {
-    upfWhoRmUid.value = rmUid;
+  /**重新发送至UPF 12_neId */
+  function reSendUPF(neId: string) {
+    upfWhoId.value = neId;
     //初始时时无需还原全部属性以及关闭
     if (ws.state() === WebSocket.OPEN) {
       ws.close();
@@ -193,7 +193,7 @@ export default function useWS() {
          * MME_UE会话事件(GroupID:1011_neId)
          * IMS_CDR会话事件(GroupID:1005_neId)
          */
-        subGroupID: '12_' + rmUid + ',1010,1011_001,1005_001',
+        subGroupID: '12_' + neId + ',1010,1011_001,1005_001',
       },
       onmessage: wsMessage,
       onerror: (ev: any) => {
@@ -208,7 +208,7 @@ export default function useWS() {
     userActivityReset();
     upfTotalFlowReset();
     topologyReset();
-    upfWhoRmUid.value = '';
+    upfWhoId.value = '';
   });
 
   return {

src/views/dashboard/overview/index.vue

@@ -242,7 +242,7 @@ function fnToRouter(name: string, query?: any) {
 function fnSelectNe(value: any, option: any) {
   queryParams.neRealId = value;
   upfWhoId.value = value;
-  reSendUPF(option.rmUid);
+  reSendUPF(value);
   // upfTotalFlow.value.map((item: any) => {
   //   item.requestFlag = false;
   // });