diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitCompetitionStudentInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitCompetitionStudentInfoController.java index 26fa8a6..dbcb9dd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitCompetitionStudentInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitCompetitionStudentInfoController.java @@ -5,6 +5,7 @@ import com.ruoyi.cms.domain.HitCompetitionStudentInfo; import com.ruoyi.cms.service.IHitCompetitionStudentInfoService; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.job.TaskException; @@ -15,6 +16,7 @@ import com.ruoyi.quartz.domain.SysJob; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.time.LocalDateTime; @@ -167,4 +169,27 @@ public class HitCompetitionStudentInfoController extends BaseController { // hitTask.scheduleTask(); return success(time); } + + /** + * 导入个人分数数据模板 + * @param response + */ + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) + { + ExcelUtil util = new ExcelUtil(HitCompetitionStudentInfo.class); + util.importTemplateExcel(response, "用户数据"); + } + + @PostMapping("/importData") + public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception + { + ExcelUtil util = new ExcelUtil(HitCompetitionStudentInfo.class); + List hitList = util.importExcel(file.getInputStream()); + logger.info("导入数据："+hitList); + String operName = getUsername(); +// String message = userService.importUser(hitList, updateSupport, operName); + String message = hitCompetitionStudentInfoService.importData(hitList); + return success(message); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java index 1b3b3a6..c2ca462 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java @@ -13,6 +13,7 @@ import java.io.Serializable; import java.util.Date; import java.util.List; +import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.HitRegistrationTeachInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -65,10 +66,14 @@ public class HitCompetitionStudentInfo implements Serializable { @ApiModelProperty(value = "所属赛区") private String division; + @TableField(exist = false) + private String competition; + @TableField(exist = false) private String divisionLabel; + @Excel(name = "手机号") @ApiModelProperty(value = "手机号") private String phoneNumber; @@ -78,6 +83,7 @@ public class HitCompetitionStudentInfo implements Serializable { @ApiModelProperty(value = "学生证") private String studentIdCard; + @Excel(name = "个人选拔赛分数") @ApiModelProperty(value = "个人选拔赛分数") private BigDecimal trialsScore; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java index e08a3aa..301db85 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.core.domain.HitRegistrationTeachInfo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; @@ -39,8 +40,12 @@ public class HitRegInfo extends BaseEntity @Excel(name = "所属赛区") private String division; + /** 赛事 */ + @ApiModelProperty(value = "赛事") + private String competition; + /** 团队名称（个人赛不需求，可以为空） */ - @Excel(name = "团队名称", readConverterExp = "个=人赛不需求，可以为空") + @Excel(name = "团队名称", readConverterExp = "个人赛不需求，可以为空") private String teamName; /** 盲样联系人 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/Preliminary.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/Preliminary.java index 5fb402b..8704281 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/Preliminary.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/Preliminary.java @@ -21,6 +21,9 @@ public class Preliminary { /** 赛区 */ private String division; + /** 赛事 */ + private String competition; + /** 学校名称 */ private String schoolName; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitCompetitionStudentInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitCompetitionStudentInfoService.java index 24c1808..376ce9f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitCompetitionStudentInfoService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitCompetitionStudentInfoService.java @@ -85,4 +85,11 @@ public interface IHitCompetitionStudentInfoService extends IService hitList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java index 72d596a..184273a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.cms.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.cms.domain.*; import com.ruoyi.cms.domain.vo.TeamsVo; @@ -14,6 +16,7 @@ import com.ruoyi.cms.service.IHitRegInfoService; import com.ruoyi.common.core.domain.HitRegistrationTeachInfo; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; @@ -24,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Calendar; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -166,6 +170,13 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); +// query.eq(HitTeams::getId, hitCompetitionStudentInfo.getHitRegId()); +// HitTeams hitTeams = hitTeamsMapper.selectOne(query); +// if (ObjectUtils.isNotEmpty(hitTeams)) { +//// hitCompetitionStudentInfo.setCompetition(hitTeams.getCompetition()); +// } if (ObjectUtils.isEmpty(hitCompetitionStudentInfo) ) { return new HitCompetitionStudentInfo(); } @@ -182,6 +193,8 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl hitRegistrationTeachInfos = hitRegistrationTeachInfoMapper.selectList(queryWrapper2); + //领队老师也可以是指导老师 + hitRegistrationTeachInfos.add(hitRegistrationTeachInfo); hitCompetitionStudentInfo.setZdTeacherList(hitRegistrationTeachInfos); LambdaQueryWrapper queryWrapper3 =new LambdaQueryWrapper<>(); @@ -296,6 +309,38 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl hitList) { + //获取当前时间 + DateTime now = DateUtil.date(); + Date date = new Date(); + if (StringUtils.isNull(hitList) || hitList.size() == 0) + { + throw new ServiceException("导入学生分数信息不能为空！"); + } + + hitList.forEach(item -> { + //判断手机号与分数是否为空 + if (!StringUtils.isNull(item.getPhoneNumber()) || !StringUtils.isNull(item.getTrialsScore())) + { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.likeRight(HitCompetitionStudentInfo::getYear, year); + queryWrapper.eq(HitCompetitionStudentInfo::getPhoneNumber, item.getPhoneNumber()); + queryWrapper.between(HitCompetitionStudentInfo::getCreateTime, DateUtil.beginOfYear(now), DateUtil.endOfYear(now)); + item.setUpdateTime(date); + hitCompetitionStudentInfoMapper.update(item, queryWrapper); + } + }); + + return "导入成功"; + } + /** * 查询团队信息 * @param teamsVo diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java index b03788d..0fed593 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java @@ -75,6 +75,12 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService @Override public List selectHitRegInfoList(HitRegInfo hitRegInfo) { + Long userId = SecurityUtils.getLoginUser().getUserId(); + //判断当前登陆人是否是领队老师，如果是查询该老师学校下的战队 + HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId); + if (teacherInfo != null && teacherInfo.getType().equals("1")) { + hitRegInfo.setSchoolName(teacherInfo.getSchoolName()); + } List hitRegInfos = hitRegInfoMapper.selectHitRegInfoList(hitRegInfo); for (HitRegInfo regInfo : hitRegInfos) { HitRegInfoUser hitRegInfoUser =new HitRegInfoUser(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitTeamsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitTeamsServiceImpl.java index a3b2810..f925836 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitTeamsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitTeamsServiceImpl.java @@ -84,6 +84,7 @@ public class HitTeamsServiceImpl extends ServiceImpl i hitRegInfo.setUploadFile(preliminary.getUploadFile()); hitRegInfo.setAuditStatus("9"); hitRegInfo.setCreateTime(new Date()); + hitRegInfo.setCompetition(preliminary.getCompetition()); int insert = hitRegInfoMapper.insert(hitRegInfo); //插入人员信息 HitRegInfoUser hitRegInfoUser1 =new HitRegInfoUser(); diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 9bd9feb..b78e34d 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,16 +6,12 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://61.156.90.46:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true - url: jdbc:mysql://localhost:3306/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true -# username: obrhgd - username: root -# password: Obr7890&*() - password: 123456 -# master: -# url: jdbc:mysql://localhost:3306/ry-cms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://61.156.90.46:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true +# url: jdbc:mysql://localhost:3306/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true + username: obrhgd # username: root -# password: root + password: Obr7890&*() +# password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index be57f0c..04f7916 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -74,7 +74,8 @@ spring: # 数据库索引 database: 9 # 密码 - password: 123456 +# password: 123456 + password: # 连接超时时间 timeout: 10s lettuce: diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 2294fe4..4dd390c 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -4,8 +4,8 @@ VUE_APP_TITLE = 虚拟仿真实验教学中心 # 开发环境配置 ENV = 'development' # 若依管理系统/开发环境 -# VUE_APP_BASE_API = 'http://192.168.31.25:8080' -VUE_APP_BASE_API = 'http://localhost:8080/hgdWebsite' +VUE_APP_BASE_API = 'http://192.168.31.25:8080' +# VUE_APP_BASE_API = 'http://localhost:8080/hgdWebsite' # VUE_APP_BASE_API = '/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js index ffb0d21..688af1e 100644 --- a/ruoyi-ui/src/utils/request.js +++ b/ruoyi-ui/src/utils/request.js @@ -16,8 +16,8 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 baseURL: process.env.VUE_APP_BASE_API, - // 超时 - timeout: 10000 + // 超时 30s + timeout: 30000 }) // request拦截器 diff --git a/ruoyi-ui/src/views/hit/stuInfo/index.vue b/ruoyi-ui/src/views/hit/stuInfo/index.vue index 4673e47..92a1a3d 100644 --- a/ruoyi-ui/src/views/hit/stuInfo/index.vue +++ b/ruoyi-ui/src/views/hit/stuInfo/index.vue @@ -15,13 +15,22 @@ - - 时间 - + + + 导入 + + 删除 @@ -133,12 +142,43 @@ 取 消 + + + + + +
将文件拖到此处，或点击上传
+
+
+ 是否更新已经存在的用户数据 +
+ 仅允许导入xls、xlsx格式文件。 + 下载模板 +
+ +
+ 确 定 + 取 消 +
+ + diff --git a/ruoyi-ui/src/views/officialWebsite/competition.vue b/ruoyi-ui/src/views/officialWebsite/competition.vue index 26c15b1..4fe8983 100644 --- a/ruoyi-ui/src/views/officialWebsite/competition.vue +++ b/ruoyi-ui/src/views/officialWebsite/competition.vue @@ -35,28 +35,25 @@
- + - - + + - + + placeholder="请选择学校名称"> + :value="item.value"> @@ -84,7 +81,7 @@ - + @@ -94,21 +91,26 @@
-
- -
成绩仅供参考，最终选择由指导老师和领队老师做决定
-
- 很遗憾，个人选拔赛未通过，您的个人成绩为 : {{ signUpForm.trialsScore }}
-
-
- 地区选拔赛成绩： +
+
+ 个人选拔赛成绩未出，请耐心等待 +
+ 成绩仅供参考，最终选择由指导老师和领队老师做决定
-
+ +
+ 很遗憾，个人选拔赛未通过，您的个人成绩为 : {{ signUpForm.trialsScore }}
+
+
+ 个人选拔赛成绩： +
+
{{ signUpForm.trialsScore }}
-
+
@@ -121,42 +123,54 @@
- - - + + + 化验赛 + 虚拟赛 + + +
+
+ + + - - - + + +
- + - +
- - - - - - - - - - - - + + + + + + + + + + + +
@@ -167,7 +181,7 @@
- + @@ -183,74 +197,54 @@
- {{preliminaryForm.divisionLabel}} - {{preliminaryForm.hitRegInfo.schoolName}} - {{preliminaryForm.ldTeacherInfo.teacherName}} - {{preliminaryForm.zdTeacherStr}} - {{preliminaryForm.hitRegInfo.sampleConcat}} - {{preliminaryForm.hitRegInfo.sampleNumber}} - {{preliminaryForm.hitRegInfo.sampleAddress}} + {{ preliminaryForm.divisionLabel }} + {{ preliminaryForm.hitRegInfo.schoolName }} + {{ preliminaryForm.ldTeacherInfo.teacherName }} + {{ preliminaryForm.zdTeacherStr }} + {{ preliminaryForm.hitRegInfo.sampleConcat }} + {{ preliminaryForm.hitRegInfo.sampleNumber }} + {{ preliminaryForm.hitRegInfo.sampleAddress }} - - + + - + - + -
-
-
-
+
+
+
+
地区选拔赛报名提交成功，请通过大赛通知获取通过信息
- -
+ +
提交
-
+
@@ -318,7 +312,7 @@ export default { SwiperSlide, "page-util": PageUtil }, - dicts: ["sys_user_sex", "school_name","com_region"], + dicts: ["sys_user_sex", "school_name", "com_region"], name: 'HelloWorld', data() { @@ -352,14 +346,15 @@ export default { leaderTeacher: "", teacherOne: "", teacherTwo: "", + competition: [], + }, + //队员 + teammateInfo: { + teamId: "", + teamName: "", + teamMateId: "", + isAgreeWith: "", }, - //队员 - teammateInfo: { - teamId: "", - teamName: "", - teamMateId: "", - isAgreeWith:"", - }, teammateList: [], // 临时用于渲染的队友列表 teacherList: [], // 临时用于渲染的导师列表 @@ -383,51 +378,54 @@ export default { { required: true, message: "专业名称不能为空", trigger: "blur" } ], studentIdCard: [ - { required: true, message: "学生证、卡不能为空", trigger: "blur" } + { required: true, message: "学生证/学生卡不能为空", trigger: "blur" } ], phoneNumber: [ { required: true, message: "手机号不能为空", trigger: "blur" } ], email: [ { required: true, message: "邮箱不能为空", trigger: "blur" } + ], + competition: [ + { required: true, message: "赛事不能为空", trigger: "blur" } ] }, - preliminaryFormRules:{ - divisionLabel : [ + preliminaryFormRules: { + divisionLabel: [ { required: true, message: "不能为空", trigger: "blur" } ], - schoolName : [ + schoolName: [ { required: true, message: "不能为空", trigger: "blur" } ], - 'ldTeacherInfo.teacherName' : [ + 'ldTeacherInfo.teacherName': [ { required: true, message: "不能为空", trigger: "blur" } ], - teamName : [ + teamName: [ { required: true, message: "不能为空", trigger: "blur" } ], - teammateOne : [ + teammateOne: [ { required: true, message: "不能为空", trigger: "blur" } ], - teammateTwo : [ + teammateTwo: [ { required: true, message: "不能为空", trigger: "blur" } ], - teacherOne : [ + teacherOne: [ { required: true, message: "不能为空", trigger: "blur" } ], - teacherTwo : [ + teacherTwo: [ { required: true, message: "不能为空", trigger: "blur" } ], - sampleConcat : [ + sampleConcat: [ { required: true, message: "不能为空", trigger: "blur" } ], - sampleNumber : [ + sampleNumber: [ { required: true, message: "不能为空", trigger: "blur" } ], - sampleAddress : [ + sampleAddress: [ { required: true, message: "不能为空", trigger: "blur" } ], - uploadFile : [ + uploadFile: [ { required: true, message: "不能为空", trigger: "blur" } ], }, @@ -460,23 +458,27 @@ export default { }, methods: { - regChoose(data,status){ + regChoose(data, status) { data.status = status console.log(data) - editRegUser(data).then(res=>{ - this.$modal.msgSuccess("成功") - this.fetchRegistrationInformation() - }) - }, - fileSubmit(){ - editRegInfo(this.preliminaryForm.hitRegInfo).then(res=>{ + editRegUser(data).then(res => { this.$modal.msgSuccess("成功") this.fetchRegistrationInformation() }) }, + fileSubmit() { + editRegInfo(this.preliminaryForm.hitRegInfo).then(res => { + this.$modal.msgSuccess("成功") + this.fetchRegistrationInformation() + }) + }, + onCompetition(){ + console.log("这是复选框点击事件", this.preliminaryForm.competition); + // if(this.preliminaryForm.competition) + }, //用户信息 loadUserInfo() { - if(getToken()){ + if (getToken()) { getHomeUserInfo().then(response => { this.signUpForm.studentId = response.data.userName; this.preliminaryForm = response.data; @@ -491,7 +493,9 @@ export default { getStudentInfoByStuId(this.signUpForm.studentId) .then(response => { this.preliminaryForm = response.data; - this.updateSignUpForm(response.data); + this.preliminaryForm.competition=["1"] + + this.updateSignUpForm(response.data); console.log('报名信息:', this.signUpForm); }) @@ -501,10 +505,10 @@ export default { this.preliminaryForm.division = data.division; this.preliminaryForm.divisionLabel = data.divisionLabel; this.preliminaryForm.ldTeacherInfo = data.ldTeacherInfo; - if(data.ldTeacherInfo){ + if (data.ldTeacherInfo) { this.preliminaryForm.leaderTeacher = data.ldTeacherInfo.userId; - }else{ - this.preliminaryForm.ldTeacherInfo ={} + } else { + this.preliminaryForm.ldTeacherInfo = {} } this.preliminaryForm.schoolName = data.schoolName; @@ -512,25 +516,25 @@ export default { this.preliminaryForm.tdStudentList = data.tdStudentList; this.preliminaryForm.zdTeacherStr = data.zdTeacherStr; this.active = 1; - if (data.zdStatus=='0'){ + if (data.zdStatus == '0') { this.active = 3; this.preliminaryForm.hitRegInfo = data.hitRegInfo } - else if (data.zdStatus=='1'){ + else if (data.zdStatus == '1') { this.active = 4; this.preliminaryForm.hitRegInfo = data.hitRegInfo - if (data.hitRegInfo.dsFile){ + if (data.hitRegInfo.dsFile) { this.active = 5; } - } else if (data.zdStatus=='9'){ + } else if (data.zdStatus == '9') { this.active = 2; this.preliminaryForm.hitRegInfo = data.hitRegInfo - }else if(data.id== null){ + } else if (data.id == null) { this.active = 0; - }else{ + } else { this.signUpForm = data; } - console.log(data,433, this.preliminaryForm) + console.log(data, 433, this.preliminaryForm) }, @@ -590,10 +594,10 @@ export default { } }, toRegister() { - if(!getToken()){ + if (!getToken()) { this.$modal.msgWarning("报名请先登录系统！") - }else{ + } else { if (this.registerStatus === '1') this.currentActive = 6; }