diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
index 3ae6e1f..b3c9592 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
@@ -56,6 +56,15 @@ li input {
 	width: 100%;
 }
 
+li select {
+	height: 30px;
+	line-height: 30px;
+	background: #f5f5f5;
+	border: 1px solid #ccc;
+	outline-style: none;
+	width: 100%;
+}
+
 .btn {
 	width: 80%;
 	height: 40px;
@@ -89,26 +98,28 @@ input[type="text"],select {
 		<input type="hidden" name="TERM_ID" id="TERM_ID" value="${pd.TERM_ID}" />
 		<div id="zhongxin">
 			<li>
-				<p>学生姓名:</p>
+				<p><span style="color:#f00">*</span>学生姓名:</p>
 				<div class="li_r">
 					<input type="text" name="NAME" id="NAME" value="${pd.NAME}"
 						maxlength="255" placeholder="这里输入学生姓名" title="学生姓名" />
 				</div>
 			</li>
 			<li>
-				<p>学籍号:</p>
+				<p><span style="color:#f00">*</span>学号:</p>
 				<div class="li_r">
-					<input type="text" name="SNO" id="SNO" value="${pd.SNO}"
-						maxlength="255" placeholder="这里输入学籍号" title="学籍号" />
+					<input type="text" name="NUMBER" id="NUMBER" value="${pd.NUMBER}"
+						maxlength="255" placeholder="这里输入学号" title="学号" />
 				</div>
 			</li>
 			<li>
-				<p>学号:</p>
+				<p><span style="color:#f00">*</span>键盘ID:</p>
 				<div class="li_r">
-					<input type="text" name="NUMBER" id="NUMBER" value="${pd.NUMBER}"
-						maxlength="255" placeholder="这里输入学号" title="学号" />
+					<input type="text" name="KEYPAD_ID" id="KEYPAD_ID"
+						value="${pd.KEYPAD_ID}" maxlength="10" placeholder="这里输入键盘ID"
+						title="键盘ID" />
 				</div>
 			</li>
+			
 			<li>
 				<p>性别:</p>
 				<div class="li_r">
@@ -119,53 +130,7 @@ input[type="text"],select {
 					</select>
 				</div>
 			</li>
-			<li>
-				<p>组号:</p>
-				<div class="li_r">
-					<input type="text" name="GROUPID" id="GROUPID"
-						value="${pd.GROUPID}" maxlength="255" placeholder="这里输入组号"
-						title="组号" />
-				</div>
-			</li>
-			<li>
-				<p>签到码:</p>
-				<div class="li_r">
-					<input type="text" name="SIGN_NO" id="SIGN_NO"
-						value="${pd.SIGN_NO}" maxlength="255" placeholder="这里输入签到码"
-						title="签到码" />
-				</div>
-			</li>
-			<li>
-				<p>家长姓名:</p>
-				<div class="li_r">
-					<input type="text" name="PARENT_NAME" id="PARENT_NAME"
-						value="${pd.PARENT_NAME}" maxlength="255" placeholder="这里输入家长姓名"
-						title="家长姓名" />
-				</div>
-			</li>
-			<li>
-				<p>家长手机:</p>
-				<div class="li_r">
-					<input type="text" name="PARENT_PHONE" id="PARENT_PHONE"
-						value="${pd.PARENT_PHONE}" maxlength="255" placeholder="这里输入家长手机号"
-						title="家长手机号" />
-				</div>
-			</li>
-			<li>
-				<p>键盘ID:</p>
-				<div class="li_r">
-					<input type="text" name="KEYPAD_ID" id="KEYPAD_ID"
-						value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入键盘ID"
-						title="键盘ID" />
-				</div>
-			</li>
-			<li>
-				<p>备注:</p>
-				<div class="li_r">
-					<input type="text" name="REMARK" id="REMARK" value="${pd.REMARK}"
-						maxlength="255" placeholder="这里输入备注" title="备注" />
-				</div>
-			</li>
+			
 
 			<div class="btn">
 				<a onclick="save();">保存</a>
@@ -201,6 +166,17 @@ input[type="text"],select {
 				$("#NAME").focus();
 				return false;
 			}
+			
+			if ($("#NUMBER").val() == "") {
+				$("#NUMBER").tips({
+					side : 3,
+					msg : '请输入学生姓名',
+					bg : '#AE81FF',
+					time : 2
+				});
+				$("#NUMBER").focus();
+				return false;
+			}
 
 			if ($("#KEYPAD_ID").val() == ""
 					|| $("#KEYPAD_ID").val().length != 10) {
@@ -221,10 +197,7 @@ input[type="text"],select {
 
 		$(function() {
 			//日期框
-			$('.date-picker').datepicker({
-				autoclose : true,
-				todayHighlight : true
-			});
+		
 		});
 	</script>
 </body>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bakk.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bakk.jsp
new file mode 100644
index 0000000..5e77d7d
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2_bakk.jsp
@@ -0,0 +1,162 @@
+<%@ 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" />
+	<style>
+		.table td{border:0 !important;}
+		.btn1 {
+	width: 80%;
+	height: 40px;
+	margin: 0 auto;
+	background: #3bc2d6;
+	margin-top: 5%;
+}
+
+.btn1 a {
+	display: block;
+	width: 100%;
+	height: 100%;
+	color: #fff;
+	text-decoration: none;
+	text-align: center;
+	line-height: 40px;
+	font-size: 20px;
+}
+	</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="student/${msg }.do" name="Form" id="Form" method="post">
+						<input type="hidden" name="ID" id="ID" value="${pd.ID}"/>
+						<input type="hidden" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}"/>
+						<input type="hidden" name="TERM_ID" id="TERM_ID" value="${pd.TERM_ID}"/>
+						<div id="zhongxin" style="padding-top: 13px;">
+						<table id="table_report" class="table">
+							<tr>
+								<td style="width:90px;text-align: right;padding-top: 13px;">姓名:</td>
+								<td><input type="text" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入学生姓名" title="学生姓名" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:90px;text-align: right;padding-top: 13px;">学籍号:</td>
+								<td><input type="text" name="SNO" id="SNO" value="${pd.SNO}" maxlength="255" placeholder="这里输入学籍号" title="学籍号" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:90px;text-align: right;padding-top: 13px;">学号:</td>
+								<td><input type="text" name="NUMBER" id="NUMBER" value="${pd.NUMBER}" maxlength="255" placeholder="这里输入学号" title="学号" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:90px;text-align: right;padding-top: 13px;">性别:</td>
+								<td>
+								<%-- <input type="number" name="SEX" id="SEX" value="${pd.SEX}" maxlength="32" placeholder="这里输入性别" title="性别" style="width:98%;"/></td> --%>
+								<select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="这里输入班级类型" style="width:98%;">
+										<option value="1"  <c:if test="${pd.SEX==1}">selected="true"</c:if>>男</option>
+										<option value="0"  <c:if test="${pd.SEX==0}">selected="true"</c:if>>女</option>
+								</select>
+								</td>
+							</tr>
+							<tr>
+								<td style="width:90px;text-align: right;padding-top: 13px;">组号:</td>
+								<td><input type="text" name="GROUPID" id="GROUPID" value="${pd.GROUPID}" maxlength="255" placeholder="这里输入组号" title="组号" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:90px;text-align: right;padding-top: 13px;">签到码:</td>
+								<td><input type="text" name="SIGN_NO" id="SIGN_NO" value="${pd.SIGN_NO}" maxlength="255" placeholder="这里输入签到码" title="签到码" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:90px;text-align: right;padding-top: 13px;">家长姓名:</td>
+								<td><input type="text" name="PARENT_NAME" id="PARENT_NAME" value="${pd.PARENT_NAME}" maxlength="255" placeholder="这里输入家长姓名" title="家长姓名" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:90px;text-align: right;padding-top: 13px;">家长手机号:</td>
+								<td><input type="text" name="PARENT_PHONE" id="PARENT_PHONE" value="${pd.PARENT_PHONE}" maxlength="255" placeholder="这里输入家长手机号" title="家长手机号" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:90px;text-align: right;padding-top: 13px;">键盘ID:</td>
+								<td><input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入键盘ID" title="键盘ID" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:90px;text-align: right;padding-top: 13px;">备注:</td>
+								<td><input type="text" name="REMARK" id="REMARK" value="${pd.REMARK}" maxlength="255" placeholder="这里输入备注" title="备注" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="text-align: center;" colspan="10">
+									<!-- <a class="btn" onclick="save();"><div style="width:100px;">保存</div></a> -->
+									<div class="btn1">
+										<a  onclick="save();">保存</a>
+									</div>
+								</td>
+							</tr>
+						</table>
+						</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">
+		$(top.hangge());
+		//保存
+		function save(){
+			if($("#NAME").val()==""){
+				$("#NAME").tips({
+					side:3,
+		            msg:'请输入学生姓名',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#NAME").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/student/uploadexcel.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp
index f2ba7c3..a1fe8be 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp
@@ -117,7 +117,8 @@ display: block;
 									</tr>
 									<tr>
 										<td style="text-align: center;padding-top: 10px;">
-											<a class="btn btn-mini btn-primary" style="background-color:#3bc2d6 !important;border-color:#3bc2d6 !important;width:300px; height:50px;line-height:50px;font-size:18px;margin-top:5%;padding:0"  onclick="save();">导入</a>
+											<a class="btn btn-mini btn-primary" style="background-color:#3bc2d6 !important;border-color:#3bc2d6 !important;width:200px; height:50px;line-height:50px;font-size:18px;margin-top:5%;padding:0"  onclick="save();">导入</a>
+											<a class="btn btn-mini btn-primary" style="background-color:#87b87f !important;border-color:#87b87f !important;width:200px; height:50px;line-height:50px;font-size:18px;margin-top:5%;padding:0"  href="static/files/Template.xls" target="_blank" >下载模板</a>
 										</td>
 									</tr>
 								</table>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
index 48c488b..b2a2e35 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
@@ -53,7 +53,9 @@
         <div class="form-group">
 		    <label for="inputEmail3" class="col-sm-2 control-label">试题答案</label>
 		    <div class="col-sm-10">
-		      <input type="text" class="form-control" id="answer" placeholder="输入题目答案（例如：“ABCDA”）">
+		      <input type="text" class="form-control" id="answer" placeholder="输入题目答案（例如：“ABCDA”）" maxlength="119">
+		     
+		     <div class="tips" style="color:#f00"></div> 
 		    </div>
 		    <div class="clearfix"></div>
 		</div>
@@ -77,7 +79,7 @@
 		<div class="form-group">
 		    <label for="inputEmail3" class="col-sm-2 control-label">单题分数</label>
 		    <div class="col-sm-10">
-		      <input type="number" class="form-control" id="fraction" placeholder="">
+		      <input type="number" class="form-control" id="fraction" placeholder="" value="1">
 		    </div>
 		    <div class="clearfix"></div>
 		</div>
@@ -115,7 +117,7 @@
 		<div class="form-group">
 		    <label for="index_s_2" class="col-sm-2 control-label">题数</label>
 		    <div class="col-sm-10">
-		      <input type="number" class="form-control" id="index_s_2" placeholder="请输入题目数量">
+		      <input type="number" class="form-control" id="index_s_2" placeholder="请输入题目数量（1-100）"  oninput="if(value.length>3) value=value.slice(0,3)">
 		    </div>
 		   <!--  <div class="col-sm-1"><span style="line-height:34px;">——</span></div>
 		    <div class="col-sm-4">
@@ -143,7 +145,7 @@
 		<div class="form-group">
 		    <label for="fraction2" class="col-sm-2 control-label">单题分数</label>
 		    <div class="col-sm-10">
-		      <input type="number" class="form-control" id="fraction2" placeholder="请输入单题分数">
+		      <input type="number" class="form-control" id="fraction2" value="1" placeholder="请输入单题分数">
 		    </div>
 		    <div class="clearfix"></div>
 		</div>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index a2d68c3..73aea1a 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -97,14 +97,14 @@
 	        <div class="form-group">
 			    <label for="enter_title" class="col-sm-4 control-label">测验标题</label>
 			    <div class="col-sm-6">
-			      <input type="text" class="form-control" id="enter_title" placeholder="输入测验标题">
+			      <input type="text" class="form-control" id="enter_title" placeholder="输入测验标题（不能超过100个字符）"  maxlength="100" minlength="1">
 			    </div>
 			    <div class="clearfix"></div>
 			</div>
 	        <div class="form-group">
 			    <label for="enter_time" class="col-sm-4 control-label">测验时长（分钟）</label>
 			    <div class="col-sm-6">
-			      <input type="number" class="form-control" id="enter_time" placeholder="输入测验时长">
+			      <input type="number" class="form-control" id="enter_time" placeholder="输入测验时长（单位：分钟）" maxlength="3" oninput="if(value.length>3) value=value.slice(0,3)">
 			    </div>
 			    <div class="clearfix"></div>
 			</div>
@@ -146,8 +146,13 @@
 			var name = $("#enter_title").val();
 			var time = $("#enter_time").val();
 			if(name != null&& name != '' && time != null && time != ''){
-				self.location.href = "<%=basePath%>" + "paper/npaper.do?" + "name=" + name + "&time=" + time ;
-				$(".title_time").modal("hide");
+				var itime = parseInt(time);
+				if(itime > 0 && itime <= 300){
+					self.location.href = "<%=basePath%>" + "paper/npaper.do?" + "name=" + name + "&time=" + time ;
+					$(".title_time").modal("hide");
+				}else{
+					alert("请输入正确的时间，时间不能超过300分钟");
+				}
 			}
 		});
 		
diff --git a/WebRoot/static/files/Template.xls b/WebRoot/static/files/Template.xls
new file mode 100644
index 0000000..98ac652
--- /dev/null
+++ b/WebRoot/static/files/Template.xls
diff --git a/WebRoot/static/js/control-604.js b/WebRoot/static/js/control-604.js
index ffc3983..ce9dfc1 100644
--- a/WebRoot/static/js/control-604.js
+++ b/WebRoot/static/js/control-604.js
@@ -136,9 +136,15 @@
 			alert("请输入题目分数");
 			return;
 		}
-		$('.fast').modal('hide');
-		//score += parseInt(fraction)*answer.split(",").length;
-		creat(answer,num_ans,fraction);
+		var frac = parseInt(fraction);
+		if(frac > 0){
+			$('.fast').modal('hide');
+			//score += parseInt(fraction)*answer.split(",").length;
+			creat(answer,num_ans,fraction);
+		}else{
+			alert("请输入正确分数");
+			return;
+		}
 	})	
 
 	/*添加试题的确定按钮*/
@@ -160,6 +166,11 @@
 			alert("请输入题目分数");
 			return;
 		}
+		var iindex_e_2 = parseInt(index_e_2);
+		if(iindex_e_2 < 1 || iindex_e_2 > 100){
+			alert("题目个数不合法");
+			return;
+		}
 		//console.log(typeof(type_2));
 		addQuestion(type_2,num_ans_2,index_s_2,index_e_2,fraction2);
 		$('.addQuestion').modal('hide');
@@ -192,7 +203,11 @@
 	/*更改多选答案*/
 	$(document).on('click','.check li',function(){
 		//$(this).siblings().removeClass("on");
-		$(this).addClass("on");
+		if($(this).hasClass('on')){
+			$(this).removeClass("on");
+		}else{
+			$(this).addClass("on");
+		}
 	})
 	/*提交保存数据*/
 	$("#save").click(function(){
@@ -241,6 +256,10 @@
 						answer+=$(".section").eq(i).find(".question").eq(j).find(".on").eq(k).text();
 						//console.log(answer);
 					}
+					if(answer == ''){
+						alert("还有试题未编辑答案。");
+						return;
+					}
 					data.questions[j]={
 						chapter_id: "0",
 						problem_type_id: "0",
@@ -408,24 +427,27 @@ function creatHtml(data){
 
 var answerLen = 0 ;
 /*快速建题中，每输入五个答案就加一个空格*/
-$("#answer").on("input propertychange",function(event){
-	if($("#answer").val().length > answerLen){
-		var answerStr = $("#answer").val();
-		var result = "";
-		if(answerStr.length > 5){
-			answerStr = answerStr.replace(new RegExp(" ","gm"),"");
-			for(var i = 0 ; i < answerStr.length ; i++){
-				result += answerStr[i];
-				if(i % 5 == 4){
-					result += " ";
-				}
+$("#answer").on("input propertychange", function(event) {
+	var answerStr = "";
+	answerStr = $("#answer").val();
+	var result = "";
+	if (answerStr.length > 5) {
+		answerStr = answerStr.replace(new RegExp(" ", "gm"), "");
+		for (var i = 0; i < answerStr.length; i++) {
+			result += answerStr[i];
+			if (i % 5 == 4 && i != answerStr.length -1) {
+				result += " ";
 			}
-		}else{
-			result = answerStr;
 		}
-		$("#answer").val(result);
+	} else {
+		result = answerStr;
+	}
+	$("#answer").val(result);
+	if (answerStr.length > 0) {
+		$(".tips").text("共" + answerStr.length + "题");
+	} else {
+		$(".tips").text("");
 	}
-	answerLen = $("#answer").val().length;
 })
 
 /*数字转汉字数字*/
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index 49e8daf..8754d12 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -1106,7 +1106,7 @@ public class V1 extends BaseController {
 		eventPd.put("EVENT_ID", get32UUID());
 		eventPd.put("EVENT_NAME", apiName);
 		eventPd.put("EVENT_USER", getUsername());
-		eventPd.put("EVENT_TYPE", "0");
+		eventPd.put("EVENT_TYPE", "-1");
 		eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
 		eventPd.put("CLIENT_ID", "SERVER");
 		eventPd.put("EVENT_IP", getRemoteIp());
diff --git a/src/com/fh/controller/sunvote/student/StudentController.java b/src/com/fh/controller/sunvote/student/StudentController.java
index 13e1761..9ceedd5 100644
--- a/src/com/fh/controller/sunvote/student/StudentController.java
+++ b/src/com/fh/controller/sunvote/student/StudentController.java
@@ -205,6 +205,7 @@ public class StudentController extends BaseController {
 		return mv;
 	}
 	
+	
 	/**修改
 	 * @param
 	 * @throws Exception