diff --git a/apps/web-antd/src/views/monitor/logininfor/data.tsx b/apps/web-antd/src/views/monitor/logininfor/data.tsx index 06a7eedb..43863c57 100644 --- a/apps/web-antd/src/views/monitor/logininfor/data.tsx +++ b/apps/web-antd/src/views/monitor/logininfor/data.tsx @@ -70,10 +70,20 @@ export const columns: VxeGridProps['columns'] = [ field: 'os', slots: { default: ({ row }) => { + /** + * Windows 10 or Windows Server 2016 太长了 分割一下 详情依旧能看到详细的 + */ + let value = row.os; + if (value) { + const split = value.split(' or '); + if (split.length === 2) { + value = split[0]; + } + } return (
{renderOsIcon(row.os, 'shrink-0')} - {row.os} + {value}
); }, diff --git a/apps/web-antd/src/views/monitor/logininfor/login-info-modal.vue b/apps/web-antd/src/views/monitor/logininfor/login-info-modal.vue index 8b5c4775..c30932b6 100644 --- a/apps/web-antd/src/views/monitor/logininfor/login-info-modal.vue +++ b/apps/web-antd/src/views/monitor/logininfor/login-info-modal.vue @@ -31,6 +31,16 @@ const items = computed(() => { return []; } const data = loginInfo.value; + /** + * Windows 10 or Windows Server 2016 太长了 分割一下 详情依旧能看到详细的 + */ + let os = data.os; + if (os) { + const split = os.split(' or '); + if (split.length === 2) { + os = split[0]!; + } + } return [ { label: '登录状态', @@ -66,7 +76,7 @@ const items = computed(() => { content: (
{renderOsIcon(data.os, 'shrink-0')} - {data.os} + {os}
), }, diff --git a/apps/web-antd/src/views/monitor/online/data.tsx b/apps/web-antd/src/views/monitor/online/data.tsx index 5e2aadb2..5472e36a 100644 --- a/apps/web-antd/src/views/monitor/online/data.tsx +++ b/apps/web-antd/src/views/monitor/online/data.tsx @@ -58,10 +58,20 @@ export const columns: VxeGridProps['columns'] = [ field: 'os', slots: { default: ({ row }) => { + /** + * Windows 10 or Windows Server 2016 太长了 分割一下 详情依旧能看到详细的 + */ + let value = row.os; + if (value) { + const split = value.split(' or '); + if (split.length === 2) { + value = split[0]; + } + } return (
{renderOsIcon(row.os, 'shrink-0')} - {row.os} + {value}
); },