From e9ff6493ddff9c929d21cc8d9a72129fa2528959 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 25 Jul 2024 18:48:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9C=8B=E6=9D=BFUPF=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E5=90=9E=E5=90=90=E5=88=9D=E5=A7=8B=E6=9F=A5=E8=AF=A2=E5=92=8C?=
 =?UTF-8?q?ws=E7=9B=91=E5=90=AC12=5FneId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/overview/components/UPFFlow/index.vue   | 11 ++++-------
 src/views/dashboard/overview/hooks/useUPFTotalFlow.ts |  5 +++--
 src/views/dashboard/overview/hooks/useWS.ts           |  6 +++---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/views/dashboard/overview/components/UPFFlow/index.vue b/src/views/dashboard/overview/components/UPFFlow/index.vue
index 607c3913..12694af7 100644
--- a/src/views/dashboard/overview/components/UPFFlow/index.vue
+++ b/src/views/dashboard/overview/components/UPFFlow/index.vue
@@ -203,17 +203,14 @@ function handleRanderChart() {
 
 /**查询初始UPF数据 */
 function fnGetInitData() {
-  // 查询10分钟前的
-  const nowDate: Date = new Date();
-  const tenMinutesAgo = new Date(nowDate.getTime() - 5 * 60 * 1000);
+  // 查询5分钟前的
+  const nowDate = new Date().getTime();
 
   listKPIData({
     neType: 'UPF',
     neId: '001',
-    startTime: parseDateToStr(tenMinutesAgo),
-    endTime: parseDateToStr(nowDate),
-    // startTime: '2024-03-20 19:50:00',
-    // endTime: '2024-03-20 19:55:00',
+    startTime: nowDate - 5 * 60 * 1000,
+    endTime: nowDate,
     interval: 5, // 5秒
     sortField: 'timeGroup',
     sortOrder: 'asc',
diff --git a/src/views/dashboard/overview/hooks/useUPFTotalFlow.ts b/src/views/dashboard/overview/hooks/useUPFTotalFlow.ts
index 27b19c8a..8a9fdacb 100644
--- a/src/views/dashboard/overview/hooks/useUPFTotalFlow.ts
+++ b/src/views/dashboard/overview/hooks/useUPFTotalFlow.ts
@@ -1,3 +1,4 @@
+import { parseDateToStr } from '@/utils/date-utils';
 import { parseSizeFromBits, parseSizeFromKbs } from '@/utils/parse-utils';
 import { ref } from 'vue';
 
@@ -22,7 +23,7 @@ export const upfFlowData = ref<FDType>({
 
 /**UPF-流量数据 数据解析 */
 export function upfFlowParse(data: Record<string, string>) {
-  upfFlowData.value.lineXTime.push(data['timeGroup']);
+  upfFlowData.value.lineXTime.push(parseDateToStr(+data['timeGroup']));
   const upN3 = parseSizeFromKbs(+data['UPF.03'], 5);
   upfFlowData.value.lineYUp.push(upN3[0]);
   const downN6 = parseSizeFromKbs(+data['UPF.06'], 5);
@@ -78,7 +79,7 @@ export function upfTFParse(data: Record<string, string>) {
 export const upfTFActive = ref<number>(0);
 
 /**属性复位 */
-export function upfTotalFlowReset() { 
+export function upfTotalFlowReset() {
   upfFlowData.value = {
     lineXTime: [],
     lineYUp: [],
diff --git a/src/views/dashboard/overview/hooks/useWS.ts b/src/views/dashboard/overview/hooks/useWS.ts
index 854a122b..ba193141 100644
--- a/src/views/dashboard/overview/hooks/useWS.ts
+++ b/src/views/dashboard/overview/hooks/useWS.ts
@@ -94,7 +94,7 @@ export default function useWS() {
     }
     switch (data.groupId) {
       // kpiEvent 指标UPF
-      case '12':
+      case '12_001':
         if (data.data) {
           upfFlowParse(data.data);
         }
@@ -197,12 +197,12 @@ export default function useWS() {
       params: {
         /**订阅通道组
          *
-         * 指标UPF (GroupID:12)
+         * 指标UPF (GroupID:12_neId)
          * AMF_UE会话事件(GroupID:1010)
          * MME_UE会话事件(GroupID:1011)
          * IMS_CDR会话事件(GroupID:1005)
          */
-        subGroupID: '12,1010,1011,1005',
+        subGroupID: '12_001,1010,1011,1005',
       },
       onmessage: wsMessage,
       onerror: wsError,