ting.yin 3 년 전
부모
커밋
3f9e39a4b8

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -36,7 +36,7 @@ public class UserController extends BaseController {
     public static final String SUBJECT_CODE_SPLIT = ",";
 
     public static Role[] ROLE_LIST = { Role.SCANNER, Role.SUBJECT_HEADER, Role.INSPECTOR, Role.MARKER,
-            Role.SCHOOL_VIEWER };
+            Role.SCHOOL_VIEWER, Role.SCHOOL_ADMIN };
 
     @Autowired
     private UserService userService;

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/arbitrateList.jsp

@@ -106,7 +106,7 @@
                     </c:if>
                 </td>
 				<td>
-				    <c:if test="${result.status.value==0 || result.status.value==1}">
+				    <c:if test="${(result.status.value==0 || result.status.value==1) && (result.totalScore!= -1)}">
                     <a href="${ctx}/web/admin/exam/arbitrate/start?historyId=${result.id}" target="_blank" class="process-link">处理</a>
 					</c:if>
 				</td>

+ 9 - 3
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/selectiveList.jsp

@@ -19,7 +19,7 @@
 			&nbsp;		
 			<a class="btn" href="${ctx}/admin/exam/paper">返回</a>
 			&nbsp;
-			<a href="${ctx}/admin/exam/selectiveGroup/clear?subjectCode=${subject.code}" class="delete-button">清空选做题分组设置</a>
+			<a href="${ctx}/admin/exam/selectiveGroup/clear?subjectCode=${subject.code}" class="delete-button btn">清空选做题分组设置</a>
 		</div>
 		<div>
 		<label>合分数量:</label><input name="selectiveCount" min="1" class="digits" type="number" id="selectiveCount" value="${selectiveCount }"/> 
@@ -62,14 +62,20 @@ $('#btnSubmit').click(function () {
         alert('请选择题目');
         return false;
     }
-	if(!$("#selectiveCount").val()){
+	var count = $("#selectiveCount").val();
+	if(count==null ||count==""){
 		alert("合分数量不能为空");
 		return;
 	}
-	if($("#selectiveCount").val()>=check_list.length || $("#selectiveCount").val()<1){
+	if(!(/(^[1-9]\d*$)/.test(count))){
+		alert("合分数量必须是正整数");
+		return;
+	}
+	if(count>=check_list.length || count<1){
 		alert("合分数量必须小于选择的题目数量且大于等于1");
 		return;
 	}
+	
    $('#inputForm').submit();
 });
 $('.delete-button').click(function () {