diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
index dc7f26f..fc0d408 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
@@ -245,20 +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/uploadHomework',
+			url:'<%=basePath%>homework/updateHomework',
 			type:"post",
 			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();
+					
+				}
 			}
 		});
 	}
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
index dae332d..16837b6 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -114,7 +114,7 @@
 					<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,6 +147,16 @@
 		});
 	});
 	
+	$('#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();
 	}
@@ -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>