From 682dc9a5d6ebe02708530800b8fcf876907a0de0 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Fri, 23 Jan 2026 14:23:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(monitor):=20=E7=BC=A9=E7=9F=AD=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在在线用户和登录日志的表格列以及登录详情弹窗中，当操作系统字段包含“ or ”（如“Windows 10 or Windows Server 2016”）时，仅显示第一部分以优化表格显示宽度。完整的原始信息在详情中仍可查看。
---
 apps/web-antd/src/views/monitor/logininfor/data.tsx  | 12 +++++++++++-
 .../views/monitor/logininfor/login-info-modal.vue    | 12 +++++++++++-
 apps/web-antd/src/views/monitor/online/data.tsx      | 12 +++++++++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

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 (
           <div class="flex items-center justify-center gap-[6px]">
             {renderOsIcon(row.os, 'shrink-0')}
-            {row.os}
+            {value}
           </div>
         );
       },
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<DescriptionsProps['items']>(() => {
     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<DescriptionsProps['items']>(() => {
       content: (
         <div class="flex items-center justify-center gap-[6px]">
           {renderOsIcon(data.os, 'shrink-0')}
-          {data.os}
+          {os}
         </div>
       ),
     },
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 (
           <div class="flex items-center justify-center gap-[6px]">
             {renderOsIcon(row.os, 'shrink-0')}
-            {row.os}
+            {value}
           </div>
         );
       },