diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java index 1f1d02b..087114f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java @@ -31,6 +31,180 @@ public class UeditorController { @Autowired private ICmsCategoryService categoryService; + private static String configJson = "{\n" + + " \"videoMaxSize\": 102400000,\n" + + " \"videoActionName\": \"uploadvideo\",\n" + + " \"fileActionName\": \"uploadfile\",\n" + + " \"fileManagerListPath\": \"file/\",\n" + + " \"imageCompressBorder\": 1600,\n" + + " \"imageManagerAllowFiles\": [\n" + + " \".png\",\n" + + " \".jpg\",\n" + + " \".jpeg\",\n" + + " \".gif\",\n" + + " \".bmp\"\n" + + " ],\n" + + " \"imageManagerListPath\": \"image/\",\n" + + " \"fileMaxSize\": 51200000,\n" + + " \"fileManagerAllowFiles\": [\n" + + " \".png\",\n" + + " \".jpg\",\n" + + " \".jpeg\",\n" + + " \".gif\",\n" + + " \".bmp\",\n" + + " \".flv\",\n" + + " \".swf\",\n" + + " \".mkv\",\n" + + " \".avi\",\n" + + " \".rm\",\n" + + " \".rmvb\",\n" + + " \".mpeg\",\n" + + " \".mpg\",\n" + + " \".ogg\",\n" + + " \".ogv\",\n" + + " \".mov\",\n" + + " \".wmv\",\n" + + " \".mp4\",\n" + + " \".webm\",\n" + + " \".mp3\",\n" + + " \".wav\",\n" + + " \".mid\",\n" + + " \".rar\",\n" + + " \".zip\",\n" + + " \".tar\",\n" + + " \".gz\",\n" + + " \".7z\",\n" + + " \".bz2\",\n" + + " \".cab\",\n" + + " \".iso\",\n" + + " \".doc\",\n" + + " \".docx\",\n" + + " \".xls\",\n" + + " \".xlsx\",\n" + + " \".ppt\",\n" + + " \".pptx\",\n" + + " \".pdf\",\n" + + " \".txt\",\n" + + " \".md\",\n" + + " \".xml\"\n" + + " ],\n" + + " \"fileManagerActionName\": \"listfile\",\n" + + " \"snapscreenInsertAlign\": \"none\",\n" + + " \"scrawlActionName\": \"uploadscrawl\",\n" + + " \"videoFieldName\": \"upfile\",\n" + + " \"imageCompressEnable\": true,\n" + + " \"videoUrlPrefix\": \"https://meevexp.oberyun.com/hgdWebsite\",\n" + + " \"fileManagerUrlPrefix\": \"https://meevexp.oberyun.com/hgdWebsite\",\n" + + " \"catcherAllowFiles\": [\n" + + " \".png\",\n" + + " \".jpg\",\n" + + " \".jpeg\",\n" + + " \".gif\",\n" + + " \".bmp\"\n" + + " ],\n" + + " \"imageManagerActionName\": \"listimage\",\n" + + " \"snapscreenPathFormat\": \"image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" + + " \"scrawlPathFormat\": \"image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" + + " \"scrawlMaxSize\": 2048000,\n" + + " \"imageInsertAlign\": \"none\",\n" + + " \"catcherPathFormat\": \"image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" + + " \"catcherMaxSize\": 2048000,\n" + + " \"snapscreenUrlPrefix\": \"\",\n" + + " \"imagePathFormat\": \"image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" + + " \"imageManagerUrlPrefix\": \"https://meevexp.oberyun.com/hgdWebsite\",\n" + + " \"scrawlUrlPrefix\": \"\",\n" + + " \"scrawlFieldName\": \"upfile\",\n" + + " \"imageMaxSize\": 2048000,\n" + + " \"imageAllowFiles\": [\n" + + " \".png\",\n" + + " \".jpg\",\n" + + " \".jpeg\",\n" + + " \".gif\",\n" + + " \".bmp\",\n" + + " \".webp\"\n" + + " ],\n" + + " \"snapscreenActionName\": \"uploadimage\",\n" + + " \"catcherActionName\": \"catchimage\",\n" + + " \"fileFieldName\": \"upfile\",\n" + + " \"fileUrlPrefix\": \"https://meevexp.oberyun.com/hgdWebsite\",\n" + + " \"imageManagerInsertAlign\": \"none\",\n" + + " \"catcherLocalDomain\": [\n" + + " \"127.0.0.1\",\n" + + " \"localhost\",\n" + + " \"img.baidu.com\"\n" + + " ],\n" + + " \"filePathFormat\": \"file/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" + + " \"videoPathFormat\": \"video/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" + + " \"fileManagerListSize\": 20,\n" + + " \"imageActionName\": \"uploadimage\",\n" + + " \"imageFieldName\": \"upfile\",\n" + + " \"imageUrlPrefix\": \"https://meevexp.oberyun.com/hgdWebsite\",\n" + + " \"scrawlInsertAlign\": \"none\",\n" + + " \"fileAllowFiles\": [\n" + + " \".png\",\n" + + " \".jpg\",\n" + + " \".jpeg\",\n" + + " \".gif\",\n" + + " \".bmp\",\n" + + " \".flv\",\n" + + " \".swf\",\n" + + " \".mkv\",\n" + + " \".avi\",\n" + + " \".rm\",\n" + + " \".rmvb\",\n" + + " \".mpeg\",\n" + + " \".mpg\",\n" + + " \".ogg\",\n" + + " \".ogv\",\n" + + " \".mov\",\n" + + " \".wmv\",\n" + + " \".mp4\",\n" + + " \".webm\",\n" + + " \".mp3\",\n" + + " \".wav\",\n" + + " \".mid\",\n" + + " \".rar\",\n" + + " \".zip\",\n" + + " \".tar\",\n" + + " \".gz\",\n" + + " \".7z\",\n" + + " \".bz2\",\n" + + " \".cab\",\n" + + " \".iso\",\n" + + " \".doc\",\n" + + " \".docx\",\n" + + " \".xls\",\n" + + " \".xlsx\",\n" + + " \".ppt\",\n" + + " \".pptx\",\n" + + " \".pdf\",\n" + + " \".txt\",\n" + + " \".md\",\n" + + " \".xml\"\n" + + " ],\n" + + " \"catcherUrlPrefix\": \"\",\n" + + " \"imageManagerListSize\": 20,\n" + + " \"catcherFieldName\": \"source\",\n" + + " \"videoAllowFiles\": [\n" + + " \".flv\",\n" + + " \".swf\",\n" + + " \".mkv\",\n" + + " \".avi\",\n" + + " \".rm\",\n" + + " \".rmvb\",\n" + + " \".mpeg\",\n" + + " \".mpg\",\n" + + " \".ogg\",\n" + + " \".ogv\",\n" + + " \".mov\",\n" + + " \".wmv\",\n" + + " \".mp4\",\n" + + " \".webm\",\n" + + " \".mp3\",\n" + + " \".wav\",\n" + + " \".mid\"\n" + + " ]\n" + + "}"; //配置ueditor后端上传接口的验证 @RequestMapping("/config") @@ -43,7 +217,7 @@ public class UeditorController { String path = ClassUtils.getDefaultClassLoader().getResource("").getPath() + "config"; System.out.println("path = " + path); PrintWriter printWriter = response.getWriter(); - printWriter.write(new ActionEnter(request, path).exec()); + printWriter.write(configJson); printWriter.flush(); printWriter.close(); } 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 fe64f11..12ba0dc 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 @@ -194,9 +194,10 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl hitRegistrationTeachInfos = hitRegistrationTeachInfoMapper.selectList(queryWrapper2); //领队老师也可以是指导老师 - hitRegistrationTeachInfos.add(hitRegistrationTeachInfo); + if (ObjectUtils.isNotEmpty(hitRegistrationTeachInfo)){ + hitRegistrationTeachInfos.add(hitRegistrationTeachInfo); + } hitCompetitionStudentInfo.setZdTeacherList(hitRegistrationTeachInfos); - LambdaQueryWrapper queryWrapper3 =new LambdaQueryWrapper<>(); queryWrapper3.eq(HitCompetitionStudentInfo::getSchoolName,hitCompetitionStudentInfo.getSchoolName()).ne(HitCompetitionStudentInfo::getUserId,user.getUserId()) .likeRight(HitCompetitionStudentInfo::getCreateTime, year).eq(HitCompetitionStudentInfo::getIsPreliminary,1) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java index 885a2f3..e1a4522 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java @@ -180,9 +180,7 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac validateCaptcha(username, user.getCode(), user.getUuid()); } boolean validPhoneNumber = isValidPhoneNumber(username); - if (!validPhoneNumber) { - msg = "手机号码格式不正确"; - }else if (StringUtils.isEmpty(username)) { + if (StringUtils.isEmpty(username)) { msg = "用户名不能为空"; } else if (StringUtils.isEmpty(password)) { msg = "用户密码不能为空"; diff --git a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue index 3843ef7..9715c7a 100644 --- a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue +++ b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue @@ -47,9 +47,9 @@ v-hasPermi="['hit:hitRegistrationStudentInfo:export']" >导出 --> - + + active-text="开启报名" inactive-text="关闭报名" > @@ -286,7 +286,7 @@ export default { //判断数组是否为空 if (this.HitRegistrationStudentInfoList.length == 0) { this.loading = false; - } + } console.log("报名信息", this.HitRegistrationStudentInfoList); this.zdTeacherList = this.HitRegistrationStudentInfoList[0].zdTeacher.map(teacher => teacher.userId); diff --git a/ruoyi-ui/src/views/officialWebsite/Components/header.vue b/ruoyi-ui/src/views/officialWebsite/Components/header.vue index b46200e..3f965cb 100644 --- a/ruoyi-ui/src/views/officialWebsite/Components/header.vue +++ b/ruoyi-ui/src/views/officialWebsite/Components/header.vue @@ -40,6 +40,7 @@ {{ currentUser }} + 进入后台 退出登录 @@ -99,9 +100,9 @@ - - - + + + @@ -366,6 +367,9 @@ export default { }); return; } + if (this.registerForm.hitRegistrationTeachInfo){ + this.registerForm.hitRegistrationTeachInfo.teacherNumber = this.registerForm.username; + } this.loading = true; register(this.registerForm).then(res => { @@ -398,6 +402,9 @@ export default { location.href = '/index'; }) }).catch(() => {}); + }, + goBack(){ + this.$router.push("/index") }, // 定义处理窗口关闭前的事件 handleBeforeUnload() { diff --git a/ruoyi-ui/src/views/officialWebsite/competition.vue b/ruoyi-ui/src/views/officialWebsite/competition.vue index 44e458b..5efcbb0 100644 --- a/ruoyi-ui/src/views/officialWebsite/competition.vue +++ b/ruoyi-ui/src/views/officialWebsite/competition.vue @@ -35,8 +35,8 @@
- - + + @@ -81,7 +81,7 @@ - + @@ -366,7 +366,7 @@ export default { { required: true, message: "学校名称不能为空", trigger: "blur" } ], studentId: [ - { required: true, message: "手机号不能为空", trigger: "blur" } + { required: true, message: "学号不能为空", trigger: "blur" } ], collegeName: [ { required: true, message: "院系名称不能为空", trigger: "blur" } @@ -480,7 +480,7 @@ export default { loadUserInfo() { if (getToken()) { getHomeUserInfo().then(response => { - this.signUpForm.studentId = response.data.userName; + // this.signUpForm.studentId = response.data.userName; this.preliminaryForm = response.data; this.fetchRegistrationInformation()