Merge branch 'main' into multi-tenant

src/views/dashboard/overview/components/UPFFlow/index.vue

@@ -204,16 +204,15 @@ 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: upfWhoId.value,
-    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',

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: [],

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

@@ -210,7 +210,7 @@ export default function useWS() {
       params: {
         /**订阅通道组
          *
-         * 指标UPF (GroupID:12)
+         * 指标UPF (GroupID:12_neId)
          * AMF_UE会话事件(GroupID:1010)
          * MME_UE会话事件(GroupID:1011)
          * IMS_CDR会话事件(GroupID:1005)