Selaa lähdekoodia

删除多余js引用,修复无法修改大题评卷模式

ting.yin 6 vuotta sitten
vanhempi
commit
780afb1616

+ 1 - 3
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkGroupController.java

@@ -319,9 +319,7 @@ public class MarkGroupController extends BaseExamController {
             if (arbitrateThreshold != null) {
                 groupService.updateArbitrateThreshold(examId, subjectCode, number, arbitrateThreshold);
             }
-            if (markMode != null) {
-                groupService.updateMarkMode(examId, subjectCode, number, markMode);
-            }
+            groupService.updateMarkMode(examId, subjectCode, number, markMode);
             if (trialCount != null && trialCount > 0 && group.getStatus() == MarkStatus.TRIAL) {
                 groupService.updateTrialCount(examId, subjectCode, number, trialCount);
             }

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

@@ -70,7 +70,7 @@
 				<td>
 				    <c:if test="${web_user.schoolAdmin==true && result.status.value!=3}">
 				    <c:if test="${result.status.value==1}">
-                    <a href="${ctx}/admin/exam/group/changeStatus?subjectCode=${result.subjectCode}&number=${result.number}&status=FORMAL" data-number="${result.number}" class="edit-button">开始正评</a>
+                    <a href="${ctx}/admin/exam/group/changeStatus?subjectCode=${result.subjectCode}&number=${result.number}&status=FORMAL" data-number="${result.number}" class="edit-button" id="statusButton">开始正评</a>
                     </c:if>
 				    <c:if test="${result.status.value==2 && result.leftCount==0}">
                     <a href="${ctx}/admin/exam/group/changeStatus?subjectCode=${result.subjectCode}&number=${result.number}&status=FINISH" data-number="${result.number}" class="edit-button">结束</a>
@@ -113,6 +113,9 @@ $('.delete-button').click(function(){
     var number = $(this).attr('data-number');
     return confirm('确定要删除第'+number+'大题吗?相关评卷任务与评卷员都将一并删除!');
 });
+$('#statusButton').click(function(){
+    return confirm('确定开始正评吗?');
+});
 </script>	
 </body>
 </html>

+ 2 - 5
stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markNew.jsp

@@ -19,9 +19,6 @@
 <script src="${ctxStatic}/perfect-scrollbar/min/perfect-scrollbar.min.js"></script>
 <link href="${ctxStatic}/perfect-scrollbar/min/perfect-scrollbar.min.css" rel="stylesheet">
 
-<script type="text/javascript" src="${ctxStatic}/utils/easy-canvas.js"></script>
-<script type="text/javascript" src="${ctxStatic}/utils/image-loader.js"></script>
-
 <script type="text/javascript" src="${ctxStatic}/mark-new/js/mark-control.js"></script>
 <script type="text/javascript" src="${ctxStatic}/mark-new/js/task-control.js"></script>
 <script type="text/javascript" src="${ctxStatic}/mark-new/js/modules/answer-view.js"></script>
@@ -79,8 +76,8 @@
 					</c:if>
 					'warning-info': {
 					},
-					'thumbnail':{
-					},
+				 	'thumbnail':{
+					}, 
 					'change-name':{
 						url : '${ctx}/mark/change-name'
 					},