From 028ecfb61e4fe7b2e787552e081d2d2da85ef7e5 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 29 Jan 2024 15:21:34 +0800 Subject: [PATCH] =?UTF-8?q?fix::=20=E7=9C=8B=E6=9D=BF=E6=B5=81=E9=87=8F?= =?UTF-8?q?=E6=80=BB=E8=AE=A1=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../overview/components/NeResources/index.vue | 6 +- .../overview/components/UPFFlow/index.vue | 4 +- .../dashboard/overview/hooks/useTopology.ts | 2 +- src/views/dashboard/overview/hooks/useWS.ts | 181 ++++++++---------- 4 files changed, 84 insertions(+), 109 deletions(-) diff --git a/src/views/dashboard/overview/components/NeResources/index.vue b/src/views/dashboard/overview/components/NeResources/index.vue index 2888bff3..f6d66e80 100644 --- a/src/views/dashboard/overview/components/NeResources/index.vue +++ b/src/views/dashboard/overview/components/NeResources/index.vue @@ -29,15 +29,15 @@ const neResourcesChart = ref(null); // 类别 const category = ref([ { - name: '系统内存', + name: t('views.dashboard.overview.resources.sysMem'), value: 1, }, { - name: '系统CPU', + name: t('views.dashboard.overview.resources.sysCpu'), value: 1, }, { - name: '网元CPU', + name: t('views.dashboard.overview.resources.neCpu'), value: 1, }, ]); diff --git a/src/views/dashboard/overview/components/UPFFlow/index.vue b/src/views/dashboard/overview/components/UPFFlow/index.vue index dd433d7a..d0b62ea5 100644 --- a/src/views/dashboard/overview/components/UPFFlow/index.vue +++ b/src/views/dashboard/overview/components/UPFFlow/index.vue @@ -104,8 +104,8 @@ function initPicture() { var charts = { unit: '(Mbps)', names: [ - t('views.dashboard.overview.UPFFlow.up'), - t('views.dashboard.overview.UPFFlow.down'), + t('views.dashboard.overview.upfFlow.up'), + t('views.dashboard.overview.upfFlow.down'), ], lineX: timeArr, diff --git a/src/views/dashboard/overview/hooks/useTopology.ts b/src/views/dashboard/overview/hooks/useTopology.ts index 727ad6d3..a5f775a2 100644 --- a/src/views/dashboard/overview/hooks/useTopology.ts +++ b/src/views/dashboard/overview/hooks/useTopology.ts @@ -3,7 +3,7 @@ import { computed, reactive, ref } from 'vue'; /**图状态 */ export const graphState = reactive>({ /**当前图组名 */ - group: '5GC System Architecture3', + group: '5GC System Architecture5', /**图数据 */ data: { combos: [], diff --git a/src/views/dashboard/overview/hooks/useWS.ts b/src/views/dashboard/overview/hooks/useWS.ts index e8a8b26c..f00b04f4 100644 --- a/src/views/dashboard/overview/hooks/useWS.ts +++ b/src/views/dashboard/overview/hooks/useWS.ts @@ -1,11 +1,19 @@ -import { - RESULT_CODE_ERROR, - RESULT_CODE_SUCCESS, -} from '@/constants/result-constants'; +import { RESULT_CODE_ERROR } from '@/constants/result-constants'; import { OptionsType, WS } from '@/plugins/ws-websocket'; -import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'; -import { ueEventData, ueEventId, ueEventTotal } from './useUEEvent'; -import { cdrEventData, cdrEventTotal, cdrEventId } from './useCDREvent'; +import { onBeforeUnmount, onMounted } from 'vue'; +import { + ueEventData, + ueEventId, + ueEventTotal, + ueEventParse, +} from './useUEEvent'; +import { + cdrEventData, + cdrEventTotal, + cdrEventId, + cdrEventParse, +} from './useCDREvent'; +import { upfTotalFlow, upfTFParse } from './useUPFTotalFlow'; /**websocket连接 */ export default function useWS() { @@ -16,34 +24,10 @@ export default function useWS() { ws.send(data); } - function wsInitData() { - // cdrEvent CDR会话事件 - ws.send({ - requestId: '1005', - type: 'cdr', - data: { - neType: 'IMS', - neId: '001', - sortField: 'timestamp', - sortOrder: 'desc', - pageNum: 1, - pageSize: 50, - }, - }); - - // ueEvent UE会话事件 - ws.send({ - requestId: '1010', - type: 'ue', - data: { - neType: 'AMF', - neId: '001', - sortField: 'timestamp', - sortOrder: 'desc', - pageNum: 1, - pageSize: 50, - }, - }); + /**接收数据后回调 */ + function wsError(ev: any) { + // 接收数据后回调 + console.log(ev); } /**接收数据后回调 */ @@ -90,12 +74,28 @@ export default function useWS() { } } break; + //UPF-总流量数 + case '1030_0': + const v0 = upfTFParse(data); + upfTotalFlow.value[0].up = v0.up; + upfTotalFlow.value[0].down = v0.down; + break; + case '1030_7': + const v7 = upfTFParse(data); + upfTotalFlow.value[1].up = v7.up; + upfTotalFlow.value[1].down = v7.down; + break; + case '1030_30': + const v30 = upfTFParse(data); + upfTotalFlow.value[2].up = v30.up; + upfTotalFlow.value[2].down = v30.down; + break; } + // 订阅组信息 if (!data?.groupId) { return; } - // 订阅组信息 switch (data.groupId) { // ueEvent UE会话事件 case '1010': @@ -120,76 +120,49 @@ export default function useWS() { } } - /**ueEvent UE会话事件 数据解析 */ - function ueEventParse(item: Record) { - let evData: Record = item.eventJSON; - if (typeof evData === 'string') { - try { - evData = JSON.parse(evData); - } catch (error) { - console.error(error); - return false; - } - } - - if (item.eventType === 'auth-result') { - return { - id: item.id || item.timestamp, - type: item.eventType, - time: evData.authTime, - imsi: evData.imsi, - msg: `${evData.authMessage}`, - }; - } - - if (item.eventType === 'detach') { - return { - id: item.id || item.timestamp, - type: item.eventType, - time: evData.detachTime, - imsi: evData.imsi, - msg: `${evData.detachResult}`, - }; - } - - if (item.eventType === 'cm-state') { - return { - id: item.id || item.timestamp, - type: item.eventType, - time: evData.changeTime, - imsi: evData.imsi, - msg: `${evData.onlineNumber}`, - }; - } + /**UPF-总流量数 发消息*/ + function upfTFSend(day: 0 | 7 | 30) { + ws.send({ + requestId: `1030_${day}`, + type: 'upf_tf', + data: { + neType: 'UPF', + neId: '001', + day: day, + }, + }); } - /**cdrEvent CDR会话事件 数据解析 */ - function cdrEventParse(item: Record) { - let evData: Record = item.cdrJSON || item.CDR; - if (typeof evData === 'string') { - try { - evData = JSON.parse(evData); - } catch (error) { - console.error(error); - return false; - } - } - - if (evData.recordType === 'CALL') { - return { - id: item.id || item.timestamp, - type: evData.recordType, - time: evData.callDuration, - call: evData.callReference, - msg: `${evData.calledParty} -> ${evData.callerParty}`, - }; - } + /**ueEvent UE会话事件 发消息*/ + function ueEventSend() { + ws.send({ + requestId: '1010', + type: 'ue', + data: { + neType: 'AMF', + neId: '001', + sortField: 'timestamp', + sortOrder: 'desc', + pageNum: 1, + pageSize: 50, + }, + }); } - /**接收数据后回调 */ - function wsError(ev: any) { - // 接收数据后回调 - console.log(ev); + /**cdrEvent CDR会话事件 发消息*/ + function cdrEventSend() { + ws.send({ + requestId: '1005', + type: 'cdr', + data: { + neType: 'IMS', + neId: '001', + sortField: 'timestamp', + sortOrder: 'desc', + pageNum: 1, + pageSize: 50, + }, + }); } onMounted(() => { @@ -214,7 +187,9 @@ export default function useWS() { }); return { - wsInitData, wsSend, + cdrEventSend, + ueEventSend, + upfTFSend, }; }