From 54a5b6adcef94ce22c743740ae7524d695ba2572 Mon Sep 17 00:00:00 2001 From: jack-rabbit <376168706@qq.com> Date: Wed, 5 Jun 2019 17:20:39 +0800 Subject: [PATCH] 1.英文翻译 --- WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp | 380 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- WebRoot/WEB-INF/jsp/sunvote/admin/en_admin_main.jsp | 475 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------- WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_edit2.jsp | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp | 254 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_edit2.jsp | 197 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_list2.jsp | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_edit2.jsp | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_edit2.jsp | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp | 283 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/system/index/en_login.jsp | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------ WebRoot/WEB-INF/jsp/system/index/login.jsp | 24 +++++++++++++++++++----- WebRoot/static/css/en_teach.css | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/com/fh/controller/base/BaseController.java | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------- src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java | 15 +++++++++++++-- src/com/fh/controller/sunvote/paper/PaperController.java | 14 ++++++++++++-- src/com/fh/controller/sunvote/sclass/SClassController.java | 16 +++++++++++++--- src/com/fh/controller/sunvote/subject/SubjectController.java | 13 +++++++++++-- src/com/fh/controller/sunvote/teacher/TeacherController.java | 21 ++++++++++++++++++--- 21 files changed, 2913 insertions(+), 465 deletions(-) create mode 100644 WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_edit2.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/coursemanagement/en_coursemanagement_list2.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list4.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/paper/en_paper_list5.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_edit2.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/sclass/en_sclass_list2.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_edit2.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/subject/en_subject_list2.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_edit2.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_list2.jsp create mode 100644 WebRoot/static/css/en_teach.css diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp index e813a46..65fbcf9 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp @@ -29,7 +29,7 @@ - +
@@ -50,8 +50,9 @@

欢迎！

${SNAME }

-

${SNAME } 管理员

-

+

${SNAME }管理员

+
+
@@ -60,14 +61,15 @@

-
- <%--
+ +
+ <%--

科目管理

@@ -84,32 +86,36 @@ 任课管理

-
-

轻松考

+ +
+
+

+ 轻松考 +

- -
-
-

- 即时测 -

- -
+
+

+ 即时测 +

+ + -
- - -
-

- 课后练 -

- -
+ + +
+

+ 课后练 +

+ + -
- -
-

- 系统设置 -

- -
+ +
+

+ 系统设置 +

+ + +
- -
- - -
+
+ -

- 年级管理 + Grade management

-
- <%--
+ +
+ <%--

科目管理

@@ -80,42 +83,40 @@
--%>

- 任课管理 + Classroom management

-
-
-

试卷管理

- - -
-
-

- 测验分析 -

- -
+
+

+ E-Exam +

+ + +
+
+

+ E-Class +

+ +
-
-

- 系统设置 -

- -
+ + +
+

+ after-class exercise +

+ + +
+ +
+

+ system settings +

+ + +
- -
- - -
+
+ -
-
- -
+
+
+ + + +
+
+ +
+ + 记住密码 +
+
+ +
+
+ + +
+
    + +
+

Clear

+
+
@@ -78,13 +113,69 @@ if(window.top != window.self){ window.top.location.href = "<%=basePath%>"; } + + document.onkeydown = function (e) { // 回车提交表单 + // 兼容FF和IE和Opera + var theEvent = window.event || e; + var code = theEvent.keyCode || theEvent.which || theEvent.charCode; + if (code == 13) { + severCheck(); + } + } + + $(".icon_down").click(function(){ + $("#loginname").focus(); + + }); + $("#loginname").focus(function(e){ + + $("#password").attr("type","password"); + var _html=""; + var u_list=JSON.parse(storage.getItem('userNameList')); + console.log(u_list); + if((u_list!=null)||(u_list.length>0)){ + $("#loginname").blur(function(){ + $(".history").hide(); + }) + for(var i=0;i'; + } + $(".history ul").html(_html); + $(".history").show(); + } + + }); + + $('.history').hover(function(){ //鼠标悬停下拉框时，解绑blur事件 + $("#loginname").unbind("blur"); + },function(){ + $("#loginname").blur(function(){ //鼠标移出下拉框时，添加blur事件 + $(".history").hide(); + }) + }); + + $(document).on('click','.history li',function(){ + var p_list=JSON.parse(storage.getItem('passWordList')); + $("#loginname").val($(this).text()); + $("#password").val(p_list[$(this).index()]); + $(".history").hide(); + }) + + //更换语言 + $("#language").change(function(){ + $.cookie("lang",$("#language").val()); + window.location.reload(); + }) + console.log($.cookie("lang")); + + //客户端校验 function check() { if ($("#loginname").val() == "") { $("#loginname").tips({ side : 2, - msg : 'User name cannot be empty', + msg : '用户名不得为空', bg : '#AE81FF', time : 3 }); @@ -97,7 +188,7 @@ if ($("#password").val() == "") { $("#password").tips({ side : 2, - msg : 'Password cannot be empty', + msg : '密码不得为空', bg : '#AE81FF', time : 3 }); @@ -108,13 +199,15 @@ $("#loginbox").tips({ side : 1, - msg : 'Logining, please wait...', + msg : '正在登录 , 请稍后 ...', bg : '#68B500', time : 10 }); return true; } + + //服务器校验 function severCheck(){ @@ -130,7 +223,8 @@ cache: false, success: function(data){ if("success" == data.result){ - saveCookie(); + if($("#rem_flag").prop("checked")) //如果选择了记住密码 + saveCookie(); if(data.teacher != null){ window.location.href="main/teacher"; }else if(data.admin != null){ @@ -141,7 +235,7 @@ }else if("usererror" == data.result){ $("#loginname").tips({ side : 1, - msg : "Incorrect user name or password", + msg : "用户名或密码有误", bg : '#FF5080', time : 15 }); @@ -150,7 +244,7 @@ }else if("codeerror" == data.result){ $("#code").tips({ side : 1, - msg : "Incorrect captcha input", + msg : "验证码输入有误", bg : '#FF5080', time : 15 }); @@ -159,7 +253,7 @@ }else{ $("#loginname").tips({ side : 1, - msg : "Missing parameters", + msg : "缺少参数", bg : '#FF5080', time : 15 }); @@ -171,31 +265,77 @@ } } + var storage=window.localStorage; + var userNameList=[]; + var passWordList=[]; + + //console.log(JSON.parse(storage.getItem('userNameList'))); + + //清除历史记录 + function clear_history(){ + window.top.remove.init({"title":"确定清除历史记录吗？","func":function(success){ + if(success){ + storage.clear(); + $(".history").hide(); + }else{ + console.log("false"); + } + }}); + window.top.remove.show(); + $(".mb_head .close img").css("display","none"); + } + //保存登录记录 function saveCookie() { - if ($("#saveid").attr("checked")) { - $.cookie('loginname', $("#loginname").val(), { + if(!window.localStorage){ + alert("浏览器不支持localstorage"); + + }else{ + //主逻辑业务 + + userNameList=JSON.parse(storage.getItem('userNameList')); + passWordList=JSON.parse(storage.getItem('passWordList')); + + + if(userNameList==null){ + var userNameList=[]; + var passWordList=[]; + userNameList.push($("#loginname").val()); + passWordList.push($("#password").val()); + + storage.setItem('userNameList',JSON.stringify(userNameList)); + storage.setItem('passWordList',JSON.stringify(passWordList)); + }else{ + + if(userNameList.indexOf($("#loginname").val())>-1){ + return false; + }else{ + userNameList.push($("#loginname").val()); + passWordList.push($("#password").val()); + storage.setItem('userNameList',JSON.stringify(userNameList)); + storage.setItem('passWordList',JSON.stringify(passWordList)); + } + } + + + + //console.log(userNameList); + + + + } + + /*$.cookie('loginname', $("#loginname").val(), { expires : 7 }); $.cookie('password', $("#password").val(), { expires : 7 - }); - } + });*/ + } - - - - - - - - - - - - + + + + + @@ -75,15 +76,21 @@ body{
- +
- -
+ +
记住密码
+
+ +
@@ -120,6 +127,8 @@ body{ }); $("#loginname").focus(function(e){ + + $("#password").attr("type","password"); var _html=""; var u_list=JSON.parse(storage.getItem('userNameList')); console.log(u_list); @@ -151,7 +160,12 @@ body{ $(".history").hide(); }) - + //更换语言 + $("#language").change(function(){ + $.cookie("lang",$("#language").val()); + window.location.reload(); + }) + console.log($.cookie("lang")); //客户端校验 diff --git a/WebRoot/static/css/en_teach.css b/WebRoot/static/css/en_teach.css new file mode 100644 index 0000000..8d11ca8 --- /dev/null +++ b/WebRoot/static/css/en_teach.css @@ -0,0 +1,63 @@ +html,body{width:100%;height:100%;} +table{font-size:16px;} +.clear{clear:both;} +.right{width:12px;height:12px;display:inline-block;background:url(../images/right.png) no-repeat;background-size:100%;} +.right_b{width:20px;height:20px;margin-right:20px;display:inline-block;background:url(../images/right_b.png) no-repeat;background-size:100%;} +.down{width:12px;height:12px;display:inline-block;background:url(../images/down.png) no-repeat;background-size:100%;} +.jiao{float:right;margin-top:32.5px;margin-right:10%;} + +.pagination{border-radius:0;float:left;} +.pagination>li>a, .pagination>li>span{color:#34c99d;} +.pagination>.active>a, .pagination>.active>a:focus, .pagination>.active>a:hover, .pagination>.active>span, .pagination>.active>span:focus, .pagination>.active>span:hover{ + background-color:#6fd9bb; + border-color:#6fd9bb; +} +.pagination>li:first-child>a, .pagination>li:first-child>span{border-radius:0;} +.pagination>li:last-child>a, .pagination>li:last-child>span{border-radius:0;} +input[type="checkbox"]{margin-right:10px;} + +.header{width:100%;background:#0bb8b9;box-sizing:border-box;padding:20px 30px;position:fixed;top:0;} +.header .logo{float:left;} +.header .out{float:right;font-size:18px;color:#fff;} +.header .out a{color:#fff;text-decoration:none;} +.header .out img{width:18px;margin-right:15px;} +.content{width:100%;height:100%;box-sizing:border-box;padding-top:66px;} +.content .content_l{width:18%;float:left;height:100%;background:#13707b;overflow-y:auto;} +.content .content_l .info_tab{padding:10% 0;border-bottom:1px solid #80afb4;} +.content .content_l .head_pic{width:88px;height:88px;border-radius:44px;overflow:hidden;float:left;margin-left:2%;} +.content .content_l .name{margin-left:calc(88px + 10%);} +.content .content_l .name p{width:100%;color:#fff;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;} +.content .content_l .name p:first-child{font-size:14px;} +.content .content_l .name p:nth-child(2){font-size:20px;} +.content .content_l .name p:nth-child(3){font-size:14px;} +.content .content_l .tab1{border-bottom:1px solid #80afb4;cursor:pointer} +.content .content_l .tab1 p{width:90%;height:77px;line-height:77px;margin-bottom:0;font-size:18px;color:#fff;padding-left:5%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.content .content_l .tab1 ul{margin-bottom:0;padding:0;font-size:18px;line-height:64px;display:none;} +.content .content_l .tab1 ul li{list-style:none;color:#fff;cursor:pointer;} +.menu_1 li{background:#1b535b;border-bottom: 1px solid #80afb4;} +.menu_2 li{background:#333333;border-bottom: 1px dashed #80afb4;} +.content .content_l .tab1 ul li:last-child{border:0;} +.content .content_l .tab1 ul li p{padding-left:10%;font-size:14px;} +.content .content_r{margin-left:18%;height:100%;overflow-y:hidden;} + + + .head_box{width:100%;height:auto;position:fixed;top:0;} + .box_header{padding:30px 5%;background:#f5f5f5;} + .head_box_l{float:left;font-size:30px;} + .head_box .table{padding:0px 5%;margin-bottom:0;} + .head_box_l p{color:#106666;margin-bottom:0;} + .head_box_r{float:right;} + .head_box_r input{padding-left:10px;} + .head_box_r img{width:30px;margin-left:10px;} + .table_box{padding:5%;padding-top:143px;} + .table_box input[name="choose"]{vertical-align:top;margin-right:15px;} + .table_box img{width:24px;} + .footer .creat,.content .content_r .footer .removeAll {float:left;} + .footer .creat input{background:#3bc2d6;outline-style:none;text-decoration:none;border:none;color:#fff;padding:15px 20px;margin-right:20px;font-size:18px;} + .footer .removeAll input{background:#f29c9f;outline-style:none;text-decoration:none;border:none;margin-left:15px;color:#fff;padding:15px 20px;font-size:18px;} + .footer .page_box{float:right;} + + +.enter{padding:0 !important;} +.jump_btn{background:#74c4a2 !important;color:#fff !important;border-color:#74c4a2 !important;} +.pagination li input{display: block;border: 0;width: 3em;height:32px;outline-style: none;} diff --git a/src/com/fh/controller/base/BaseController.java b/src/com/fh/controller/base/BaseController.java index 7ea4cd5..6769a61 100644 --- a/src/com/fh/controller/base/BaseController.java +++ b/src/com/fh/controller/base/BaseController.java @@ -1,6 +1,5 @@ package com.fh.controller.base; - import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -21,135 +20,160 @@ import com.fh.util.UuidUtil; * 修改时间：2015、12、11 */ public class BaseController { - + protected Logger logger = Logger.getLogger(this.getClass()); private static final long serialVersionUID = 6357869213649815390L; - - /** new PageData对象 + + /** + * new PageData对象 + * * @return */ - public PageData getPageData(){ + public PageData getPageData() { return new PageData(this.getRequest()); } - - /**得到ModelAndView + + /** + * 得到ModelAndView + * * @return */ - public ModelAndView getModelAndView(){ + public ModelAndView getModelAndView() { return new ModelAndView(); } - - /**得到request对象 + + /** + * 得到request对象 + * * @return */ public HttpServletRequest getRequest() { - HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder + .getRequestAttributes()).getRequest(); return request; } - /**得到32位的uuid + /** + * 得到32位的uuid + * * @return */ - public String get32UUID(){ + public String get32UUID() { return UuidUtil.get32UUID(); } - - /**得到分页列表的信息 + + /** + * 得到分页列表的信息 + * * @return */ - public Page getPage(){ + public Page getPage() { return new Page(); } - - public static void logBefore(Logger logger, String interfaceName){ + + public static void logBefore(Logger logger, String interfaceName) { logger.info(""); logger.info("start"); logger.info(interfaceName); } - - public static void logAfter(Logger logger){ + + public static void logAfter(Logger logger) { logger.info("end"); logger.info(""); } - - - public String getUsername(){ + + public String getUsername() { Session session = Jurisdiction.getSession(); - User user = (User)session.getAttribute(Const.SESSION_USER); - if(user != null){ + User user = (User) session.getAttribute(Const.SESSION_USER); + if (user != null) { return user.getUSERNAME(); } return "ERROR"; } - - public String getUserID(){ + + public String getUserID() { Session session = Jurisdiction.getSession(); - User user = (User)session.getAttribute(Const.SESSION_USER); - if(user != null){ + User user = (User) session.getAttribute(Const.SESSION_USER); + if (user != null) { return user.getUSER_ID(); } return "ERROR"; } - - public String getRole(){ + + public String getRole() { Session session = Jurisdiction.getSession(); - String role = (String)session.getAttribute(getUsername() + Const.ROLE_ID); + String role = (String) session.getAttribute(getUsername() + + Const.ROLE_ID); return role; } - - public String getTeacherID(){ + + public String getTeacherID() { Session session = Jurisdiction.getSession(); - User user = (User)session.getAttribute(Const.SESSION_USER); - if(user != null){ + User user = (User) session.getAttribute(Const.SESSION_USER); + if (user != null) { return user.getTeacherID(); } return "ERROR"; } - - - public String getSchoolID(){ + + public String getSchoolID() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.SCHOOL_ID); + String schoolName = (String) session.getAttribute(getUsername() + + Const.SCHOOL_ID); return schoolName; } - public String getSchoolName(){ + + public String getSchoolName() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.SCHOOL_NAME); + String schoolName = (String) session.getAttribute(getUsername() + + Const.SCHOOL_NAME); return schoolName; } - public String getGradeID(){ + + public String getGradeID() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.GRADE_ID); + String schoolName = (String) session.getAttribute(getUsername() + + Const.GRADE_ID); return schoolName; } - public String getGradeName(){ + + public String getGradeName() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.GRADE_NAME); + String schoolName = (String) session.getAttribute(getUsername() + + Const.GRADE_NAME); return schoolName; } - public String getSubjectId(){ + + public String getSubjectId() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.SUBJECT_ID); + String schoolName = (String) session.getAttribute(getUsername() + + Const.SUBJECT_ID); return schoolName; } - public String getSubjectName(){ + + public String getSubjectName() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.SUBJECT_NAME); + String schoolName = (String) session.getAttribute(getUsername() + + Const.SUBJECT_NAME); return schoolName; } - public String getClassId(){ + + public String getClassId() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.CLASS_ID); + String schoolName = (String) session.getAttribute(getUsername() + + Const.CLASS_ID); return schoolName; } - public String getClassName(){ + + public String getClassName() { Session session = Jurisdiction.getSession(); - String schoolName = (String)session.getAttribute(getUsername() + Const.CLASS_NAME); + String schoolName = (String) session.getAttribute(getUsername() + + Const.CLASS_NAME); return schoolName; } - - public String getCookieLanguage(){ + + public String getCookieLanguage() { Cookie[] cookies = getRequest().getCookies(); if (cookies != null) { for (Cookie cookie : cookies) { @@ -160,22 +184,27 @@ public class BaseController { } return null; } - + public String getLang() { String lang = getCookieLanguage(); - if(lang == null){ + if (lang == null) { lang = getRequest().getLocale().getLanguage(); + + Cookie cookies = new Cookie("lang", lang); + + + } + return lang; } - - public boolean isChineseLanguageClient(){ + + public boolean isChineseLanguageClient() { String lang = getLang(); - if(lang != null && lang.length() >= 2){ - lang = lang.substring(0,2); + if (lang != null && lang.length() >= 2) { + lang = lang.substring(0, 2); } return "zh".equals(getLang()); } - - + } diff --git a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java index 35b26c9..4880ef9 100644 --- a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java +++ b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java @@ -193,8 +193,14 @@ public class CourseManagementController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); page.setPd(pd); + page.setLangIsChina(isChineseLanguageClient()); List varList = coursemanagementService.listCourse(page); //列出CourseManagement列表 - mv.setViewName("sunvote/coursemanagement/coursemanagement_list2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/coursemanagement/coursemanagement_list2"); + }else{ + mv.setViewName("sunvote/coursemanagement/en_coursemanagement_list2"); + } + mv.addObject("varList", varList); mv.addObject("pd", pd); mv.addObject("QX",Jurisdiction.getHC()); //按钮权限 @@ -256,7 +262,12 @@ public class CourseManagementController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - mv.setViewName("sunvote/coursemanagement/coursemanagement_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/coursemanagement/coursemanagement_edit2"); + }else{ + mv.setViewName("sunvote/coursemanagement/en_coursemanagement_edit2"); + } + List teachers = teacherService.listAll(pd); mv.addObject("teachers",teachers); diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java index ad74392..a07ed82 100644 --- a/src/com/fh/controller/sunvote/paper/PaperController.java +++ b/src/com/fh/controller/sunvote/paper/PaperController.java @@ -383,7 +383,12 @@ public class PaperController extends BaseController { // pd.put("PAPER_TYPE","2"); // List varList2 = paperService.list(page); //列出Paper列表 // varList.addAll(varList2); - mv.setViewName("sunvote/paper/paper_list4"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/paper/paper_list4"); + }else{ + mv.setViewName("sunvote/paper/en_paper_list4"); + } + for(PageData p:varList){ String examTime = p.getString("EXAM_TIME"); @@ -445,8 +450,13 @@ public class PaperController extends BaseController { pd.put("PAPER_TYPE","2"); pd.put("USER_ID", this.getUserID()); page.setPd(pd); + page.setLangIsChina(isChineseLanguageClient()); List varList = paperService.list(page); //列出Paper列表 - mv.setViewName("sunvote/paper/paper_list5"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/paper/paper_list5"); + }else{ + mv.setViewName("sunvote/paper/en_paper_list5"); + } for(PageData p:varList){ String examTime = p.getString("EXAM_TIME"); diff --git a/src/com/fh/controller/sunvote/sclass/SClassController.java b/src/com/fh/controller/sunvote/sclass/SClassController.java index 6d232e7..479fc4c 100644 --- a/src/com/fh/controller/sunvote/sclass/SClassController.java +++ b/src/com/fh/controller/sunvote/sclass/SClassController.java @@ -181,7 +181,12 @@ public class SClassController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = this.getPageData(); page.setPd(pd); - mv.setViewName("sunvote/sclass/sclass_list2"); + page.setLangIsChina(isChineseLanguageClient()); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/sclass/sclass_list2"); + }else{ + mv.setViewName("sunvote/sclass/en_sclass_list2"); + } List varList = sclassService.list(page); //列出SClass列表 mv.addObject("varList", varList); mv.addObject("pd", pd); @@ -224,7 +229,7 @@ public class SClassController extends BaseController { if(isChineseLanguageClient()){ mv.setViewName("sunvote/sclass/sclass_edit2"); }else{ - mv.setViewName("sunvote/sclass/sclass_edit2"); + mv.setViewName("sunvote/sclass/en_sclass_edit2"); } List schools = schoolService.listAll(pd); mv.addObject("schools",schools); @@ -273,7 +278,12 @@ public class SClassController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd = sclassService.findById(pd); //根据ID读取 - mv.setViewName("sunvote/sclass/sclass_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/sclass/sclass_edit2"); + }else{ + mv.setViewName("sunvote/sclass/en_sclass_edit2"); + } + //mv.setViewName("sunvote/sclass/sclass_edit2"); List schools = schoolService.listAll(pd); mv.addObject("schools",schools); List basestations = basestationService.listAll(pd); diff --git a/src/com/fh/controller/sunvote/subject/SubjectController.java b/src/com/fh/controller/sunvote/subject/SubjectController.java index 1eab3ff..af010e2 100644 --- a/src/com/fh/controller/sunvote/subject/SubjectController.java +++ b/src/com/fh/controller/sunvote/subject/SubjectController.java @@ -148,8 +148,13 @@ public class SubjectController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); page.setPd(pd); + page.setLangIsChina(isChineseLanguageClient()); List varList = subjectService.listAllSchool(page); //列出Subject列表 - mv.setViewName("sunvote/subject/subject_list2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/subject/subject_list2"); + }else{ + mv.setViewName("sunvote/subject/en_subject_list2"); + } mv.addObject("varList", varList); mv.addObject("pd", pd); mv.addObject("QX",Jurisdiction.getHC()); //按钮权限 @@ -194,7 +199,11 @@ public class SubjectController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - mv.setViewName("sunvote/subject/subject_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/subject/subject_edit2"); + }else{ + mv.setViewName("sunvote/subject/en_subject_edit2"); + } List varList = subjectService.listNotSchoolSubject(pd); mv.addObject("varList", varList); mv.addObject("msg", "save2"); diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java index ed8443d..4028025 100644 --- a/src/com/fh/controller/sunvote/teacher/TeacherController.java +++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java @@ -532,8 +532,14 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); page.setPd(pd); + page.setLangIsChina(isChineseLanguageClient()); List varList = teacherService.list(page); // 列出Teacher列表 - mv.setViewName("sunvote/teacher/teacher_list2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/teacher/teacher_list2"); + }else{ + mv.setViewName("sunvote/teacher/en_teacher_list2"); + } + mv.addObject("varList", varList); mv.addObject("pd", pd); @@ -583,7 +589,12 @@ public class TeacherController extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - mv.setViewName("sunvote/teacher/teacher_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/teacher/teacher_edit2"); + }else{ + mv.setViewName("sunvote/teacher/en_teacher_edit2"); + } + List schools = schoolService.listAll(pd); mv.addObject("schools", schools); @@ -630,7 +641,11 @@ public class TeacherController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd = teacherService.findById(pd); // 根据ID读取 - mv.setViewName("sunvote/teacher/teacher_edit2"); + if(isChineseLanguageClient()){ + mv.setViewName("sunvote/teacher/teacher_edit2"); + }else{ + mv.setViewName("sunvote/teacher/en_teacher_edit2"); + } List schools = schoolService.listAll(pd); mv.addObject("schools", schools); List subjects = subjectService.listAllSchool(pd); -- libgit2 0.21.4