Merge branch 'develop' of http://120.78.57.84/Elvis/SunvoteEducation into develop

孙向锦
2 parents a28085c0 892c3766
Showing 6 changed files with 372 additions and 128 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -172,7 +172,7 @@
 							<div style="text-align: center;" colspan="10">
 								<a class="btn btn-mini btn-primary" onclick="save();">确定布置</a>
-								<a class="btn btn-mini btn-danger" onclick="window.top.modal.remove();">取消</a>
+								<a class="btn btn-mini btn-danger" onclick="back()">取消</a>
 							</div>
 						</div>
 						<div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div>
@@ -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',
 <%@ 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 @@
 			</div>
 			<div style="padding:0 5%;background:#fff;">
 				<table class="table table-striped">
-				<col style="width: 10%" />
+				<col style="width: 8%" />
 				<col style="width: 20%" />
 				<col style="width: 15%" />
 				<col style="width: 15%" />
 				<col style="width: 10%" />
+				<col style="width: 7%" />
 				<col style="width: 10%" />
-				<col style="width: 10%" />
+				<col style="width: 5%" />
 				<col style="width: 10%" />
 				<thead>
 					<tr>
@@ -61,6 +63,7 @@
 						<th>练习标题</th>
 						<th>布置时间</th>
 						<th>完成时间</th>
+						<th>班级</th>
 						<th>题目数</th>
 						<th>完成情况</th>
 						<th>总分</th>
@@ -72,13 +75,14 @@
 		</div>
 		<div class="table_box">
 			<table class="table table-striped">
-				<col style="width: 10%" />
+				<col style="width: 8%" />
 				<col style="width: 20%" />
 				<col style="width: 15%" />
 				<col style="width: 15%" />
 				<col style="width: 10%" />
+				<col style="width: 7%" />
 				<col style="width: 10%" />
-				<col style="width: 10%" />
+				<col style="width: 5%" />
 				<col style="width: 10%" />
 				<tbody>
 				<c:choose>
@@ -86,9 +90,10 @@
 						<c:forEach items="${varList}" var="var" varStatus="vs">
 							<tr>
 								<td><input type="checkbox" name='ids' id="ids" value="${var.HOMEWORK_ID}"/>${vs.index+1}</td>
-								<td ><a  target="_blank" href="<%=basePath%>homework/goView.do?homework_id=${var.HOMEWORK_ID}">${var.NAME}</a></td>
+								<td ><a  onclick="view('<%=basePath%>homework/goView.do?homework_id=${var.HOMEWORK_ID}')">${var.NAME}</a></td>
 								<td >${var.CREATE_DATE}</td>
 								<td >${var.COMPLETE_DATE}</td>
+								<td >${myelfun:findClassName(var.CLASS_ID)}</td>
 								<td >${var.QUESTION_COUNT}</td>
 								<td >${var.COMPLETE_COUNT == "0" ? "未完成":"已完成"}</td>
 								<td >${var.ALL_SCORE}</td>
@@ -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);
+<%@ 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 + "/";
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<base href="<%=basePath%>">
+
+<title>${info.CLASS_NAME}成绩报表</title>
+<base href="<%=basePath%>">
+<!-- 下拉框 -->
+<link rel="stylesheet" href="static/ace/css/chosen.css" />
+  <link type="text/css" href="static/css/tablescroller.css" rel="stylesheet" />
+<!-- jsp文件头和头部 -->
+<%@ include file="../../system/index/top.jsp"%>
+<!-- 日期框 -->
+<link rel="stylesheet" href="static/ace/css/datepicker.css" />
+<style>
+	.font span{    font-size: 12px;
+    font-weight: initial;color:#000;}
+	</style>
+</head>
+
+<body style="background:#fff;">
+	<div style="padding:20px 20px;">
+		<form action="report/report.do" method="post" name="Form" id="Form" style="margin-bottom:0;">
+			<input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" />
+			<input type="hidden" name="ROLE" id="ROLE" value="${pd.ROLE}" />
+			<table style="margin-top:5px;margin-bottom:20px;">
+				<tr>
+					<td><div style="width:150px;text-align:center;">课程统计: ${info.testsize}</div></td>
+					<td><div style="width:150px;text-align:center;">班级名册: ${info.CLASS_NAME}</div></td>
+				
+					<td><div style="width:150px;text-align:center;"><span>学生人数: ${info.STUDENT_NUM}</span></div></td>
+					<td></td>
+					<c:if test="${not empty subjectInfos}">
+						<td>
+							<select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入所属学校">
+										<option value="">全部</option>
+										<c:forEach var="item" items="${subjectInfos}">
+											<option value="${item.SUBJECT_ID}" <c:if test="${pd.SUBJECT_ID == item.SUBJECT_ID }">selected = ture</c:if>>${item.SCNAME}</option>
+										</c:forEach>
+							</select>
+						</td>
+					</c:if>
+					<td style="padding-left:2px;">
+					<input
+						class="span10 date-picker" name="lastStart" id="lastStart"
+						value="${start_date}" type="text" data-date-format="yyyy-mm-dd"
+						readonly="readonly" style="width:88px;" placeholder="开始日期"
+						title="开始日期" />
+						</td>
+					<td style="padding-left:2px;"><input
+						class="span10 date-picker" name="lastEnd" id="lastEnd" value="${end_date}"
+						type="text" data-date-format="yyyy-mm-dd" readonly="readonly"
+						style="width:88px;" placeholder="结束日期" title="结束日期" /></td>
+					<td style="vertical-align:top;padding-left:2px"><a
+						class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i
+							id="nav-search-icon"
+							class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
+				</tr>
+			</table>
+			<table id="simple-table"
+				class="table table-striped table-bordered table-hover"
+				style="margin-top:0px;margin-bottom:0px;">
+				<thead>
+					<tr>
+						<th class="center th_name"><div style="width:150px;">姓名</div></th>
+						<th class="center "><div style="width:150px;">课程平均得分率</div></th>
+						<th class="center"><div style="width:80px;">课程总分</div></th>
+						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
+							<th class="center kc"><a
+								 onclick="paper('${info.CLASS_ID}','${var.TESTPAPER_ID}');"><div style="width:180px;     margin: 0 auto;cursor:hand" class="font">${var.NAME}</br><span>${var.CREATE_DATE}</span></div></a></th>
+						</c:forEach>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td class="center"><div style="width:150px;">班级课程总分</div></td>
+						<td class="center"><div style="width:150px;"></div></td>
+						<td class="center"><div style="width:80px;"></div></td>
+						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
+							<td class="center"><div style="width:80px;margin:0 auto;">${var.TOTAL_SCORE}</div></td>
+						</c:forEach>
+					</tr>
+					<tr>
+						<td class="center"><div style="width:150px;">班级课程平均分</div></td>
+						<td class="center"><div style="width:150px;"></div></td>
+						<td class="center"><div style="width:80px;"></div></td>
+						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
+							<td class="center"><div style="width:80px;margin:0 auto;">${var.AVG_SCORE}</div></td>
+						</c:forEach>
+					</tr>
+					<tr>
+						<td class="center"><div style="width:150px;">班级课程平均得分率</div></td>
+						<td class="center"><div style="width:150px;"></div></td>
+						<td class="center"><div style="width:80px;"></div></td>
+						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
+							<td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number"
+									value="${var.TOTAL_SCORE == 0 ? 0: (var.AVG_SCORE / var.TOTAL_SCORE * 100)}"
+									maxFractionDigits="2" />%</div></td>
+						</c:forEach>
+					</tr>
+
+					<c:choose>
+						<c:when test="${not empty studentList}">
+							<c:forEach items="${studentList}" var="var" varStatus="vs">
+								<tr>
+									<%-- <td class="center"><a
+										href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a>
+									</td> --%>
+									<td class="center"><div style="width:150px;cursor:hand"><a
+										 onclick="student('${info.CLASS_ID}','${var.STUDENT_ID}')">${var.NAME}</a></div>
+									</td>
+									<td class="center"><div style="width:150px;"><fmt:formatNumber type="number"
+											value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
+											maxFractionDigits="2" />%</div></td>
+									<td class="center"><div style="width:80px;margin:0 auto;">${var.GETSCORE }</div></td>
+									<c:forEach items="${testpaperList}" var="var1" varStatus="vs1">
+										<td class="center"><div style="width:180px;margin:0 auto;"><c:set var="TEST_ID"
+												value="${var1.TESTPAPER_ID}" /> ${var[TEST_ID] }</div></td>
+									</c:forEach>
+								</tr>
+							</c:forEach>
+						</c:when>
+					</c:choose>
+				</tbody>
+			</table>
+			<div id="scrollableTable"></div>
+		</form>
+	</div>
+
+	<%@ include file="../../system/index/foot.jsp"%>
+	<script src="static/ace/js/bootbox.js"></script>
+	<!-- ace scripts -->
+	<script src="static/ace/js/ace/ace.js"></script>
+	<!-- 下拉框 -->
+	<script src="static/ace/js/chosen.jquery.js"></script>
+	<!-- 日期框 -->
+	<script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
+	<!--提示框-->
+	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
+
+ 	<script language="javascript" src="static/js/tablescroller.js"></script>
+    <script language="javascript" src="static/js/tablescroller.jquery.js"></script>
+    
+  
+    
+	<script type="text/javascript">
+		$(function() {
+			
+			//日期框
+			$('.date-picker').datepicker({
+				autoclose : true,
+				todayHighlight : true
+			});
+
+			//下拉框
+			if (!ace.vars['touch']) {
+				$('.chosen-select').chosen({
+					allow_single_deselect : true
+				});
+				$(window).off('resize.chosen').on('resize.chosen', function() {
+					$('.chosen-select').each(function() {
+						var $this = $(this);
+						$this.next().css({
+							'width' : $this.parent().width()
+						});
+					});
+				}).trigger('resize.chosen');
+				$(document).on('settings.ace.chosen',
+						function(e, event_name, event_val) {
+							if (event_name != 'sidebar_collapsed')
+								return;
+							$('.chosen-select').each(function() {
+								var $this = $(this);
+								$this.next().css({
+									'width' : $this.parent().width()
+								});
+							});
+						});
+				$('#chosen-multiple-style .btn').on(
+						'click',
+						function(e) {
+							var target = $(this).find('input[type=radio]');
+							var which = parseInt(target.val());
+							if (which == 2)
+								$('#form-field-select-4').addClass(
+										'tag-input-style');
+							else
+								$('#form-field-select-4').removeClass(
+										'tag-input-style');
+						});
+			}
+
+			//复选框全选控制
+			var active_class = 'active';
+			$('#simple-table > thead > tr > th input[type=checkbox]').eq(0).on(
+					'click',
+					function() {
+						var th_checked = this.checked;//checkbox inside "TH" table header
+						$(this).closest('table').find('tbody > tr').each(
+								function() {
+									var row = this;
+									if (th_checked)
+										$(row).addClass(active_class).find(
+												'input[type=checkbox]').eq(0)
+												.prop('checked', true);
+									else
+										$(row).removeClass(active_class).find(
+												'input[type=checkbox]').eq(0)
+												.prop('checked', false);
+								});
+					});
+		});
+		
+		var role = '${pd.ROLE}';
+		
+		function precent(avg,total){
+			if(total == 0){
+				return "0%"
+			}
+			return Math.round(avg / total * 100)/100 + '%' ;
+		}
+		
+		function tosearch(){
+			var url = "<%=basePath%>report/report.do?classid=${info.CLASS_ID}" ;
+			var startDate = $("#lastStart").val();
+			var endDate =  $("#lastEnd").val();
+			var subject_id =  $("#SUBJECT_ID").val();
+			url = url + "&start_date=" + startDate ;
+			if(endDate != null){
+				url = url + "&end_date=" + endDate;
+			}
+			if(subject_id != null){
+				url = url + "&SUBJECT_ID=" + subject_id;
+			}
+			if(role == "admin"){
+				url = url + "&ROLE=admin" ;
+			}
+			window.location.href = url;
+			window.top.loading.show();
+			/* $("#Form").sumbit(); */
+		}
+		
+		function student(classid,studentid){
+		
+			var url = "<%=basePath%>report/student_report?studentid=" + studentid + "&class_id=" + classid ;
+			var startDate = $("#lastStart").val();
+			var endDate =  $("#lastEnd").val();
+			url = url + "&start_date=" + startDate + "&end_date=" + endDate ;
+			var SUBJECT_ID = $("#SUBJECT_ID").val();
+			if(SUBJECT_ID != null && SUBJECT_ID != ''){
+				url = url + "&SUBJECT_ID="+ SUBJECT_ID ;
+			}
+			window.self.location.href = url;
+			window.top.loading.show();
+		}
+		
+		function paper(class_id,testpaper_id){
+			var url = "<%=basePath%>report/test_report?TestID=" + testpaper_id + "&class_id=" + class_id;
+			var startDate = $("#lastStart").val();
+			var endDate =  $("#lastEnd").val();
+			url = url + "&start_date=" + startDate + "&end_date=" + endDate ;
+			window.self.location.href = url;
+			window.top.loading.show();
+		}
+		
+		$(document).ready(function(){
+			window.top.loading.remove();
+			
+			 var sour = "${testpaperList}";
+			
+			 if(sour != null && sour.length > 3){
+				var _width = $('#mainFrame', parent.document).width()-40;
+				var _heigh = $('#mainFrame', parent.document).height()-100;
+				var options = {
+	            width: _width,
+	            height: _heigh,
+	            pinnedRows: 4,
+	            pinnedCols: 3,
+	            container: "#scrollableTable",
+	            removeOriginal: true
+	        	};
+				$("#simple-table").tablescroller(options);
+		        var name_height = $(".kc").last().parent().height()-18.5;
+		        console.log(name_height);
+		        $(".th_name").height(name_height);
+			} 
+				
+		});
+		
+	</script>
+
+</body>
+</html>
@@ -62,46 +62,7 @@
 													 <input class="date-picker" type="text" class="form-control" style="width:150px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.COMPLETE_DATE}"/>
 												</li>
 											</c:if>
-											<!-- <li>
-												
-												<input type="checkbox" id="class1" name="className" value="1"  />
-												<label for="class1"></label>
-												 <span>1班</span> 
-												 <input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/>
-											</li>
-											<li>
-												
-												<input type="checkbox" id="class2" name="className" value="1"  />
-												<label for="class2"></label>
-												 <span>2班</span> 
-												 <input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/>
-											</li>
-											<li>
-												
-												<input type="checkbox" id="class3" name="className" value="1"  />
-												<label for="class3"></label>
-												 <span>3班</span> 
-												 <input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/>
-											</li>
-											<li>
-												
-												<input type="checkbox" id="class4" name="className" value="1"  />
-												<label for="class4"></label>
-												 <span>4班</span> 
-												 <input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/>
-											</li>
-											<li>
-												<input type="checkbox" id="class5" name="className" value="1" />
-												<label for="class5"></label>
-												<span>5班</span>
-												<input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/>
-											</li>
-											<li>
-												<input type="checkbox" id="class6" name="className" value="1" />
-												<label for="class6"></label>
-												<span>6班</span>
-												<input class="date-picker" type="text" class="form-control" style="width:200px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/>
-											</li> -->
+											
 										</ul>
 									</div>
@@ -119,9 +80,9 @@
 								<col width="10%"/>
 								<thead>
 									<tr>
-										<th style="text-align:left;"><span>题目数量</span><span class="add">+</span><input type="number" class="w_100" id="que_num" value="${pd.QUESTION_COUNT==null?0:pd.QUESTION_COUNT}"/><span class="redu">-</span></th>
-										<th><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" id="ans_num" value="4"/><span class="redu">-</span></th>
-										<th><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" id="score" value="1"/><span class="redu">-</span></th>
+										<th style="text-align:left;"><span>题目数量</span><input type="number" class="w_100" id="que_num" value="${pd.QUESTION_COUNT==null?0:pd.QUESTION_COUNT}"/></th>
+										<th><span>选项个数</span><input type="number" class="w_100 ans_num" id="ans_num" value="4"/></th>
+										<th><span>分值</span><input type="number" class="w_100 score" id="score" value="1"/></th>
 										<th></th>
 									</tr>
 								</thead>
@@ -151,9 +112,9 @@
 														</div>
 													</td>
-													<td class="middle"><span>选项个数</span><span class="add">+</span><input type="number" class="w_100 ans_num" value="${var.OPTION_NUM}"/><span class="redu">-</span></td>
-													<td class="middle"><span>分值</span><span class="add">+</span><input type="number" class="w_100 score" value="${var.SCORE}"/><span class="redu">-</span></td>
-													<td class="last"><a class="remove"><img src="static/images/remove.png" /></a></td>
+													<td class="middle"><span>选项个数</span><input type="number" class="w_100 ans_num" value="${var.OPTION_NUM}"/></td>
+													<td class="middle"><span>分值</span><input type="number" class="w_100 score" value="${var.SCORE}"/></td>
+													<td class="last"></td>
 												</tr>
 											</c:forEach>
 										</c:when>
@@ -171,8 +132,8 @@
 						<div>
 							<div style="text-align: center;" colspan="10">
-								<a class="btn btn-mini btn-primary" onclick="save();">确定布置</a>
-								<a class="btn btn-mini btn-danger" onclick="window.top.modal.remove();">取消</a>
+								
+								<a class="btn btn-mini btn-danger" onclick="back();">退出</a>
 							</div>
 						</div>
 						<div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div>
@@ -202,83 +163,20 @@
 	<!--提示框-->
 	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
 	<!--页面交互-->
-	<script src="static/js/control_homework.js?t=1"></script>
+
 	<script>
-	var homework_id="${pd.HOMEWORK_ID}";
 	$(function() {
 		window.top.loading.remove();
-		work.que_num=parseInt($("#que_num").val());
-		//日期框
-		$(document).on("focus",".date-picker",function(){
-			$(this).datepicker({
-				autoclose: true,
-				todayHighlight: true
-			});			
-		});
-	if(${pd.CLASS_ID==null}==true){
-		$.ajax({         //获取该名教师下的班级信息
-			url:'<%=basePath%>coursemanagement/teacherClass',
-			type:"get",
-			data:{teacher_id:"${pd.TEACHER_ID}"},
-			success:function(res){
-				console.log(res);
-				if(res.data.length>0){
-					var _html="";
-					$.each(res.data,function(k,v){
-						_html+='<li><input type="checkbox" id="class'+k+'" name="className" value="'+v.ID+'"><label for="class'+k+'"></label><span>'+v.CLASS_NAME+'</span><input class="date-picker" type="text" style="width:150px;text-align:center;" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""></li>';
-						
-					});
-					$(".classBox ul").html(_html);
-				}
-			}
-		});
-	}
-		
-		
 	});
-	
-	function save_data(data){
-		$.ajax({         //获取该名教师下的班级信息
-			url:'<%=basePath%>homework/uploadHomework',
-			type:"post",
-			dataType:"text",
-			data:{"JSON":data},
-			success:function(res){
-				var res=JSON.parse(res);
-				if(res.message=="success"){
-					alert(res.message);
-					console.log(res);
-					
-					var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}';
-					parent.$("#mainFrame").attr('src',path);
-					window.top.loading.show();
-				}
-				
-			}
-		});
-	}
-	function up_data(data){
-		$.ajax({         //获取该名教师下的班级信息
-			url:'<%=basePath%>homework/updateHomework',
-			type:"post",
-			dataType:"text",
-			data:{"JSON":data},
-			success:function(res){
-				var res=JSON.parse(res);
-				if(res.message=="success"){
-					alert(res.message);
-					console.log(res);
-					
-					var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}';
-					parent.$("#mainFrame").attr('src',path);
-					window.top.loading.show();
-					
-				}
-			}
-		});
+	function back(){
+		var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER_ID}';
+		parent.$("#mainFrame").attr('src',path);
+		window.top.loading.show();
 	}
+	
+	
 	</script>
 </body>
 </html>
 \ No newline at end of file
@@ -106,7 +106,7 @@
 						<p id="practice_do" onclick="event.stopPropagation();homeWork('${SCHOOL_ID}')">布置练习</p>
 					</li>
 					<li>
-						<p id="practice_report">练习报表</p>
+						<p id="practice_report" onclick="event.stopPropagation();homeReport('${SCHOOL_ID}')">练习报表</p>
 					</li>
 				</ul>
 		</div>
@@ -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)){
@@ -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);