update

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/service/impl/UserServiceImpl.java

@@ -271,7 +271,8 @@ public class UserServiceImpl implements UserService {
                     user.setSchoolId(exam.getSchoolId());
                     user.setCreatedTime(new Date());
                     if (random) {
-                        password = String.valueOf(Math.random() * 9000 + 1000);
+                        int i = (int) (Math.random() * 9000);
+                        password = String.valueOf(i + 1000);
                         user.setPassword(EncryptUtils.md5(password));
                         user.setRandomPassword(password);
                     } else {

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/rejectHistory.jsp

@@ -175,7 +175,7 @@
     function goSearch() {
         $("#pageNumber").val(1);
         $("#pageSize").val('${query.pageSize}');
-        $("#searchForm").attr('action', '${ctx}/admin/exam/reject/hisotry');
+        $("#searchForm").attr('action', '${ctx}/admin/exam/reject/history');
         $("#searchForm").submit();
         return false;
     }

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/reset.jsp

@@ -6,6 +6,11 @@
     <meta name="decorator" content="default"/>
     <%@include file="/WEB-INF/views/include/head.jsp" %>
     <link rel="stylesheet" href="${ctxStatic}/common/login.css">
+	<style type="text/css">
+	.right {
+	padding: 45px 130px;
+	}     
+     </style>
     <script type="text/javascript">
         $(document).ready(function () {
             <!--针对nw.js评卷客户端，自动窗口最大化-->

stmms-web/src/main/webapp/static/common/login.css

@@ -108,7 +108,7 @@ input {
 	float: left;
 	width: 100%;
 	height: 540px;
-	padding: 45px 130px;
+	padding: 90px 130px;
 }
 /*title*/
 .title h1 {
@@ -189,11 +189,11 @@ input#password:focus {
 	background: url(../images/password-on.png) no-repeat 20px 50% #FFF;
 }
 input#password2 {
-	background: url(../images/password.png) no-repeat 20px 50%;
+	background: url(../images/password2.png) no-repeat 20px 50%;
 	margin-top: 20px;
 }
 input#password2:focus {
-	background: url(../images/password-on.png) no-repeat 20px 50% #FFF;
+	background: url(../images/password2-on.png) no-repeat 20px 50% #FFF;
 }
 input#empno {
 	background: url(../images/empno.png) no-repeat 20px 50%;