From f50e02e6e73fa12affe45714062c85f20c1ac169 Mon Sep 17 00:00:00 2001 From: lai <371757574@qq.com> Date: Sat, 11 May 2024 16:58:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=BAdnn,st=E6=B7=BB=E5=8A=A0=E6=98=9F?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/neUser/sub/index.vue | 82 ++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue index 88cb6449..327eab9e 100644 --- a/src/views/neUser/sub/index.vue +++ b/src/views/neUser/sub/index.vue @@ -1538,30 +1538,29 @@ onMounted(() => {
- + -
- - - - -
+ - + + + + + + + @@ -1591,7 +1590,9 @@ onMounted(() => { @@ -2071,26 +2072,29 @@ onMounted(() => {
- - -
- - - - -
+ + + - + + + + + + + @@ -2120,6 +2124,8 @@ onMounted(() => { From 56833b654ed266291575fc81f6a03cad1efc9ff5 Mon Sep 17 00:00:00 2001 From: lai <371757574@qq.com> Date: Sat, 11 May 2024 16:59:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/locales/en-US.ts | 4 ++-- src/i18n/locales/zh-CN.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index 47676d17..cdb464ce 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -642,7 +642,7 @@ export default { import: 'Import', loadDataConfirm: 'Are you sure you want to reload the data?', loadData: 'Load Data', - loadDataTip: 'Successfully fetched load data: {num} entries, the system is internally updating the data. You can click reset to refresh the data list after the loading is finished, please don it repeat click to get update!!!!', + loadDataTip: 'Successfully fetched load data: {num} entries, the system is internally updating the data. Please wait a moment!!!!', startIMSI: 'Start IMSI', batchAddText: 'Batch Add', batchDelText: 'Batch Delete', @@ -669,7 +669,7 @@ export default { import: 'Import', loadDataConfirm: 'Are you sure you want to reload the data?', loadData: 'Load Data', - loadDataTip: 'Successfully fetched load data: {num} entries, the system is internally updating the data. You can click reset to refresh the data list after the loading is finished, please don it repeat click to get update!!!!', + loadDataTip: 'Successfully fetched load data: {num} entries, the system is internally updating the data. Please wait a moment!!!!', numAdd: 'Number of releases', numDel: 'Number of deleted', checkDel: 'Check Delete', diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index d7ceeb43..cef9baca 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -642,7 +642,7 @@ export default { import: '导入', loadDataConfirm: '确认要重新加载数据吗？', loadData: '加载数据', - loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新。加载结束后可点击重置刷新数据列表，请勿重复点击获取更新!!!', + loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新，请稍候!!!', startIMSI: '起始IMSI', batchAddText: '批量新增', batchDelText: '批量删除', @@ -669,7 +669,7 @@ export default { import: '导入', loadDataConfirm: '确认要重新加载数据吗？', loadData: '加载数据', - loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新。加载结束后可点击重置刷新数据列表，请勿重复点击获取更新!!!', + loadDataTip: '成功获取加载数据：{num}条，系统内部正在进行数据更新，请稍候!!!', numAdd: '放号个数', numDel: '删除个数', checkDel:'勾选删除', From 1e2c2b5170ed54cf2fa8c3e4ab0bd7cb5c5408f1 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Sat, 11 May 2024 18:03:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=8B=93=E6=89=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=A6=96=E4=B8=AA=E9=9D=9EOMC=E7=9A=84=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/monitor/topology/index.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/monitor/topology/index.vue b/src/views/monitor/topology/index.vue index 1d9cebb9..e4148c39 100644 --- a/src/views/monitor/topology/index.vue +++ b/src/views/monitor/topology/index.vue @@ -61,7 +61,7 @@ function fnGetList(refresh: boolean = false) { res.data.length > 0 ) { // 根网管 - let rootNodeInfo = { neName: undefined }; + let rootNodeInfo = { neName: "OMC_001" }; const nodes = []; const edges = []; for (const item of res.data) { @@ -70,7 +70,7 @@ function fnGetList(refresh: boolean = false) { const nodeIndex = nodes.findIndex(v => v.id === item.neName); if (nodeIndex === -1) { if (item.neType === 'OMC') { - nodes.push({ + nodes.unshift({ id: item.neName, label: item.neName, info: item, @@ -120,7 +120,7 @@ function fnGetList(refresh: boolean = false) { }); } } else { - edges.push({ + edges.unshift({ source: item.neName, target: rootNodeInfo.neName, label: `${item.neName}-${rootNodeInfo.neName}`, @@ -140,6 +140,7 @@ function fnGetList(refresh: boolean = false) { }) .then(hasNeList => { if (!hasNeList) return; + console.log(graphG6Data) if (refresh) { // graphG6.value.get('canvas').set('localRefresh', true); graphG6.value.destroy();