diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
new file mode 100644
index 0000000..19b16dc
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
@@ -0,0 +1,266 @@
+<%@ 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+"/";
+%>
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+	<base href="<%=basePath%>">
+	<!-- 下拉框 -->
+	<link rel="stylesheet" href="static/ace/css/chosen.css" />
+	<!-- jsp文件头和头部 -->
+	<%@ include file="../../system/index/top.jsp"%>
+	<!-- 日期框 -->
+	<link rel="stylesheet" href="static/ace/css/datepicker.css" />
+	
+	
+	<link rel="stylesheet" href="static/css/edit.css" />
+	<style>
+		.subject_body_tabel{border-collapse: separate;border-spacing:0 10px;}
+		.subject_body_tabel td{border:1px solid #000;}
+		.subject_body_tabel .first{border-right:0;}
+		.subject_body_tabel .middle{border-left:0;border-right:0;}
+		.subject_body_tabel .last{border-left:0;}
+		
+	</style>
+</head>
+<body class="no-skin">
+<!-- /section:basics/navbar.layout -->
+<div class="main-container" id="main-container">
+	<!-- /section:basics/sidebar -->
+	<div class="main-content">
+		<div class="main-content-inner">
+			<div class="page-content">
+				<div class="row">
+					<div class="col-xs-12">
+					
+					<form action="homework/${msg }.do" name="Form" id="Form" method="post">
+						<input type="hidden" name="HOMEWORK_ID" id="HOMEWORK_ID" value="${pd.HOMEWORK_ID}"/>
+						<div id="zhongxin" style="padding-top: 13px;">
+						<table id="table_report" class="table">
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">练习标题</td>
+								<td><input type="text" name="CODE" id="CODE" value="${pd.CODE}" maxlength="255" placeholder="输入练习标题，不超过20个汉字" title="作业代码" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">练习说明</td>
+								<td><input type="text" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="输入题目说明，如教材第12页1-5题，教辅第5页1-3题，尽量精简，不超过100个汉字" title="作业名称" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">指定班级完成时间</td>
+								<td>
+									<div class="classBox">
+										<ul>
+											<li><input type="radio" name="className" value="1" checked="true" /> 1班 <input class="date-picker" type="text" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/></li>
+											<li><input type="radio" name="className" value="1" /> 2班 <input class="date-picker" type="text" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/></li>
+											<li><input type="radio" name="className" value="1" /> 3班 <input class="date-picker" type="text" placeholder="完成日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/></li>
+										</ul>
+									</div>
+								
+								</td>
+							</tr>
+							
+						</table>
+						</div>
+						<hr />
+						<div class="subject">
+							<table  width="100%">
+								<col width="50%"/>
+								<col width="20%"/>
+								<col width="20%"/>
+								<col width="10%"/>
+								<thead>
+									<tr>
+										<th><span>题目数量</span><input type="number" value="1"/></th>
+										<th><span>选项个数</span><input type="number" value="1"/></th>
+										<th><span>分值</span><input type="number" value="1"/></th>
+										<th></th>
+									</tr>
+								</thead>
+							</table>
+							<table width="100%" border="0"  class="subject_body_tabel">
+								<col width="10%"/>
+								<col width="40%"/>
+								<col width="20%"/>
+								<col width="20%"/>
+								<col width="10%"/>
+								<tbody>									
+									<tr>
+										<td class="first">1</td>
+										<td class="middle">1</td>
+										<td class="middle"><span>选项个数</span><input type="number" value="1"/></td>
+										<td class="middle"><span>分值</span><input type="number" value="1"/></td>
+										<td class="last"><input type="button" value="删除"/></td>
+									</tr>
+									<tr>
+										<td class="first">1</td>
+										<td class="middle">1</td>
+										<td class="middle"><span>选项个数</span><input type="number" value="1"/></td>
+										<td class="middle"><span>分值</span><input type="number" value="1"/></td>
+										<td class="last"><input type="button" value="删除"/></td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<hr />
+						<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>
+							</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>
+					</form>
+					</div>
+					<!-- /.col -->
+				</div>
+				<!-- /.row -->
+			</div>
+			<!-- /.page-content -->
+		</div>
+	</div>
+	<!-- /.main-content -->
+</div>
+<!-- /.main-container -->
+
+
+	<!-- 页面底部js¨ -->
+	<%@ include file="../../system/index/foot.jsp"%>
+	<!-- 下拉框 -->
+	<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 type="text/javascript">
+		
+		function save(){
+			if($("#CODE").val()==""){
+				$("#CODE").tips({
+					side:3,
+		            msg:'请输入作业代码',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#CODE").focus();
+			return false;
+			}
+			if($("#NAME").val()==""){
+				$("#NAME").tips({
+					side:3,
+		            msg:'请输入作业名称',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#NAME").focus();
+			return false;
+			}
+			if($("#SUBJECT_ID").val()==""){
+				$("#SUBJECT_ID").tips({
+					side:3,
+		            msg:'请输入科目ID',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#SUBJECT_ID").focus();
+			return false;
+			}
+			if($("#CLASS_ID").val()==""){
+				$("#CLASS_ID").tips({
+					side:3,
+		            msg:'请输入班级ID',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#CLASS_ID").focus();
+			return false;
+			}
+			if($("#GRADE_ID").val()==""){
+				$("#GRADE_ID").tips({
+					side:3,
+		            msg:'请输入年级ID',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#GRADE_ID").focus();
+			return false;
+			}
+			if($("#SCHOOL_ID").val()==""){
+				$("#SCHOOL_ID").tips({
+					side:3,
+		            msg:'请输入学校ID',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#SCHOOL_ID").focus();
+			return false;
+			}
+			if($("#COMPLETE_DATE").val()==""){
+				$("#COMPLETE_DATE").tips({
+					side:3,
+		            msg:'请输入需要完成时间',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#COMPLETE_DATE").focus();
+			return false;
+			}
+			if($("#CREATE_DATE").val()==""){
+				$("#CREATE_DATE").tips({
+					side:3,
+		            msg:'请输入创建时间',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#CREATE_DATE").focus();
+			return false;
+			}
+			if($("#MODIFY_DATE").val()==""){
+				$("#MODIFY_DATE").tips({
+					side:3,
+		            msg:'请输入修改时间',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#MODIFY_DATE").focus();
+			return false;
+			}
+			if($("#COMPLETE_COUNT").val()==""){
+				$("#COMPLETE_COUNT").tips({
+					side:3,
+		            msg:'请输入完成次数',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#COMPLETE_COUNT").focus();
+			return false;
+			}
+			if($("#ALL_SCORE").val()==""){
+				$("#ALL_SCORE").tips({
+					side:3,
+		            msg:'请输入总分',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#ALL_SCORE").focus();
+			return false;
+			}
+			$("#Form").submit();
+			$("#zhongxin").hide();
+			$("#zhongxin2").show();
+		}
+		
+		$(function() {
+			//日期框
+			$('.date-picker').datepicker({
+				autoclose: true,
+				todayHighlight: true
+			});
+		});
+		</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
index 898b91b..3a9cc2f 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -14,192 +14,106 @@
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
 <!-- jsp文件头和头部 -->
-<%@ include file="../../system/index/top.jsp"%>
+
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
+<link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet">
+<link href="static/css/teach.css" rel="stylesheet">
 </head>
 <body class="no-skin">
-
-	<!-- /section:basics/navbar.layout -->
-	<div class="main-container" id="main-container">
-		<!-- /section:basics/sidebar -->
-		<div class="main-content">
-			<div class="main-content-inner">
-				<div class="page-content">
-					<div class="row">
-						<div class="col-xs-12">
-							
-						<!-- 检索  -->
-						<form action="homework/list.do" method="post" name="Form" id="Form">
-						<table style="margin-top:5px;">
+	<form action="../paper/list2.do" method="post" name="Form" id="Form">
+		<div class="head_box">
+		<div class="box_header">
+			<div class="head_box_l">
+				<p>
+					<span class="right_b"></span>练习列表
+				</p>
+			</div>
+			<div class="head_box_r">
+				<select name="status" id="status" style="width:90px;height:26px;margin-right:5px;padding:0;border-color:#aaa;">
+					<option value="0">全部</option>
+					<option value="1">完成</option>
+					<option value="2">未完成</option>
+				</select>
+				<input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTSTART }"/> 
+				<input type="text" class="date-picker" placeholder="结束日期" name="lastEnd" name="lastEnd" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTEND}"/>
+				 <a href="#" onclick="tosearch();"><img
+					src="static/images/search.png" /></a>
+			</div>
+			<div class="clear"></div>
+			</div>
+			<div style="padding:0 5%;background:#fff;">
+				<table class="table table-striped">
+				<col style="width: 10%" />
+				<col style="width: 20%" />
+				<col style="width: 20%" />
+				<col style="width: 20%" />
+				<col style="width: 20%" />
+				<col style="width: 10%" />
+				<thead>
+					<tr>
+						<th><input type="checkbox"  name='ids' id="ids" />序号</th>
+						<th>测验标题</th>
+						<th>创建时间</th>
+						<th>建议考试时长</th>
+						<th>总分</th>
+						<th>操作</th>
+					</tr>
+				</thead>
+			</table>
+			</div>
+		</div>
+		<div class="table_box">
+			<table class="table table-striped">
+				<col style="width: 10%" />
+				<col style="width: 20%" />
+				<col style="width: 20%" />
+				<col style="width: 20%" />
+				<col style="width: 20%" />
+				<col style="width: 10%" />
+				<tbody>
+				<c:choose>
+					<c:when test="${not empty varList}">
+						<c:forEach items="${varList}" var="var" varStatus="vs">
 							<tr>
+								<td><input type="checkbox" name='ids' id="ids" value="${var.PAPER_ID}"/>${vs.index+1}</td>
+								<td ><a  target="_blank" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}">${var.TITLE}</a></td>
+								<td >${var.CREATE_DATE}</td>
+								<td >${var.EXAM_TIME}</td>
+								<td >${var.SCORE}</td>
 								<td>
-									<div class="nav-search">
-										<span class="input-icon">
-											<input type="text" placeholder="这里输入关键词" class="nav-search-input" id="nav-search-input" autocomplete="off" name="keywords" value="${pd.keywords }" placeholder="这里输入关键词"/>
-											<i class="ace-icon fa fa-search nav-search-icon"></i>
-										</span>
-									</div>
-								</td>
-								<td style="padding-left:2px;"><input class="span10 date-picker" name="lastStart" id="lastStart"  value="" 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" name="lastEnd"  value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="结束日期" title="结束日期"/></td>
-								<td style="vertical-align:top;padding-left:2px;">
-								 	<select class="chosen-select form-control" name="name" id="id" data-placeholder="请选择" style="vertical-align:top;width: 120px;">
-									<option value=""></option>
-									<option value="">全部</option>
-									<option value="">1</option>
-									<option value="">2</option>
-								  	</select>
+								<a onclick="del('${var.PAPER_ID}');"><img src="static/images/remove.png" /></a>
+								<a onclick="del('${var.PAPER_ID}');"><img src="static/images/eidtor.png" /></a>
 								</td>
-								<c:if test="${QX.cha == 1 }">
-								<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>
-								</c:if>
-								<c:if test="${QX.toExcel == 1 }"><td style="vertical-align:top;padding-left:2px;"><a class="btn btn-light btn-xs" onclick="toExcel();" title="导出到EXCEL"><i id="nav-search-icon" class="ace-icon fa fa-download bigger-110 nav-search-icon blue"></i></a></td></c:if>
 							</tr>
-						</table>
-						<!-- 检索  -->
-					
-						<table id="simple-table" class="table table-striped table-bordered table-hover" style="margin-top:5px;">	
-							<thead>
-								<tr>
-									<th class="center" style="width:35px;">
-									<label class="pos-rel"><input type="checkbox" class="ace" id="zcheckbox" /><span class="lbl"></span></label>
-									</th>
-									<th class="center" style="width:50px;">序号</th>
-									<th class="center">作业代码</th>
-									<th class="center">作业名称</th>
-									<th class="center">科目ID</th>
-									<th class="center">班级ID</th>
-									<th class="center">年级ID</th>
-									<th class="center">学校ID</th>
-									<th class="center">需要完成时间</th>
-									<th class="center">创建时间</th>
-									<th class="center">修改时间</th>
-									<th class="center">完成次数</th>
-									<th class="center">总分</th>
-									<th class="center">操作</th>
-								</tr>
-							</thead>
-													
-							<tbody>
-							<!-- 开始循环 -->	
-							<c:choose>
-								<c:when test="${not empty varList}">
-									<c:if test="${QX.cha == 1 }">
-									<c:forEach items="${varList}" var="var" varStatus="vs">
-										<tr>
-											<td class='center'>
-												<label class="pos-rel"><input type='checkbox' name='ids' value="${var.HOMEWORK_ID}" class="ace" /><span class="lbl"></span></label>
-											</td>
-											<td class='center' style="width: 30px;">${vs.index+1}</td>
-											<td class='center'>${var.CODE}</td>
-											<td class='center'>${var.NAME}</td>
-											<td class='center'>${var.SUBJECT_ID}</td>
-											<td class='center'>${var.CLASS_ID}</td>
-											<td class='center'>${var.GRADE_ID}</td>
-											<td class='center'>${var.SCHOOL_ID}</td>
-											<td class='center'>${var.COMPLETE_DATE}</td>
-											<td class='center'>${var.CREATE_DATE}</td>
-											<td class='center'>${var.MODIFY_DATE}</td>
-											<td class='center'>${var.COMPLETE_COUNT}</td>
-											<td class='center'>${var.ALL_SCORE}</td>
-											<td class="center">
-												<c:if test="${QX.edit != 1 && QX.del != 1 }">
-												<span class="label label-large label-grey arrowed-in-right arrowed-in"><i class="ace-icon fa fa-lock" title="无权限"></i></span>
-												</c:if>
-												<div class="hidden-sm hidden-xs btn-group">
-													<c:if test="${QX.edit == 1 }">
-													<a class="btn btn-xs btn-success" title="编辑" onclick="edit('${var.HOMEWORK_ID}');">
-														<i class="ace-icon fa fa-pencil-square-o bigger-120" title="编辑"></i>
-													</a>
-													</c:if>
-													<c:if test="${QX.del == 1 }">
-													<a class="btn btn-xs btn-danger" onclick="del('${var.HOMEWORK_ID}');">
-														<i class="ace-icon fa fa-trash-o bigger-120" title="删除"></i>
-													</a>
-													</c:if>
-												</div>
-												<div class="hidden-md hidden-lg">
-													<div class="inline pos-rel">
-														<button class="btn btn-minier btn-primary dropdown-toggle" data-toggle="dropdown" data-position="auto">
-															<i class="ace-icon fa fa-cog icon-only bigger-110"></i>
-														</button>
-			
-														<ul class="dropdown-menu dropdown-only-icon dropdown-yellow dropdown-menu-right dropdown-caret dropdown-close">
-															<c:if test="${QX.edit == 1 }">
-															<li>
-																<a style="cursor:pointer;" onclick="edit('${var.HOMEWORK_ID}');" class="tooltip-success" data-rel="tooltip" title="修改">
-																	<span class="green">
-																		<i class="ace-icon fa fa-pencil-square-o bigger-120"></i>
-																	</span>
-																</a>
-															</li>
-															</c:if>
-															<c:if test="${QX.del == 1 }">
-															<li>
-																<a style="cursor:pointer;" onclick="del('${var.HOMEWORK_ID}');" class="tooltip-error" data-rel="tooltip" title="删除">
-																	<span class="red">
-																		<i class="ace-icon fa fa-trash-o bigger-120"></i>
-																	</span>
-																</a>
-															</li>
-															</c:if>
-														</ul>
-													</div>
-												</div>
-											</td>
-										</tr>
-									
-									</c:forEach>
-									</c:if>
-									<c:if test="${QX.cha == 0 }">
-										<tr>
-											<td colspan="100" class="center">您无权查看</td>
-										</tr>
-									</c:if>
-								</c:when>
-								<c:otherwise>
-									<tr class="main_info">
-										<td colspan="100" class="center" >没有相关数据</td>
-									</tr>
-								</c:otherwise>
-							</c:choose>
-							</tbody>
-						</table>
-						<div class="page-header position-relative">
-						<table style="width:100%;">
-							<tr>
-								<td style="vertical-align:top;">
-									<c:if test="${QX.add == 1 }">
-									<a class="btn btn-mini btn-success" onclick="add();">新增</a>
-									</c:if>
-									<c:if test="${QX.del == 1 }">
-									<a class="btn btn-mini btn-danger" onclick="makeAll('确定要删除选中的数据吗?');" title="批量删除" ><i class='ace-icon fa fa-trash-o bigger-120'></i></a>
-									</c:if>
-								</td>
-								<td style="vertical-align:top;"><div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div></td>
-							</tr>
-						</table>
-						</div>
-						</form>
+							
+						
+						</c:forEach>
+					</c:when>
+					<c:otherwise>
+						<tr class="main_info">
+							<td colspan="100" class="center" >没有相关数据</td>
+						</tr>
+					</c:otherwise>
+				</c:choose>
+				</tbody>
+			</table>
+			<div class="footer">
+				<div class="creat">
+					<input type="button"  onclick="edit()" value="布置练习" />
+				</div>
+				<div class="removeAll">
+					<input type="button" onclick="deleteAll()" value="批量删除" />
+				</div>
+				<div class="page_box">
 					
-						</div>
-						<!-- /.col -->
-					</div>
-					<!-- /.row -->
+					<div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
 				</div>
-				<!-- /.page-content -->
 			</div>
 		</div>
-		<!-- /.main-content -->
-
-		<!-- 返回顶部 -->
-		<a href="#" id="btn-scroll-up" class="btn-scroll-up btn btn-sm btn-inverse">
-			<i class="ace-icon fa fa-angle-double-up icon-only bigger-110"></i>
-		</a>
-
-	</div>
-	<!-- /.main-container -->
+	</form>
 
 	<!-- basic scripts -->
 	<!-- 页面底部js¨ -->
@@ -215,168 +129,25 @@
 	<!--提示框-->
 	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
 	<script type="text/javascript">
-		$(top.hangge());//关闭加载状态
-		//检索
-		function tosearch(){
-			top.jzts();
-			$("#Form").submit();
-		}
-		$(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);
-				});
-			});
+	$(document).ready(function() {
+		window.top.loading.remove();
+		//日期框
+		$('.date-picker').datepicker({
+			autoclose: true,
+			todayHighlight: true
 		});
-		
-		//新增
-		function add(){
-			 top.jzts();
-			 var diag = new top.Dialog();
-			 diag.Drag=true;
-			 diag.Title ="新增";
-			 diag.URL = '<%=basePath%>homework/goAdd.do';
-			 diag.Width = 450;
-			 diag.Height = 355;
-			 diag.Modal = true;				//有无遮罩窗口
-			 diag. ShowMaxButton = true;	//最大化按钮
-		     diag.ShowMinButton = true;		//最小化按钮
-			 diag.CancelEvent = function(){ //关闭事件
-				 if(diag.innerFrame.contentWindow.document.getElementById('zhongxin').style.display == 'none'){
-					 if('${page.currentPage}' == '0'){
-						 tosearch();
-					 }else{
-						 tosearch();
-					 }
-				}
-				diag.close();
-			 };
-			 diag.show();
-		}
-		
-		//删除
-		function del(Id){
-			bootbox.confirm("确定要删除吗?", function(result) {
-				if(result) {
-					top.jzts();
-					var url = "<%=basePath%>homework/delete.do?HOMEWORK_ID="+Id+"&tm="+new Date().getTime();
-					$.get(url,function(data){
-						tosearch();
-					});
-				}
-			});
-		}
-		
-		//修改
-		function edit(Id){
-			 top.jzts();
-			 var diag = new top.Dialog();
-			 diag.Drag=true;
-			 diag.Title ="编辑";
-			 diag.URL = '<%=basePath%>homework/goEdit.do?HOMEWORK_ID='+Id;
-			 diag.Width = 450;
-			 diag.Height = 355;
-			 diag.Modal = true;				//有无遮罩窗口
-			 diag. ShowMaxButton = true;	//最大化按钮
-		     diag.ShowMinButton = true;		//最小化按钮 
-			 diag.CancelEvent = function(){ //关闭事件
-				 if(diag.innerFrame.contentWindow.document.getElementById('zhongxin').style.display == 'none'){
-					 tosearch();
-				}
-				diag.close();
-			 };
-			 diag.show();
-		}
-		
-		//批量操作
-		function makeAll(msg){
-			bootbox.confirm(msg, function(result) {
-				if(result) {
-					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==''){
-						bootbox.dialog({
-							message: "<span class='bigger-110'>您没有选择任何内容!</span>",
-							buttons: 			
-							{ "button":{ "label":"确定", "className":"btn-sm btn-success"}}
-						});
-						$("#zcheckbox").tips({
-							side:1,
-				            msg:'点这里全选',
-				            bg:'#AE81FF',
-				            time:8
-				        });
-						return;
-					}else{
-						if(msg == '确定要删除选中的数据吗?'){
-							top.jzts();
-							$.ajax({
-								type: "POST",
-								url: '<%=basePath%>homework/deleteAll.do?tm='+new Date().getTime(),
-						    	data: {DATA_IDS:str},
-								dataType:'json',
-								//beforeSend: validateData,
-								cache: false,
-								success: function(data){
-									 $.each(data.list, function(i, list){
-											tosearch();
-									 });
-								}
-							});
-						}
-					}
-				}
-			});
-		};
-		
-		//导出excel
-		function toExcel(){
-			window.location.href='<%=basePath%>homework/excel.do';
+	});
+	function edit(Id){
+		window.top.modal.init({
+		'title':'布置练习',
+		'width':1200,
+		'url':'<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id,
+		func:function() {
+			tosearch();
 		}
+		});
+		window.top.modal.show();
+	}
 	</script>
 
 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 888c393..4292d8b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -94,16 +94,16 @@
 				</ul>
 		</div>
 		<div class="analyse tab1">
-			<p>
+			<p >
 				课后练<span class="right jiao"></span>
 			</p>
 			
 			<ul class="menu_1">
 					<li>
-						<p id="practice_do">布置练习</p>
+						<p id="practice_manage" onclick="event.stopPropagation();homeWork('${SCHOOL_ID}')">练习列表</p>
 					</li>
 					<li>
-						<p id="practice_manage">练习管理</p>
+						<p id="practice_do" >布置练习</p>
 					</li>
 					<li>
 						<p id="practice_report">练习报表</p>
@@ -176,6 +176,14 @@
 				window.top.loading.show();
 			}
 		}
+		function homeWork(schoolId){
+			//var path = "../school/goEdit2.do?ID=" + schoolId ;
+
+			var path = '<%=basePath%>homework/list.do?ID=' + schoolId ;
+			
+				$("#mainFrame").attr('src',path);
+				window.top.loading.show();
+		}
 		
 		function report(classId){
 			//window.open('<%=basePath%>report/report.do?classid=' + classId);
diff --git a/WebRoot/static/js/dailog.js b/WebRoot/static/js/dailog.js
index 138fe7e..ae2a40a 100644
--- a/WebRoot/static/js/dailog.js
+++ b/WebRoot/static/js/dailog.js
@@ -3,16 +3,35 @@
 		this.init.title=obj.title;
 		this.init.url=obj.url;
 		this.init.func = obj.func;
+		this.init.width = obj.width;
+		this.init.height = obj.height;
 		},
 	show:function(){
 		if(window.top!=window.self){
 			$("body",top.document).append('<div class="mb"><div class="mb_box"><div class="mb_head"><p>'+window.top.init.title+'</p><div class="close"><img src="../static/images/close.png" /></div></div><div class="mb_content"><iframe src="'+window.top.modal.init.url+'"></iframe></div></div></div>');
+			if(window.top.init.width){
+				var w=(window.top.init.width>window.document.body.clientWidth)?window.document.body.clientWidth:window.top.init.width;
+				$(".mb_box",top.document).css("width",w);
+			}
+			if(window.top.init.height){
+				var h=(window.top.init.height>window.document.body.clientHeight)?window.document.body.clientHeight:window.top.init.height;
+				$(".mb_box",top.document).css("height",h);
+			}
 		}else{
 			if($(".loading").length==0)
 			{
 				$("body").append('<div class="mb"><div class="mb_box"><div class="mb_head"><p>'+window.top.modal.init.title+'</p><div class="close"><img src="../static/images/close.png" /></div></div><div class="mb_content"><iframe src="'+window.top.modal.init.url+'"></iframe></div></div></div>');
+				if(window.top.modal.init.width){
+					var w=(window.top.modal.init.width>window.document.body.clientWidth)?window.document.body.clientWidth:window.top.modal.init.width;
+					$(".mb_box").css("width",w);
+				}
+				if(window.top.modal.init.height){
+					var h=(window.top.modal.init.height>window.document.body.clientHeight)?window.document.body.clientHeight:window.top.modal.init.height;
+					$(".mb_box").css("height",h);
+				}
 			}
 		}
+	
 		
 	},
 	remove:function(){
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index a3a0e47..f5c17b1 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -162,6 +162,23 @@ public class HomeworkController extends BaseController {
 		mv.addObject("pd", pd);
 		return mv;
 	}
+	/**
+	 * 去修改页面
+	 * 
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/goEdit2")
+	public ModelAndView goEdit2() throws Exception {
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd = homeworkService.findById(pd); // 根据ID读取
+		mv.setViewName("sunvote/homework/homework_edit2");
+		mv.addObject("msg", "edit");
+		mv.addObject("pd", pd);
+		return mv;
+	}
 
 	/**
 	 * 批量删除

练习标题
练习说明
指定班级完成时间	+ + + 1班 + 2班 + 3班 + + + +
- -	序号	作业代码	作业名称	科目ID	班级ID	年级ID	学校ID	需要完成时间	创建时间	修改时间	完成次数	总分	操作
- -	${vs.index+1}	${var.CODE}	${var.NAME}	${var.SUBJECT_ID}	${var.CLASS_ID}	${var.GRADE_ID}	${var.SCHOOL_ID}	${var.COMPLETE_DATE}	${var.CREATE_DATE}	${var.MODIFY_DATE}	${var.COMPLETE_COUNT}	${var.ALL_SCORE}	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
您无权查看
没有相关数据