修改登录和修改密码页面样式；

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

@@ -83,16 +83,20 @@
             <div class="loginbox">
                 <form action="${ctx}/mark/reset" method="post" role="form" id="loginForm">
                     <div class="input-group">
+                    	<img src="${ctxStatic}/images/userid.png" class="input-icon">
                         <input type="text" class="form-control required" id="loginName" name="name" placeholder="请输入姓名" autocomplete="off" value="${loginName }"
                                data-i18n-placeholder="user.reset.name"/>
                     </div>
-                    <div class="input-group">
+                    <div class="input-group input-top">
+                    	<img src="${ctxStatic}/images/empno.png" class="input-icon">
                         <input type="text" class="form-control required" id="empno" name="empno" placeholder="请输入工号" autocomplete="off"/>
                     </div>
-                    <div class="input-group">
+                    <div class="input-group input-top">
+                   		 <img src="${ctxStatic}/images/password.png" class="input-icon">
                         <input type="password" class="form-control required" id="password" name="password" placeholder="请输入4位以上新密码" autocomplete="off" data-i18n-placeholder="user.reset.password"/>
                     </div>
-                    <div class="input-group">
+                    <div class="input-group input-top">
+                    	<img src="${ctxStatic}/images/password.png" class="input-icon">
                         <input type="password" class="form-control required" id=password2 name="password2" placeholder="再次输入密码" autocomplete="off" data-i18n-placeholder="user.reset.password.again"/>
                     </div>
                     <div class="point <c:if test="${message == null }">hide</c:if>">

stmms-web/src/main/webapp/WEB-INF/views/modules/student/login.jsp

@@ -32,10 +32,12 @@
             <div class="loginbox">
                 <form action="${ctx}/student/${school.id}" method="post" role="form" id="loginForm">
                     <div class="input-group">
+                    	<img src="${ctxStatic}/images/userid.png" class="input-icon">
                         <input type="text" class="form-control required" name="studentCode" placeholder="请输入学号"
                                autocomplete="off" value="${studentCode }" data-i18n-placeholder="student.search.code"/>
                     </div>
-                    <div class="input-group">
+                    <div class="input-group input-top">
+                    	<img src="${ctxStatic}/images/userid.png" class="input-icon">
                         <input type="text" class="form-control required" name="name" placeholder="请输入姓名"
                                autocomplete="off" value="${name }" data-i18n-placeholder="student.search.name"/>
                     </div>

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/login.jsp

@@ -57,10 +57,12 @@
                 <input id="loginType" name="loginType" value=<c:if test="${loginType == null}">'admin-login'</c:if>
                 <c:if test="${loginType != null}">"${loginType}"</c:if>/>
                 <div class="input-group">
+                	 <img src="${ctxStatic}/images/userid.png" class="input-icon">
                     <input type="text" class="form-control required" id="loginName" name="loginName" placeholder="请输入账号"
                            autocomplete="off" value="${loginName }" data-i18n-placeholder="user.login.name"/>
                 </div>
-                <div class="input-group">
+                <div class="input-group input-top">
+                	<img src="${ctxStatic}/images/password.png" class="input-icon">
                     <input type="password" class="form-control required" id="password" name="password" placeholder="请输入密码"
                            autocomplete="off" data-i18n-placeholder="user.login.password"/>
                 </div>

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

@@ -86,16 +86,20 @@
             <div class="loginbox">
                 <form action="${ctx}/admin/reset" method="post" role="form" id="loginForm">
                     <div class="input-group">
+                    	<img src="${ctxStatic}/images/userid.png" class="input-icon">
                         <input type="text" class="form-control required" id="loginName" name="name" placeholder="请输入姓名" autocomplete="off" value="${loginName }"
                                data-i18n-placeholder="user.reset.name"/>
                     </div>
-                    <div class="input-group">
+                    <div class="input-group input-top">
+                    	<img src="${ctxStatic}/images/empno.png" class="input-icon">
                         <input type="text" class="form-control required" id="empno" name="empno" placeholder="请输入工号" autocomplete="off"/>
                     </div>
-                    <div class="input-group">
+                    <div class="input-group input-top">
+                    	<img src="${ctxStatic}/images/password.png" class="input-icon">
                         <input type="password" class="form-control required" id="password" name="password" placeholder="请输入密码" autocomplete="off" data-i18n-placeholder="user.reset.password"/>
                     </div>
-                    <div class="input-group">
+                    <div class="input-group input-top">
+                    	<img src="${ctxStatic}/images/password.png" class="input-icon">
                         <input type="password" class="form-control required" id=password2 name="password2" placeholder="再次输入密码" autocomplete="off" data-i18n-placeholder="user.reset.password.again"/>
                     </div>
                     <div class="point <c:if test="${message == null }">hide</c:if>">

stmms-web/src/main/webapp/sql/upgrade/1.3.14.sql

@@ -491,25 +491,26 @@ CREATE TABLE `task_child` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
--- Table structure for import_sign_page
+-- Table structure for sign_page
 -- ----------------------------
-DROP TABLE IF EXISTS `import_sign_page`;
-CREATE TABLE `import_sign_page` (
-  `exam_id` int(5) NOT NULL,
+DROP TABLE IF EXISTS `sign_page`;
+CREATE TABLE `sign_page` (
+  `exam_id` int(11) NOT NULL,
+  `exam_number` varchar(30) NOT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
-  `exam_room` varchar(100) DEFAULT NULL,
-  `student_code` varchar(50) NOT NULL,
-  `student_name` varchar(100) DEFAULT NULL,
-  `subject_code` varchar(30) NOT NULL,
-  `subject_name` varchar(50) DEFAULT NULL,
-  `exam_number` varchar(20) NOT NULL,
-  `pagelist` varchar(50) DEFAULT NULL,
-  `is_absent` int(2) DEFAULT NULL,
-  `edit_time` varchar(30) DEFAULT NULL,
-  `edit_user` varchar(50) DEFAULT NULL,
-  PRIMARY KEY (`exam_number`,`exam_id`),
-  KEY `student_code_2` (`student_code`),
-  KEY `exam_number` (`exam_number`)
+  `page_no` varchar(11) NOT NULL,
+  `xh` int(10) NOT NULL,
+  `Card_DefCount` int(3) DEFAULT NULL,
+  `subject_code` varchar(30) DEFAULT NULL,
+  `sign_page_src` longtext,
+  `scan_remark` longtext,
+  `Card_type` varchar(50) DEFAULT NULL,
+  `img_name` varchar(50) NOT NULL,
+  `is_upload` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
+  `DiskSerNo` varchar(30) DEFAULT NULL,
+  `check_status` int(2) DEFAULT NULL,
+  PRIMARY KEY (`img_name`,`xh`,`exam_id`),
+  KEY `exam_number` (`exam_number`,`exam_site`,`page_no`,`subject_code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------

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

@@ -152,6 +152,7 @@ a:hover, a:focus, a:focus-within,a:active, a:visited{
 /*input*/
 .input-group {
 	width: 100%;
+	position:relative;  
 }
 .input-group input {
 	width: 100%;
@@ -175,33 +176,42 @@ a:hover, a:focus, a:focus-within,a:active, a:visited{
 	-moz-box-shadow: 0px 10px 15px 0px rgba(203,205,211,.1);
 	box-shadow: 0px 10px 15px 0px rgba(203,205,211,.1);
 }
-input#loginName {
-	background: url(../images/userid.png) no-repeat 20px 50%;
+.input-icon{
+	position:absolute;  
+	left:15px; 
+	top:15px;
+	z-index:1;
+}
+.input-top{
+	margin-top: 20px;
+}
+/* input#loginName {
+	 background: url(../images/userid.png) no-repeat 20px 50%;
 }
 input#loginName:focus {
 	background: url(../images/userid-on.png) no-repeat 20px 50% #FFF;
 }
 input#password {
-	background: url(../images/password.png) no-repeat 20px 50%;
+ 	background: url(../images/password.png) no-repeat 20px 50%;
 	margin-top: 20px;
 }
 input#password:focus {
 	background: url(../images/password-on.png) no-repeat 20px 50% #FFF;
-}
+} 
 input#password2 {
-	background: url(../images/password2.png) no-repeat 20px 50%;
+	/* background: url(../images/password2.png) no-repeat 20px 50%;
 	margin-top: 20px;
 }
 input#password2:focus {
 	background: url(../images/password2-on.png) no-repeat 20px 50% #FFF;
 }
 input#empno {
-	background: url(../images/empno.png) no-repeat 20px 50%;
+	background: url(../images/empno.png) no-repeat 20px 50%; 
 	margin-top: 20px;
 }
 input#empno:focus {
 	background: url(../images/empno-on.png) no-repeat 20px 50% #FFF;
-}
+}  */
 input:-internal-autofill-selected{
 	background: none!important;
 }