1
0
Просмотр исходного кода

修复仲裁显示,屏蔽多媒体下分组新增和修改

ting.yin 5 лет назад
Родитель
Сommit
3ab78af5aa

+ 2 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkGroupController.java

@@ -120,6 +120,8 @@ public class MarkGroupController extends BaseExamController {
         model.addAttribute("resultList", list);
         model.addAttribute("subject", subject);
         model.addAttribute("subjectList", getExamSubject(examId, wu));
+        Exam exam = examService.findById(examId);
+        model.addAttribute("examType", exam.getType());
         return "modules/exam/groupList";
     }
 

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

@@ -19,6 +19,9 @@
 <script src="${ctxStatic}/perfect-scrollbar/min/perfect-scrollbar.min.js"></script>
 <link href="${ctxStatic}/perfect-scrollbar/min/perfect-scrollbar.min.css" rel="stylesheet">
 
+<script src="${ctxStatic}/i18n/jquery.i18n.properties.js" type="text/javascript"></script>
+<script src="${ctxStatic}/i18n/load.js" type="text/javascript"></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/sheet-view.js"></script>

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

@@ -19,6 +19,9 @@
 <script src="${ctxStatic}/perfect-scrollbar/min/perfect-scrollbar.min.js"></script>
 <link href="${ctxStatic}/perfect-scrollbar/min/perfect-scrollbar.min.css" rel="stylesheet">
 
+<script src="${ctxStatic}/i18n/jquery.i18n.properties.js" type="text/javascript"></script>
+<script src="${ctxStatic}/i18n/load.js" type="text/javascript"></script>
+
 <script src="${ctxStatic}/rich-text/js/render.js"></script>
 <link href="${ctxStatic}/rich-text/css/rich-text.css" rel="stylesheet">
 <script type="text/javascript" src="${ctxStatic}/viewer/viewer.js"></script>

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

@@ -28,8 +28,10 @@
 			<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 			
 			<c:if test="${web_user.schoolAdmin==true}">
+				<c:if test="${examType!='MULTI_MEDIA'}">
 			&nbsp;
-			<a href="${ctx}/admin/exam/group/add?subjectCode=${subject.code}" class="btn">新增</a>
+				<a href="${ctx}/admin/exam/group/add?subjectCode=${subject.code}" class="btn">新增</a>
+				</c:if>
 			&nbsp;
 			<a href="${ctx}/admin/exam/group/check-count?subjectCode=${subject.code}" class="btn">数量校对</a>
 			</c:if>
@@ -86,8 +88,10 @@
 					<a href="${ctx}/admin/exam/group/reset?subjectCode=${result.subjectCode}&number=${result.number}" data-number="${result.number}" class="reset-button">重置</a>
 					</c:if>
 					&nbsp;
+					<c:if test="${examType!='MULTI_MEDIA'}">
 					<a href="${ctx}/admin/exam/group/edit-simple?subjectCode=${result.subjectCode}&number=${result.number}" data-number="${result.number}" class="edit-button">修改</a>
 					&nbsp;
+					</c:if>
 					<a href="${ctx}/admin/exam/group/delete?subjectCode=${result.subjectCode}&number=${result.number}" data-number="${result.number}" class="delete-button">删除</a>
 					</c:if>