样式修改

This commit is contained in:
2025-11-27 17:59:17 +08:00
parent 4cc02f0142
commit a6e7c82fe5
5 changed files with 20 additions and 5 deletions

View File

@@ -14,6 +14,7 @@ import org.xyzh.common.core.enums.UserStatus;
import org.xyzh.common.dto.permission.TbSysPermission;
import org.xyzh.common.dto.system.TbSysLoginLog;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.common.dto.user.TbSysUserInfo;
import org.xyzh.common.dto.menu.TbSysMenu;
import org.xyzh.common.exception.auth.AuthException;
import org.xyzh.common.utils.IDUtils;
@@ -239,6 +240,15 @@ public class LoginServiceImpl implements LoginService {
loginDomain.setLoginType(loginType);
loginDomain.setLoginTime(new Date());
loginDomain.setIpAddress(ipAddress);
// 用户信息
try {
ResultDomain<TbSysUserInfo> resultDomain = userService.getUserInfoById(user.getID());
if (resultDomain.isSuccess()) {
loginDomain.setUserInfo(resultDomain.getData());
}
} catch (Exception e) {
loginDomain.setUserInfo(null);
}
// 获取用户角色和权限(如果服务可用)
try {
ResultDomain<UserDeptRoleVO> resultDomain = roleService.getDeptRolesByUserId(user.getID());

View File

@@ -65,13 +65,13 @@
</sql>
<sql id="FullUser_Column_List">
id, user_id, avatar, gender, family_name, given_name, full_name, student_id,id_card, address,
id, user_id, avatar, gender, family_name, given_name, full_name,level, student_id,id_card, address,
create_time, update_time, delete_time, deleted, status
</sql>
<!-- 用户信息字段 -->
<sql id="UserInfo_Column_List">
id, user_id, avatar, gender, family_name, given_name, full_name, student_id,id_card, address,
id, user_id, avatar, gender, family_name, given_name, full_name, level,student_id,id_card, address,
create_time, update_time, delete_time, deleted
</sql>

View File

@@ -129,6 +129,9 @@ const authModule: Module<AuthState, any> = {
user: (state) => {
return state.loginDomain?.user || null;
},
userinfo: (state) => {
return state.loginDomain?.userInfo || null;
},
// 获取用户角色
userRoles: (state) => {

View File

@@ -32,6 +32,7 @@ export interface SysUserInfo extends BaseDTO {
/** 用户名迁移到userInfo中便于统一展示 */
username?: string;
studentId?: string;
level?: string;
/** 真实姓名 */
realName?: string;
/** 昵称 */

View File

@@ -9,8 +9,8 @@
<div class="progress-info">
<div class="progress-header">
<span class="progress-text">当前学习进度{{ completedCount }}/{{ totalCount }}</span>
<span class="progress-percent">{{ progressPercent }}%</span>
<span class="progress-level">{{ userLevel }}</span>
<!-- <span class="progress-percent">{{ progressPercent }}%</span> -->
<!-- <span class="progress-level">{{ userLevel }}</span> -->
</div>
<div class="progress-bar-container">
<div class="progress-bar">
@@ -147,7 +147,8 @@ const taskList = ref<TaskItemVO[]>([]);
const totalCount = ref(0);
const completedCount = ref(0);
const pendingCount = ref(0);
const userLevel = ref('Level1');
// const userLevel = "Lv"+useStore().getters['auth/userinfo'].level;
// 计算进度百分比
const progressPercent = computed(() => {