From f4a7359454522a54843d62cf39f5317fea0b34dc Mon Sep 17 00:00:00 2001 From: jack-rabbit <376168706@qq.com> Date: Sun, 8 Dec 2019 11:57:56 +0800 Subject: [PATCH] 1.增加班级统计报表和导出 --- WebRoot/WEB-INF/jsp/save_result2.jsp | 24 +++++++++++++++++++++++- WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp | 15 ++++++++++++--- WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp | 6 ++++-- WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp | 2 ++ WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp | 1 + WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp | 259 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp | 254 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp | 35 ++++++++++++++++++++++++++++++++--- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp | 9 +++++++++ WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp | 12 +++++++++++- WebRoot/WEB-INF/tld/elfun.tld | 2 +- WebRoot/static/files/Template.xls | Bin 27136 -> 0 bytes WebRoot/static/files/Template1.xls | Bin 18944 -> 0 bytes WebRoot/static/images/fail.png | Bin 0 -> 30961 bytes resources/mybatis1/sunvote/StudentMapper.xml | 10 ++++++++++ src/com/fh/controller/api/V1.java | 5 ++++- src/com/fh/controller/sunvote/Myelfun.java | 2 +- src/com/fh/controller/sunvote/paper/PaperController.java | 477 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------- src/com/fh/controller/sunvote/student/StudentController.java | 14 ++++++++++---- src/com/fh/controller/sunvote/teacher/TeacherController.java | 29 +++++++++++++++++++++++++++++ src/com/fh/entity/Page.java | 6 +++--- src/com/fh/service/sunvote/student/StudentManager.java | 6 ++++++ src/com/fh/service/sunvote/student/impl/StudentService.java | 8 ++++++++ 23 files changed, 1130 insertions(+), 46 deletions(-) create mode 100644 WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp create mode 100644 WebRoot/static/images/fail.png diff --git a/WebRoot/WEB-INF/jsp/save_result2.jsp b/WebRoot/WEB-INF/jsp/save_result2.jsp index 4235763..e3fa682 100644 --- a/WebRoot/WEB-INF/jsp/save_result2.jsp +++ b/WebRoot/WEB-INF/jsp/save_result2.jsp @@ -15,10 +15,32 @@ - + + +
+ + +

导入失败

+
+
${msg}
+ - +
@@ -60,7 +64,7 @@

年级管理

-
+ - + @@ -90,6 +91,7 @@ diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp index 38e30af..a6a158f 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp @@ -86,6 +86,7 @@ +
${var.EXAM_TIME} ${var.SCORE} + 查看成绩
创建时间 建议考试时长 总分操作
@@ -114,6 +115,7 @@ ${var.CREATE_DATE} ${var.EXAM_TIME} ${var.SCORE} + 查看成绩 diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp index 7c3bc60..f700475 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp @@ -99,6 +99,7 @@ ${var.EXAM_TIME} ${var.SCORE} + 查看成绩 diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp new file mode 100644 index 0000000..3bd0fa6 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp @@ -0,0 +1,259 @@ +<%@ 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="myelfun" uri="/WEB-INF/tld/elfun.tld"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + path + "/"; +%> + + + + + +教育管理系统 + + + + + + + + + + + + + + + + + +
+
+
+
+

+ 试卷测验列表 +

+
+
+ + +
+ +
+
+ +
+
+
+   + 试卷名称：${myelfun:findPaperName(pd.PAPER_ID)} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号
班级名称
考试时间
平均分
班级总人数
优秀人数
优秀率
良好人数
良好率
及格人数
及格率
低分人数
低分率
操作
${vs.index+1}${myelfun:findClassName(var.class_id)}${var.creat_time}${var.avg_score}${var.student_num}${var.you} + % + ${var.liang} + % + ${var.jige} + % + ${var.difen} + % + 查看成绩
没有相关数据
+ +
+ +
+ +
+ + +
+
+
+
+ + +<%@ include file="../../system/index/foot2.jsp"%> + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp new file mode 100644 index 0000000..c637cb4 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp @@ -0,0 +1,254 @@ +<%@ 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="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + path + "/"; +%> + + + + + +教育管理系统 + + + + + + + + + + + + + + + + + +
+
+
+
+

+ 试卷测验列表 +

+
+ +
+ + +
+ +
+
+ +
+
+
+   + 试卷名称：${myelfun:findPaperName(pd.PAPER_ID)} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
题号
答案
答题人数
正确人数
正确率
满分值
平均分
选 ${myelfun:jstlInt2Char(var+1)}人数
选${myelfun:jstlInt2Char(var+1)}比例
漏选人数
漏选比例
${var.QUESTION_RANK}${var.ANSWER}${var.ANSWERNUM}${var.RIGHTNUM} + % + ${var.QUESTION_SCORE} + + ${var1} + % +
没有相关数据
+ + + +
+ +
+ + +
+
+
+
+ + +<%@ include file="../../system/index/foot2.jsp"%> + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp index 10a4855..d01a302 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp @@ -16,7 +16,6 @@ - +
@@ -68,7 +71,7 @@ - ${vs.index+1} ${var.CNAME} ${var.ENAME} @@ -91,7 +94,7 @@
- +
@@ -179,6 +182,32 @@ }); window.top.modal.show(); } + $('#ids').on('click', function(){ + var th_checked = $("#ids").prop('checked');//checkbox inside "TH" table header + + $(".table_box .table").find('tbody > tr').each(function(){ + var row = this; + if(th_checked) $(row).find('input[type=checkbox]').eq(0).prop('checked', true); + else $(row).find('input[type=checkbox]').eq(0).prop('checked', false); + }); + }); + + $("input[type=checkbox]").on('click',function(){ + 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==''){ + $("#remove").attr("disabled","disabled"); + $("#remove").css("background","#ccc"); + }else{ + $("#remove").removeAttr("disabled"); + $("#remove").css("background","#f29c9f"); + } + }) diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp index 2a9be0a..58530e9 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp @@ -27,6 +27,11 @@ +
@@ -284,6 +289,10 @@ if (defaultUrl != '' && defaultUrl != '') { $("#mainFrame").attr('src', defaultUrl); } + $(".menu_2 li").click(function(){ + $(".active").removeClass("active"); + $(this).addClass("active"); + }) \ 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 b01afc4..be2247c 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp @@ -82,7 +82,7 @@
课程总分
${var.NAME}
${var.CREATE_DATE}
 + onclick="paper('${info.CLASS_ID}','${var.TESTPAPER_ID}');">
${var.NAME}
${var.CREATE_DATE}
 @@ -239,6 +239,16 @@ var url = "<%=basePath%>report/report.do?classid=${info.CLASS_ID}" ; var startDate = $("#lastStart").val(); var endDate = $("#lastEnd").val(); + var temp=""; + var sd = parseInt(startDate.replace(/-/g,"")); + var ed = parseInt(endDate.replace(/-/g,"")); + if(sd>ed){ + temp = startDate; + startDate = endDate; + endDate = temp; + } + $("#lastStart").val(startDate); + $("#lastEnd").val(endDate); var subject_id = $("#SUBJECT_ID").val(); url = url + "&start_date=" + startDate ; if(endDate != null){ diff --git a/WebRoot/WEB-INF/tld/elfun.tld b/WebRoot/WEB-INF/tld/elfun.tld index 6503a79..585ec67 100644 --- a/WebRoot/WEB-INF/tld/elfun.tld +++ b/WebRoot/WEB-INF/tld/elfun.tld @@ -146,7 +146,7 @@ 数字转字符 jstlInt2Char com.fh.controller.sunvote.Myelfun - java.lang.String findSoftwareName(int) + java.lang.String jstlInt2Char(int) ${myelfun:jstlInt2Char(obj1)} diff --git a/WebRoot/static/files/Template.xls b/WebRoot/static/files/Template.xls index 98ac652..b61fe41 100644 Binary files a/WebRoot/static/files/Template.xls and b/WebRoot/static/files/Template.xls differ diff --git a/WebRoot/static/files/Template1.xls b/WebRoot/static/files/Template1.xls index 1c5bd6f..6bee5d7 100644 Binary files a/WebRoot/static/files/Template1.xls and b/WebRoot/static/files/Template1.xls differ diff --git a/WebRoot/static/images/fail.png b/WebRoot/static/images/fail.png new file mode 100644 index 0000000..0c99e40 Binary files /dev/null and b/WebRoot/static/images/fail.png differ diff --git a/resources/mybatis1/sunvote/StudentMapper.xml b/resources/mybatis1/sunvote/StudentMapper.xml index 0e66932..d9057be 100644 --- a/resources/mybatis1/sunvote/StudentMapper.xml +++ b/resources/mybatis1/sunvote/StudentMapper.xml @@ -108,6 +108,16 @@ NAME = #{NAME} + + + \n"); + sb.append("
    • \n"); sb.append("
  • " + jump + "
    • \n"); sb.append("
  • " + frist + "
    • \n"); sb.append("
  • " + previous + "
    • \n"); }else{ sb.append("
  • "+ total +""+totalResult+"" + articles + "
    • \n"); - sb.append("
    • \n"); + sb.append("
    • \n"); sb.append("
  • " + jump + "
    • \n"); sb.append("
  • " + frist + "
    • \n"); sb.append("
  • " + previous + "
    • \n"); @@ -127,7 +127,7 @@ public class Page { sb.append("
  • " + next + "
    • \n"); sb.append("
  • " + tail + "
    • \n"); } - sb.append("
  • " + total +totalResult+articles + "
    • \n"); +// sb.append("
  • " + total +totalResult+articles + "
    • \n"); sb.append("