diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp index fc0d408..6c14dd4 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp @@ -172,7 +172,7 @@
确定布置 - 取消 + 取消
@@ -237,7 +237,11 @@ }); - + function back(){ + var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}'; + parent.$("#mainFrame").attr('src',path); + window.top.loading.show(); + } function save_data(data){ $.ajax({ //获取该名教师下的班级信息 url:'<%=basePath%>homework/uploadHomework', diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp index 6161215..1a5b3d9 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp @@ -1,6 +1,7 @@ <%@ 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() + "://" @@ -47,13 +48,14 @@
- + + - + @@ -61,6 +63,7 @@ + @@ -72,13 +75,14 @@
练习标题 布置时间 完成时间班级 题目数 完成情况 总分
- + + - + @@ -86,9 +90,10 @@ - + + @@ -167,6 +172,11 @@ parent.$("#mainFrame").attr('src',path); window.top.loading.show(); } + function view(url){ + var path = url + parent.$("#mainFrame").attr('src',path); + window.top.loading.show(); + } function edit(Id){ var path = '<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&HOMEWORK_ID='+Id; parent.$("#mainFrame").attr('src',path); diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp new file mode 100644 index 0000000..20d6870 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp @@ -0,0 +1,304 @@ +<%@ 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"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + + +${info.CLASS_NAME}成绩报表 + + + + + +<%@ include file="../../system/index/top.jsp"%> + + + + + + +
+
+ + +
${vs.index+1}${var.NAME}${var.NAME} ${var.CREATE_DATE} ${var.COMPLETE_DATE}${myelfun:findClassName(var.CLASS_ID)} ${var.QUESTION_COUNT} ${var.COMPLETE_COUNT == "0" ? "未完成":"已完成"} ${var.ALL_SCORE}
+ + + + + + + + + + + + + +
课程统计: ${info.testsize}
班级名册: ${info.CLASS_NAME}
学生人数: ${info.STUDENT_NUM}
 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + + + +
姓名
课程平均得分率
课程总分
${var.NAME}
${var.CREATE_DATE}
班级课程总分
${var.TOTAL_SCORE}
班级课程平均分
${var.AVG_SCORE}
班级课程平均得分率
%
${var.NAME} + +
%
${var.GETSCORE }
${var[TEST_ID] }
+
+ +
+ + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + + + + + + + + + diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp index fc0d408..84b815e 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp @@ -62,46 +62,7 @@ - + @@ -119,9 +80,9 @@ - 题目数量+- - 选项个数+- - 分值+- + 题目数量 + 选项个数 + 分值 @@ -151,9 +112,9 @@ - 选项个数+- - 分值+- - + 选项个数 + 分值 + @@ -171,8 +132,8 @@
- 确定布置 - 取消 + + 退出
@@ -202,83 +163,20 @@ - + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp index a94dffe..c257479 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp @@ -106,7 +106,7 @@

布置练习

  • -

    练习报表

    +

    练习报表

    • @@ -193,6 +193,13 @@ window.top.loading.show(); } + function homeReport(schoolId){ + var path = '<%=basePath%>homework/report.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ; + + $("#mainFrame").attr('src',path); + window.top.loading.show(); + } + function report(classId){ //window.open('<%=basePath%>report/report.do?classid=' + classId); //if($("#mainFrame").attr('src') != ('<%=basePath%>report/report.do?classid=' + classId)){ diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java index 9e20f74..9872f42 100644 --- a/src/com/fh/controller/sunvote/homework/HomeworkController.java +++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java @@ -202,7 +202,7 @@ public class HomeworkController extends BaseController { } /** - * 去修改页面 + * 去预览页面 * * @param * @throws Exception @@ -215,7 +215,28 @@ public class HomeworkController extends BaseController { pd = homeworkService.findById(pd); // 根据ID读取 pd.put("QUESTIONS", homeworkproblemService.listProblem(pd)); pd.put("TEACHER_ID", geTeacherID()); - mv.setViewName("sunvote/homework/homework_edit2"); + mv.setViewName("sunvote/homework/homework_view"); + mv.addObject("msg", "edit"); + mv.addObject("operation", "view"); + mv.addObject("pd", pd); + return mv; + } + + /** + * 去查看报表页面 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/report") + public ModelAndView report() throws Exception { + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + pd = homeworkService.findById(pd); // 根据ID读取 + pd.put("QUESTIONS", homeworkproblemService.listProblem(pd)); + pd.put("TEACHER_ID", geTeacherID()); + mv.setViewName("sunvote/homework/homework_report"); mv.addObject("msg", "edit"); mv.addObject("operation", "view"); mv.addObject("pd", pd);