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 = '*:*:*'; 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; } 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', }, ]; 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 => { // 找到编辑更新的网元 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(() => {