From c51bd4bc1e1a0783f33b1be47fef9d8023ea680c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sun, 29 Sep 2024 23:40:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yanzhu/system/api/domain/SysUser.java | 11 + .../yanzhu/system/api/model/LoginUser.java | 13 + .../auth/controller/TokenController.java | 5 + .../yanzhu/auth/service/SysLoginService.java | 3 + .../common/core/web/domain/BaseEntity.java | 11 + .../com/yanzhu/manage/domain/BusExamInfo.java | 39 ++- .../yanzhu/manage/domain/BusExamQuestion.java | 15 +- .../com/yanzhu/manage/domain/BusExamUser.java | 77 ++++- .../mapper/manage/BusExamInfoMapper.xml | 18 +- .../mapper/manage/BusExamQuestionMapper.xml | 10 +- .../mapper/manage/BusExamUserMapper.xml | 43 +-- .../controller/BusExamUserController.java | 13 +- .../manage/service/IBusExamUserService.java | 2 +- .../impl/BusExamQuestionServiceImpl.java | 4 +- .../service/impl/BusExamUserServiceImpl.java | 6 +- .../system/controller/SysUserController.java | 4 + .../resources/mapper/system/SysUserMapper.xml | 6 +- yanzhu-ui-vue3/src/store/modules/user.js | 10 +- .../src/views/manage/busExamInfo/index.vue | 149 ++++++---- .../views/manage/busExamInfoQues/index.vue | 267 ------------------ .../views/manage/busExamQuestion/index.vue | 119 +++++++- .../src/views/manage/busExamUser/index.vue | 126 ++------- .../views/manage/busTrainingVideo/index.vue | 8 +- 23 files changed, 473 insertions(+), 486 deletions(-) delete mode 100644 yanzhu-ui-vue3/src/views/manage/busExamInfoQues/index.vue diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java index 58b7d625..6203b8d9 100644 --- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java +++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java @@ -29,6 +29,9 @@ public class SysUser extends BaseEntity @Excel(name = "公司编号", type = Type.IMPORT) private Long comId; + /** 公司名称 */ + private String comName; + /** 部门ID */ @Excel(name = "部门编号", type = Type.IMPORT) private Long deptId; @@ -168,6 +171,14 @@ public class SysUser extends BaseEntity this.comId = comId; } + public String getComName() { + return comName; + } + + public void setComName(String comName) { + this.comName = comName; + } + public Long getDeptId() { return deptId; diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/model/LoginUser.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/model/LoginUser.java index 91e52f7c..7f3afd9e 100644 --- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/model/LoginUser.java +++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/model/LoginUser.java @@ -73,6 +73,11 @@ public class LoginUser implements Serializable */ private Long projectDeptId; + /** + * 项目公司信息 + */ + private String projectDeptName; + public String getToken() { return token; @@ -187,6 +192,14 @@ public class LoginUser implements Serializable this.projectName = projectName; } + public String getProjectDeptName() { + return projectDeptName; + } + + public void setProjectDeptName(String projectDeptName) { + this.projectDeptName = projectDeptName; + } + /** * 无参构造方法 */ diff --git a/yanzhu-auth/src/main/java/com/yanzhu/auth/controller/TokenController.java b/yanzhu-auth/src/main/java/com/yanzhu/auth/controller/TokenController.java index 1dfbbeef..e749911c 100644 --- a/yanzhu-auth/src/main/java/com/yanzhu/auth/controller/TokenController.java +++ b/yanzhu-auth/src/main/java/com/yanzhu/auth/controller/TokenController.java @@ -67,12 +67,14 @@ public class TokenController Map proData = dataResult.getData(); SysUser user = loginUser.getSysUser(); user.setActiveComId(Convert.toLong(proData.get("comId"))); + user.setActiveComName(Convert.toStr(proData.get("comName"))); user.setActiveProjectId(Convert.toLong(proData.get("id"))); user.setActiveProjectName(Convert.toStr(proData.get("projectName"))); loginUser.setSysUser(user); loginUser.setProjectId(Convert.toLong(proData.get("id"))); loginUser.setProjectName(Convert.toStr(proData.get("projectName"))); loginUser.setProjectDeptId(Convert.toLong(proData.get("comId"))); + loginUser.setProjectDeptName(Convert.toStr(proData.get("comName"))); // 刷新令牌有效期 tokenService.refreshToken(loginUser); return R.ok(); @@ -86,6 +88,9 @@ public class TokenController if(Objects.nonNull(user.getActiveComId())){ userInfo.setProjectDeptId(user.getActiveComId()); } + if(Objects.nonNull(user.getActiveComName())){ + userInfo.setProjectDeptName(user.getActiveComName()); + } if(Objects.nonNull(user.getActiveProjectId())){ userInfo.setProjectId(user.getActiveProjectId()); } diff --git a/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java b/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java index 0ff7c9c6..aa35ad39 100644 --- a/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java +++ b/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java @@ -107,6 +107,9 @@ public class SysLoginService if(Objects.nonNull(user.getActiveComId())){ userInfo.setProjectDeptId(user.getActiveComId()); } + if(Objects.nonNull(user.getActiveComName())){ + userInfo.setProjectDeptName(user.getActiveComName()); + } if(Objects.nonNull(user.getActiveProjectId())){ userInfo.setProjectId(user.getActiveProjectId()); } diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/domain/BaseEntity.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/domain/BaseEntity.java index 81aac5d2..4683bd09 100644 --- a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/domain/BaseEntity.java +++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/domain/BaseEntity.java @@ -44,6 +44,9 @@ public class BaseEntity implements Serializable /** 选中公司 */ private Long activeComId; + /** 选中公司 */ + private String activeComName; + /** 选中项目 */ private Long activeProjectId; @@ -147,6 +150,14 @@ public class BaseEntity implements Serializable this.activeComId = activeComId; } + public String getActiveComName() { + return activeComName; + } + + public void setActiveComName(String activeComName) { + this.activeComName = activeComName; + } + public Long getActiveProjectId() { return activeProjectId; } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusExamInfo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusExamInfo.java index a954c834..573385ff 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusExamInfo.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusExamInfo.java @@ -54,14 +54,26 @@ public class BusExamInfo extends BaseEntity @Excel(name = "单选题数量") private String singleNum; + /** 单选题分数 */ + @Excel(name = "单选题分数") + private String singleMark; + /** 多选题数量 */ @Excel(name = "多选题数量") private String multipleNum; + /** 多选题分数 */ + @Excel(name = "多选题分数") + private String multipleMark; + /** 判断题数量 */ @Excel(name = "判断题数量") private String estimateNum; + /** 判断题分数 */ + @Excel(name = "判断题分数") + private String estimateMark; + /** 试卷分数 */ @Excel(name = "试卷分数") private Long fullMark; @@ -214,7 +226,32 @@ public class BusExamInfo extends BaseEntity { return useNumber; } - public void setIsDel(Long isDel) + + public String getSingleMark() { + return singleMark; + } + + public void setSingleMark(String singleMark) { + this.singleMark = singleMark; + } + + public String getMultipleMark() { + return multipleMark; + } + + public void setMultipleMark(String multipleMark) { + this.multipleMark = multipleMark; + } + + public String getEstimateMark() { + return estimateMark; + } + + public void setEstimateMark(String estimateMark) { + this.estimateMark = estimateMark; + } + + public void setIsDel(Long isDel) { this.isDel = isDel; } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusExamQuestion.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusExamQuestion.java index 2d8577a9..1c99a018 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusExamQuestion.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusExamQuestion.java @@ -50,6 +50,10 @@ public class BusExamQuestion extends BaseEntity @Excel(name = "问题类型") private Long questionType; + /** 问题范围 */ + @Excel(name = "问题范围") + private String questionScope; + /** 问题描述 */ @Excel(name = "问题描述") private String questionDesc; @@ -144,7 +148,16 @@ public class BusExamQuestion extends BaseEntity { return questionType; } - public void setQuestionDesc(String questionDesc) + + public String getQuestionScope() { + return questionScope; + } + + public void setQuestionScope(String questionScope) { + this.questionScope = questionScope; + } + + public void setQuestionDesc(String questionDesc) { this.questionDesc = questionDesc; } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusExamUser.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusExamUser.java index 85b9de43..ae9fb79e 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusExamUser.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusExamUser.java @@ -18,18 +18,33 @@ public class BusExamUser extends BaseEntity /** 主键 */ private Long id; - /** 部门主键 */ - @Excel(name = "部门主键") - private Long deptId; + /** 单位主键 */ + @Excel(name = "单位主键") + private Long comId; + + /** 单位名称 */ + @Excel(name = "单位名称") + private String comName; /** 项目主键 */ @Excel(name = "项目主键") private Long projectId; + /** 项目名称 */ + @Excel(name = "项目名称") + private String projectName; + /** 用户主键 */ - @Excel(name = "用户主键") private Long userId; + /** 用户名称 */ + @Excel(name = "用户名称") + private Long userNick; + + /** 用户账号 */ + @Excel(name = "用户账号") + private Long userName; + /** 试卷名称 */ @Excel(name = "试卷名称") private String examTitle; @@ -83,16 +98,24 @@ public class BusExamUser extends BaseEntity { return id; } - public void setDeptId(Long deptId) - { - this.deptId = deptId; + + public Long getComId() { + return comId; } - public Long getDeptId() - { - return deptId; + public void setComId(Long comId) { + this.comId = comId; } - public void setProjectId(Long projectId) + + public String getComName() { + return comName; + } + + public void setComName(String comName) { + this.comName = comName; + } + + public void setProjectId(Long projectId) { this.projectId = projectId; } @@ -101,7 +124,16 @@ public class BusExamUser extends BaseEntity { return projectId; } - public void setUserId(Long userId) + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public void setUserId(Long userId) { this.userId = userId; } @@ -110,7 +142,24 @@ public class BusExamUser extends BaseEntity { return userId; } - public void setExamTitle(String examTitle) + + public Long getUserNick() { + return userNick; + } + + public void setUserNick(Long userNick) { + this.userNick = userNick; + } + + public Long getUserName() { + return userName; + } + + public void setUserName(Long userName) { + this.userName = userName; + } + + public void setExamTitle(String examTitle) { this.examTitle = examTitle; } @@ -214,7 +263,7 @@ public class BusExamUser extends BaseEntity public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) - .append("deptId", getDeptId()) + .append("comId", getComId()) .append("projectId", getProjectId()) .append("userId", getUserId()) .append("examTitle", getExamTitle()) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusExamInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusExamInfoMapper.xml index 44ecab0f..da461750 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusExamInfoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusExamInfoMapper.xml @@ -15,8 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -40,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select bei.id, bei.com_id, sd.dept_name as com_name, bei.project_id, pi.project_name, bei.exam_title, bei.exam_type, bei.craft_type, bei.craft_post, bei.single_num, bei.multiple_num, bei.estimate_num, bei.full_mark, bei.pass_mark, bei.use_number, bei.is_del, bei.create_by, bei.create_time, bei.update_by, bei.update_time, bei.remark from bus_exam_info bei + select bei.id, bei.com_id, sd.dept_name as com_name, bei.project_id, pi.project_name, bei.exam_title, bei.exam_type, bei.craft_type, bei.craft_post, bei.single_num, bei.single_mark, bei.multiple_num, bei.multiple_mark, bei.estimate_num, bei.estimate_mark, bei.full_mark, bei.pass_mark, bei.use_number, bei.is_del, bei.create_by, bei.create_time, bei.update_by, bei.update_time, bei.remark from bus_exam_info bei left join pro_project_info pi on pi.id = bei.project_id left join sys_dept sd on sd.dept_id = pi.com_id @@ -51,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bei.is_del != 2 and bei.com_id = #{comId} and bei.project_id = #{projectId} + and bei.com_id = #{activeComId} + and bei.project_id = #{activeProjectId} and bei.exam_title = #{examTitle} and bei.exam_type = #{examType} and bei.craft_type = #{craftType} @@ -60,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - and dept_id = #{deptId} - and project_id = #{projectId} - and user_id = #{userId} - and exam_title = #{examTitle} - and exam_type = #{examType} - and craft_type = #{craftType} - and craft_post = #{craftPost} - and single_num = #{singleNum} - and multiple_num = #{multipleNum} - and estimate_num = #{estimateNum} - and user_mark = #{userMark} - and res_status = #{resStatus} - and use_times = #{useTimes} - and is_del = #{isDel} + + beu.is_del = 0 + and beu.com_id = #{comId} + and beu.project_id = #{projectId} + and beu.com_id = #{activeComId} + and beu.project_id = #{activeProjectId} + and beu.user_id = #{userId} + and (beu.com_id = #{activeComId} or ) + and beu.exam_title = #{examTitle} + and beu.exam_type = #{examType} + and beu.craft_type = #{craftType} + and beu.craft_post = #{craftPost} + and beu.res_status = #{resStatus} + and beu.use_times = #{useTimes} + order by beu.id desc diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java index 249497d6..47082f77 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BusExamUserController.java @@ -71,7 +71,7 @@ public class BusExamUserController extends BaseController @PostMapping public AjaxResult add(@RequestBody BusExamUser busExamUser) { - return toAjax(busExamUserService.insertBusExamUser(busExamUser)); + return success(busExamUserService.insertBusExamUser(busExamUser)); } /** @@ -95,4 +95,15 @@ public class BusExamUserController extends BaseController { return toAjax(busExamUserService.deleteBusExamUserByIds(ids)); } + + /** + * 新增用户试卷 + * @RequiresPermissions("manage:busExamUser:add") + */ + @Log(title = "新增试卷考题", businessType = BusinessType.INSERT) + @PostMapping("/push") + public AjaxResult pushBusExamUser(@RequestBody BusExamUser busExamUser) + { + return success(busExamUserService.insertBusExamUser(busExamUser)); + } } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IBusExamUserService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IBusExamUserService.java index 621be9e3..9a08b6e8 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IBusExamUserService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IBusExamUserService.java @@ -33,7 +33,7 @@ public interface IBusExamUserService * @param busExamUser 用户试卷 * @return 结果 */ - public int insertBusExamUser(BusExamUser busExamUser); + public BusExamUser insertBusExamUser(BusExamUser busExamUser); /** * 修改用户试卷 diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamQuestionServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamQuestionServiceImpl.java index 93babffe..d4cfba87 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamQuestionServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamQuestionServiceImpl.java @@ -68,8 +68,8 @@ public class BusExamQuestionServiceImpl implements IBusExamQuestionService @Override public int insertBusExamQuestion(BusExamQuestion busExamQuestion) { - ProProjectInfo info = redisService.getCacheObject(CacheConstants.PRO_PROJECT+busExamQuestion.getProjectId()); - busExamQuestion.setComId(info.getComId()); + /**ProProjectInfo info = redisService.getCacheObject(CacheConstants.PRO_PROJECT+busExamQuestion.getProjectId()); + busExamQuestion.setComId(info.getComId());*/ busExamQuestion.setCreateBy(SecurityUtils.getUsername()); busExamQuestion.setCreateTime(DateUtils.getNowDate()); busExamQuestion.setUpdateTime(DateUtils.getNowDate()); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java index 79b73015..381bf6d2 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java @@ -2,6 +2,8 @@ package com.yanzhu.manage.service.impl; import java.util.List; import com.yanzhu.common.core.utils.DateUtils; +import com.yanzhu.common.security.utils.SecurityUtils; +import com.yanzhu.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.manage.mapper.BusExamUserMapper; @@ -51,8 +53,10 @@ public class BusExamUserServiceImpl implements IBusExamUserService * @return 结果 */ @Override - public int insertBusExamUser(BusExamUser busExamUser) + public BusExamUser insertBusExamUser(BusExamUser busExamUser) { + SysUser cache = SecurityUtils.getLoginUser().getSysUser(); + busExamUser.setCreateTime(DateUtils.getNowDate()); return busExamUserMapper.insertBusExamUser(busExamUser); } diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java index 5c9931a6..82930bd0 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java @@ -135,6 +135,7 @@ public class SysUserController extends BaseController { // 默认以公司管理员登录 sysUser = userService.selectUserByUserName(username, sysUser.getComId()); sysUser.setActiveComId(sysUser.getComId()); + sysUser.setActiveComName(sysUser.getComName()); } else { // 查询用户绑定项目列表 List> list = userService.selectProjectsByUserId(sysUser.getUserId()); @@ -144,6 +145,7 @@ public class SysUserController extends BaseController { // 以项目人员身份登录 sysUser = userService.selectUserByUserName(username, Convert.toLong(list.get(0).get("project_id"))); sysUser.setActiveComId(sysUser.getComId()); + sysUser.setActiveComName(sysUser.getComName()); sysUser.setActiveProjectId(Convert.toLong(list.get(0).get("project_id"))); sysUser.setActiveProjectName(Convert.toStr(list.get(0).get("project_name"))); } @@ -170,6 +172,7 @@ public class SysUserController extends BaseController { List> list = userService.selectProjectsByUserId(sysUser.getUserId()); sysUser.setActiveComId(sysUser.getComId()); + sysUser.setActiveComName(sysUser.getComName()); sysUser.setActiveProjectId(Convert.toLong(list.get(0).get("project_id"))); sysUser.setActiveProjectName(Convert.toStr(list.get(0).get("project_name"))); @@ -231,6 +234,7 @@ public class SysUserController extends BaseController { } } user.setActiveComId(cache.getComId()); + user.setActiveComName(cache.getComName()); user.setActiveProjectId(cache.getActiveProjectId()); user.setActiveProjectName(cache.getActiveProjectName()); // 角色集合 diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserMapper.xml b/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserMapper.xml index fa152ab5..f598d014 100644 --- a/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/yanzhu-modules/yanzhu-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -65,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.com_id, u.dept_id, u.user_name, u.nick_name, u.user_type, u.card_type, u.card_code, u.user_picture, u.card_img_pos, u.card_img_inv, u.user_infos, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + select u.user_id, u.com_id, com.dept_name as com_name, u.dept_id, u.user_name, u.nick_name, u.user_type, u.card_type, u.card_code, u.user_picture, u.card_img_pos, u.card_img_inv, u.user_infos, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.dept_short_name, d.dept_code, d.dept_type, 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,com.dept_name com_dept_name from sys_user u @@ -288,8 +289,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/yanzhu-ui-vue3/src/store/modules/user.js b/yanzhu-ui-vue3/src/store/modules/user.js index 2523ccb7..ccf6877a 100644 --- a/yanzhu-ui-vue3/src/store/modules/user.js +++ b/yanzhu-ui-vue3/src/store/modules/user.js @@ -12,6 +12,8 @@ const useUserStore = defineStore( compInfo:{}, roles: [], permissions: [], + currentComId: null, + currentComName: null, currentProId: null, currentProName: null, }), @@ -46,11 +48,13 @@ const useUserStore = defineStore( } else { this.roles = ['ROLE_DEFAULT'] } - this.name = user.userName + this.name = user.userName; this.compInfo=user.comp; this.avatar = avatar; - this.currentProId = user.activeProjectId - this.currentProName = user.activeProjectName + this.currentComId = user.activeComId; + this.currentComName = user.activeComName; + this.currentProId = user.activeProjectId; + this.currentProName = user.activeProjectName; resolve(res) }).catch(error => { reject(error) diff --git a/yanzhu-ui-vue3/src/views/manage/busExamInfo/index.vue b/yanzhu-ui-vue3/src/views/manage/busExamInfo/index.vue index 477b9817..9efc0432 100644 --- a/yanzhu-ui-vue3/src/views/manage/busExamInfo/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/busExamInfo/index.vue @@ -27,10 +27,11 @@ /> - + - + @@ -101,11 +102,17 @@ - - - - - + + + + + + + + + @@ -242,6 +259,30 @@ const data = reactive({ examTitle: [{ required: true, message: "试卷名称不能为空", trigger: "blur" }], craftType: [{ required: true, message: "工种类型不能为空", trigger: "change" }], craftPost: [{ required: true, message: "工种岗位不能为空", trigger: "change" }], + singleNum: [ + { required: true, message: "单选题数量不能为空", trigger: "blur" }, + { type: "number", message: "请输入数字类型", trigger: "blur" }, + ], + singleMark: [ + { required: true, message: "单选题分数不能为空", trigger: "blur" }, + { type: "number", message: "请输入数字类型", trigger: "blur" }, + ], + multipleNum: [ + { required: true, message: "多选题数量不能为空", trigger: "blur" }, + { type: "number", message: "请输入数字类型", trigger: "blur" }, + ], + multipleMark: [ + { required: true, message: "多选题分数不能为空", trigger: "blur" }, + { type: "number", message: "请输入数字类型", trigger: "blur" }, + ], + estimateNum: [ + { required: true, message: "判断题数量不能为空", trigger: "blur" }, + { type: "number", message: "请输入数字类型", trigger: "blur" }, + ], + estimateMark: [ + { required: true, message: "判断题分数不能为空", trigger: "blur" }, + { type: "number", message: "请输入数字类型", trigger: "blur" }, + ], passMark: [ { required: true, message: "合格分数不能为空", trigger: "blur" }, { type: "number", message: "请输入数字类型", trigger: "blur" }, @@ -255,9 +296,6 @@ const { queryParams, form, rules } = toRefs(data); function getList() { loading.value = true; listBusExamInfo(queryParams.value).then(response => { - response.rows.forEach(item => { - item.disabledState = initRowDisabled(item); - }) busExamInfoList.value = response.rows; total.value = response.total; loading.value = false; @@ -385,6 +423,11 @@ function setStatus(val, row) { }); } +/** 岗位类型改变 */ +function changeCraftType() { + form.value.craftPost = null; +} + /** 删除按钮操作 */ function handleDelete(row) { const _ids = row.id || ids.value; @@ -435,20 +478,6 @@ function handleExport() { }, `busExamInfo_${new Date().getTime()}.xlsx`) } -/** 初始化行标识 */ -function initRowDisabled(row) { - let roles = userStore.roles; - if(roles.includes("admin")){ - return false; - }else if(roles.includes("gsAdmin") && row.comId){ - return false; - }else if(row.projectId){ - return false; - }else{ - return true; - } -} - getList();