From c024c304d553369515b966436aa16c4a83316196 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Wed, 17 Jul 2024 15:44:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=88=E5=AF=B9=E5=88=87=E6=8D=A2=E6=97=B6?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../overview/components/NeResources/index.vue |  3 ++
 src/views/dashboard/overview/hooks/useWS.ts   | 38 ++++++-------------
 src/views/dashboard/overview/index.vue        | 19 +++-------
 3 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/src/views/dashboard/overview/components/NeResources/index.vue b/src/views/dashboard/overview/components/NeResources/index.vue
index 05d5467e..3fc1fb24 100644
--- a/src/views/dashboard/overview/components/NeResources/index.vue
+++ b/src/views/dashboard/overview/components/NeResources/index.vue
@@ -237,6 +237,9 @@ function handleRanderChart(
 
 function fnChangeData(data: any[], itemID: string) {
   let info = data.find((item: any) => item.id === itemID);
+  if (!info) {
+    return;
+  }
   if (!info.neState.online) return;
   // if (!info.neState.online) {
   //   info = data.find((item: any) => item.id === itemID);
diff --git a/src/views/dashboard/overview/hooks/useWS.ts b/src/views/dashboard/overview/hooks/useWS.ts
index f91438f6..24f06381 100644
--- a/src/views/dashboard/overview/hooks/useWS.ts
+++ b/src/views/dashboard/overview/hooks/useWS.ts
@@ -12,7 +12,7 @@ import {
   upfFlowParse,
   upfTotalFlowReset,
 } from './useUPFTotalFlow';
-import { topologyReset, neStateParse } from './useTopology';
+import { topologyReset, neStateParse, neStateRequestMap } from './useTopology';
 import PQueue from 'p-queue';
 
 /**UPF-的Id */
@@ -35,7 +35,6 @@ export default function useWS() {
   function wsError(ev: any) {
     // 接收数据后回调
     console.error(ev);
-    
   }
 
   /**接收数据后回调 */
@@ -198,7 +197,14 @@ export default function useWS() {
   /**重新发送至UPF 12_rmUid */
   function reSendUPF(rmUid: string) {
     upfWhoRmUid.value = rmUid;
-    ws.close();
+    //初始时时无需还原全部属性以及关闭
+    if (ws.state() === WebSocket.OPEN) {
+      ws.close();
+      userActivityReset();
+      upfTotalFlowReset();
+      neStateRequestMap.value = new Map();
+      //topologyReset();
+    }
     const options: OptionsType = {
       url: '/ws',
       params: {
@@ -214,37 +220,15 @@ export default function useWS() {
       onmessage: wsMessage,
       onerror: wsError,
     };
-    setTimeout(() => {
-      // 在这里进行重新连接WebSocket的操作
-      ws.connect(options);
-    }, 1000); //延迟1秒
-  }
-
-  onMounted(() => {
-    const options: OptionsType = {
-      url: '/ws',
-      params: {
-        /**订阅通道组
-         *
-         * 指标UPF (GroupID:12)
-         * AMF_UE会话事件(GroupID:1010)
-         * MME_UE会话事件(GroupID:1011)
-         * IMS_CDR会话事件(GroupID:1005)
-         */
-        subGroupID: '12_' + upfWhoRmUid.value + ',1010,1011,1005',
-      },
-      onmessage: wsMessage,
-      onerror: wsError,
-    };
     ws.connect(options);
-  });
+  }
 
   onBeforeUnmount(() => {
     ws.close();
     userActivityReset();
     upfTotalFlowReset();
     topologyReset();
-    upfWhoRmUid.value='';
+    upfWhoRmUid.value = '';
   });
 
   return {
diff --git a/src/views/dashboard/overview/index.vue b/src/views/dashboard/overview/index.vue
index 658544dc..755bac9d 100644
--- a/src/views/dashboard/overview/index.vue
+++ b/src/views/dashboard/overview/index.vue
@@ -20,11 +20,7 @@ import {
   graphNodeStateNum,
   neStateRequestMap,
 } from './hooks/useTopology';
-import {
-  upfTotalFlow,
-  upfTFActive,
-  upfTotalFlowReset,
-} from './hooks/useUPFTotalFlow';
+import { upfTotalFlow, upfTFActive } from './hooks/useUPFTotalFlow';
 import { upfWhoId } from './hooks/useWS';
 
 import { useFullscreen } from '@vueuse/core';
@@ -210,8 +206,7 @@ function fnSelectNe(value: any, option: any) {
   upfTotalFlow.value.map((item: any) => {
     item.requestFlag = false;
   });
-
-  upfTotalFlowReset(); //属性重置  流量总量 上下行速率
+  loadData();
 }
 
 // 定义一个方法返回 views 容器
@@ -224,7 +219,7 @@ const getPopupContainer = () => {
 
 onMounted(() => {
   fnGetSkim().then(() => {
-    loadData();
+    // loadData();
   });
   // 获取网元网元列表
   useNeInfoStore()
@@ -240,11 +235,9 @@ onMounted(() => {
           });
           //arr.push({ value: '002', label: 'UPF_002', rmUid: '4400HXUPF002' });
           neOtions.value = arr;
-
           if (arr.length > 0) {
-            queryParams.neRealId = arr[0].value;
-            upfWhoId.value = arr[0].value;
-            reSendUPF(arr[0].rmUid);
+            //queryParams.neRealId = arr[0].value;
+            fnSelectNe(arr[0].value, arr[0]);
           }
         }
       } else {
@@ -414,8 +407,6 @@ onBeforeUnmount(() => {
           </div>
         </div>
       </div>
-
-      
     </div>
     <div class="column" style="flex: 4; margin: 1.333rem 0.833rem 0">
       <!-- 实时流量 -->