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 @@ -
+
@@ -228,6 +228,7 @@
+
@@ -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 {