From f0561242ca4bf439ff4a6b4d9c35f20c2caf7eba Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 9 Jul 2024 10:04:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20fetch=E8=AF=B7=E6=B1=82=E6=8B=BC?= =?UTF-8?q?=E6=8E=A5=E5=9C=B0=E5=9D=80=E6=A0=8F=E5=8F=82=E6=95=B0=E4=B8=8D?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E8=AF=B7=E6=B1=82=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/http-fetch.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/http-fetch.ts b/src/plugins/http-fetch.ts index fb4294c7..9ea0ecab 100644 --- a/src/plugins/http-fetch.ts +++ b/src/plugins/http-fetch.ts @@ -165,8 +165,8 @@ function beforeRequest(options: OptionsType): OptionsType | Promise { } } - // get请求拼接地址栏参数 - if (options.method === 'get' && options.params) { + // 请求拼接地址栏参数 + if (options.params) { let paramStr = ''; const params = options.params; for (const key in params) { From a7de701d4d9fcd79232f87407a927b504d776c43 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 9 Jul 2024 16:11:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81kvdb=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=8C=85=E5=AE=89=E8=A3=85=EF=BC=8Cdb=5Fip=E9=BB=98?= =?UTF-8?q?=E8=AE=A40.0.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants/ne-constants.ts | 6 +++--- src/views/index.vue | 7 +++---- src/views/ne/neConfPara5G/components/Para5GForm.vue | 2 +- src/views/ne/neConfPara5G/index.vue | 2 +- .../ne/neQuickSetup/components/NeInfoSoftwareInstall.vue | 6 +----- src/views/ne/neSoftware/components/UploadMoreFile.vue | 5 +++++ .../system/quick-start/components/NeInfoConfigPara5G.vue | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/constants/ne-constants.ts b/src/constants/ne-constants.ts index 68f3a378..4cd14a74 100644 --- a/src/constants/ne-constants.ts +++ b/src/constants/ne-constants.ts @@ -20,7 +20,7 @@ export const NE_TYPE_LIST = [ /** * 网元拓展包列表,默认顺序 - * IMS-adb/rtproxy/mf - * UDM-adb + * IMS-adb/kvdb/rtproxy/mf + * UDM-adb/kvdb */ -export const NE_EXPAND_LIST = ['ADB', 'RTPROXY', 'MF']; +export const NE_EXPAND_LIST = ['ADB', 'KVDB', 'RTPROXY', 'MF']; diff --git a/src/views/index.vue b/src/views/index.vue index 47d015b1..c32c5201 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -153,11 +153,10 @@ type nfStateType = { /**网元详细信息 */ let pronInfo: nfStateType = reactive({ hostName: '5gc', - osInfo: - 'Linux 5gc 4.15.0-112-generic #113-Ubuntu SMP Thu Jul 9 23:41:39 UTC 2020 x86_64 GNU/Linux', - dbInfo: 'adb v1.0.1', + osInfo: 'Linux 5gc 4.15.0-112-generic 2020 x86_64 GNU/Linux', + dbInfo: 'db v9.9.9', ipAddress: '-', - port: 3030, + port: 33030, version: '-', cpuUse: '-', memoryUse: '-', diff --git a/src/views/ne/neConfPara5G/components/Para5GForm.vue b/src/views/ne/neConfPara5G/components/Para5GForm.vue index d9da3bb1..66ba7738 100644 --- a/src/views/ne/neConfPara5G/components/Para5GForm.vue +++ b/src/views/ne/neConfPara5G/components/Para5GForm.vue @@ -74,7 +74,7 @@ let state: StateType = reactive({ amf_ip: '172.16.5.120', ausf_ip: '172.16.5.130', udm_ip: '172.16.5.140', - adb_ip: '0.0.0.0', + db_ip: '0.0.0.0', smf_ip: '172.16.5.150', pcf_ip: '172.16.5.160', nssf_ip: '172.16.5.170', diff --git a/src/views/ne/neConfPara5G/index.vue b/src/views/ne/neConfPara5G/index.vue index 6be68cb9..58d4efae 100644 --- a/src/views/ne/neConfPara5G/index.vue +++ b/src/views/ne/neConfPara5G/index.vue @@ -136,7 +136,7 @@ function fnGetData() { break; case 'UDM': state.from.sbi.udm_ip = item.ip; - state.from.sbi.adb_ip = '0.0.0.0'; + state.from.sbi.db_ip = '0.0.0.0'; break; case 'SMF': state.from.sbi.smf_ip = item.ip; diff --git a/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue b/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue index 52c4fee7..7427a194 100644 --- a/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue +++ b/src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue @@ -157,11 +157,7 @@ type StateType = { optionType: 'upload' | 'option'; /**文件上传 */ visibleByFile: boolean; - /** - * 依赖包类型 - * IMS-rtproxy/mf/adb - * UDM-adb - */ + /**网元拓展包列表类型 */ depType: string[]; /**软件包信息数据 */ from: { diff --git a/src/views/ne/neSoftware/components/UploadMoreFile.vue b/src/views/ne/neSoftware/components/UploadMoreFile.vue index 50a6bf10..d91a59c7 100644 --- a/src/views/ne/neSoftware/components/UploadMoreFile.vue +++ b/src/views/ne/neSoftware/components/UploadMoreFile.vue @@ -91,6 +91,9 @@ async function fnModalOk() { if (expandFile['ADB']) { pkgArr.push(expandFile['ADB']); } + if (expandFile['KVDB']) { + pkgArr.push(expandFile['KVDB']); + } if (expandFile['RTPROXY']) { pkgArr.push(expandFile['RTPROXY']); } @@ -104,6 +107,8 @@ async function fnModalOk() { const udm = from.find(s => s.neType === 'UDM'); if (udm && expandFile['ADB']) { udm.path = [expandFile['ADB'], udm.path].join(','); + } else if (udm && expandFile['KVDB']) { + udm.path = [expandFile['KVDB'], udm.path].join(','); } // 安装带依赖包-指定网元时 diff --git a/src/views/system/quick-start/components/NeInfoConfigPara5G.vue b/src/views/system/quick-start/components/NeInfoConfigPara5G.vue index d975b669..9268d8dd 100644 --- a/src/views/system/quick-start/components/NeInfoConfigPara5G.vue +++ b/src/views/system/quick-start/components/NeInfoConfigPara5G.vue @@ -113,7 +113,7 @@ function fnGetList() { break; case 'UDM': state.from.sbi.udm_ip = item.ip; - state.from.sbi.adb_ip = '0.0.0.0'; + state.from.sbi.db_ip = '0.0.0.0'; break; case 'SMF': state.from.sbi.smf_ip = item.ip; From 5ac0ca41eb92fcc40b30d9691e9fc9888b91cc9f Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 9 Jul 2024 18:36:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?style:=20=E7=AD=BE=E7=BA=A6=E7=94=A8?= =?UTF-8?q?=E6=88=B7IMSI=E7=BC=96=E8=BE=91=E6=97=B6=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8CcnType=E6=B7=BB=E5=8A=A0=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 1 + src/i18n/locales/zh-CN.ts | 1 + src/views/neUser/sub/index.vue | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index d3a5aad9..88c1364c 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -883,6 +883,7 @@ export default { imsiTip3: 'MSIN = Mobile Subscriber Identification Number, consisting of 10 equal digits.', msisdnTip: 'Maximum parameter length {num}', inputTip: 'The maximum length of the parameter is {num}', + cnTypeTip: 'Type of network access allowed', arfbTip: 'Restricted area template, in which the UE is not allowed to communicate with the network in the restricted area specified in the template', sarTip: 'Service Area Restriction template, defining permitted areas in which the UE can communicate with the network, and disallowed areas in which the UE and the network are not allowed to initiate Service Requests or SM signaling to obtain subscriber services', micoTip: 'Signed MICO business flag bits', diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index 7c0a41b1..374af28a 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -883,6 +883,7 @@ export default { imsiTip3: 'MSIN=移动客户识别码，采用等长10位数字构成', msisdnTip: '参数最大长度 {num}', inputTip: '参数最大长度为 {num}', + cnTypeTip: '允许接入的网络类型', arfbTip: '限制区域模板，在模板指定的限制区域中，UE 不允许与网络通信', sarTip: '服务区域限制模板，定义允许的区域，UE 在这些区域中可以和网络通信；定义不允许的区，UE 和网络在这些区域中，不允许发起Service Request 或 SM 信令来获取用户服务', micoTip: '签约的 MICO 业务标志位', diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue index 0de9eaaa..72dc5fff 100644 --- a/src/views/neUser/sub/index.vue +++ b/src/views/neUser/sub/index.vue @@ -1535,7 +1535,11 @@ onMounted(() => { name="imsi" v-bind="modalStateFrom.validateInfos.imsi" > - + - + Date: Tue, 9 Jul 2024 19:02:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?style:=20=E6=95=B0=E6=8D=AECDR=E7=9A=84?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/smfCDR/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/dashboard/smfCDR/index.vue b/src/views/dashboard/smfCDR/index.vue index ad726ee6..385a7b8e 100644 --- a/src/views/dashboard/smfCDR/index.vue +++ b/src/views/dashboard/smfCDR/index.vue @@ -197,7 +197,7 @@ let tableColumns: ColumnsType = [ title: t('views.dashboard.cdr.smfInvocationTime'), // 调用时间 dataIndex: 'cdrJSON', align: 'left', - width: 250, + width: 200, customRender(opt) { const cdrJSON = opt.value; return cdrJSON.invocationTimestamp; @@ -616,7 +616,7 @@ onBeforeUnmount(() => { :data-source="tableState.data" :size="tableState.size" :pagination="tablePagination" - :scroll="{ x: tableColumns.length * 120, y: 'calc(100vh - 480px)' }" + :scroll="{ x: tableColumns.length * 150, y: 'calc(100vh - 480px)' }" :row-selection="{ type: 'checkbox', columnWidth: '48px',