Merge remote-tracking branch 'origin/main' into practical-training
This commit is contained in:
@@ -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',
|
||||
|
||||
@@ -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: '-',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -157,11 +157,7 @@ type StateType = {
|
||||
optionType: 'upload' | 'option';
|
||||
/**文件上传 */
|
||||
visibleByFile: boolean;
|
||||
/**
|
||||
* 依赖包类型
|
||||
* IMS-rtproxy/mf/adb
|
||||
* UDM-adb
|
||||
*/
|
||||
/**网元拓展包列表类型 */
|
||||
depType: string[];
|
||||
/**软件包信息数据 */
|
||||
from: {
|
||||
|
||||
@@ -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(',');
|
||||
}
|
||||
|
||||
// 安装带依赖包-指定网元时
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user