diff --git a/.env.development b/.env.development index bf7f0713..1e7ed646 100644 --- a/.env.development +++ b/.env.development @@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS" VITE_APP_CODE = "CN EMS" # 应用版本 -VITE_APP_VERSION = "2.240617.1" +VITE_APP_VERSION = "2.240619.1" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" diff --git a/.env.production b/.env.production index f487dce1..3b1b6622 100644 --- a/.env.production +++ b/.env.production @@ -11,7 +11,7 @@ VITE_APP_NAME = "Core Network EMS" VITE_APP_CODE = "CN EMS" # 应用版本 -VITE_APP_VERSION = "2.240617.1" +VITE_APP_VERSION = "2.240619.1" # 接口基础URL地址-不带/后缀 VITE_API_BASE_URL = "/omc-api" 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; } diff --git a/src/components/UploadModal/index.vue b/src/components/UploadModal/index.vue index e4d65cc5..662927d9 100644 --- a/src/components/UploadModal/index.vue +++ b/src/components/UploadModal/index.vue @@ -84,7 +84,7 @@ function fnUpload(up: UploadRequestOption) { :keyboard="false" :mask-closable="false" :confirm-loading="props.loading" - :footer="null" + :footer="false" @cancel="fnModalClose" > diff --git a/src/views/configManage/softwareManage/components/software-history.vue b/src/views/configManage/softwareManage/components/software-history.vue index 3c5724ba..ee7e883e 100644 --- a/src/views/configManage/softwareManage/components/software-history.vue +++ b/src/views/configManage/softwareManage/components/software-history.vue @@ -210,7 +210,7 @@ watch( :keyboard="false" :mask-closable="false" @cancel="fnModalCancel" - :footer="null" + :footer="false" > 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(() => { > - - + + { :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/neUser/ue/index.vue b/src/views/neUser/ue/index.vue index b01d3eaf..08c6e77c 100644 --- a/src/views/neUser/ue/index.vue +++ b/src/views/neUser/ue/index.vue @@ -413,7 +413,7 @@ onMounted(() => { :visible="modalState.visibleByView" :title="modalState.title" @cancel="fnModalCancel" - :footer="null" + :footer="false" > 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) { diff --git a/src/views/traceManage/pcap/index.vue b/src/views/traceManage/pcap/index.vue index 19681b2f..d5ecd361 100644 --- a/src/views/traceManage/pcap/index.vue +++ b/src/views/traceManage/pcap/index.vue @@ -539,7 +539,7 @@ onMounted(() => { :drag="true" :width="800" :visible="modalState.visibleByView" - :footer="null" + :footer="false" :maskClosable="false" :keyboard="false" :title="t('views.traceManage.pcap.textLogMsg')"