From 323da55c9db0052609231bce57e1971c1b9651a5 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 15 Oct 2025 11:42:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=A0=B9?= =?UTF-8?q?=E7=BD=91=E7=AE=A1=E8=8A=82=E7=82=B9=E5=A4=84=E7=90=86=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=94=AF=E6=8C=81=E6=97=A0OMC=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/monitor/topology/index.vue | 45 ++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/src/views/monitor/topology/index.vue b/src/views/monitor/topology/index.vue index fdb9d274..fd3080ce 100644 --- a/src/views/monitor/topology/index.vue +++ b/src/views/monitor/topology/index.vue @@ -64,10 +64,50 @@ function fnGetList(refresh: boolean = false) { Array.isArray(res.data) && res.data.length > 0 ) { - // 根网管 - let rootNodeInfo = { neName: 'OMC_001' }; const nodes = []; const edges = []; + + // 根网管 + let rootNodeInfo = { + neName: 'ROOT', + serverState: { + online: true, + }, + }; + // 处理没有OMC的情况 + const omcFilter = res.data.filter(v => v.neType === 'OMC'); + if (omcFilter.length === 1) { + rootNodeInfo.neName = omcFilter[0].neName; + } else { + nodes.unshift({ + id: rootNodeInfo.neName, + label: rootNodeInfo.neName, + info: rootNodeInfo, + labelCfg: { + position: 'bottom', + offset: 8, + style: { + fill: '#fff', + fontSize: 14, + }, + }, + size: 60, + icon: { + x: -30, + y: -30, + // 可更换为其他图片地址 + img: parseBasePath('/svg/service_db.svg'), + width: 60, + height: 60, + }, + }); + edges.push({ + source: rootNodeInfo.neName, + target: rootNodeInfo.neName, + label: `${rootNodeInfo.neName}-${rootNodeInfo.neName}`, + }); + } + for (const item of res.data) { item.serverState = {}; // 节点 @@ -96,7 +136,6 @@ function fnGetList(refresh: boolean = false) { height: 60, }, }); - !rootNodeInfo.neName && (rootNodeInfo = item); } else { nodes.push({ id: item.neName, From fc64460870a3573d1704dcf65ff0dddeb6456db2 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 17 Oct 2025 10:20:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E7=BD=91=E5=85=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=80=89=E6=8B=A9=E4=BC=A0=E5=85=A5neId=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ne/neConfig.ts | 3 ++- src/views/ne/neConfig/index.vue | 4 ++-- src/views/ne/neConfigHA/index.vue | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/api/ne/neConfig.ts b/src/api/ne/neConfig.ts index 6631562f..5704b84c 100644 --- a/src/api/ne/neConfig.ts +++ b/src/api/ne/neConfig.ts @@ -6,10 +6,11 @@ import { request } from '@/plugins/http-fetch'; * @param query 查询参数 * @returns object */ -export function getAllNeConfig(neType: string) { +export function getAllNeConfig(neType: string, neId: string) { return request({ url: `/ne/config/list/${neType}`, method: 'GET', + params: { neId }, timeout: 60_000, }); } diff --git a/src/views/ne/neConfig/index.vue b/src/views/ne/neConfig/index.vue index 625f74bb..36ed47f9 100644 --- a/src/views/ne/neConfig/index.vue +++ b/src/views/ne/neConfig/index.vue @@ -209,7 +209,7 @@ function fnActiveConfigNode(key: string | number) { /**查询配置可选属性值列表 */ function fnGetNeConfig() { - const neType = neTypeSelect.value[0]; + const [neType, neId] = neTypeSelect.value ; if (!neType) { message.warning({ content: t('views.ne.neConfig.neTypePleace'), @@ -220,7 +220,7 @@ function fnGetNeConfig() { treeState.loading = true; // 获取数据 - getAllNeConfig(neType).then(res => { + getAllNeConfig(neType, neId).then(res => { if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) { const arr = []; for (const item of res.data) { diff --git a/src/views/ne/neConfigHA/index.vue b/src/views/ne/neConfigHA/index.vue index c9d8ee0d..043d9e3d 100644 --- a/src/views/ne/neConfigHA/index.vue +++ b/src/views/ne/neConfigHA/index.vue @@ -30,7 +30,7 @@ let neIdSelect = ref([]); let neTypeSelectStatus = ref(true); /**网元类型neType选择 */ async function fnSelectNeType(_: any, info: any) { - if (!info) return; + if (!info) return; await fnGetNeConfig(info.value); if (treeState.data.length === 0) { message.warning({ @@ -226,7 +226,8 @@ async function fnGetNeConfig(neType: string) { treeState.loading = true; // 获取数据 - const res = await getAllNeConfig(neType); + let neId = neTypeSelect.value[1]; + const res = await getAllNeConfig(neType, neId); if (res.code === RESULT_CODE_SUCCESS) { const arr = []; for (const v of res.data) { From 7491ccc00b24118d8bb1a34b079cd2fc8d884cab Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Sat, 18 Oct 2025 14:20:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E7=BD=91=E5=85=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=A4=87=E4=BB=BD=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neConfigBackup/index.vue | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/views/ne/neConfigBackup/index.vue b/src/views/ne/neConfigBackup/index.vue index 385fe1ab..28ccc035 100644 --- a/src/views/ne/neConfigBackup/index.vue +++ b/src/views/ne/neConfigBackup/index.vue @@ -303,12 +303,8 @@ function fnModalVisibleByEdit(row: Record) { const modalStateFrom = Form.useForm( modalState.from, reactive({ - name: [ - { - required: true, - message: '请输入名称', - }, - ], + name: [{ required: true, message: t('common.inputPlease') }], + remark: [{ required: true, message: t('common.inputPlease') }], }) ); @@ -462,7 +458,11 @@ function fnSyncFileToFTP(row: Record) { - + @@ -524,13 +524,21 @@ function fnSyncFileToFTP(row: Record) { - + - + From 0d134002295acb31d9d769626b06b619efa48bd3 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Sat, 18 Oct 2025 18:09:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=202.2510.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1753a8d..e799980d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # 版本发布日志 +## 2.2510.3-20251018 + +- 新增 备份网元日志文件数据查看 +- 修复 更新根网管节点处理逻辑，支持无OMC情况 +- 新增 网元配置选择传入neId查询相应版本配置数据 +- 修复 网元配置备份修改表单校验规则，添加备注字段必填项 + ## 2.2510.2-20251011 - 新增 UDM-auth数据导出按钮权限定义