diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
index 9569d6a..fc0d408 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
@@ -54,7 +54,7 @@
 								<td>
 									<div class="classBox">
 										<ul>
-											<c:if test="${pd.CLASS_ID != ''}">
+											<c:if test="${pd.CLASS_ID != null}">
 												<li class="checked">
 													<input type="checkbox" checked="true" id="class0" name="className" value="${pd.CLASS_ID}"  />
 													<label for="class0"></label>
@@ -119,7 +119,7 @@
 								<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="0"/><span class="redu">-</span></th>
+										<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></th>
@@ -179,7 +179,7 @@
 					</form>
 					
 					
-					${pd}
+					
 					
 					</div>
 					<!-- /.col -->
@@ -204,8 +204,11 @@
 	<!--页面交互-->
 	<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({
@@ -213,11 +216,11 @@
 				todayHighlight: true
 			});			
 		});
-	if('${pd.CLASS_ID}'==''){
+	if(${pd.CLASS_ID==null}==true){
 		$.ajax({         //获取该名教师下的班级信息
 			url:'<%=basePath%>coursemanagement/teacherClass',
 			type:"get",
-			data:{teacher_id:'${pd.TEACHER_ID}'},
+			data:{teacher_id:"${pd.TEACHER_ID}"},
 			success:function(res){
 				console.log(res);
 				if(res.data.length>0){
@@ -242,8 +245,36 @@
 			dataType:"text",
 			data:{"JSON":data},
 			success:function(res){
-				alert("保存成功");
-				console.log(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();
+					
+				}
 			}
 		});
 	}
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
index 16bf629..16837b6 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -111,10 +111,10 @@
 			</table>
 			<div class="footer">
 				<div class="creat">
-					<input type="button"  onclick="add()" value="布置练习" />
+					<input type="button"  onclick="add('${pd.TEACHER_ID}')" value="布置练习" />
 				</div>
 				<div class="removeAll">
-					<input type="button" onclick="deleteAll()" value="批量删除" />
+					<input type="button" onclick="del()" value="批量删除" />
 				</div>
 				<div class="page_box">
 					
@@ -147,11 +147,21 @@
 		});
 	});
 	
+	$('#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);
+		});
+	});
+	
 	function tosearch(){
 		$("#Form").submit();
 	}
 	function add(Id){
-		var path = '<%=basePath%>homework/goAdd2.do?school_id=${pd.SCHOOL_ID}&HOMEWORK_ID='+Id;
+		var path = '<%=basePath%>homework/goAdd2.do?teacher_id='+Id;
 		parent.$("#mainFrame").attr('src',path);
 		window.top.loading.show();
 	}
@@ -160,6 +170,38 @@
 		parent.$("#mainFrame").attr('src',path);
 		window.top.loading.show();
 	}
+	function del(Id){
+		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%>homework/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();
+	}
 	
 	</script>
 
diff --git a/WebRoot/static/js/control_homework.js b/WebRoot/static/js/control_homework.js
index 798d929..3b69c0f 100644
--- a/WebRoot/static/js/control_homework.js
+++ b/WebRoot/static/js/control_homework.js
@@ -26,7 +26,7 @@
 				}
 			}
 			else if(_id=="ans_num"){//新增选项
-				alert(work.que_num);
+				//alert($("#que_num").val());
 				for(j=1;j<=work.que_num;j++){	//轮询每道题目
 					var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目选项个数
 					if(now_length<work.ans_num){   //当前题目选项个数小于数字框中个数，则把选项个数增加到数字框中的个数
@@ -46,6 +46,7 @@
 			}else{
 				if(_id.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ //没有id，但是class中含有ans_num，则为单个题目中的选项设置框
 					var _index=_id.closest("tr").index()+1;
+					console.log(_index);
 					for(i=index;i<=num;i++){
 						$(".question"+_index+" ul").append('<li class="btn btn-default">'+String.fromCharCode(0x41 + i-1)+'</li>')
 					}
@@ -98,24 +99,30 @@
 			if(_that.siblings(".w_100").attr("id")){
 				//将下面的数字框的值设置成标题栏数字框的值
 				var _class=_that.siblings(".w_100").attr("id");
-				$("."+_class).val(temp_num);
+				
 				//题目数
 				if(_class=="que_num"){
 					work.que_num=temp_num;
-					creat_work(_class,work.que_num,work.que_num);
+					creat_work(_class,work.que_num,work.que_num);					
 				}
 				//选项数
 				if(_class=="ans_num"){
+					if(temp_num>=10){
+						temp_num=9;
+					}
 					work.ans_num=temp_num;
 					creat_work(_class,work.ans_num,work.ans_num);
-				}				
+				}	
+				$("."+_class).val(temp_num);
 			}
 			else{
 				if(_that.siblings(".w_100").attr("class").indexOf("ans_num")>-1){
 					creat_work(_that,temp_num,temp_num);
 				}
 			}
-			
+			if(work.que_num!=0){
+				$(".main_info").remove();
+			}
 		})
 		//点击-按钮
 		$(document).on("click",".redu",function(){
@@ -148,7 +155,9 @@
 					remove_work(_that,temp_num,temp_num);
 				}
 			}
-			
+			if(work.que_num!=0){
+				$(".main_info").remove();
+			}
 		})
 		$(document).on("click",".remove",function(){
 			var _that=$(this);
@@ -172,6 +181,9 @@
 			var old_num=parseInt(work.que_num);
 			var _temp=now_num-old_num;
 			
+			if(now_num!=0){
+				$(".main_info").remove();
+			}
 			if(_temp>0){
 				creat_work($(this).attr("id"),(old_num+1),now_num);
 			}else{
@@ -185,7 +197,9 @@
 			var now_num=parseInt($("#ans_num").val());
 			var old_num=parseInt(work.ans_num);
 			var _temp=now_num-old_num;
-			
+			if(now_num>=10){
+				now_num=9;	
+			}
 			$(".ans_num").val(now_num);
 			work.ans_num=now_num;
 			
@@ -311,7 +325,18 @@
 			saveData.QUESTIONS=QUESTIONS;
 			
 			//console.log(saveData);
-			save_data(JSON.stringify(saveData));
+			if(homework_id==""){
+				save_data(JSON.stringify(saveData));
+				//console.log("保存");
+			}
+			else{
+				//console.log("更新");
+				saveData.HOMEWORK_ID=homework_id;
+				up_data(JSON.stringify(saveData));
+			}
+				
+			
+			
 			
 			
 		}