From cb7f4b28777aca7563991254136948ce818bcc66 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 9 Apr 2026 14:14:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8A=BD=E5=B1=89=E6=95=88=E6=9E=9C=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/system/api/domain/SysUser.java | 2 + .../resources/mapper/system/SysUserMapper.xml | 2 +- ruoyi-ui/src/assets/styles/ruoyi.scss | 49 +++++ ruoyi-ui/src/views/system/user/index.vue | 15 +- ruoyi-ui/src/views/system/user/view.vue | 177 ++++++++++++++++++ 5 files changed, 242 insertions(+), 3 deletions(-) create mode 100644 ruoyi-ui/src/views/system/user/view.vue diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java index 02e3b0050..e212fb1c7 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java @@ -3,6 +3,7 @@ package com.ruoyi.system.api.domain; import java.util.Date; import java.util.List; import javax.validation.constraints.*; +import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; @@ -68,6 +69,7 @@ public class SysUser extends BaseEntity private String loginIp; /** 最后登录时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT) private Date loginDate; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 49de1cab1..9f88dc796 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.update_by, u.update_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index 73e7c2a94..4a00395b8 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -233,6 +233,55 @@ } /** 详细卡片样式 */ +.detail-drawer { + .el-drawer__header { + margin-bottom: 6px; + padding: 8px 12px 6px; + font-size: 15px; + color: #303133; + background: #f8f8f8; + } + .section-header { + font-size: 15px; + color: #6379bb; + border-bottom: 1px solid #ddd; + margin: 12px 0 16px 0; + padding-bottom: 8px; + } + .drawer-content { + padding: 0 20px 20px 20px; + .info-item { + display: flex; + align-items: flex-start; + padding: 8px 0; + min-height: 40px; + } + .info-label { + flex-shrink: 0; + width: 200px; + color: #606266; + font-size: 13px; + line-height: 1.6; + padding-top: 4px; + text-align: right; + margin-right: 14px; + } + .info-value { + flex: 1; + color: #303133; + font-size: 13px; + font-weight: 500; + line-height: 1.6; + word-break: break-all; + padding-top: 4px; + min-height: 1.6em; + &.plaintext { + border-bottom: 1px dashed #dde1e6; + } + } + } +} + .detail-wrap { padding: 0 4px; } .detail-card { diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index ef4cbf7d4..7d3f940af 100644 --- a/ruoyi-ui/src/views/system/user/index.vue +++ b/ruoyi-ui/src/views/system/user/index.vue @@ -46,7 +46,11 @@ - + + + @@ -163,6 +167,8 @@ + + @@ -174,11 +180,12 @@ import Treeselect from "@riophae/vue-treeselect" import "@riophae/vue-treeselect/dist/vue-treeselect.css" import TreePanel from "@/components/TreePanel" import ExcelImportDialog from "@/components/ExcelImportDialog" +import UserViewDrawer from "./view" export default { name: "User", dicts: ['sys_normal_disable', 'sys_user_sex'], - components: { Treeselect, TreePanel, ExcelImportDialog }, + components: { Treeselect, TreePanel, ExcelImportDialog, UserViewDrawer }, data() { return { // 遮罩层 @@ -456,6 +463,10 @@ export default { ...this.queryParams }, `user_${new Date().getTime()}.xlsx`) }, + /** 详情按钮操作 */ + handleViewData(row) { + this.$refs.userViewRef.open(row.userId) + }, /** 导入按钮操作 */ handleImport() { this.$refs.importUserRef.open() diff --git a/ruoyi-ui/src/views/system/user/view.vue b/ruoyi-ui/src/views/system/user/view.vue new file mode 100644 index 000000000..04726c078 --- /dev/null +++ b/ruoyi-ui/src/views/system/user/view.vue @@ -0,0 +1,177 @@ + + +