Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
luoshi
/
stmms-ft
1
0
Салаа 0
Файлууд
Эх сурвалжийг харах

fix bugs

ting.yin 5 жил өмнө
parent
0413100e05
commit
3380f82607
8 өөрчлөгдсөн 61 нэмэгдсэн , 16 устгасан
Өөрчлөллтийг нэгтгэж харах Өөрчлөлтийн статистик харах
  1. 1 1
      stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/SubjectiveQuestionDTO.java
  2. 2 2
      stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ExamController.java
  3. 4 0
      stmms-web/src/main/webapp/WEB-INF/views/modules/mark/picConfig.jsp
  4. 14 13
      stmms-web/src/main/webapp/WEB-INF/views/modules/mark/reset.jsp
  5. 10 0
      stmms-web/src/main/webapp/static/i18n/messages.properties
  6. 10 0
      stmms-web/src/main/webapp/static/i18n/messages_en.properties
  7. 10 0
      stmms-web/src/main/webapp/static/i18n/messages_ja.properties
  8. 10 0
      stmms-web/src/main/webapp/static/i18n/messages_zh.properties

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/SubjectiveQuestionDTO.java
Файл харах 

@@ -72,7 +72,7 @@ public class SubjectiveQuestionDTO implements QuestionDTO {
 
         setScorePolicy(group != null && group.getScorePolicy() != null ? group.getScorePolicy().getValue()
 
         setScorePolicy(group != null && group.getScorePolicy() != null ? group.getScorePolicy().getValue()
 
                 : ScorePolicy.AVG.getValue());
 
                 : ScorePolicy.AVG.getValue());
 
         setMarkMode(group != null && group.getMarkMode() != null ? group.getMarkMode().getName() : "");
 
         setMarkMode(group != null && group.getMarkMode() != null ? group.getMarkMode().getName() : "");
 
-        setTrialCount(group != null ? group.getTrialCount() : 0);
 
+        setTrialCount(group != null&& group.getTrialCount() != null  ? group.getTrialCount() : 0);
 
     }
 
     }
 
 
 
     public ExamQuestion transform() {
 
     public ExamQuestion transform() {

+ 2 - 2
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ExamController.java
Файл харах 

@@ -246,8 +246,8 @@ public class ExamController extends BaseExamController {
 
             model.addAttribute("imageServer", imageServer);
 
             model.addAttribute("imageServer", imageServer);
 
             return "modules/mark/picConfig";
 
             return "modules/mark/picConfig";
 
         } else {
 
         } else {
 
-            addMessage(redirectAttributes, "参数有误");
 
-            return "redirect:/admin/exam-list";
 
+            model.addAttribute("message", "参数有误");
 
+            return "modules/mark/picConfig";
 
         }
 
         }
 
     }
 
     }

+ 4 - 0
stmms-web/src/main/webapp/WEB-INF/views/modules/mark/picConfig.jsp
Файл харах 

@@ -48,6 +48,10 @@
 
 </body>
 
 </body>
 
 
 
 <script type="text/javascript">
 
 <script type="text/javascript">
 
+var message = '${message}';
 
+if(message!=null&&message!=''&&message!=undefined){
 
+	alert(message);
 
+}
 
 var image_server = '${imageServer}';
 
 var image_server = '${imageServer}';
 
 var pictureConfig = '${pictureConfig}';
 
 var pictureConfig = '${pictureConfig}';
 
 var picUrls = '${picUrls}';
 
 var picUrls = '${picUrls}';

+ 14 - 13
stmms-web/src/main/webapp/WEB-INF/views/modules/mark/reset.jsp
Файл харах 

@@ -2,7 +2,7 @@
 
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 
 <html>
 
 <html>
 
 <head>
 
 <head>
 
-	<title>评卷员设置</title>
 
+	<title><spring:message code="user.reset.title"/></title>
 
 	<meta name="decorator" content="default"/>
 
 	<meta name="decorator" content="default"/>
 
 	<%@include file="/WEB-INF/views/include/head.jsp" %>
 
 	<%@include file="/WEB-INF/views/include/head.jsp" %>
 
     <link rel="stylesheet" href="${ctxStatic}/common/login.css">
 
     <link rel="stylesheet" href="${ctxStatic}/common/login.css">
 
@@ -17,26 +17,26 @@
 
 			$('#submit-button').click(function(){
 
 			$('#submit-button').click(function(){
 
 				var name = $('#loginName').val();
 
 				var name = $('#loginName').val();
 
 				if(name==''){
 
 				if(name==''){
 
-					showError('请输入姓名');
 
+					showError($.i18n.prop("user.reset.name"));
 
 					return false;
 
 					return false;
 
 				}
 
 				}
 
 				if(name.length>10){
 
 				if(name.length>10){
 
-					showError('姓名长度不应超过10个字');
 
+					showError($.i18n.prop("user.reset.name.length"));
 
 					return false;
 
 					return false;
 
 				}
 
 				}
 
 
 
 				var password = $('#password').val();
 
 				var password = $('#password').val();
 
 				var password2 = $('#password2').val();
 
 				var password2 = $('#password2').val();
 
 				if(password==''){
 
 				if(password==''){
 
-					showError('请输入密码');
 
+					showError($.i18n.prop("user.reset.password"));
 
 					return false;
 
 					return false;
 
 				}
 
 				}
 
-				if(password.length>8){
 
-					showError('密码长度不应超过8个字符');
 
+				if(password.length>8 || password.length<4){
 
+					showError($.i18n.prop("user.reset.password.length"));
 
 					return false;
 
 					return false;
 
 				}
 
 				}
 
 				if(password!=password2){
 
 				if(password!=password2){
 
-					showError('两次密码输入内容不一致');
 
+					showError($.i18n.prop("user.reset.password.same"));
 
 					return false;
 
 					return false;
 
 				}
 
 				}
 
 				return true;
 
 				return true;
 
@@ -52,6 +52,7 @@
 
 		if(self.frameElement && self.frameElement.tagName=="IFRAME"){
 
 		if(self.frameElement && self.frameElement.tagName=="IFRAME"){
 
 			parent.location.reload();
 
 			parent.location.reload();
 
 		}
 
 		}
 
+		load();
 
 	</script>
 
 	</script>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -63,26 +64,26 @@
 
 	   </div>
 
 	   </div>
 
 	   <div class="right">
 
 	   <div class="right">
 
 	     <div class="title">
 
 	     <div class="title">
 
-	       <h1>首次登陆，请完善资料</h1>
 
+	       <h1 data-i18n-text="user.reset.title">首次登陆，请完善资料</h1>
 
 	       <br/>
 
 	       <br/>
 
 	     </div>
 
 	     </div>
 
 	     <div class="loginbox">
 
 	     <div class="loginbox">
 
 	      <form action="${ctx}/mark/reset" method="post" role="form" id="loginForm">
 
 	      <form action="${ctx}/mark/reset" method="post" role="form" id="loginForm">
 
 	        <div class="input-group">
 
 	        <div class="input-group">
 
-	        	<input type="text" class="form-control required" id="loginName" name="name" placeholder="请输入姓名" autocomplete="off" value="${loginName }"/>
 
+	        	<input type="text" class="form-control required" id="loginName" name="name" placeholder="请输入姓名" autocomplete="off" value="${loginName }" data-i18n-placeholder="user.reset.name"/>
 
 	        </div>
 
 	        </div>
 
 	        <div class="input-group">
 
 	        <div class="input-group">
 
-	        	<input type="password" class="form-control required" id="password" name="password" placeholder="请输入密码" autocomplete="off"/>
 
+	        	<input type="password" class="form-control required" id="password" name="password" placeholder="请输入密码" autocomplete="off" data-i18n-placeholder="user.reset.password"/>
 
 	        </div>
 
 	        </div>
 
 	        <div class="input-group">
 
 	        <div class="input-group">
 
-	        	<input type="password" class="form-control required" id=password2 name="password2" placeholder="再次输入密码" autocomplete="off"/>
 
+	        	<input type="password" class="form-control required" id=password2 name="password2" placeholder="再次输入密码" autocomplete="off" data-i18n-placeholder="user.reset.password.again"/>
 
 	        </div>
 
 	        </div>
 
 	        <div class="point hide">
 
 	        <div class="point hide">
 
 	        <em class="error"></em>
 
 	        <em class="error"></em>
 
 	        </div>
 
 	        </div>
 
 	        <div class="login-btn">
 
 	        <div class="login-btn">
 
-	        	<input class="opacity" type="submit" id="submit-button" value="确 定"/>
 
-	        	<a href="${ctx}/logout" class="opacity">退 出</a>
 
+	        	<input class="opacity" type="submit" id="submit-button" value="确 定" data-i18n-value="user.reset.subimt"/>
 
+	        	<a href="${ctx}/logout" class="opacity" data-i18n-text="user.reset.logou">退 出</a>
 
 	        </div>
 
 	        </div>
 
 	      </form>
 
 	      </form>
 
 	     </div>
 
 	     </div>

+ 10 - 0
stmms-web/src/main/webapp/static/i18n/messages.properties
Файл харах 

@@ -11,6 +11,16 @@ user.login.error.group=\u5927\u9898\u4e0d\u5b58\u5728
 
 user.login.error.disabled=\u5e10\u53f7\u5df2\u7981\u7528
 
 user.login.error.disabled=\u5e10\u53f7\u5df2\u7981\u7528
 
 user.login.error.password=\u5bc6\u7801\u9519\u8bef
 
 user.login.error.password=\u5bc6\u7801\u9519\u8bef
 
 user.login.error.access=\u7528\u6237\u6ca1\u6709\u8bbf\u95ee\u6743\u9650
 
 user.login.error.access=\u7528\u6237\u6ca1\u6709\u8bbf\u95ee\u6743\u9650
 
+#reset
 
+user.reset.submit=\u786e\u5b9a
 
+user.reset.logout=\u9000\u51fa
 
+user.reset.title=\u9996\u6b21\u767b\u9646\uff0c\u8bf7\u5b8c\u5584\u8d44\u6599
 
+user.reset.name=\u8f93\u5165\u7528\u6237\u540d
 
+user.reset.password=\u8f93\u5165\u65b0\u5bc6\u7801
 
+user.reset.again=\u518d\u6b21\u8f93\u5165\u65b0\u5bc6\u7801
 
+user.reset.name.length=\u957f\u5ea6\u4e0d\u80fd\u8d85\u8fc710\u4e2a\u5b57
 
+user.reset.password.same=\u4e24\u6b21\u5bc6\u7801\u8bf7\u4fdd\u6301\u4e00\u81f4
 
+user.reset.password.length=\u5bc6\u7801\u7684\u957f\u5ea6\u81f3\u5c114\u4f4d\uff0c\u4e0d\u80fd\u8d85\u8fc78\u4f4d
 
 #mark-control
 
 #mark-control
 
 mark.control.assistant=\u5c0f\u52a9\u624b
 
 mark.control.assistant=\u5c0f\u52a9\u624b
 
 mark.control.mode.track=\u5207\u6362\u5230\u8f68\u8ff9\u6a21\u5f0f
 
 mark.control.mode.track=\u5207\u6362\u5230\u8f68\u8ff9\u6a21\u5f0f

+ 10 - 0
stmms-web/src/main/webapp/static/i18n/messages_en.properties
Файл харах 

@@ -11,6 +11,16 @@ user.login.error.group=the question group is not exist
 
 user.login.error.disabled=Account disabled
 
 user.login.error.disabled=Account disabled
 
 user.login.error.password=Password error
 
 user.login.error.password=Password error
 
 user.login.error.access=User does not have access
 
 user.login.error.access=User does not have access
 
+#reset
 
+user.reset.submit=Submit
 
+user.reset.logout=Logout
 
+user.reset.title=Supplement personal information
 
+user.reset.name=press your name
 
+user.reset.password=press new password
 
+user.reset.again=press new password again
 
+user.reset.name.length=length cannot exceed 10 words
 
+user.reset.password.same=please keep the same password twice
 
+user.reset.password.length=password must be at least 4 word,cannot exceed 8 words
 
 #mark-control
 
 #mark-control
 
 mark.control.assistant=Assistant
 
 mark.control.assistant=Assistant
 
 mark.control.mode.track=Track Mode
 
 mark.control.mode.track=Track Mode

+ 10 - 0
stmms-web/src/main/webapp/static/i18n/messages_ja.properties
Файл харах 

@@ -11,6 +11,16 @@ user.login.error.group=\u8a72\u5f53\u3059\u308b\u30b0\u30eb\u30fc\u30d7\u306f\u5
 
 user.login.error.disabled=\u30a2\u30ab\u30a6\u30f3\u30c8\u306f\u7981\u6b62\u3055\u308c\u305f
 
 user.login.error.disabled=\u30a2\u30ab\u30a6\u30f3\u30c8\u306f\u7981\u6b62\u3055\u308c\u305f
 
 user.login.error.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u30a8\u30e9\u30fc
 
 user.login.error.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u30a8\u30e9\u30fc
 
 user.login.error.access=\u30e6\u30fc\u30b6\u30fc\u306f\u30b7\u30b9\u30c6\u30e0\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u6a29\u9650\u3092\u6301\u3061\u307e\u305b\u3093
 
 user.login.error.access=\u30e6\u30fc\u30b6\u30fc\u306f\u30b7\u30b9\u30c6\u30e0\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u6a29\u9650\u3092\u6301\u3061\u307e\u305b\u3093
 
+#reset
 
+user.reset.submit=\u78ba\u8a8d
 
+user.reset.logout=\u30ed\u30b0\u30a2\u30a6\u30c8
 
+user.reset.title=\u521d\u30ed\u30b0\u30a4\u30f3\u306a\u306e\u3067\uff0c\u8cc7\u6599\u3092\u5b8c\u5099\u3057\u3066\u4e0b\u3055\u3044
 
+user.reset.name=\u30e6\u30fc\u30b6\u30fc\u30cd\u30fc\u30e0\u3092\u5165\u529b\u4e0b\u3055\u3044
 
+user.reset.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u4e0b\u3055\u3044
 
+user.reset.again=\u518d\u3073\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u4e0b\u3055\u3044
 
+user.reset.name.length=\u9577\u3055\u306f8\u6841\u3092\u8d85\u3048\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
 
+user.reset.password.same=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u4e00\u81f4\u3057\u3066\u4e0b\u3055\u3044
 
+user.reset.password.length=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u9577\u3055\u306f\uff14\u6841\u4ee5\u4e0a\u3001\uff18\u6841\u4ee5\u4e0b\u3068\u306a\u308a\u307e\u3059
 
 #mark-control
 
 #mark-control
 
 mark.control.assistant=\u30a2\u30b7\u30b9\u30bf\u30f3\u30c8
 
 mark.control.assistant=\u30a2\u30b7\u30b9\u30bf\u30f3\u30c8
 
 mark.control.mode.track=\u8ecc\u8de1\u30e2\u30fc\u30c9\u3078
 
 mark.control.mode.track=\u8ecc\u8de1\u30e2\u30fc\u30c9\u3078

+ 10 - 0
stmms-web/src/main/webapp/static/i18n/messages_zh.properties
Файл харах 

@@ -11,6 +11,16 @@ user.login.error.group=\u5927\u9898\u4e0d\u5b58\u5728
 
 user.login.error.disabled=\u5e10\u53f7\u5df2\u7981\u7528
 
 user.login.error.disabled=\u5e10\u53f7\u5df2\u7981\u7528
 
 user.login.error.password=\u5bc6\u7801\u9519\u8bef
 
 user.login.error.password=\u5bc6\u7801\u9519\u8bef
 
 user.login.error.access=\u7528\u6237\u6ca1\u6709\u8bbf\u95ee\u6743\u9650
 
 user.login.error.access=\u7528\u6237\u6ca1\u6709\u8bbf\u95ee\u6743\u9650
 
+#reset
 
+user.reset.submit=\u786e\u5b9a
 
+user.reset.logout=\u9000\u51fa
 
+user.reset.title=\u9996\u6b21\u767b\u9646\uff0c\u8bf7\u5b8c\u5584\u8d44\u6599
 
+user.reset.name=\u8f93\u5165\u7528\u6237\u540d
 
+user.reset.password=\u8f93\u5165\u65b0\u5bc6\u7801
 
+user.reset.again=\u518d\u6b21\u8f93\u5165\u65b0\u5bc6\u7801
 
+user.reset.name.length=\u957f\u5ea6\u4e0d\u80fd\u8d85\u8fc710\u4e2a\u5b57
 
+user.reset.password.same=\u4e24\u6b21\u5bc6\u7801\u8bf7\u4fdd\u6301\u4e00\u81f4
 
+user.reset.password.length=\u5bc6\u7801\u7684\u957f\u5ea6\u81f3\u5c114\u4f4d\uff0c\u4e0d\u80fd\u8d85\u8fc78\u4f4d
 
 #mark-control
 
 #mark-control
 
 mark.control.assistant=\u5c0f\u52a9\u624b
 
 mark.control.assistant=\u5c0f\u52a9\u624b
 
 mark.control.mode.track=\u5207\u6362\u5230\u8f68\u8ff9\u6a21\u5f0f
 
 mark.control.mode.track=\u5207\u6362\u5230\u8f68\u8ff9\u6a21\u5f0f