From aa8920f4878b09696772f554cac8d2e621fcf573 Mon Sep 17 00:00:00 2001
From: zjl <xx@qq.com>
Date: Wed, 18 Dec 2024 09:18:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E3=80=81=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97=E3=80=81=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/console/index.vue     |  8 +++----
 src/views/system/logger/loginLog/edit.vue |  2 +-
 src/views/system/user/columns.ts          | 29 ++++++++++++++++-------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/views/dashboard/console/index.vue b/src/views/dashboard/console/index.vue
index cc9ace7..19df8e5 100644
--- a/src/views/dashboard/console/index.vue
+++ b/src/views/dashboard/console/index.vue
@@ -10,7 +10,7 @@
           :bordered="false"
         >
           <template #header-extra>
-            <n-tag type="success">日</n-tag>
+            <n-tag type="success" :bordered="false">日</n-tag>
           </template>
           <div class="flex justify-between px-1 py-1">
             <n-skeleton v-if="loading" :width="100" size="medium" />
@@ -59,7 +59,7 @@
           :bordered="false"
         >
           <template #header-extra>
-            <n-tag type="info">周</n-tag>
+            <n-tag type="info" :bordered="false">周</n-tag>
           </template>
           <div class="flex justify-between px-1 py-1">
             <n-skeleton v-if="loading" :width="100" size="medium" />
@@ -102,7 +102,7 @@
           :bordered="false"
         >
           <template #header-extra>
-            <n-tag type="warning">周</n-tag>
+            <n-tag type="warning" :bordered="false">周</n-tag>
           </template>
           <div class="flex justify-between px-1 py-1">
             <n-skeleton v-if="loading" :width="100" size="medium" />
@@ -151,7 +151,7 @@
           :bordered="false"
         >
           <template #header-extra>
-            <n-tag type="error">月</n-tag>
+            <n-tag type="error" :bordered="false">月</n-tag>
           </template>
           <div class="flex justify-between px-1 py-1">
             <n-skeleton v-if="loading" :width="100" size="medium" />
diff --git a/src/views/system/logger/loginLog/edit.vue b/src/views/system/logger/loginLog/edit.vue
index 35ca9c2..32235c7 100644
--- a/src/views/system/logger/loginLog/edit.vue
+++ b/src/views/system/logger/loginLog/edit.vue
@@ -28,7 +28,7 @@
           {{ formData.requestMethod }}
         </n-descriptions-item>
         <n-descriptions-item label="请求状态">
-          <n-tag :color="formData.status ? 'danger' : 'success'">{{
+          <n-tag :color="formData.status ? 'danger' : 'success'" :bordered="false">{{
             formData.status ? '异常' : '正常'
           }}</n-tag>
         </n-descriptions-item>
diff --git a/src/views/system/user/columns.ts b/src/views/system/user/columns.ts
index ba8da19..d70577a 100644
--- a/src/views/system/user/columns.ts
+++ b/src/views/system/user/columns.ts
@@ -17,16 +17,17 @@ export const columns: BasicColumn[] = [
   {
     title: '登录账号',
     key: 'username',
-    width: 150,
+    width: 100,
   },
   {
     title: '用户姓名',
     key: 'realname',
-    width: 150,
+    width: 100,
   },
   {
     title: '头像',
     key: 'avatar',
+    width: 100,
     render(row) {
       return h(NImage, {
         width: 48,
@@ -35,11 +36,10 @@ export const columns: BasicColumn[] = [
         fit: 'fill',
       });
     },
-    width: 100,
   },
   {
     title: '性别',
-    width: 100,
+    width: 80,
     key: 'gender',
     render(row) {
       let typeText = '';
@@ -78,19 +78,32 @@ export const columns: BasicColumn[] = [
   {
     title: '手机号',
     key: 'mobile',
-    width: 160,
+    width: 120,
   },
   {
     title: '用户角色',
     key: 'role',
+    width: 250,
     render(row) {
       let roleNames = '';
       if (row.roles.length > 0) {
         roleNames = row.roles.map((role) => role.name).join(',');
       }
-      return h('span', roleNames || '-');
+      // return h('span', roleNames || '-');
+      return h(
+        NTag,
+        {
+          style: {
+            marginRight: '6px',
+          },
+          type: 'info',
+          bordered: false,
+        },
+        {
+          default: () => roleNames,
+        },
+      );
     },
-    width: 100,
   },
   {
     title: '职级',
@@ -105,7 +118,7 @@ export const columns: BasicColumn[] = [
   {
     title: '部门',
     key: 'deptName',
-    width: 160,
+    width: 100,
   },
   {
     title: '状态',