From 068cda72df875c97fc48224a8eed892f2190adda Mon Sep 17 00:00:00 2001
From: xh <11675084@qq.com>
Date: Wed, 17 Sep 2025 03:12:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/setting/permission/admin/edit.vue   |  2 +-
 .../views/setting/permission/admin/index.vue  | 50 +++++++++++--------
 .../views/setting/permission/menu/index.vue   |  2 +-
 .../views/setting/permission/role/auth.vue    |  2 +-
 .../views/setting/permission/role/index.vue   | 38 +++++++-------
 server/service/systemService/adminService.go  |  2 +-
 6 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/admin/src/views/setting/permission/admin/edit.vue b/admin/src/views/setting/permission/admin/edit.vue
index a859417..ed7ae23 100644
--- a/admin/src/views/setting/permission/admin/edit.vue
+++ b/admin/src/views/setting/permission/admin/edit.vue
@@ -100,7 +100,7 @@
                     />
                 </el-form-item>
 
-                <el-form-item label="管理员状态" v-if="!isRoot">
+                <el-form-item label="状态" v-if="!isRoot">
                     <el-switch v-model="formData.isDisable" :active-value="0" :inactive-value="1" />
                 </el-form-item>
             </el-form>
diff --git a/admin/src/views/setting/permission/admin/index.vue b/admin/src/views/setting/permission/admin/index.vue
index be685ec..d8e78fc 100644
--- a/admin/src/views/setting/permission/admin/index.vue
+++ b/admin/src/views/setting/permission/admin/index.vue
@@ -9,7 +9,7 @@
                     <el-input v-model="formData.nickname" clearable @keyup.enter="resetPage" />
                 </el-form-item>
                 <el-form-item label="管理员角色" class="w-[280px]">
-                    <el-select v-model="formData.role">
+                    <el-select v-model="formData.role" :empty-values="[null, undefined]">
                         <el-option label="全部" value="" />
                         <el-option
                             v-for="(item, index) in optionsData.role"
@@ -56,22 +56,28 @@
                 导出
             </el-button>
 
-            <div class="mt-4">
-                <el-table :data="pager.lists" size="large">
-                    <el-table-column label="ID" prop="id" min-width="60" />
-                    <el-table-column label="头像" min-width="100">
+            <div class="mt-4" style="height: calc(100vh - 360px)">
+                <vxe-table
+                    :data="pager.lists"
+                    :row-config="{
+                        keyField: 'id'
+                    }"
+                    max-height="100%"
+                >
+                    <vxe-column title="ID" field="id" min-width="60" />
+                    <vxe-column title="头像" width="80">
                         <template #default="{ row }">
-                            <el-avatar :size="50" :src="row.avatar"></el-avatar>
+                            <el-avatar :size="40" :src="row.avatar"></el-avatar>
                         </template>
-                    </el-table-column>
-                    <el-table-column label="账号" prop="username" min-width="100" />
-                    <el-table-column label="名称" prop="nickname" min-width="100" />
-                    <el-table-column label="角色" prop="role" min-width="100" />
-                    <el-table-column label="部门" prop="dept" min-width="100" />
-                    <el-table-column label="创建时间" prop="createTime" min-width="180" />
-                    <el-table-column label="最近登录时间" prop="lastLoginTime" min-width="180" />
-                    <el-table-column label="最近登录IP" prop="lastLoginIp" min-width="120" />
-                    <el-table-column label="状态" min-width="100">
+                    </vxe-column>
+                    <vxe-column title="账号" field="username" min-width="100" />
+                    <vxe-column title="名称" field="nickname" min-width="100" />
+                    <vxe-column title="角色" field="role" min-width="100" />
+                    <vxe-column title="部门" field="dept" min-width="100" />
+                    <vxe-column title="创建时间" field="createTime" width="150" />
+                    <vxe-column title="最近登录时间" field="lastLoginTime" width="150" />
+                    <vxe-column title="最近登录IP" field="lastLoginIp" width="120" />
+                    <vxe-column title="状态" width="80">
                         <template #default="{ row }">
                             <el-switch
                                 v-perms="['admin:system:admin:disable']"
@@ -82,8 +88,8 @@
                                 @change="changeStatus($event, row.id)"
                             />
                         </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
+                    </vxe-column>
+                    <vxe-column title="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button
                                 v-perms="['admin:system:admin:edit']"
@@ -103,8 +109,8 @@
                                 删除
                             </el-button>
                         </template>
-                    </el-table-column>
-                </el-table>
+                    </vxe-column>
+                </vxe-table>
             </div>
             <div class="flex mt-4 justify-end">
                 <pagination v-model="pager" @change="getLists" />
@@ -134,9 +140,9 @@ defineOptions({
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 表单数据
 const formData = reactive<any>({
-    //   username: "",
-    //   nickname: "",
-    //   role: "",
+    username: '',
+    nickname: '',
+    role: ''
 })
 const showEdit = ref(false)
 const { pager, getLists, resetParams, resetPage } = usePaging({
diff --git a/admin/src/views/setting/permission/menu/index.vue b/admin/src/views/setting/permission/menu/index.vue
index 5c78ca9..1b6eba5 100644
--- a/admin/src/views/setting/permission/menu/index.vue
+++ b/admin/src/views/setting/permission/menu/index.vue
@@ -10,7 +10,7 @@
                 </el-button>
                 <el-button @click="handleExpand"> 展开/收起 </el-button>
             </div>
-            <div style="height: calc(100vh - 200px)">
+            <div class="mt-4" style="height: calc(100vh - 220px)">
                 <vxe-table
                     ref="tableRef"
                     :row-config="rowConfig"
diff --git a/admin/src/views/setting/permission/role/auth.vue b/admin/src/views/setting/permission/role/auth.vue
index 0d79326..ae09b49 100644
--- a/admin/src/views/setting/permission/role/auth.vue
+++ b/admin/src/views/setting/permission/role/auth.vue
@@ -15,7 +15,7 @@
                 :model="formData"
                 label-width="60px"
             >
-                <el-scrollbar class="h-[400px] sm:h-[600px]">
+                <el-scrollbar class="h-[400px] sm:h-[500px]">
                     <el-form-item label="权限" prop="menus">
                         <div>
                             <el-checkbox label="展开/折叠" @change="handleExpand" />
diff --git a/admin/src/views/setting/permission/role/index.vue b/admin/src/views/setting/permission/role/index.vue
index 50dc5f6..e50a356 100644
--- a/admin/src/views/setting/permission/role/index.vue
+++ b/admin/src/views/setting/permission/role/index.vue
@@ -10,28 +10,30 @@
                 </el-button>
             </div>
             <div class="mt-4">
-                <div>
-                    <el-table :data="pager.lists" size="large" v-loading="pager.loading">
-                        <el-table-column prop="id" label="ID" min-width="100" />
-                        <el-table-column prop="name" label="名称" min-width="150" />
-                        <el-table-column
-                            prop="remark"
-                            label="备注"
-                            min-width="150"
-                            show-overflow-tooltip
-                        />
-                        <el-table-column prop="sort" label="排序" min-width="100" />
-                        <el-table-column prop="member" label="角色人数" min-width="120" />
-                        <el-table-column label="岗位状态" prop="isDisable" min-width="100">
+                <div style="height: calc(100vh - 270px)">
+                    <vxe-table
+                        :data="pager.lists"
+                        :row-config="{
+                            keyField: 'id'
+                        }"
+                        max-height="100%"
+                        v-loading="pager.loading"
+                    >
+                        <vxe-column field="id" title="ID" min-width="60" />
+                        <vxe-column field="name" title="名称" min-width="150" />
+                        <vxe-column field="remark" title="备注" min-width="150" />
+                        <vxe-column field="sort" title="排序" min-width="100" />
+                        <vxe-column field="member" title="角色人数" min-width="100" />
+                        <vxe-column title="岗位状态" field="isDisable" min-width="80">
                             <template #default="{ row }">
                                 <el-tag class="ml-2" :type="row.isDisable ? 'danger' : 'primary'">
                                     {{ row.isDisable ? '停用' : '正常' }}
                                 </el-tag>
                             </template>
-                        </el-table-column>
+                        </vxe-column>
 
-                        <el-table-column prop="createTime" label="创建时间" min-width="180" />
-                        <el-table-column label="操作" width="190" fixed="right">
+                        <vxe-column field="createTime" title="创建时间" width="150" />
+                        <vxe-column title="操作" width="190" fixed="right">
                             <template #default="{ row }">
                                 <el-button
                                     v-perms="['admin:system:role:edit']"
@@ -58,8 +60,8 @@
                                     删除
                                 </el-button>
                             </template>
-                        </el-table-column>
-                    </el-table>
+                        </vxe-column>
+                    </vxe-table>
                 </div>
                 <div class="flex justify-end mt-4">
                     <pagination v-model="pager" @change="getLists" />
diff --git a/server/service/systemService/adminService.go b/server/service/systemService/adminService.go
index 5bf1ce3..1361874 100644
--- a/server/service/systemService/adminService.go
+++ b/server/service/systemService/adminService.go
@@ -179,7 +179,7 @@ func (adminSrv systemAuthAdminService) List(page request.PageReq, listReq system
 	if listReq.Nickname != "" {
 		adminModel = adminModel.Where("nickname like ?", "%"+listReq.Nickname+"%")
 	}
-	if listReq.Role >= 0 {
+	if listReq.Role > 0 {
 		adminModel = adminModel.Where("role = ?", listReq.Role)
 	}
 	// 总数