diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp
index 8ff55c3..b6c01cf 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp
@@ -34,7 +34,7 @@
 						<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 style="width:75px;text-align: right;padding-top: 13px;">年级名称:</td>
 								<td>
 									<select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="">
 									<c:forEach var="item" items="${gradeList}">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
index 482b039..3363f29 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -184,7 +184,7 @@
 	
 	$(":checkbox").on("click",function(){
 		if($("input[type='checkbox']:checked").length>0){
-			$(".disable").attr("disabled","false");
+			$(".disable").removeAttr("disabled");
 			$(".disable").removeClass("disable");
 		}else{
 			$(".disable").attr("disabled","true");
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
index 3ffe377..f9a4d8e 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
@@ -121,9 +121,17 @@
 			</div><!-- /.modal-content -->
 		  </div><!-- /.modal-dialog -->
 		</div><!-- /.modal -->
-  	<script type="text/javascript">
+  	
+ 
+	<script src="../static/js/jquery.min.js"></script>
+	<script src="../static/js/bootstrap.min.js" ></script>
+	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
+	<script src="../static/ace/js/bootbox.js"></script>
+	<script src="../static/js/teach_paper.js?a=1"></script>
+	<script type="text/javascript">
   		var url = "<%=basePath%>" ;
   		$(document).ready(function(){
+  			$(".table_box").css("padding-top",$(".head_box").height());
 			window.top.loading.remove();
 		});
   		$('.date-picker').datepicker({
@@ -132,10 +140,4 @@
 			});
 			var view = "查看" ;
   	</script>
- 
-	<script src="../static/js/jquery.min.js"></script>
-	<script src="../static/js/bootstrap.min.js" ></script>
-	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
-	<script src="../static/ace/js/bootbox.js"></script>
-	<script src="../static/js/teach_paper.js?a=0"></script>
 </html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp
index 1212315..d3a9ea1 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp
@@ -127,5 +127,5 @@
 	<script src="../static/js/bootstrap.min.js"></script>
 	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
 	<script src="../static/ace/js/bootbox.js"></script>
-	<script src="../static/js/teach_paper.js?a=2"></script>
+	<script src="../static/js/teach_paper.js?a=3"></script>
 </html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
index bc76256..d405dce 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
@@ -34,6 +34,9 @@
 						<input type="hidden" name="ID" id="ID" value="${pd.ID}"/>
 						<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_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>
@@ -57,7 +60,11 @@
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">密码:</td>
-								<td><input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
+								<td>
+									<input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码"  style="opacity:0;height:0;padding:0;margin:0;border:0;float:left;"/>
+									<input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="opacity:0;height:0;padding:0;margin:0;border:0;float:left;"/>
+									<input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;" />
+								</td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">性别:</td>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp
index 28e9cdb..8d53835 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp
@@ -53,7 +53,10 @@
 							</tr>
 							<tr>
 								<td style="width:90px;text-align: right;padding-top: 13px;">原密码:</td>
-								<td><input type="password" name="PASSWORD_OLD" id="PASSWORD_OLD" value="" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
+								<td>
+									<input type="password" name="PASSWORD_OLD" id="PASSWORD_OLD1" value="" maxlength="255" placeholder="这里输入密码" title="密码" style="height:0;padding:0;margin:0;border:0;opacity:0;float:left;"/>
+									<input type="password" name="PASSWORD_OLD" id="PASSWORD_OLD" value="" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/>
+								</td>
 							</tr>
 							<tr>
 								<td style="width:90px;text-align: right;padding-top: 13px;">新密码:</td>
@@ -106,7 +109,7 @@
 	<!--提示框-->
 	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
 		<script type="text/javascript">
-		$(top.hangge());
+		
 		//保存
 		function save(){
 			
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
index d050aa0..35421f2 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
@@ -86,8 +86,9 @@
 		var user_id= "${pd.userId}";
 		var url = "<%=basePath%>";
 		$(document).ready(function(){
+			$(".table_box").css("padding-top",$(".head_box").height());
 			window.top.loading.remove();
 		});
 	</script>
-	<script src="../static/js/test_list.js?a=1"></script>
+	<script src="../static/js/test_list.js?a=2"></script>
 </html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/system/index/login.jsp b/WebRoot/WEB-INF/jsp/system/index/login.jsp
index 6d00e96..423d807 100644
--- a/WebRoot/WEB-INF/jsp/system/index/login.jsp
+++ b/WebRoot/WEB-INF/jsp/system/index/login.jsp
@@ -175,7 +175,7 @@ body{
 				$("#loginname").tips({
 					side : 2,
 					msg : '用户名不得为空',
-					bg : '#AE81FF',
+					bg : '#FF5080',
 					time : 3
 				});
 				showfh();
@@ -188,7 +188,7 @@ body{
 				$("#password").tips({
 					side : 2,
 					msg : '密码不得为空',
-					bg : '#AE81FF',
+					bg : '#FF5080',
 					time : 3
 				});
 				showfh();
@@ -196,12 +196,7 @@ body{
 				return false;
 			}
 			
-			 $("#loginbox").tips({
-				side : 1,
-				msg : '正在登录 , 请稍后 ...',
-				bg : '#68B500',
-				time : 10
-			}); 
+			 
 
 			return true;
 		}
diff --git a/WebRoot/static/js/teach_paper.js b/WebRoot/static/js/teach_paper.js
index a0a1f25..82e03b5 100644
--- a/WebRoot/static/js/teach_paper.js
+++ b/WebRoot/static/js/teach_paper.js
@@ -4,7 +4,6 @@
 			subject_id="",
 			class_id="";
 		$(document).ready(function(){
-			
 			timeList();
 			$.ajax({
 				url:url+"/teacher/info",
@@ -12,21 +11,25 @@
 				type:"post",
 				success:function(data){
 					console.log(data);
-					if(typeof(data.data.subjectList) != 'undefind' && data.data.subjectList.length > 0){
-						subject_id=data.data.subjectList[0].SUBJECT_ID;
-					}
-					user_id=data.data.ID;
-
-					if(data.data.classInfoList.length>0){
-						for(var i=0;i<data.data.classInfoList.length;i++){
-							class_html += '<li data-classId="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</li>';
-							option_html += '<option value="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</option>'
+					if(data!=null){
+						if(typeof(data.data.subjectList) != 'undefind' && data.data.subjectList.length > 0){
+							subject_id=data.data.subjectList[0].SUBJECT_ID;
 						}
-						$(".classList").html(class_html+'<div class="clearfix"></div>');
-						$(".classList li").eq(0).addClass("active");
-						$("#dealer_id_2").html(option_html);
+						user_id=data.data.ID;
+	
+						if(data.data.classInfoList.length>0){
+							for(var i=0;i<data.data.classInfoList.length;i++){
+								class_html += '<li data-classId="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</li>';
+								option_html += '<option value="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</option>'
+							}
+							$(".classList").html(class_html+'<div class="clearfix"></div>');
+							$(".classList li").eq(0).addClass("active");
+							$("#dealer_id_2").html(option_html);
+						}
+						getList();
+					}else{
+						window.top.loading.remove();
 					}
-					getList();
 				},
 				error: function (XMLHttpRequest, textStatus, errorThrown) {
 				// wrong massage   
diff --git a/WebRoot/static/js/teach_paper1.js b/WebRoot/static/js/teach_paper1.js
index ecef41f..328bd46 100644
--- a/WebRoot/static/js/teach_paper1.js
+++ b/WebRoot/static/js/teach_paper1.js
@@ -5,7 +5,7 @@
 			subject_id="",
 			class_id="";
 		$(document).ready(function(){
-			
+			$(".table_box").css("padding-top",$(".head_box").height());
 			timeList();
 			$.ajax({
 				url:url+"/SunvoteEducation/teacher/info",
diff --git a/WebRoot/static/js/test_list.js b/WebRoot/static/js/test_list.js
index 53765ad..780d2d0 100644
--- a/WebRoot/static/js/test_list.js
+++ b/WebRoot/static/js/test_list.js
@@ -65,21 +65,25 @@ function getList(start_date, end_date, class_id) { // 获取测验列表
 				},
 				success : function(data) {
 					console.log(data);
-					for (var i = 0; i < data.data.length; i++) {
-						tab_html += '<tr><td>'
-								+ (i + 1)
-								+ '</td><td>'
-								+ data.data[i].name
-								+ '</td><td>'
-								+ getClassName(data.data[i].classId)
-								+ '</td><td>'
-								+ data.data[i].createDate
-								+ '</td><td><a onclick="window.top.loading.show();jump($(this));" data-id="'
-								+ data.data[i].testpaperId
-								+ '" >查看详情</a> &nbsp;&nbsp;&nbsp;&nbsp; <!-- <a onclick="window.top.loading.show();ansync($(this)); " data-id="' 
-								+ data.data[i].testpaperId + '" >班级分析</a> --></td></tr>'
+					if(data.length>0){
+						for (var i = 0; i < data.data.length; i++) {
+							tab_html += '<tr><td>'
+									+ (i + 1)
+									+ '</td><td>'
+									+ data.data[i].name
+									+ '</td><td>'
+									+ getClassName(data.data[i].classId)
+									+ '</td><td>'
+									+ data.data[i].createDate
+									+ '</td><td><a onclick="window.top.loading.show();jump($(this));" data-id="'
+									+ data.data[i].testpaperId
+									+ '" >查看详情</a> &nbsp;&nbsp;&nbsp;&nbsp; <!-- <a onclick="window.top.loading.show();ansync($(this)); " data-id="' 
+									+ data.data[i].testpaperId + '" >班级分析</a> --></td></tr>'
+						}
+						$("#tab_body").html(tab_html);
+					}else{
+						$("#tab_body").html('<td style="text-align:center;padding-top:20px;">暂无数据</td>');
 					}
-					$("#tab_body").html(tab_html);
 				},
 				error: function (XMLHttpRequest, textStatus, errorThrown) {
 					// 错误信息