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

This commit is contained in:
lai
2024-07-11 10:18:35 +08:00
7 changed files with 14 additions and 13 deletions

View File

@@ -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'];

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 = '';
const params = options.params;
for (const key in params) {

View File

@@ -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',

View File

@@ -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;

View File

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

View File

@@ -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(',');
}
// 安装带依赖包-指定网元时

View File

@@ -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;