diff --git a/yudao-ui-admin-vben-master/src/views/users/mine/index.vue b/yudao-ui-admin-vben-master/src/views/users/mine/index.vue index 0267187..2085800 100644 --- a/yudao-ui-admin-vben-master/src/views/users/mine/index.vue +++ b/yudao-ui-admin-vben-master/src/views/users/mine/index.vue @@ -1,6 +1,8 @@ @@ -150,22 +207,23 @@ const tabledata = [ ▋ 基本资料 + 基本信息 - - + + - + - + - + @@ -176,7 +234,7 @@ const tabledata = [ - + 修改手机号 @@ -232,11 +290,11 @@ const tabledata = [ - + 更多信息 - + @@ -356,17 +414,19 @@ const tabledata = [ ▋ 登录记录 + - {{ `2023-08-22` }} + {{item.logType}} + {{ `日期:2023-08-22` }} @@ -374,14 +434,18 @@ const tabledata = [ - - {{ `kang-pc` }} + + {{item.username}} + - {{ `上海市长宁区 14.127.100.242` }} + {{item.userIp}} + - {{ `2023-08-22 12:00` }} + + + {{item.createTime}} @@ -399,6 +463,7 @@ const tabledata = [ ▋ 系统通知 + @@ -432,7 +497,7 @@ const tabledata = [ - + 通知标题 @@ -442,7 +507,7 @@ const tabledata = [ {{ record.name }} - + {{ record.title }} @@ -535,7 +600,7 @@ const tabledata = [ - 部门:{{ `再生资源事业部<采购部` }} + 部门:{{ `再生资源事业部 采购部` }} 业务线:{{ `废铁、废铝` }} @@ -544,7 +609,7 @@ const tabledata = [ - 默认登录: + 默认登录: @@ -630,7 +695,7 @@ const tabledata = [ display: flex; flex-wrap: wrap; justify-content: space-between; - + .list{ width: 30%; @@ -685,7 +750,7 @@ const tabledata = [ } - + } } @@ -698,7 +763,7 @@ const tabledata = [ .ant-tabs-tab .ant-tabs-tab-active{ padding: 8px 24px; text-align: center; - + } .datum{ @@ -708,7 +773,7 @@ const tabledata = [ color: #666; .datumtop{ - p{ + p{ margin-bottom: 15px; font-size:18px; font-weight:700; @@ -718,7 +783,7 @@ const tabledata = [ color:#409EFF; } } - + } .datumbox{ @@ -759,7 +824,7 @@ const tabledata = [ .pleft{ margin: 20px ; - + } } @@ -852,7 +917,7 @@ justify-content: space-between; flex-direction: column; width: 300px; margin-left: 20px; - + .usersId{ font-size:20px ; diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/user/UserBaseVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/user/UserBaseVO.java index 0a28360..a2ff09c 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/user/UserBaseVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/user/UserBaseVO.java @@ -8,6 +8,7 @@ import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; +import java.time.LocalDateTime; import java.util.Set; /** @@ -51,4 +52,31 @@ public class UserBaseVO { @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png") private String avatar; + @Schema(description = "员工工号", example = "123") + private String jobNumber; + + @Schema(description = "微信账号", example = "123") + private String wechatAccount; + + @Schema(description = "出生日期", example = "123") + private LocalDateTime birthDatetime; + + @Schema(description = "籍贯", example = "123") + private String nativePlace; + + @Schema(description = "学历", example = "123") + private String education; + + @Schema(description = "专业", example = "123") + private String speciality; + + @Schema(description = "毕业院校", example = "123") + private String graduationInstitution; + + @Schema(description = "毕业时间", example = "123") + private LocalDateTime institutionDatatime; + + @Schema(description = "个人简介", example = "123") + private String personalProfile; + } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/user/AdminUserDO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/user/AdminUserDO.java index 3758461..109e9b5 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/user/AdminUserDO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/dal/dataobject/user/AdminUserDO.java @@ -96,6 +96,42 @@ public class AdminUserDO extends TenantBaseDO { * 最后登录时间 */ private LocalDateTime loginDate; + /** + * 员工工号 + */ + private String jobNumber; + /** + * 微信账号 + */ + private String wechatAccount; + /** + * 出生日期 + */ + private LocalDateTime birthDatetime; + /** + * 籍贯 + */ + private String nativePlace; + /** + * 学历 + */ + private String education; + /** + * 专业 + */ + private String speciality; + /** + * 毕业院校 + */ + private String graduationInstitution; + /** + * 毕业时间 + */ + private LocalDateTime institutionDatatime; + /** + * 个人简介 + */ + private String personalProfile; private Long defaultEnterpriseId;
▋ 基本资料 +
基本信息
更多信息
▋ 登录记录 +
▋ 系统通知 +
- 部门:{{ `再生资源事业部<采购部` }} + 部门:{{ `再生资源事业部 采购部` }}
业务线:{{ `废铁、废铝` }} @@ -544,7 +609,7 @@ const tabledata = [
- 默认登录: + 默认登录: