diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 0d2ef39..02147e4 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,8 @@
 eclipse.preferences.version=1
 encoding//WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp=UTF-8
 encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp=UTF-8
+encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/en_set_question.jsp=UTF-8
+encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/en_stduent_report.jsp=UTF-8
 encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/indexPage.jsp=UTF-8
 encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp=UTF-8
 encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp=UTF-8
diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
index b7281aa..9dafbf9 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
@@ -37,9 +37,9 @@
 				</div>
 				<div class="clearfix"></div>
 			</div>
-			<div style="background:#fff;">
+			<div style="background:#fff;" >
 
-				<table class="table table-striped">
+				<table class="table table-striped" style="margin: 0px 5%">
 					<col style="width: 10%" />
 					<col style="width: 22%" />
 					<col style="width: 22%" />
@@ -62,7 +62,7 @@
 
 		</div>
 		<div class="table_box" style="padding:0px">
-			<table class="table table-striped">
+			<table class="table table-striped" style="margin: 0px 5%">
 				<col style="width: 10%" />
 				<col style="width: 22%" />
 				<col style="width: 22%" />
@@ -91,13 +91,13 @@
 					</c:choose>
 				</tbody>
 			</table>
-			<div class="footer" style="width:auto">
+			<div class="footer" style="width:auto;margin: 0px 5%;">
 				<div class="creat">
-					<!-- <input type="button" onclick="add();" value="添加学生" /> -->
-				</div>
-				<div class="creat">
-					<!-- <input type="button" onclick="upload();" value="批量导入" /> -->
+					<input type="button" onclick="add();" value="添加班级" />
 				</div>
+				 <div class="removeAll">
+					<input type="button" onclick="delete();" value="删除" />
+				</div> 
 				
 				<div class="page_box">
 					<div class="pagination"
@@ -124,6 +124,16 @@
 			window.top.loading.remove();
 			$(".table_box").css("padding-top",$(".head_box").height());
 		});
+		
+		$('#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);
+				});
+		});
 	</script>
 
 
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/en_student_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/en_student_edit2.jsp
new file mode 100644
index 0000000..95bd859
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/en_student_edit2.jsp
@@ -0,0 +1,196 @@
+<%@ 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/datepicker.css" />
+<style type="text/css">
+li {
+	list-style: none;
+	margin-top: 10px;
+	clear: right;
+	clear: both;
+}
+
+li p {
+	width: 5em;
+	text-align: right;
+	margin: 0;
+	margin-right: 0.5em;
+	float: left;
+	line-height: 30px;
+}
+
+li .li_r {
+	margin-left: 6em;
+	margin-right: 1em;
+	clear: right;
+}
+
+li .li_r select {
+	height: 30px;
+	line-height: 30px;
+	background: #f5f5f5;
+	border: 1px solid #ccc;
+	outline-style: none;
+	width: 100%;
+}
+
+li input {
+	height: 30px;
+	line-height: 30px;
+	background: #f5f5f5;
+	border: 1px solid #ccc;
+	outline-style: none;
+	width: 100%;
+}
+
+
+
+.btn {
+	width: 80%;
+	height: 40px;
+	margin: 0 auto;
+	background: #3bc2d6;
+	margin-top: 5%;
+}
+
+.btn a {
+	display: block;
+	width: 100%;
+	height: 100%;
+	color: #fff;
+	text-decoration: none;
+	text-align: center;
+	line-height: 40px;
+	font-size: 20px;
+}
+
+input[type="text"],select {
+	padding-left: 6px;
+}
+</style>
+
+</head>
+<body>
+	<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">
+			<li>
+				<p><span style="color:#f00">*</span>Name:</p>
+				<div class="li_r">
+					<input type="text" name="NAME" id="NAME" value="${pd.NAME}"
+						maxlength="255" placeholder="please input student name" title="Name" />
+				</div>
+			</li>
+			<li>
+				<p><span style="color:#f00">*</span>No.:</p>
+				<div class="li_r">
+					<input type="text" name="NUMBER" id="NUMBER" value="${pd.NUMBER}"
+						maxlength="255" placeholder="please input the No." title="No." />
+				</div>
+			</li>
+			<li>
+				<p><span style="color:#f00">*</span>Keypad ID:</p>
+				<div class="li_r">
+					<input type="text" name="KEYPAD_ID" id="KEYPAD_ID"
+						value="${pd.KEYPAD_ID}" placeholder="please input the keypad id"
+						title="Keypad Id" />
+				</div>
+			</li>
+			
+			<li>
+				<p>Sex:</p>
+				<div class="li_r">
+					<select class="chosen-select form-control" name="SEX" id="SEX"
+						data-placeholder="please choose the sex">
+						<option value="1" <c:if test="${pd.SEX==1}">selected="true"</c:if>>Man</option>
+						<option value="0" <c:if test="${pd.SEX==0}">selected="true"</c:if>>Woman</option>
+					</select>
+				</div>
+			</li>
+			
+
+			<div class="btn">
+				<a onclick="save();">Save</a>
+			</div>
+		</div>
+		<div id="zhongxin2" class="center" style="display:none">
+
+			<img src="static/images/jiazai.gif" /><br />
+			<h4 class="lighter block green">Submit...</h4>
+		</div>
+	</form>
+
+
+
+	<!-- 页面底部js¨ -->
+	<%@ include file="../../system/index/foot2.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 ($("#NAME").val() == "") {
+				$("#NAME").tips({
+					side : 3,
+					msg : 'Please input the student name',
+					bg : '#AE81FF',
+					time : 2
+				});
+				$("#NAME").focus();
+				return false;
+			}
+			
+			if ($("#NUMBER").val() == "") {
+				$("#NUMBER").tips({
+					side : 3,
+					msg : 'Please input the student number.',
+					bg : '#AE81FF',
+					time : 2
+				});
+				$("#NUMBER").focus();
+				return false;
+			}
+
+			if ($("#KEYPAD_ID").val() == "") {
+				$("#KEYPAD_ID").tips({
+					side : 3,
+					msg : 'Please input the keypad id',
+					bg : '#AE81FF',
+					time : 2
+				});
+				$("#KEYPAD_ID").focus();
+				return false;
+			}
+
+			$("#Form").submit();
+			$("#zhongxin").hide();
+			$("#zhongxin2").show();
+		}
+
+		$(function() {
+			//日期框
+		
+		});
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
new file mode 100644
index 0000000..1c0ff07
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/en_student_list2.jsp
@@ -0,0 +1,214 @@
+<%@ 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"%>
+<%
+	String path = request.getContextPath();
+	String basePath = request.getScheme() + "://"
+			+ request.getServerName() + ":" + request.getServerPort() + path + "/";
+%>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>SunVote-Education Management System</title>
+
+<!-- Bootstrap -->
+<link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet">
+<link href="../static/css/teach.css" rel="stylesheet">
+
+<!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
+<!-- 警告：通过 file:// 协议（就是直接将 html 页面拖拽到浏览器中）访问页面时 Respond.js 不起作用 -->
+<!--[if lt IE 9]>
+      <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+      <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+</head>
+<body>
+
+<form action="../student/listcs.do" method="post" name="Form" id="Form">
+		<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 class="head_box">
+			<div class="box_header">
+			<div class="head_box_l">
+				<p>
+					<span class="right_b"></span>Student Management
+				</p>
+				</div><div class="clearfix"></div>
+				</div>
+			<div style="padding:0 5%;background:#fff;">
+			<table class="table table-striped">
+				<col style="width: 10%" />
+				<col style="width: 22%" />
+				<col style="width: 22%" />
+				<col style="width: 23%" />
+				<col style="width: 23%" />
+				<thead>
+					<tr>
+						<th><input type="checkbox" value="0" name='ids' id="ids"  />Serial No.</th>
+						<th>Name</th>
+						<th>Student ID</th>
+						<th>Keypad ID</th>
+						<th>Operation</th>
+					</tr>
+				</thead>
+			</table></div>
+			
+			<div class="clearfix"></div>
+		</div>
+		<div class="table_box">
+			<table class="table table-striped">
+				<col style="width: 10%" />
+				<col style="width: 22%" />
+				<col style="width: 22%" />
+				<col style="width: 23%" />
+				<col style="width: 23%" />
+				<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.ID}" />${vs.index+1}</td>
+									<td class='center'>${var.NAME}</td>
+											<td>${var.NUMBER}</td>
+											<td>${var.KEYPAD_ID}</td>
+											<td><a href="#" onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="../static/images/eidtor.png" /></a><a href="#" onclick="del('${var.ID}');"><img src="../static/images/remove.png" /></a></td>
+							</tr>
+						
+						</c:forEach>
+					</c:when>
+					<c:otherwise>
+						<tr class="main_info">
+							<td colspan="100" class="center" >No Data</td>
+						</tr>
+					</c:otherwise>
+				</c:choose>
+				</tbody>
+			</table>
+	
+	
+			<div class="footer">
+				<div class="creat">
+					<input type="button" onclick="add();" value="Add Student" />
+				</div>
+				<div class="creat">
+					<input type="button" onclick="upload();" value="Batch Import" />
+				</div>
+				<div class="removeAll" >
+					<input type="button" onclick="deleteAll();" value="Batch Delete" />
+				</div>
+				<div class="page_box">
+					<div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
+				</div>
+			</div>
+		</div>
+	</form>
+</body>
+
+<%@ include file="../../system/index/foot2.jsp"%>
+<script type="text/javascript">
+		$(document).ready(function(){
+			window.top.loading.remove();
+		});
+		function tosearch(){
+			$("#Form").submit();
+		}
+		
+		$('#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 del(Id){
+			window.top.remove.init({"title":"Delete","func":function(success){
+				if(success){
+					var url = "<%=basePath%>student/delete.do?ID="+Id+"&tm="+new Date().getTime();
+					window.top.loading.show();
+					$.get(url,function(data){
+						tosearch();
+					});
+				}
+				else{
+					console.log("false");
+				}
+			}});
+			window.top.remove.show();
+		}
+		
+		function add(){
+			window.top.modal.init({
+			'title':'Add Student',
+			'url':'<%=basePath%>student/goAdd2.do?class_id=${pd.CLASS_ID}&term_id=${pd.TERM_ID}',
+			func:function() {
+				tosearch();
+			}
+			});
+			window.top.modal.show();
+		}
+		
+		function edit(Id){
+			window.top.modal.init({
+			'title':'添加学生',
+			'url':'<%=basePath%>student/goEdit2.do?ID='+Id,
+			func:function() {
+				tosearch();
+			}
+			});
+			window.top.modal.show();
+		}
+		
+		function deleteAll(){
+			window.top.remove.init({"title":"Delete","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%>student/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();
+		}
+		
+		function upload(){
+			 window.top.modal.init({
+			'title':'Import excel student name list',
+			'url':'<%=basePath%>student/goUploadExcel.do?class_id=${pd.CLASS_ID}&term_id=${pd.TERM_ID}',
+			func:function() {
+				tosearch();
+			}
+			});
+			window.top.modal.show();
+		}
+		
+</script>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/en_uploadexcel.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/en_uploadexcel.jsp
new file mode 100644
index 0000000..f22ac19
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/en_uploadexcel.jsp
@@ -0,0 +1,198 @@
+<%@ 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"%>
+<%
+	String path = request.getContextPath();
+	String basePath = request.getScheme() + "://"
+			+ request.getServerName() + ":" + request.getServerPort()
+			+ path + "/";
+%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<base href="<%=basePath%>">
+
+<!-- jsp文件头和头部 -->
+<%@ include file="../../system/index/top.jsp"%>
+
+
+<style>
+
+.ace-file-input .ace-file-container{
+display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 40px;
+    background-color: #ffffff;
+    border: 1px solid #d5d5d5;
+    cursor: pointer;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    -webkit-transition: all 0.15s;
+    -o-transition: all 0.15s;
+    transition: all 0.15s;
+}
+.ace-file-input .ace-file-container:before{
+    display: inline-block;
+    content: attr(data-title);
+    position: absolute;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    line-height: 34px;
+    text-align: center;
+    padding: 0 8px;
+    background-color: #3bc2d6;
+    color: #FFF;
+    font-size: 11px;
+    font-weight: bold;
+    border: 2px solid #FFF;
+    border-left-width: 4px;
+    -webkit-transition: all 0.3s;
+    -o-transition: all 0.3s;
+    transition: all 0.3s;
+}
+.ace-file-input .ace-file-container .ace-file-name {
+    display: inline-block;
+    height: 38px;
+    max-width: 80%;
+    white-space: nowrap;
+    overflow: hidden;
+    line-height: 38px;
+    color: #888888;
+    font-size: 13px;
+    vertical-align: top;
+    position: static;
+    padding-left: 36px;
+    }
+    
+    .ace-file-input .ace-file-container .ace-icon {
+    display: inline-block;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    line-height: 34px;
+    width: 36px;
+    text-align: center;
+    font-family: FontAwesome;
+    font-size: 13px;
+    border: 2px solid #FFF;
+    color: #FFF;
+    -webkit-transition: all 0.1s;
+    -o-transition: all 0.1s;
+    transition: all 0.1s;
+    background-color: #3bc2d6;
+    }
+    
+    .ace-file-input .ace-file-container .ace-file-name:after {
+    display: inline-block;
+    content: attr(data-title);
+}
+
+
+</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/readExcel.do?CLASS_ID=${pd.CLASS_ID}&TERM_ID=${pd.TERM_ID}" name="Form" id="Form" method="post" enctype="multipart/form-data">
+								<div id="zhongxin">
+									<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}"/>
+								<table style="width:95%;" >
+									<tr>
+										<td style="padding-top: 20px;"><input type="file" id="excel" name="excel" style="width:50px;" onchange="fileType(this)" /></td>
+									</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:200px; height:50px;line-height:50px;font-size:18px;margin-top:5%;padding:0"  onclick="save();">Import</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" >Download template</a>
+										</td>
+									</tr>
+								</table>
+								</div>
+								<div id="zhongxin2" class="center" style="display:none"><br/><img src="static/images/jzx.gif" /><br/><h4 class="lighter block green"></h4></div>
+							</form>
+						</div>
+						<!-- /.col -->
+					</div>
+					<!-- /.row -->
+				</div>
+				<!-- /.page-content -->
+			</div>
+		</div>
+		<!-- /.main-content -->
+	</div>
+	<!-- /.main-container -->
+
+	<!-- basic scripts -->
+	<!-- 页面底部js¨ -->
+	<%@ include file="../../system/index/foot.jsp"%>
+	<!-- ace scripts -->
+	<script src="static/ace/js/ace/ace.js"></script>
+	<!-- 上传控件 -->
+	<script src="static/ace/js/ace/elements.fileinput.js"></script>
+	<!--提示框-->
+	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
+	<script type="text/javascript">
+		$(function() {
+			//上传
+			$('#excel').ace_file_input({
+				no_file:'Please select a file in xls format',
+				btn_choose:'Select',
+				btn_change:'Modify',
+				droppable:false,
+				onchange:null,
+				thumbnail:false, //| true | large
+				whitelist:'xls|xls',
+				blacklist:'gif|png|jpg|jpeg'
+				//onchange:''
+			});
+		});
+		
+		//保存
+		function save(){
+			if($("#excel").val()=="" || document.getElementById("excel").files[0] =='Please select a file in xls format'){
+				
+				$("#excel").tips({
+					side:3,
+		            msg:'Please select file',
+		            bg:'#AE81FF',
+		            time:3
+		        });
+				return false;
+			}
+			$("#Form").submit();
+			$("#zhongxin").hide();
+			$("#zhongxin2").show();
+		}
+		function fileType(obj){
+			var fileType=obj.value.substr(obj.value.lastIndexOf(".")).toLowerCase();//获得文件后缀名
+		    if(fileType != '.xls'){
+		    	$("#excel").tips({
+					side:3,
+		            msg:'Please select a file in xls format',
+		            bg:'#AE81FF',
+		            time:3
+		        });
+		    	$("#excel").val('');
+		    	document.getElementById("excel").files[0] = 'Please select a file in xls format';
+		    }
+		}
+	</script>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
index c27b0ed..3bb0f65 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
@@ -119,7 +119,12 @@
 		  </div><!-- /.modal-dialog -->
 		</div><!-- /.modal -->
   	<script type="text/javascript">
-  		var url = "<%=basePath%>"
+  		var url = "<%=basePath%>" ;
+  		$('.date-picker').datepicker({
+				autoclose: true,
+				todayHighlight: true,
+			});
+			var view = "查看" ;
   	</script>
  
 	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list.jsp
index cf0a7a8..ca327a1 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list.jsp
@@ -46,7 +46,7 @@
 								<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>
+								<c:if test="${QX.toExcel == 1 }"><td style="vertical-align:top;padding-left:2px;"><a class="btn btn-light btn-xs" onclick="toExcel();" title="c"><i id="nav-search-icon" class="ace-icon fa fa-download bigger-110 nav-search-icon blue"></i></a></td></c:if>
 							</tr>
 						</table>
 						<!-- 检索  -->
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 4546623..3b22197 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -148,7 +148,7 @@
 			 <div class="form-group">
 			    <label for="enter_time" class="col-sm-4 control-label">模板</label>
 			    <div class="col-sm-6">
-			      <select class="chosen-select form-control" name="TEMPLATE_ID" id="TEMPLATE_ID" data-placeholder="这里输入所属学校">
+			      <select class="chosen-select form-control" name="TEMPLATE_ID" id="TEMPLATE_ID" data-placeholder="">
 			      		<option value="">自定义</option>
 						<c:forEach items="${templateInfos}" var="var" varStatus="vs">
 							<option value="${var.PAGETEMPLATE_ID}">${var.NAME}</option>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
index 808227c..20d6870 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
@@ -277,7 +277,7 @@
 		$(document).ready(function(){
 			window.top.loading.remove();
 			
-			/* var sour = "${testpaperList}";
+			 var sour = "${testpaperList}";
 			
 			 if(sour != null && sour.length > 3){
 				var _width = $('#mainFrame', parent.document).width()-40;
@@ -295,7 +295,7 @@
 		        console.log(name_height);
 		        $(".th_name").height(name_height);
 			} 
-				 */
+				
 		});
 		
 	</script>
diff --git a/WebRoot/WEB-INF/jsp/system/index/login.jsp b/WebRoot/WEB-INF/jsp/system/index/login.jsp
index 6e4e9a3..1bfb2bb 100644
--- a/WebRoot/WEB-INF/jsp/system/index/login.jsp
+++ b/WebRoot/WEB-INF/jsp/system/index/login.jsp
@@ -27,6 +27,12 @@
 <script type="text/javascript" src="static/js/jQuery.md5.js"></script>
 <script type="text/javascript" src="static/js/jquery.tips.js"></script>
 <script type="text/javascript" src="static/js/jquery.cookie.js"></script>
+<script type="text/javascript" src="static/js/lang.js"></script>
+<script type="text/javascript" >
+	if(lang() != 'zh'){
+		
+	}
+</script>
 <style type="text/css">
 .div_foot {
 	height: 30px;
@@ -187,7 +193,6 @@
 		<script src="static/login/js/jquery.mobile.customized.min.js"></script>
 		<script src="static/login/js/camera.min.js"></script>
 		<script src="static/login/js/templatemo_script.js"></script>
-		<script src="static/login/js/ban.js"></script>
 		<script type="text/javascript" src="static/js/jQuery.md5.js"></script>
 		<script type="text/javascript" src="static/js/jquery.tips.js"></script>
 		<script type="text/javascript" src="static/js/jquery.cookie.js"></script>
diff --git a/WebRoot/static/js/control.js b/WebRoot/static/js/control.js
index a93715d..a44d7f0 100644
--- a/WebRoot/static/js/control.js
+++ b/WebRoot/static/js/control.js
@@ -154,7 +154,7 @@
 		var num_ans=$("#num_ans").val();
 		var fraction=$("#fraction").val();
 		if(answer==''){
-			alert("请输入题目答案，以分号隔开");
+			alert("请输入题目答案");
 			return;
 		}else if(fraction==''){
 			alert("请输入题目分数");
diff --git a/WebRoot/static/js/teach_paper.js b/WebRoot/static/js/teach_paper.js
index 42cb8d2..bef22f0 100644
--- a/WebRoot/static/js/teach_paper.js
+++ b/WebRoot/static/js/teach_paper.js
@@ -27,17 +27,13 @@
 					getList();
 				},
 				error: function (XMLHttpRequest, textStatus, errorThrown) {
-				// 错误信息   
-				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				// wrong massage   
+				alert("Status code:"+XMLHttpRequest.status+"Status"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
 				window.top.loading.remove();
 				}
 			})
 
-			//日期框
-			$('.date-picker').datepicker({
-				autoclose: true,
-				todayHighlight: true
-			});
+			
 			window.top.loading.remove();
 		})
 		
@@ -60,14 +56,14 @@
 				success:function(data){
 					console.log(data);
 					for(var i=0;i<data.data.length;i++){
-						tab_html += '<tr data-id="'+data.data[i].PAPER_ID+'" data-classid="'+data.data[i].CLASS_ID+'"><td><input type="checkbox" name="ids" id="ids" value="'+data.data[i].PAPER_ID+'"/>'+(i+1)+'</td><td>'+data.data[i].TITLE+'</td><td>'+getClassName(data.data[i].CLASS_ID)+'</td><td>'+getSubjectName(data.data[i].SUBJECT_ID)+'</td><td>'+data.data[i].EXAM_TIME+'分钟</td><td>'+data.data[i].CREATE_DATE+'</td><td><a onclick="jump($(this))">查看</a></td><td><a href="#" onclick="del($(this));"><img src="../static/images/remove.png" /></a></td></tr>';
+						tab_html += '<tr data-id="'+data.data[i].PAPER_ID+'" data-classid="'+data.data[i].CLASS_ID+'"><td><input type="checkbox" name="ids" id="ids" value="'+data.data[i].PAPER_ID+'"/>'+(i+1)+'</td><td>'+data.data[i].TITLE+'</td><td>'+getClassName(data.data[i].CLASS_ID)+'</td><td>'+getSubjectName(data.data[i].SUBJECT_ID)+'</td><td>'+data.data[i].EXAM_TIME+'分钟</td><td>'+data.data[i].CREATE_DATE+'</td><td><a onclick="jump($(this))">' + view + '</a></td><td><a href="#" onclick="del($(this));"><img src="../static/images/remove.png" /></a></td></tr>';
 					}
 					$("#tab_body").html(tab_html);
 					window.top.loading.remove();
 				},
 				error: function (XMLHttpRequest, textStatus, errorThrown) {
-				// 错误信息   
-				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				// wrong massage   
+				alert("Status code:"+XMLHttpRequest.status+"Status"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
 				window.top.loading.remove();
 			}
 			});
@@ -100,7 +96,7 @@
 				class_id=$(".classList .active").attr("data-classid");
 				location.href="set_question.do?subject_id="+subject_id+"&class_id="+class_id+"&user_id="+user_id;
 			}else{
-				alert("请先选择班级");
+				alert("Please select class first");
 			}
 			window.top.loading.show();
 				console.log($(".classList .active").length);
@@ -117,8 +113,8 @@
 					subjectName=data.data;
 				},
 				error: function (XMLHttpRequest, textStatus, errorThrown) {
-				// 错误信息   
-				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				// wrong massage   
+				alert("Status code:"+XMLHttpRequest.status+"Status"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
 				window.top.loading.remove();
 			}
 			})
@@ -135,8 +131,8 @@
 					className=data.data;
 				},
 				error: function (XMLHttpRequest, textStatus, errorThrown) {
-				// 错误信息   
-				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				// wrong massage   
+				alert("Status code:"+XMLHttpRequest.status+"Status:"+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
 				window.top.loading.remove();
 			}
 			})
@@ -194,7 +190,7 @@
 		function del(obj){       //删除
 			//var remove = new remove();
 			var id=obj.closest("tr").attr("data-id");
-			window.top.remove.init({"title":"删除","func":function(success){
+			window.top.remove.init({"title":"Delete","func":function(success){
 				if(success){
 					var url1 = url+ "/paper/delete.do?PAPER_ID="+id+"&tm="+new Date().getTime();
 					window.top.loading.show();
@@ -209,7 +205,7 @@
 			window.top.remove.show();
 		}
 		function deleteAll(){       //批量删除
-			window.top.remove.init({"title":"删除","func":function(success){
+			window.top.remove.init({"title":"Delete","func":function(success){
 				if(success){
 					var str = '';
 					for(var i=0;i < document.getElementsByName('ids').length;i++){
diff --git a/WebRoot/static/js/test_list.js b/WebRoot/static/js/test_list.js
index 6c63914..53765ad 100644
--- a/WebRoot/static/js/test_list.js
+++ b/WebRoot/static/js/test_list.js
@@ -33,7 +33,7 @@ $(document).ready(
 								},
 								error: function (XMLHttpRequest, textStatus, errorThrown) {
 									// 错误信息   
-									alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+									alert("Status code："+XMLHttpRequest.status+"Status："+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
 									window.top.loading.remove();
 								}
 							})
@@ -83,7 +83,7 @@ function getList(start_date, end_date, class_id) { // 获取测验列表
 				},
 				error: function (XMLHttpRequest, textStatus, errorThrown) {
 					// 错误信息   
-					alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+					alert("Status code："+XMLHttpRequest.status+"Status："+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
 					window.top.loading.remove();
 				}
 			});
@@ -128,7 +128,7 @@ function getClassName(id) { // 获取班级中文名
 		},
 		error: function (XMLHttpRequest, textStatus, errorThrown) {
 				// 错误信息   
-				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				alert("Status code："+XMLHttpRequest.status+"Status："+XMLHttpRequest.readyState+"wrong massage："+textStatus+"");
 				window.top.loading.remove();
 			}
 	})
diff --git a/resources/dbconfig.properties b/resources/dbconfig.properties
index 896903b..0a550a0 100644
--- a/resources/dbconfig.properties
+++ b/resources/dbconfig.properties
@@ -1,5 +1,5 @@
 #数据源 1
-url:jdbc:mysql://47.107.98.47:3306/education?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
+url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 driverClassName:com.mysql.jdbc.Driver
diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml
index 1879d19..0f80e56 100644
--- a/resources/mybatis1/api/V1Mapper.xml
+++ b/resources/mybatis1/api/V1Mapper.xml
@@ -139,10 +139,12 @@
 		 	SELECT
 				sv_teacher.`NAME` AS TEACHER_NAME,
 				sv_grade.`NAME` AS GRADE_NAME,
+				sv_grade.`ENAME` AS GRADE_ENAME,
 				sv_grade.ID AS GRADE_ID,
 				sv_sclass.CLASS_NAME AS CLASS_NAME,
 				sv_sclass.ID AS CLASS_ID,
 				sv_subject.CNAME AS SUBJECT_NAME,
+				sv_subject.ENAME AS SUBJECT_ENAME,
 				sv_subject.ID AS SUBJECT_ID,
 			  	sv_school.`NAME` as SCHOOL_NAME,
 			  	sv_school.ID AS SCHOOL_ID,
diff --git a/src/com/fh/controller/base/BaseController.java b/src/com/fh/controller/base/BaseController.java
index 710f0f6..159a41d 100644
--- a/src/com/fh/controller/base/BaseController.java
+++ b/src/com/fh/controller/base/BaseController.java
@@ -1,6 +1,7 @@
 package com.fh.controller.base;
 
 
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.shiro.session.Session;
@@ -148,4 +149,32 @@ public class BaseController {
 		return schoolName;
 	}
 	
+	public String getCookieLanguage(){
+		Cookie[] cookies = getRequest().getCookies();
+		if (cookies != null) {
+			for (Cookie cookie : cookies) {
+				if (cookie.getName().equals("lang")) {
+					return cookie.getValue();
+				}
+			}
+		}
+		return null;
+	}
+	
+	public String getLang() {
+		String lang = getCookieLanguage();
+		if(lang == null){
+			lang = getRequest().getLocale().getLanguage();
+		}
+		return lang;
+	}
+	
+	public boolean isChineseLanguageClient(){
+		String lang = getLang();
+		if(lang != null && lang.length() >= 2){
+			lang = lang.substring(0,2);
+		}
+		return "zh".equals(getLang());
+	}
+	
 }
diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java
index 2f2d4ff..5a3347d 100644
--- a/src/com/fh/controller/sunvote/paper/PaperController.java
+++ b/src/com/fh/controller/sunvote/paper/PaperController.java
@@ -239,7 +239,11 @@ public class PaperController extends BaseController {
 				ex.printStackTrace();
 			}
 		}
-		mv.setViewName("sunvote/teacher/creat_question");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/teacher/creat_question");
+		}else{
+			mv.setViewName("sunvote/teacher/en_creat_question");
+		}
 		mv.addObject("pd", pd);
 		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
 		return mv;
@@ -278,7 +282,11 @@ public class PaperController extends BaseController {
 			mv.addObject("TEMPLEATE", template);
 		}
 		
-		mv.setViewName("sunvote/teacher/creat_question");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/teacher/creat_question");
+		}else{
+			mv.setViewName("sunvote/teacher/en_creat_question");
+		}
 		mv.addObject("pd", pd);
 		if(paperType != null && "2".equals(paperType)){
 			mv.addObject("JUMP_URL", "/main/admin");
@@ -311,14 +319,19 @@ public class PaperController extends BaseController {
 		pd.put("PAPER_TYPE","1");
 		page.setPd(pd);
 		List<PageData>	varList = paperService.list(page);	//列出Paper列表
-		mv.setViewName("sunvote/paper/paper_list2");
+		page.setLangIsChina(isChineseLanguageClient());
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/paper/paper_list2");
+		}else{
+			mv.setViewName("sunvote/paper/en_paper_list2");
+		}
 		
 		for(PageData p:varList){
 			String examTime = p.getString("EXAM_TIME");
 			if(examTime != null){
 				try{
 					int et = Integer.parseInt(examTime);
-					String min = (et / 60 ) + "" ;
+					String min = (et / 60 ) + "" ;	
 					if(min.length() < 2){
 						min = "0" + min ;
 					}
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index 87e345b..8f78691 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -201,7 +201,11 @@ public class ReportController extends BaseController {
 		mv.addObject("start_date", pd.get("START_DATE"));
 		mv.addObject("end_date", pd.get("END_DATE"));
 		mv.addObject("pd", pd);
-		mv.setViewName("sunvote/teacher/teacher_report_1");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/teacher/teacher_report_1");
+		}else{
+			mv.setViewName("sunvote/teacher/en_teacher_report_1");
+		}
 		return mv;
 	}
 	
@@ -235,7 +239,11 @@ public class ReportController extends BaseController {
 			url += "&SUBJECT_ID=" + pd.getString("SUBJECT_ID");
 		}
 		mv.addObject("URL",url);
-		mv.setViewName("sunvote/teacher/stduent_report");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/teacher/stduent_report");
+		}else{
+			mv.setViewName("sunvote/teacher/en_stduent_report");
+		}
 		mv.addObject("start_date", pd.get("START_DATE"));
 		mv.addObject("end_date", pd.get("END_DATE"));
 		mv.addObject("pd", pd);
@@ -534,8 +542,11 @@ public class ReportController extends BaseController {
 		mv.addObject("studentInfo", studentList);
 		mv.addObject("teacherPd", teacherPd);
 		mv.addObject("subjectPd", subjectPd);
-		
-		mv.setViewName("sunvote/teacher/teacher_report_test");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/teacher/teacher_report_test");
+		}else{
+			mv.setViewName("sunvote/teacher/en_teacher_report_test");
+		}
 		return mv;
 	}
 	
diff --git a/src/com/fh/controller/sunvote/student/StudentController.java b/src/com/fh/controller/sunvote/student/StudentController.java
index 9ceedd5..721fda0 100644
--- a/src/com/fh/controller/sunvote/student/StudentController.java
+++ b/src/com/fh/controller/sunvote/student/StudentController.java
@@ -107,8 +107,11 @@ public class StudentController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		mv.addObject("pd", getPageData());
 		
-		
-		mv.setViewName("sunvote/student/uploadexcel");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/student/uploadexcel");
+		}else{
+			mv.setViewName("sunvote/student/en_uploadexcel");
+		}
 		return mv;
 	}
 	
@@ -257,7 +260,12 @@ public class StudentController extends BaseController {
 		pd = this.getPageData();
 		page.setPd(pd);
 		List<PageData>	varList = studentService.datalistclassPage(page);	//列出Student列表
-		mv.setViewName("sunvote/student/student_list2");
+		page.setLangIsChina(isChineseLanguageClient());
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/student/student_list2");
+		}else{
+			mv.setViewName("sunvote/student/en_student_list2");
+		}
 		mv.addObject("varList", varList);
 		mv.addObject("pd", pd);
 		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
@@ -288,7 +296,11 @@ public class StudentController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		mv.setViewName("sunvote/student/student_edit2");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/student/student_edit2");
+		}else{
+			mv.setViewName("sunvote/student/en_student_edit2");
+		}
 		mv.addObject("msg", "save2");
 		mv.addObject("pd", pd);
 		return mv;
@@ -320,7 +332,11 @@ public class StudentController extends BaseController {
 		String classID = pd.getString("CLASS_ID");
 		pd = studentService.findById(pd);	//根据ID读取
 		pd.put("CLASS_ID", classID);
-		mv.setViewName("sunvote/student/student_edit2");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/student/student_edit2");
+		}else{
+			mv.setViewName("sunvote/student/en_student_edit2");
+		}
 		mv.addObject("msg", "edit2");
 		mv.addObject("pd", pd);
 		return mv;
diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java
index 09b2496..3684fbb 100644
--- a/src/com/fh/controller/sunvote/teacher/TeacherController.java
+++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java
@@ -166,7 +166,11 @@ public class TeacherController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		mv.setViewName("sunvote/teacher/teach_paper");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/teacher/teach_paper");
+		}else{
+			mv.setViewName("sunvote/teacher/en_teach_paper");
+		}
 		pd.put("userId", userId);
 		mv.addObject("pd", pd);
 		return mv;
@@ -204,7 +208,11 @@ public class TeacherController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd.put("userId", userId);
-		mv.setViewName("sunvote/teacher/test_list");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/teacher/test_list");
+		}else{
+			mv.setViewName("sunvote/teacher/en_test_list");
+		}
 		mv.addObject("pd", pd);
 		return mv;
 	}
@@ -224,7 +232,11 @@ public class TeacherController extends BaseController {
 		pd = this.getPageData();
 		pd.put("userId", userId);
 		pd.put("subject_id",  getSubjectID(userId));
-		mv.setViewName("sunvote/teacher/paper_view");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/teacher/paper_view");
+		}else{
+			mv.setViewName("sunvote/teacher/en_paper_view");
+		}
 		mv.addObject("pd", pd);
 		return mv;
 	}
@@ -255,7 +267,11 @@ public class TeacherController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd.put("userId", userId);
-		mv.setViewName("sunvote/teacher/paper_view2");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/teacher/paper_view2");
+		}else{
+			mv.setViewName("sunvote/teacher/en_paper_view2");
+		}
 		mv.addObject("pd", pd);
 		return mv;
 	}
@@ -356,7 +372,11 @@ public class TeacherController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd.put("userId", userId);
-		mv.setViewName("sunvote/teacher/set_question");
+		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/teacher/set_question");
+		}else{
+			mv.setViewName("sunvote/teacher/en_set_question");
+		}
 		mv.addObject("pd", pd);
 		return mv;
 	}
diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java
index ef52d4c..d826ddb 100644
--- a/src/com/fh/controller/system/login/LoginController.java
+++ b/src/com/fh/controller/system/login/LoginController.java
@@ -110,7 +110,11 @@ public class LoginController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd = this.setLoginPd(pd); // 设置登录页面的配置参数
-		mv.setViewName("system/index/login");
+		if(isChineseLanguageClient()){
+			mv.setViewName("system/index/login");
+		}else{
+			mv.setViewName("system/index/en_login");
+		}
 		mv.addObject("pd", pd);
 		return mv;
 	}
@@ -272,7 +276,11 @@ public class LoginController extends BaseController {
 					session.setAttribute(USERNAME + Const.ROLE_ID,
 							"teacher");
 					session.setAttribute(Const.SESSION_USERNAME, USERNAME); // 放入用户名到session
-					mv.setViewName("sunvote/teacher/teacher_main");
+					if(isChineseLanguageClient()){
+						mv.setViewName("sunvote/teacher/teacher_main");
+					}else{
+						mv.setViewName("sunvote/teacher/en_teacher_main");
+					}
 					mv.addObject("user", user);
 					pd.put("SYSNAME", Tools.readTxtFile(Const.SYSNAME)); // 读取系统名称
 					if(pd.get("DEFAULTURL") == null){
@@ -313,7 +321,11 @@ public class LoginController extends BaseController {
 					mv.addObject("gradeInfos", gradeInfos);
 					mv.addObject("subjectInfos", subjectInfos);
 					session.setAttribute(Const.SESSION_USERNAME, USERNAME); // 放入用户名到session
-					mv.setViewName("sunvote/admin/admin_main");
+					if(isChineseLanguageClient()){
+						mv.setViewName("sunvote/admin/admin_main");
+					}else{
+						mv.setViewName("sunvote/admin/en_admin_main");
+					}
 					mv.addObject("user", user);
 					pd.put("SYSNAME", Tools.readTxtFile(Const.SYSNAME)); // 读取系统名称
 					if(pd.get("DEFAULTURL") == null){
@@ -352,10 +364,18 @@ public class LoginController extends BaseController {
 				mv.addObject("user", user);
 				mv.addObject("menuList", menuList);
 			} else {
-				mv.setViewName("system/index/login");// session失效后跳转登录页面
+				if(isChineseLanguageClient()){
+					mv.setViewName("system/index/login");
+				}else{
+					mv.setViewName("system/index/en_login");
+				}
 			}
 		} catch (Exception e) {
-			mv.setViewName("system/index/login");
+			if(isChineseLanguageClient()){
+				mv.setViewName("system/index/login");
+			}else{
+				mv.setViewName("system/index/en_login");
+			}
 			logger.error(e.getMessage(), e);
 		}
 		pd.put("SYSNAME", Tools.readTxtFile(Const.SYSNAME)); // 读取系统名称
@@ -593,7 +613,11 @@ public class LoginController extends BaseController {
 		pd = this.getPageData();
 		pd.put("msg", pd.getString("msg"));
 		pd = this.setLoginPd(pd); // 设置登录页面的配置参数
-		mv.setViewName("system/index/login");
+		if(isChineseLanguageClient()){
+			mv.setViewName("system/index/login");
+		}else{
+			mv.setViewName("system/index/en_login");
+		}
 		mv.addObject("pd", pd);
 		return mv;
 	}
diff --git a/src/com/fh/entity/Page.java b/src/com/fh/entity/Page.java
index 3f306ba..1a47145 100644
--- a/src/com/fh/entity/Page.java
+++ b/src/com/fh/entity/Page.java
@@ -57,23 +57,56 @@ public class Page {
 		this.currentPage = currentPage;
 	}
 	
+	
+	private String total = "共" ;
+	private String articles = "条";
+	private String frist = "首页" ;
+	private String previous = "上一页";
+	private String next = "下一页";
+	private String tail = "尾页" ;
+	private String jump = "跳转" ;
+	private String pageNumber = "页码";
+	private String displayNumber = "显示条数" ;
+	public void setLangIsChina(boolean is){
+		if(is){
+			total = "共" ;
+			articles = "条";
+			frist = "首页" ;
+			previous = "上一页";
+			next = "下一页";
+			tail = "尾页" ;
+			jump = "跳转" ;
+			pageNumber = "页码";
+			displayNumber = "显示条数" ;
+		}else{
+			total = "" ;
+			articles = " articles";
+			frist = "Frist" ;
+			previous = "Previous";
+			next = "Next";
+			tail = "Tail" ;
+			jump = "JUMP" ;
+			pageNumber = "Page number";
+			displayNumber = "Display Number" ;
+		}
+	}
 	//拼接分页 页面及JS函数
 	public String getPageStr() {
 		StringBuffer sb = new StringBuffer();
 		if(totalResult>0){
 			sb.append("	<ul class=\"pagination pull-right no-margin\">\n");
 			if(currentPage==1){
-				sb.append("	<li><a>共"+totalResult+"条</a></li>\n");
-				sb.append("	<li><span style='padding:0'><input type=\"number\" value=\"\" id=\"toGoPage\" style=\"width:50px;text-align:center;float:left\" placeholder=\"页码\"/></span></li>\n");
-				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"toTZ();\"  class=\"btn btn-mini btn-success\">跳转</a></li>\n");
-				sb.append("	<li><a>首页</a></li>\n");
-				sb.append("	<li><a>上页</a></li>\n");
+				sb.append("	<li><a>" + total +totalResult+articles + "</a></li>\n");
+				sb.append("	<li><span style='padding:0'><input type=\"number\" value=\"\" id=\"toGoPage\" style=\"width:50px;text-align:center;float:left\" placeholder=\"" + pageNumber + "\"/></span></li>\n");
+				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"toTZ();\"  class=\"btn btn-mini btn-success\">" + jump + "</a></li>\n");
+				sb.append("	<li><a>" + frist + "</a></li>\n");
+				sb.append("	<li><a>" + previous + "</a></li>\n");
 			}else{
-				sb.append("	<li><a>共<font color=red>"+totalResult+"</font>条</a></li>\n");
-				sb.append("	<li><input type=\"number\" value=\"\" id=\"toGoPage\" style=\"width:50px;text-align:center;float:left\" placeholder=\"页码\"/></li>\n");
-				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"toTZ();\"  class=\"btn btn-mini btn-success\">跳转</a></li>\n");
-				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"nextPage(1)\">首页</a></li>\n");
-				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"nextPage("+(currentPage-1)+")\">上页</a></li>\n");
+				sb.append("	<li><a>"+ total +"<font color=red>"+totalResult+"</font>" + articles + "</a></li>\n");
+				sb.append("	<li><input type=\"number\" value=\"\" id=\"toGoPage\" style=\"width:50px;text-align:center;float:left\" placeholder=\"" + pageNumber + "\"/></li>\n");
+				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"toTZ();\"  class=\"btn btn-mini btn-success\">" + jump + "</a></li>\n");
+				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"nextPage(1)\">" + frist + "</a></li>\n");
+				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"nextPage("+(currentPage-1)+")\">" + previous + "</a></li>\n");
 			}
 			int showTag = 5;//分页标签显示数量
 			int startTag = 1;
@@ -88,14 +121,14 @@ public class Page {
 					sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"nextPage("+i+")\">"+i+"</a></li>\n");
 			}
 			if(currentPage==totalPage){
-				sb.append("	<li><a>下页</a></li>\n");
-				sb.append("	<li><a>尾页</a></li>\n");
+				sb.append("	<li><a>" + next + "</a></li>\n");
+				sb.append("	<li><a>" + tail + "</a></li>\n");
 			}else{
-				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"nextPage("+(currentPage+1)+")\">下页</a></li>\n");
-				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"nextPage("+totalPage+")\">尾页</a></li>\n");
+				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"nextPage("+(currentPage+1)+")\">" + next + "</a></li>\n");
+				sb.append("	<li style=\"cursor:pointer;\"><a onclick=\"nextPage("+totalPage+")\">" + tail + "</a></li>\n");
 			}
-			sb.append("	<li><a>共"+totalPage+"页</a></li>\n");
-			sb.append("	<li><span class=\"enter\"><select title='显示条数' style=\"width:55px;float:left;height:32px;margin-top:1px;border:0\" onchange=\"changeCount(this.value)\">\n");
+			sb.append("	<li><a>" + total +totalResult+articles + "</a></li>\n");
+			sb.append("	<li><span class=\"enter\"><select title='" + displayNumber + "' style=\"width:55px;float:left;height:32px;margin-top:1px;border:0\" onchange=\"changeCount(this.value)\">\n");
 			sb.append("	<option value='"+showCount+"'>"+showCount+"</option>\n");
 			sb.append("	<option value='10'>10</option>\n");
 			sb.append("	<option value='20'>20</option>\n");
@@ -216,4 +249,5 @@ public class Page {
 		this.pd = pd;
 	}
 	
+	
 }
