From c1aabdbe42ca1820f5ed90acefd19368d7ae18a1 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 28 Jun 2024 14:55:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E7=BC=96=E8=BE=91=E6=97=B6=E5=B1=80=E9=83=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ne/neInfo/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/ne/neInfo/index.vue b/src/views/ne/neInfo/index.vue index 517c5b9f..d1a5761c 100644 --- a/src/views/ne/neInfo/index.vue +++ b/src/views/ne/neInfo/index.vue @@ -220,6 +220,12 @@ function fnModalVisibleByEdit(row?: Record) { * 进行表达规则校验 */ function fnModalEditOk(from: Record) { + // 新增时刷新列表 + if (!from.id) { + fnGetList(); + return; + } + // 编辑时局部更新信息 stateNeInfo(from.neType, from.neId) .then(res => { // 找到编辑更新的网元 From 1fa8601675c7935e982d8cbd1262d40ca2700387 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 1 Jul 2024 16:02:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20UDM=20Object=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/neUser/sub/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue index 358aa2aa..0de9eaaa 100644 --- a/src/views/neUser/sub/index.vue +++ b/src/views/neUser/sub/index.vue @@ -1252,7 +1252,7 @@ onMounted(() => { From 481734cfe1e555002f3f687054dc5db38be642e3 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 3 Jul 2024 14:49:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E7=9C=8B=E6=9D=BFMME=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BA100%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/overview/components/NeResources/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/dashboard/overview/components/NeResources/index.vue b/src/views/dashboard/overview/components/NeResources/index.vue index 07b2f34c..05d5467e 100644 --- a/src/views/dashboard/overview/components/NeResources/index.vue +++ b/src/views/dashboard/overview/components/NeResources/index.vue @@ -277,6 +277,9 @@ function fnChangeData(data: any[], itemID: string) { if (men > 100) { men = +(men / 100).toFixed(2); } + if (men > 100) { + men = 100; + } sysMemUsage = men; } From d3332216205cdffc9bf6b710473c500b7a8a7776 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 3 Jul 2024 14:50:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?style:=20=E5=9C=A8=E7=BA=BF=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E6=96=87=E5=AD=97=E9=9D=A0=E5=B7=A6?= =?UTF-8?q?=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/monitor/online/index.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue index eb3b7b29..51b245ac 100644 --- a/src/views/monitor/online/index.vue +++ b/src/views/monitor/online/index.vue @@ -45,7 +45,7 @@ let tableColumns: ColumnsType = [ title: t('common.rowId'), dataIndex: 'num', width: '50px', - align: 'center', + align: 'left', customRender(opt) { const idxNum = (tablePagination.current - 1) * tablePagination.pageSize; return idxNum + opt.index + 1; @@ -54,17 +54,17 @@ let tableColumns: ColumnsType = [ { title: t('views.monitor.online.mettingId'), dataIndex: 'tokenId', - align: 'center', + align: 'left', }, { title: t('views.monitor.online.account'), dataIndex: 'userName', - align: 'center', + align: 'left', }, { title: t('views.monitor.online.host'), dataIndex: 'ipaddr', - align: 'center', + align: 'left', }, // { // title: t('views.monitor.online.loginDes'), @@ -74,17 +74,17 @@ let tableColumns: ColumnsType = [ { title: t('views.monitor.online.os'), dataIndex: 'os', - align: 'center', + align: 'left', }, { title: t('views.monitor.online.lib'), dataIndex: 'browser', - align: 'center', + align: 'left', }, { title: t('views.monitor.online.loginTime'), dataIndex: 'loginTime', - align: 'center', + align: 'left', customRender(opt) { if (+opt.value <= 0) return ''; return parseDateToStr(+opt.value); @@ -93,7 +93,7 @@ let tableColumns: ColumnsType = [ { title: t('common.operate'), key: 'tokenId', - align: 'center', + align: 'left', }, ]; From 43a99e93288d67e40db949560fa49835a53c5c4a Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 3 Jul 2024 15:13:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E8=A7=92=E8=89=B2=E7=94=A8system=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E9=81=BF=E5=85=8Dadmin=E6=B7=B7=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants/admin-constants.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/constants/admin-constants.ts b/src/constants/admin-constants.ts index eeca5ec2..645cd472 100644 --- a/src/constants/admin-constants.ts +++ b/src/constants/admin-constants.ts @@ -1,5 +1,5 @@ -/**管理员-系统指定角色KEY */ -export const ADMIN_ROLE_KEY = 'admin'; +/**系统管理员-系统指定角色KEY */ +export const ADMIN_ROLE_KEY = 'system'; -/**管理员-系统指定权限 */ +/**系统管理员-系统指定权限 */ export const ADMIN_PERMISSION = '*:*:*';