OMC/fe.ems.vue3
1
0
Fork 0
Code Issues Releases 3 Activity

Merge branch 'multi-tenant' of http://192.168.2.166:3180/OMC/ems_frontend_vue3 into multi-tenant

Browse Source
This commit is contained in:
lai
2024-07-11 10:18:35 +08:00
parent 93315776da 24cd0ff101
commit 71d23cbc32
7 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/constants/ne-constants.ts
View File

@@ -20,7 +20,7 @@ export const NE_TYPE_LIST = [
/** /**
* 网元拓展包列表,默认顺序 * 网元拓展包列表,默认顺序
* IMS-adb/rtproxy/mf * IMS-adb/kvdb/rtproxy/mf
* UDM-adb * UDM-adb/kvdb
*/ */
export const NE_EXPAND_LIST = ['ADB', 'RTPROXY', 'MF']; export const NE_EXPAND_LIST = ['ADB', 'KVDB', 'RTPROXY', 'MF'];

4
src/plugins/http-fetch.ts
View File

@@ -165,8 +165,8 @@ function beforeRequest(options: OptionsType): OptionsType | Promise<any> {
} }
} }
// get请求拼接地址栏参数 // 请求拼接地址栏参数
if (options.method === 'get' && options.params) { if (options.params) {
let paramStr = ''; let paramStr = '';
const params = options.params; const params = options.params;
for (const key in params) { for (const key in params) {

2
src/views/ne/neConfPara5G/components/Para5GForm.vue
View File

@@ -74,7 +74,7 @@ let state: StateType = reactive({
amf_ip: '172.16.5.120', amf_ip: '172.16.5.120',
ausf_ip: '172.16.5.130', ausf_ip: '172.16.5.130',
udm_ip: '172.16.5.140', udm_ip: '172.16.5.140',
adb_ip: '0.0.0.0', db_ip: '0.0.0.0',
smf_ip: '172.16.5.150', smf_ip: '172.16.5.150',
pcf_ip: '172.16.5.160', pcf_ip: '172.16.5.160',
nssf_ip: '172.16.5.170', nssf_ip: '172.16.5.170',

2
src/views/ne/neConfPara5G/index.vue
View File

@@ -136,7 +136,7 @@ function fnGetData() {
break; break;
case 'UDM': case 'UDM':
state.from.sbi.udm_ip = item.ip; 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; break;
case 'SMF': case 'SMF':
state.from.sbi.smf_ip = item.ip; state.from.sbi.smf_ip = item.ip;

6
src/views/ne/neQuickSetup/components/NeInfoSoftwareInstall.vue
View File

@@ -157,11 +157,7 @@ type StateType = {
optionType: 'upload' | 'option'; optionType: 'upload' | 'option';
/**文件上传 */ /**文件上传 */
visibleByFile: boolean; visibleByFile: boolean;
/** /**网元拓展包列表类型 */
* 依赖包类型
* IMS-rtproxy/mf/adb
* UDM-adb
*/
depType: string[]; depType: string[];
/**软件包信息数据 */ /**软件包信息数据 */
from: { from: {

5
src/views/ne/neSoftware/components/UploadMoreFile.vue
View File

@@ -91,6 +91,9 @@ async function fnModalOk() {
if (expandFile['ADB']) { if (expandFile['ADB']) {
pkgArr.push(expandFile['ADB']); pkgArr.push(expandFile['ADB']);
} }
if (expandFile['KVDB']) {
pkgArr.push(expandFile['KVDB']);
}
if (expandFile['RTPROXY']) { if (expandFile['RTPROXY']) {
pkgArr.push(expandFile['RTPROXY']); pkgArr.push(expandFile['RTPROXY']);
} }
@@ -104,6 +107,8 @@ async function fnModalOk() {
const udm = from.find(s => s.neType === 'UDM'); const udm = from.find(s => s.neType === 'UDM');
if (udm && expandFile['ADB']) { if (udm && expandFile['ADB']) {
udm.path = [expandFile['ADB'], udm.path].join(','); udm.path = [expandFile['ADB'], udm.path].join(',');
} else if (udm && expandFile['KVDB']) {
udm.path = [expandFile['KVDB'], udm.path].join(',');
} }
// 安装带依赖包-指定网元时 // 安装带依赖包-指定网元时

2
src/views/system/quick-start/components/NeInfoConfigPara5G.vue
View File

@@ -113,7 +113,7 @@ function fnGetList() {
break; break;
case 'UDM': case 'UDM':
state.from.sbi.udm_ip = item.ip; 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; break;
case 'SMF': case 'SMF':
state.from.sbi.smf_ip = item.ip; state.from.sbi.smf_ip = item.ip;