From 3a11109642961896bd5ae64ead123cf1a31e5216 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 03 三月 2025 15:54:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/system/role.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/system/role.vue b/admin/src/views/system/role.vue
index cfb8d9d..0d44875 100644
--- a/admin/src/views/system/role.vue
+++ b/admin/src/views/system/role.vue
@@ -28,21 +28,21 @@
@sort-change="handleSortChange"
>
<el-table-column type="selection" fixed="left" width="55"></el-table-column>
- <el-table-column prop="code" label="瑙掕壊缂栫爜" fixed="left" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="瑙掕壊鍚嶇О" fixed="left" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="瑙掕壊澶囨敞" min-width="120px"></el-table-column>
+ <el-table-column prop="code" label="瑙掕壊缂栫爜" show-overflow-tooltip fixed="left" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="瑙掕壊鍚嶇О" show-overflow-tooltip fixed="left" min-width="140px"></el-table-column>
+ <el-table-column prop="remark" label="瑙掕壊澶囨敞" min-width="130px" show-overflow-tooltip></el-table-column>
<el-table-column prop="createUser" label="鍒涘缓浜�" min-width="100px">
<template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="140px" sortable="custom" sort-by="role.CREATE_TIME"></el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="150px" sortable="custom" sort-by="role.CREATE_TIME"></el-table-column>
<el-table-column prop="updateUser" label="鏇存柊浜�" min-width="100px">
<template slot-scope="{row}">{{row.updateUserInfo == null ? '' : row.updateUserInfo.username}}</template>
</el-table-column>
- <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" min-width="140px"></el-table-column>
+ <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['system:role:update', 'system:role:createRolePermission','system:datapermission:create', 'system:role:createRoleMenu', 'system:role:delete'])"
label="鎿嶄綔"
- min-width="270"
+ min-width="300"
fixed="right"
>
<template v-if="isAdmin || (row.code !== adminCode && userInfo.roles.findIndex(code => code === row.code) === -1)" slot-scope="{row}">
--
Gitblit v1.9.3