From 0955a79965be074ec90f26c531a4a0f37da3d3a9 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 19 Jun 2024 14:51:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?style:=20=E7=A7=BB=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8console=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faultManage/fault-setting/index.vue | 27 +++++++++++-------- src/views/monitor/topology/index.vue | 3 +-- .../monitor/topologyBuild/hooks/useEdge.ts | 4 +-- .../monitor/topologyBuild/hooks/useGraph.ts | 6 ++--- src/views/neUser/nssfAmf/index.vue | 1 - src/views/neUser/pcf/index.vue | 2 -- src/views/system/dict/data.vue | 1 - .../quick-start/components/SystemConfig.vue | 3 --- .../setting/components/change-help-doc.vue | 1 - 9 files changed, 21 insertions(+), 27 deletions(-) diff --git a/src/views/faultManage/fault-setting/index.vue b/src/views/faultManage/fault-setting/index.vue index 7cb2a3be..d65a5063 100644 --- a/src/views/faultManage/fault-setting/index.vue +++ b/src/views/faultManage/fault-setting/index.vue @@ -94,7 +94,7 @@ function fnFormLogSetFinish() { /**告警前转接口对象信息状态 */ let forwardState: ModalStateType = reactive({ - title:t('views.faultManage.faultSetting.forwardSet'), + title: t('views.faultManage.faultSetting.forwardSet'), from: { interface: 'email', emailObj: [], @@ -128,11 +128,15 @@ function fnFormForwardFinish() { forwardStateFrom.validate().then(() => { forwardState.confirmLoading = true; const from = toRaw(forwardState.from); - console.log(from); updateForwardSet(from) .then(res => { if (res.code === RESULT_CODE_SUCCESS) { - message.success( t('common.msgSuccess', { msg: t('views.faultManage.faultSetting.save')}), 3); + message.success( + t('common.msgSuccess', { + msg: t('views.faultManage.faultSetting.save'), + }), + 3 + ); } else { message.warning(t('views.faultManage.faultSetting.noChange'), 3); } @@ -158,7 +162,6 @@ onMounted(() => { if (resArr[1].status === 'fulfilled') { const result = resArr[1].value; if (result.code === RESULT_CODE_SUCCESS) { - console.log(result.data); let finalData: any = { emailObj: result.data[0]['to_user'], smsObj: result.data[1]['to_user'], @@ -273,12 +276,11 @@ onMounted(() => { - - + + { :token-separators="[',']" > - + { - if (!hasNeList) return; - console.log(graphG6Data) + if (!hasNeList) return; if (refresh) { // graphG6.value.get('canvas').set('localRefresh', true); graphG6.value.destroy(); diff --git a/src/views/monitor/topologyBuild/hooks/useEdge.ts b/src/views/monitor/topologyBuild/hooks/useEdge.ts index 0406ee87..066fdde9 100644 --- a/src/views/monitor/topologyBuild/hooks/useEdge.ts +++ b/src/views/monitor/topologyBuild/hooks/useEdge.ts @@ -173,9 +173,7 @@ export default function useEdge() { edge.type = 'loop'; } // 不存在fontWeight会触发异常 - if(!edge.labelCfg.style.fontWeight){ - console.log(edge) - debugger + if(!edge.labelCfg.style.fontWeight){ edge.labelCfg.style.fontWeight = 500 } // 存在更新，新增id是#不监听变化 diff --git a/src/views/monitor/topologyBuild/hooks/useGraph.ts b/src/views/monitor/topologyBuild/hooks/useGraph.ts index 751ccdc9..f9339607 100644 --- a/src/views/monitor/topologyBuild/hooks/useGraph.ts +++ b/src/views/monitor/topologyBuild/hooks/useGraph.ts @@ -94,7 +94,7 @@ export default function useGraph() { `; }, handleMenuClick(target, item) { - console.log(target, item); + // console.log(target, item); const targetId = target.id; switch (targetId) { case 'create-edge': @@ -223,7 +223,7 @@ export default function useGraph() { `; }, handleMenuClick(target, item) { - console.log(target, item); + // console.log(target, item); const targetId = target.id; switch (targetId) { case 'edit': @@ -302,7 +302,7 @@ export default function useGraph() { `; }, handleMenuClick(target, item) { - console.log(target, item); + // console.log(target, item); const targetId = target.id; switch (targetId) { case 'edit': diff --git a/src/views/neUser/nssfAmf/index.vue b/src/views/neUser/nssfAmf/index.vue index ec6c7e52..f21e0850 100644 --- a/src/views/neUser/nssfAmf/index.vue +++ b/src/views/neUser/nssfAmf/index.vue @@ -64,7 +64,6 @@ function fnGetList(pageNum?: number) { tableState.loading = true; listNSSFAMF().then(res => { if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) { - console.log(res.rows); // 取消勾选 if (tableState.selectedRowKeys.length > 0) { tableState.selectedRowKeys = []; diff --git a/src/views/neUser/pcf/index.vue b/src/views/neUser/pcf/index.vue index 6d84bfed..cc6ce5a2 100644 --- a/src/views/neUser/pcf/index.vue +++ b/src/views/neUser/pcf/index.vue @@ -300,7 +300,6 @@ function fnModalVisibleByEdit(row?: Record) { sessRules = [sessRules]; } modalState.from.sessRules = sessRules; - console.log(modalState.from); modalState.title = t('views.neUser.pcf.updateTitle', { imsi: row.imsi, @@ -327,7 +326,6 @@ function fnModalOk() { const from = JSON.parse(JSON.stringify(modalState.from)); from.neId = queryParams.neId || '-'; from.rfsp = Number(from.rfsp) || 0; - console.log(from); let pccRules = modalState.from.pccRules; if (Array.isArray(pccRules)) { pccRules = pccRules.join('|'); diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue index 7cb65d22..5f92ee42 100644 --- a/src/views/system/dict/data.vue +++ b/src/views/system/dict/data.vue @@ -301,7 +301,6 @@ function fnModalVisibleByVive(row: Record) { * @param dictCode 数据编号id, 不传为新增 */ function fnModalVisibleByEdit(dictCode?: string | number, record?: any) { - console.log(record); if (!dictCode) { modalStateFrom.resetFields(); modalState.from.dictType = queryParams.dictType; diff --git a/src/views/system/quick-start/components/SystemConfig.vue b/src/views/system/quick-start/components/SystemConfig.vue index 88766b63..64f5d613 100644 --- a/src/views/system/quick-start/components/SystemConfig.vue +++ b/src/views/system/quick-start/components/SystemConfig.vue @@ -117,7 +117,6 @@ function fnSaveAcount() { // 发送保存 state.confirmLoading = true; bootloaderAccount(state.username, state.password).then(res => { - console.log(res); if (res.code === RESULT_CODE_SUCCESS) { message.success(t('common.operateOk')); } else { @@ -158,7 +157,6 @@ function fnSaveSystem() { // 发送保存 state.confirmLoading = true; Promise.all(reqArr).then(resArr => { - console.log(resArr); message.success(t('views.system.quickStart.sysSaveOk')); state.confirmLoading = false; }); @@ -206,7 +204,6 @@ function fnCheckAppNameOverflow() { if (!container) return; const text: HTMLDivElement | null = container.querySelector('.marquee'); if (!text) return; - console.log(text.offsetWidth, container.offsetWidth); if (text.offsetWidth > container.offsetWidth) { text.classList.add('app-name_scrollable'); } else { diff --git a/src/views/system/setting/components/change-help-doc.vue b/src/views/system/setting/components/change-help-doc.vue index 20b1cbe3..171c8f77 100644 --- a/src/views/system/setting/components/change-help-doc.vue +++ b/src/views/system/setting/components/change-help-doc.vue @@ -28,7 +28,6 @@ let state: StateType = reactive({ /**上传前检查或转换压缩 */ function fnBeforeUpload(file: FileType) { - console.log(file.type); if (state.loading) return false; const isType = ['application/pdf'].includes(file.type); if (!isType) { From 1ec374eb2603ca7243890ec670aee1051aacbbdb Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 19 Jun 2024 16:55:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?style:=20UE=E5=9C=A8=E7=BA=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=B4=E6=97=B6=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/neUser/base5G.ts | 4 ++- src/api/neUser/smf.ts | 55 +++++++++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/src/api/neUser/base5G.ts b/src/api/neUser/base5G.ts index b1769c44..2621ed53 100644 --- a/src/api/neUser/base5G.ts +++ b/src/api/neUser/base5G.ts @@ -25,8 +25,10 @@ export async function listBase5G(query: Record) { data.total = rows.length; data.rows = rows; } + // 模拟数据 - // data.rows =[{"address":"192.168.1.137:38412","id":"217","name":"attach-enb-100000-20","ueNum":0}] + // data.rows = [{"address":"192.168.1.137:38412","id":"217","name":"attach-enb-100000-20","ueNum":0}] + // data.rows = [{address: "192.168.8.223", id: 257, name: "SmallCell", ueNum: 0}] return data; } diff --git a/src/api/neUser/smf.ts b/src/api/neUser/smf.ts index a1221024..a19f2617 100644 --- a/src/api/neUser/smf.ts +++ b/src/api/neUser/smf.ts @@ -31,36 +31,55 @@ export async function listUEInfoBySMF(query: Record) { // data.code = RESULT_CODE_SUCCESS; // data.rows = [ // { - // imsi: 'imsi-460002082101038', - // msisdn: 'msisdn-12307550000', + // imsi: 'imsi-460000100000090', + // msisdn: 'msisdn-12307550090', // pduSessionInfo: [ // { - // activeTime: '2024-05-08 11:08:22', + // activeTime: '2024-06-19 14:35:26', // dnn: 'ims', - // ipv4: '10.10.86.2', - // ipv6: '', - // pduSessionID: 5, - // ranN3IP: '192.168.5.100', - // sstSD: '1-000001', - // tai: '46000-001124', - // upState: 'Active', - // upfN3IP: '192.168.14.201', - // }, - // { - // activeTime: '2024-05-08 11:08:23', - // dnn: 'cmnet', - // ipv4: '10.10.86.201', + // ipv4: '10.10.48.8', // ipv6: '', // pduSessionID: 6, - // ranN3IP: '192.168.5.100', + // ranN3IP: '192.168.1.137', // sstSD: '1-000001', // tai: '46000-001124', // upState: 'Active', - // upfN3IP: '192.168.14.201', + // upfN3IP: '192.168.1.161', + // }, + // { + // activeTime: '2024-06-19 14:35:26', + // dnn: 'cmnet', + // ipv4: '10.10.48.9', + // ipv6: '2001:4860:4860::/64', + // pduSessionID: 7, + // ranN3IP: '192.168.1.137', + // sstSD: '1-000001', + // tai: '46000-001124', + // upState: 'Active', + // upfN3IP: '192.168.1.161', // }, // ], // ratType: 'NR', // }, + // { + // imsi: 'imsi-460602072701180', + // msisdn: 'msisdn-123460600080', + // pduSessionInfo: [ + // { + // activeTime: '2024-06-19 14:31:09', + // dnn: 'cmnet', + // ipv4: '10.10.48.4', + // ipv6: '', + // pduSessionID: 5, + // ranN3IP: '192.168.8.223', + // sstSD: '1-000001', + // tai: '46060-0001', + // upState: 'Active', + // upfN3IP: '192.168.1.161', + // }, + // ], + // ratType: 'EUTRAN', + // }, // ]; return data; } From e1548d2c982e651cc86163aa9ce6bc99a364726d Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 19 Jun 2024 16:57:07 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20UE=E4=BA=8B=E4=BB=B6MME=20=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E6=8E=A8=E9=80=81=E6=98=BE=E7=A4=BA/=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=BB=93=E6=9E=9C=E4=BF=9D=E6=8C=81=E5=92=8CAMF?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/mmeUE/index.vue | 82 ++++++++++++------- .../components/UserActivity/index.vue | 28 ++----- src/views/dashboard/overview/hooks/useWS.ts | 3 +- 3 files changed, 62 insertions(+), 51 deletions(-) diff --git a/src/views/dashboard/mmeUE/index.vue b/src/views/dashboard/mmeUE/index.vue index 0756eab0..74a6523d 100644 --- a/src/views/dashboard/mmeUE/index.vue +++ b/src/views/dashboard/mmeUE/index.vue @@ -23,13 +23,16 @@ const queue = new PQueue({ concurrency: 1, autoStart: true }); /**字典数据 */ let dict: { - /**UE 事件类型MME */ - ueEventTypeMME: DictType[]; - /**UE 事件结果MME */ - ueEventResultMME: DictType[]; + /**UE 事件认证代码类型 */ + ueAauthCode: DictType[]; + /**UE 事件类型 */ + ueEventType: DictType[]; + /**UE 事件CM状态 */ + ueEventCmState: DictType[]; } = reactive({ - ueEventTypeMME: [], - ueEventResultMME: [], + ueAauthCode: [], + ueEventType: [], + ueEventCmState: [], }); /**开始结束时间 */ @@ -40,7 +43,7 @@ let queryParams = reactive({ /**网元类型 */ neType: 'MME', neId: '001', - eventType: '', + eventType: 'auth-result', imsi: '', sortField: 'timestamp', sortOrder: 'desc', @@ -56,9 +59,9 @@ let queryParams = reactive({ /**查询参数重置 */ function fnQueryReset() { - eventTypes.value = []; + eventTypes.value = ['auth-result']; queryParams = Object.assign(queryParams, { - eventType: '', + eventType: 'auth-result', imsi: '', startTime: '', endTime: '', @@ -72,7 +75,7 @@ function fnQueryReset() { } /**记录类型 */ -const eventTypes = ref([]); +const eventTypes = ref(['auth-result']); /**查询记录类型变更 */ function fnQueryEventTypeChange(value: any) { @@ -397,15 +400,19 @@ function wsMessage(res: Record) { onMounted(() => { // 初始字典数据 Promise.allSettled([ - getDict('ue_event_mme_type'), - getDict('ue_event_mme_result'), + getDict('ue_auth_code'), + getDict('ue_event_type'), + getDict('ue_event_cm_state'), ]) .then(resArr => { if (resArr[0].status === 'fulfilled') { - dict.ueEventTypeMME = resArr[0].value; + dict.ueAauthCode = resArr[0].value; } if (resArr[1].status === 'fulfilled') { - dict.ueEventResultMME = resArr[1].value; + dict.ueEventType = resArr[1].value; + } + if (resArr[2].status === 'fulfilled') { + dict.ueEventCmState = resArr[2].value; } }) .finally(() => { @@ -439,7 +446,7 @@ onBeforeUnmount(() => { @@ -595,13 +602,24 @@ onBeforeUnmount(() => { >