From 04796449da83df192a0cfa343a6970fce5762a48 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 26 Jun 2025 09:37:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=20=E8=B4=A6=E5=8F=B7=E7=BB=91=E5=AE=9A=20=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F/=E9=80=BB=E8=BE=91=E9=87=8D=E6=9E=84(=E5=9B=9E?=
 =?UTF-8?q?=E6=BB=9A=E4=BA=86=20=E6=97=A2=E8=A6=81=E5=8F=88=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |   4 +-
 .../profile/components/online-device.vue      | 113 ++++++------------
 2 files changed, 38 insertions(+), 79 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcd460c7..c36b1a42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,8 +13,8 @@
 
 - 字典接口抛出异常(为什么会抛出异常?)无限调用接口 兼容处理
 - 代码生成 字典下拉加载 改为每次进入编辑页面都加载
-- 个人中心 账号绑定 样式/逻辑重构
-- 个人中心 下拉卡片 昵称超长省略显示
+- ~~个人中心 账号绑定 样式/逻辑重构~~(回滚了 既要又要的问题)
+- ~~个人中心 下拉卡片 昵称超长省略显示~~(回滚了 既要又要的问题)
 
 # 1.4.0
 
diff --git a/apps/web-antd/src/views/_core/profile/components/online-device.vue b/apps/web-antd/src/views/_core/profile/components/online-device.vue
index 47f0bccc..926f2bab 100644
--- a/apps/web-antd/src/views/_core/profile/components/online-device.vue
+++ b/apps/web-antd/src/views/_core/profile/components/online-device.vue
@@ -1,93 +1,52 @@
 <script setup lang="ts">
 import type { Recordable } from '@vben/types';
 
-import type { OnlineUser } from '#/api/monitor/online/model';
+import type { VxeGridProps } from '#/adapter/vxe-table';
 
-import { onMounted, shallowRef } from 'vue';
-
-import { getPopupContainer } from '@vben/utils';
-
-import {
-  Card,
-  Descriptions,
-  DescriptionsItem,
-  Popconfirm,
-  Spin,
-  Tag,
-} from 'ant-design-vue';
-import dayjs from 'dayjs';
+import { Popconfirm } from 'ant-design-vue';
 
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { forceLogout2, onlineDeviceList } from '#/api/monitor/online';
-import { renderBrowserIcon, renderOsIcon } from '#/utils/render';
+import { columns } from '#/views/monitor/online/data';
+
+const gridOptions: VxeGridProps = {
+  columns,
+  keepSource: true,
+  pagerConfig: {
+    enabled: false,
+  },
+  proxyConfig: {
+    ajax: {
+      query: async () => {
+        return await onlineDeviceList();
+      },
+    },
+  },
+  rowConfig: {
+    keyField: 'tokenId',
+  },
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({ gridOptions });
 
 async function handleForceOffline(row: Recordable<any>) {
   await forceLogout2(row.tokenId);
-  await loadData();
-}
-
-const list = shallowRef<OnlineUser[]>([]);
-const loading = shallowRef(false);
-async function loadData() {
-  loading.value = true;
-  const resp = await onlineDeviceList();
-  list.value = resp.rows.map((item) => {
-    // Windows 10 or Windows Server 2016 太长了 分割一下
-    let value = item.os;
-    if (value) {
-      const split = value.split(' or ');
-      if (split.length === 2) {
-        value = split[0]!;
-      }
-      item.os = value;
-    }
-    return item;
-  });
-  loading.value = false;
+  await tableApi.query();
 }
-onMounted(loadData);
 </script>
 
 <template>
-  <div class="mb-6">
-    <Spin :spinning="loading">
-      <div
-        class="grid max-h-[calc(100vh/2)] min-h-[100px] grid-cols-1 gap-4 overflow-auto lg:grid-cols-2 2xl:grid-cols-3"
-      >
-        <Card
-          v-for="online in list"
-          :key="online.tokenId"
-          size="small"
-          :title="`登录时间: ${dayjs(online.loginTime).format('YYYY-MM-DD HH:mm:ss')}`"
+  <div>
+    <BasicTable table-title="我的在线设备">
+      <template #action="{ row }">
+        <Popconfirm
+          :title="`确认强制下线[${row.userName}]?`"
+          placement="left"
+          @confirm="handleForceOffline(row)"
         >
-          <template #extra>
-            <Popconfirm
-              title="确认强制下线?"
-              placement="left"
-              :get-popup-container="getPopupContainer"
-              @confirm="handleForceOffline(online)"
-            >
-              <a-button danger size="small">强制下线</a-button>
-            </Popconfirm>
-          </template>
-          <Descriptions size="middle" :column="2">
-            <DescriptionsItem label="登录平台">
-              <Tag>{{ online.deviceType }}</Tag>
-            </DescriptionsItem>
-            <DescriptionsItem label="浏览器">
-              <component :is="renderBrowserIcon(online.browser)" />
-            </DescriptionsItem>
-            <DescriptionsItem label="系统">
-              <component :is="renderOsIcon(online.os)" />
-            </DescriptionsItem>
-            <DescriptionsItem label="IP地址">
-              {{ online.ipaddr }}
-            </DescriptionsItem>
-            <DescriptionsItem label="登录地址">
-              {{ online.loginLocation }}
-            </DescriptionsItem>
-          </Descriptions>
-        </Card>
-      </div>
-    </Spin>
+          <a-button danger size="small" type="link">强制下线</a-button>
+        </Popconfirm>
+      </template>
+    </BasicTable>
   </div>
 </template>