diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp
index dca2ff4..5c9a17a 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp
@@ -29,7 +29,6 @@
 			<div class="page-content">
 				<div class="row">
 					<div class="col-xs-12">
-					
 					<form action="teacher/${msg }.do" name="Form" id="Form" method="post">
 						<input type="hidden" name="ID" id="ID" value="${pd.ID}"/>
 						<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 241ad6d..90695c4 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -38,6 +38,9 @@
 		<div class="out">
 			<a href="../logout"><img src="../static/images/close.png" />退出登录</a>
 		</div>
+		<div class="out" style="margin-right:20px;">
+			<a onclick="editInfo()"><img src="../static/images/psw_edit.png" />个人设置</a>
+		</div>
 		<div class="clear"></div>
 	</div>
 	<div class="content">
@@ -51,8 +54,8 @@
 					<p id="name">${pd.TEACHER.TNAME }</p>
 					<p id="school">${pd.TEACHER.SNAME }</p>
 				</div>
-					<br/>
 			<br/>
+			<br />
 			<br/>
 			</div>
 			
@@ -217,6 +220,17 @@
 			//}
 		}
 		
+		function editInfo(){
+			window.top.modal.init({
+				'title':'个人设置',
+				'url':'<%=basePath%>teacher/goEdit3.do?teacher_id=${pd.TEACHER.ID}',
+				func:function() {
+					//tosearch();
+				}
+				});
+				window.top.modal.show();
+		}
+		
 		$("#time_submit").click(function(){
 			var name = $("#enter_title").val();
 			var time = $("#enter_time").val();
@@ -249,6 +263,8 @@
 			//}
 		});
 		
+		
+		
 		var defaultUrl = '${pd.DEFAULTURL}' ;
 		if(defaultUrl != '' && defaultUrl != ''){
 			$("#mainFrame").attr('src',defaultUrl);
diff --git a/WebRoot/static/images/psw_edit.png b/WebRoot/static/images/psw_edit.png
new file mode 100644
index 0000000..e0fef26
--- /dev/null
+++ b/WebRoot/static/images/psw_edit.png