@@ -151,7 +151,7 @@
:bordered="false"
>
- 月
+ 月
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 }}
- {{
+ {{
formData.status ? '异常' : '正常'
}}
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: '状态',