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

Merge remote-tracking branch 'origin/main' into practical-training

Browse Source
This commit is contained in:
TsMask
2024-07-09 19:09:04 +08:00
parent efa8764bd1 9e0a99d160
commit f3c46976ae
12 changed files with 36 additions and 22 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
* 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'];

1
src/i18n/locales/en-US.ts
View File

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

1
src/i18n/locales/zh-CN.ts
View File

@@ -883,6 +883,7 @@ export default {
imsiTip3: 'MSIN=移动客户识别码，采用等长10位数字构成',
msisdnTip: '参数最大长度 {num}',
inputTip: '参数最大长度为 {num}',
cnTypeTip: '允许接入的网络类型',
arfbTip: '限制区域模板，在模板指定的限制区域中，UE 不允许与网络通信',
sarTip: '服务区域限制模板，定义允许的区域，UE 在这些区域中可以和网络通信；定义不允许的区，UE 和网络在这些区域中，不允许发起Service Request 或 SM 信令来获取用户服务',
micoTip: '签约的 MICO 业务标志位',

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

4
src/views/dashboard/smfCDR/index.vue
View File

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

7
src/views/index.vue
View File

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

2
src/views/ne/neConfPara5G/components/Para5GForm.vue
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',

2
src/views/ne/neConfPara5G/index.vue
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;

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

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

5
src/views/ne/neSoftware/components/UploadMoreFile.vue
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(',');
}
// 安装带依赖包-指定网元时

18
src/views/neUser/sub/index.vue
View File

@@ -1535,7 +1535,11 @@ onMounted(() => {
name="imsi"
v-bind="modalStateFrom.validateInfos.imsi"
>
<a-input v-model:value="modalState.from.imsi" allow-clear>
<a-input
v-model:value="modalState.from.imsi"
allow-clear
:disabled="!!modalState.from.id"
>
<template #prefix>
<a-tooltip placement="topLeft">
<template #title>
@@ -1549,7 +1553,11 @@ onMounted(() => {
</template>
</a-input>
</a-form-item>
<a-form-item label="CN Type" name="cn">
<a-form-item
label="CN Type"
name="cn"
:help="t('views.neUser.sub.cnTypeTip')"
>
<a-select
v-model:value="modalState.from.cn"
:options="dict.udmSubCNType"
@@ -2096,7 +2104,11 @@ onMounted(() => {
</template>
</a-input>
</a-form-item>
<a-form-item label="CN Type" name="cn">
<a-form-item
label="CN Type"
name="cn"
:help="t('views.neUser.sub.cnTypeTip')"
>
<a-select
v-model:value="modalState.BatchForm.cn"
:options="dict.udmSubCNType"

2
src/views/system/quick-start/components/NeInfoConfigPara5G.vue
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;