diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp index 66dbc3e..d9d1197 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp @@ -65,7 +65,7 @@ - ${vs.index+1} + ${vs.index+1} ${var.TITLE} ${var.CREATE_DATE} ${var.EXAM_TIME} @@ -181,7 +181,7 @@ console.log("false"); } }}); - remove.show(); + window.top.remove.show(); } \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp index 3a2bb22..5e77d7d 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp @@ -16,6 +16,27 @@ <%@ include file="../../system/index/top.jsp"%> + @@ -81,7 +102,10 @@ -
保存
 + +
+ 保存 +
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bak.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bak.jsp new file mode 100644 index 0000000..5beb215 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bak.jsp @@ -0,0 +1,215 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + + + + + + +
+ + + +
+
  • +

    学生姓名:

    +
    + +
    +
    • +
  • +

    学籍号:

    +
    + +
    +
    • +
  • +

    学号:

    +
    + +
    +
    • +
  • +

    性别:

    +
    + +
    +
    • +
  • +

    组号:

    +
    + +
    +
    • +
  • +

    签到码:

    +
    + +
    +
    • +
  • +

    家长姓名:

    +
    + +
    +
    • +
  • +

    家长手机:

    +
    + +
    +
    • +
  • +

    键盘ID:

    +
    + +
    +
    • +
  • +

    备注:

    +
    + +
    +
    • + +
    + 保存 +
    +
    + +
    + + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp index 46eb44b..7ef8c41 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp @@ -19,9 +19,6 @@ href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet"> - - - @@ -47,8 +44,7 @@ - + @@ -60,11 +56,11 @@ - + - + - + @@ -126,7 +122,7 @@ console.log("false"); } }}); - remove.show(); + window.top.remove.show(); } function add(){ @@ -140,8 +136,48 @@ window.top.modal.show(); } - function deleteAll(){ + function edit(Id){ + window.top.modal.init({ + 'title':'添加学生', + 'url':'<%=basePath%>student/goEdit2.do?ID='+Id, + func:function() { + tosearch(); + } + }); + window.top.modal.show(); + } + function deleteAll(){ + window.top.remove.init({"title":"删除","func":function(success){ + if(success){ + var str = ''; + for(var i=0;i < document.getElementsByName('ids').length;i++){ + if(document.getElementsByName('ids')[i].checked){ + if(str=='') str += document.getElementsByName('ids')[i].value; + else str += ',' + document.getElementsByName('ids')[i].value; + } + } + if(str==''){ + + }else{ + $.ajax({ + type: "POST", + url: '<%=basePath%>student/deleteAll.do?tm='+new Date().getTime(), + data: {DATA_IDS:str}, + dataType:'json', + //beforeSend: validateData, + cache: false, + success: function(data){ + tosearch(); + } + }); + } + } + else{ + console.log("false"); + } + }}); + window.top.remove.show(); } diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp index 67cf61c..c6b0ed9 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp @@ -1,70 +1,88 @@ - - - + + + <% String path = request.getContextPath(); String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + path + "/"; %> - -班级-测试名单 + +班级-测试名单 - - - - - + + + + + + + + - + + + + + + + + - - + +
    +
    + + + +
    +
      - +
    -

    +
    +

    +
    - +
    - +
    -

    班级平均得分率0.0%

    +

    + 班级平均得分率0.0% +

    -

    班级最高得分率0.0%

    +

    + 班级最高得分率0.0% +

    @@ -83,10 +101,9 @@
    - - - - + +
    @@ -100,5 +117,21 @@ var URL = '<%=basePath%>${URL}'; - - \ No newline at end of file + + + + + + + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp index 2fedaee..2d65d54 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp @@ -26,7 +26,7 @@ -
    +
    序号序号 姓名 学号 键盘ID
    ${vs.index+1}${vs.index+1} ${var.NAME}${var.SNO}${var.NUMBER} ${var.KEYPAD_ID}
    @@ -61,7 +61,7 @@ + href="report/test_report?TestID=${var.TESTPAPER_ID}&class_id=${info.CLASS_ID}">
    ${var.NAME}
    ${var.CREATE_DATE}
    diff --git a/WebRoot/static/css/mb_style.css b/WebRoot/static/css/mb_style.css index 3661deb..94df2f2 100644 --- a/WebRoot/static/css/mb_style.css +++ b/WebRoot/static/css/mb_style.css @@ -7,8 +7,9 @@ .mb_content{height:calc(100% - 50px);} .mb_content iframe{width:100%;height:100%;border:0;box-sizing:border-box;padding:12px;} -.remove .mb_box{display:table;padding-bottom:5%;} +.remove .mb_box{display:table;padding-bottom:3%;} +.remove .mb_msg p{text-align: left;line-height: 40px;font-size: 20px;margin: 0;padding-left: 20px;} .mb_content .mb_content_l{width:50%;float:left;margin-top:5%;} -.mb_content .mb_content_l a{width:50%;margin:0 auto;display:block;color:#fff;text-decoration:none;background:#3bc2d6;text-align:center;height:40px;line-height:40px;} +.mb_content .mb_content_l a{width:50%;margin:0 auto;display:block;color:#fff;text-decoration:none;background:#fd8080;text-align:center;height:40px;line-height:40px;} .mb_content .mb_content_r{width:50%;float:left;margin-top:5%;} .mb_content .mb_content_r a{width:50%;margin:0 auto;display:block;color:#fff;text-decoration:none;background:#3bc2d6;text-align:center;height:40px;line-height:40px;} diff --git a/WebRoot/static/css/style1.css b/WebRoot/static/css/style1.css index aa7c2fb..3e25a68 100644 --- a/WebRoot/static/css/style1.css +++ b/WebRoot/static/css/style1.css @@ -7,12 +7,14 @@ ul{padding:0;} .yellow{background:yellow;} .clear{clear:both;} +.container{display:table;margin:0 auto;} +.container input[type="text"]{margin-right:10px;} .content .content_l{height:100%;overflow-y:auto;padding:0;} .content .content_l li p{line-height:50px;font-size:25px;text-align:center;} .content .content_r{padding:0;overflow-x:hidden;} .content .content_r .tabel_t{background:#50b5c9;padding-top:5%;position:relative;} .content .content_r .tabel_t .name{color:#fff;text-align:center;} -.header .navbar{background:#fff;border-bottom:1px solid #ccc;height:70px;} +.header .navbar{background:#fff;border-bottom:1px solid #ccc;height:50px;} .circle{border-bottom:1px solid #fff;} .circle .col-md-6{height:200px;} .circle .col-md-6 div:first-child{margin:0 auto;} diff --git a/WebRoot/static/images/eidtor.png b/WebRoot/static/images/eidtor.png new file mode 100644 index 0000000..16ea1e6 --- /dev/null +++ b/WebRoot/static/images/eidtor.png diff --git a/WebRoot/static/js/control1.js b/WebRoot/static/js/control1.js index cc986d5..2581d37 100644 --- a/WebRoot/static/js/control1.js +++ b/WebRoot/static/js/control1.js @@ -60,10 +60,12 @@ }) $("#search").click(function(){ - var date_string=$("#test6").val(); - var date_arry=date_string.split(' - '); - startDate=date_arry[0]; - endDate=date_arry[1]; +// var date_string=$("#test6").val(); +// var date_arry=date_string.split(' - '); +// startDate=date_arry[0]; +// endDate=date_arry[1]; + startDate = $("#starDate").val(); + endDate = $("#endDate").val(); getData(startDate,endDate); }) diff --git a/WebRoot/static/js/remove.js b/WebRoot/static/js/remove.js index c15e0dc..d264b09 100644 --- a/WebRoot/static/js/remove.js +++ b/WebRoot/static/js/remove.js @@ -3,14 +3,23 @@ var remove={ init:function(obj){ this.init.title=obj.title; this.init.func = obj.func; + this.init.msg = obj.msg; }, show:function(){ - if(window.top!=window.self){ + if(window.top!=window.self){ $("body",top.document).append('

    '+window.top.remove.init.title+'

    确认
    取消
    '); + console.log(typeof(window.top.remove.init.msg)); + if(typeof(window.top.remove.init.msg) != "undefined"){ + $(".mb_content_l").before('

    '+window.top.remove.init.msg+'

    '); + } }else{ if($(".loading").length==0) { + console.log(typeof(window.top.remove.init.msg)); $("body").append('

    '+window.top.remove.init.title+'

    确认
    取消
    '); + if(typeof(window.top.remove.init.msg) != "undefined"){ + $(".mb_content_l").before('

    '+window.top.remove.init.msg+'

    '); + } } } }, diff --git a/src/com/fh/controller/sunvote/student/StudentController.java b/src/com/fh/controller/sunvote/student/StudentController.java index 43be44d..f5ccc36 100644 --- a/src/com/fh/controller/sunvote/student/StudentController.java +++ b/src/com/fh/controller/sunvote/student/StudentController.java @@ -58,7 +58,6 @@ public class StudentController extends BaseController { @RequestMapping(value="/save") public ModelAndView save() throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"新增Student"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限 ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); @@ -181,7 +180,6 @@ public class StudentController extends BaseController { @RequestMapping(value="/delete") public void delete(PrintWriter out) throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"删除Student"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限 PageData pd = new PageData(); pd = this.getPageData(); studentService.delete(pd); @@ -198,7 +196,6 @@ public class StudentController extends BaseController { @RequestMapping(value="/edit") public ModelAndView edit() throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"修改Student"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限 ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); @@ -208,6 +205,22 @@ public class StudentController extends BaseController { return mv; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit2") + public ModelAndView edit2() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"修改Student"); + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + studentService.edit(pd); + mv.addObject("msg","success2"); + mv.setViewName("save_result"); + return mv; + } + /**列表 * @param page * @throws Exception @@ -215,7 +228,6 @@ public class StudentController extends BaseController { @RequestMapping(value="/list") public ModelAndView list(Page page) throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"列表Student"); - //if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码) ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); @@ -239,7 +251,6 @@ public class StudentController extends BaseController { @RequestMapping(value="/listcs") public ModelAndView listClassStudent(Page page) throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"列表Student"); - //if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码) ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); @@ -309,7 +320,7 @@ public class StudentController extends BaseController { pd = studentService.findById(pd); //根据ID读取 pd.put("CLASS_ID", classID); mv.setViewName("sunvote/student/student_edit2"); - mv.addObject("msg", "edit"); + mv.addObject("msg", "edit2"); mv.addObject("pd", pd); return mv; } @@ -322,7 +333,6 @@ public class StudentController extends BaseController { @ResponseBody public Object deleteAll() throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"批量删除Student"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限 PageData pd = new PageData(); Map map = new HashMap(); pd = this.getPageData(); @@ -348,7 +358,6 @@ public class StudentController extends BaseController { @RequestMapping(value="/excel") public ModelAndView exportExcel() throws Exception{ logBefore(logger, Jurisdiction.getUsername()+"导出Student到excel"); - if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} ModelAndView mv = new ModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); diff --git a/src/com/fh/interceptor/LoginHandlerInterceptor.java b/src/com/fh/interceptor/LoginHandlerInterceptor.java index 8ff0e4d..4fb3240 100644 --- a/src/com/fh/interceptor/LoginHandlerInterceptor.java +++ b/src/com/fh/interceptor/LoginHandlerInterceptor.java @@ -22,7 +22,7 @@ public class LoginHandlerInterceptor extends HandlerInterceptorAdapter{ try{ Jurisdiction.hasJurisdiction(path); }catch(Exception e){ - e.printStackTrace(); + } if(!b){ response.sendRedirect(request.getContextPath() + Const.LOGIN);
    课程总分
    ${var.NAME}${var.CREATE_DATE}