From dac1bebabf39bb3e91cdc0f31ad2fbb283e8ab32 Mon Sep 17 00:00:00 2001
From: zyh <zhangyahao530@163.com>
Date: Wed, 27 Aug 2025 21:31:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=A3=80=E6=9F=A5=E5=92=8C=E8=B0=83=E8=AF=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E8=B0=83=E6=95=B4=E6=A1=8C=E9=9D=A2=E7=AB=AF?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E5=92=8C=E5=8F=AF=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/UserList.vue | 44 +++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/views/users/UserList.vue b/src/views/users/UserList.vue
index 6932196..0429287 100644
--- a/src/views/users/UserList.vue
+++ b/src/views/users/UserList.vue
@@ -128,7 +128,7 @@
     </div>
 
     <!-- 桌面端表格 -->
-    <div v-else>
+    <div v-else class="desktop-content">
     <el-card class="mb16" shadow="never">
       <el-form :inline="true" :model="query" @submit.prevent>
         <el-form-item label="关键词">
@@ -228,6 +228,7 @@
       </template>
     </el-dialog>
     </div>
+    </div>
   </div>
 </template>
 
@@ -237,7 +238,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search } from '@element-plus/icons-vue'
 import { fetchUsers, createUser, updateUser, deleteUser, setUserStatus, resetUserPassword } from '@/api/users'
 import { showErrorMessage, showSuccessMessage } from '@/utils/error'
-import { hasPermission, PERMISSIONS } from '@/utils/permission'
+import { hasPermission, PERMISSIONS, getCurrentUser, getCurrentUserType } from '@/utils/permission'
 
 const loading = ref(false)
 const list = ref([])
@@ -270,7 +271,11 @@ const userTypeDisplayMap = {
 }
 
 // 权限检查
-const canViewUsers = computed(() => hasPermission(PERMISSIONS.USER_VIEW))
+const canViewUsers = computed(() => {
+  const permission = hasPermission(PERMISSIONS.USER_VIEW)
+  console.log('canViewUsers:', permission, 'USER_VIEW:', PERMISSIONS.USER_VIEW)
+  return permission
+})
 const canCreateUser = computed(() => hasPermission(PERMISSIONS.USER_CREATE))
 const canEditUser = computed(() => hasPermission(PERMISSIONS.USER_UPDATE))
 const canDeleteUser = computed(() => hasPermission(PERMISSIONS.USER_DELETE))
@@ -287,6 +292,13 @@ function unwrap(res) {
 }
 
 async function load() {
+  console.log('开始加载用户数据，权限检查:', canViewUsers.value)
+  
+  if (!canViewUsers.value) {
+    ElMessage.warning('没有权限查看用户列表')
+    return
+  }
+  
   loading.value = true
   try {
     // 根据OpenAPI文档，参数映射：pageSize -> size
@@ -296,12 +308,21 @@ async function load() {
     }
     delete params.pageSize
     
+    console.log('请求参数:', params)
     const res = await fetchUsers(params)
+    console.log('API原始响应:', res)
+    
     const data = unwrap(res) || {}
+    console.log('解析后数据:', data)
+    
     // 兼容后端返回两种分页结构
     list.value = data.list || data.items || []
     total.value = data.total || data.totalCount || list.value.length
+    
+    console.log('用户列表数据:', list.value)
+    console.log('总数:', total.value)
   } catch (e) {
+    console.error('加载用户数据失败:', e)
     showErrorMessage(e, '加载失败')
   } finally {
     loading.value = false
@@ -467,7 +488,18 @@ watch(() => form.userType, (newType) => {
 })
 
 onMounted(() => {
+  // 添加调试信息
+  console.log('用户管理页面加载')
+  const auth = getCurrentUser()
+  const userType = getCurrentUserType()
+  console.log('当前用户信息:', auth)
+  console.log('用户类型:', userType)
+  console.log('权限列表:', hasPermission ? 'hasPermission函数存在' : 'hasPermission函数不存在')
+  
   checkMobile()
+  console.log('isMobile状态:', isMobile.value)
+  console.log('窗口宽度:', window.innerWidth)
+  
   window.addEventListener('resize', checkMobile)
   load()
 })
@@ -622,12 +654,12 @@ onUnmounted(() => {
 
 /* 移动端隐藏桌面端组件 */
 @media (max-width: 768px) {
-  .users-page > div:not(.mobile-user-list) {
-    display: none;
+  .desktop-content {
+    display: none !important;
   }
   
   .users-page .permission-denied {
-    display: block;
+    display: block !important;
   }
   
   .mobile-search-card .el-input {