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({ /**UPF-流量数据 数据解析 */ export function upfFlowParse(data: Record) { - 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) { export const upfTFActive = ref(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,