Преглед на файлове

修复查询员查看原卷;回评提交问题卷后无任务错误;多媒体放开导入考生

ting.yin преди 5 години
родител
ревизия
47dc2f9e79

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

@@ -106,8 +106,8 @@ public class DataSyncController extends BaseExamController {
             dataSync = new DataSync();
             dataSync = new DataSync();
             dataSync.setExamId(examId);
             dataSync.setExamId(examId);
             dataSync.setRootOrgId(rootOrgId);
             dataSync.setRootOrgId(rootOrgId);
-            dataSync.setStudentUrl("http://" + host + ":" + port + studentUri);
-            dataSync.setSubjectUrl("http://" + host + ":" + port + subjectUri);
+            dataSync.setStudentUrl(host + ":" + port + studentUri);
+            dataSync.setSubjectUrl(host + ":" + port + subjectUri);
             dataSync.setAppId(appId);
             dataSync.setAppId(appId);
             dataSync.setSecretKey(secretKey);
             dataSync.setSecretKey(secretKey);
         }
         }

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

@@ -173,7 +173,7 @@ public class LibraryController extends BaseExamController {
     }
     }
 
 
     @RequestMapping(value = "/getJson", method = RequestMethod.GET)
     @RequestMapping(value = "/getJson", method = RequestMethod.GET)
-    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER, Role.SCHOOL_VIEWER })
     public String getJson(Model model, HttpServletRequest request, @RequestParam Integer studentId,
     public String getJson(Model model, HttpServletRequest request, @RequestParam Integer studentId,
             @RequestParam(required = false) Integer groupNumber) {
             @RequestParam(required = false) Integer groupNumber) {
         int examId = getSessionExamId(request);
         int examId = getSessionExamId(request);

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

@@ -101,9 +101,10 @@
 			<input type="text" name="batchCode" value="${query.batchCode}" maxlength="30" class="input-small"/>
 			<input type="text" name="batchCode" value="${query.batchCode}" maxlength="30" class="input-small"/>
 			<br><br>
 			<br><br>
 			&nbsp;<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
 			&nbsp;<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
-			<c:if test="${web_user.schoolAdmin==true && examType!='MULTI_MEDIA'}">
+			<c:if test="${web_user.schoolAdmin==true}">
 			&nbsp;<a href="${ctx}/admin/exam/student/add" class="btn btn-primary">添加</a>
 			&nbsp;<a href="${ctx}/admin/exam/student/add" class="btn btn-primary">添加</a>
 			&nbsp;<input id="btnImport" class="btn" type="button" value="导入"/>
 			&nbsp;<input id="btnImport" class="btn" type="button" value="导入"/>
+				<c:if test="${examType!='MULTI_MEDIA' }">
 			&nbsp;<div class="btn-group">
 			&nbsp;<div class="btn-group">
                         <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
                         <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
                             导入名单<span class="caret"></span>
                             导入名单<span class="caret"></span>
@@ -111,9 +112,10 @@
                         <ul class="dropdown-menu">
                         <ul class="dropdown-menu">
                             <li><a href="##" id="breachBtnImport">违纪名单</a></li>
                             <li><a href="##" id="breachBtnImport">违纪名单</a></li>
                             <li><a href="##" id="absentBtnImport">缺考名单</a></li>
                             <li><a href="##" id="absentBtnImport">缺考名单</a></li>
-                            <li><a href="##" id="uploadBtnImport">多媒体上传名单</a></li>
+<!--                             <li><a href="##" id="uploadBtnImport">多媒体上传名单</a></li> -->
                         </ul>
                         </ul>
-            </div>
+            	</div>
+            	</c:if>
 			</c:if>
 			</c:if>
 			<c:if test="${query.totalCount>0 && query.totalCount<=10000}">
 			<c:if test="${query.totalCount>0 && query.totalCount<=10000}">
 			&nbsp;<input id="export-button" class="btn" type="button" value="导出"/>
 			&nbsp;<input id="export-button" class="btn" type="button" value="导出"/>

+ 3 - 1
stmms-web/src/main/webapp/static/mark-track/js/modules/mark-board.js

@@ -23,7 +23,9 @@ function MarkBoard(option) {
         this.initByTask(context.task);
         this.initByTask(context.task);
     });
     });
     this.markControl.on('history.submit.success', this, function(event, context, eventObject) {
     this.markControl.on('history.submit.success', this, function(event, context, eventObject) {
-        this.initByTask(context.task);
+    	if(context.task != undefined){
+    		this.initByTask(context.task);
+    	}
     });
     });
     this.markControl.on('mark.focus.change', this, function(event, context, eventObject) {
     this.markControl.on('mark.focus.change', this, function(event, context, eventObject) {
         this.onFocusChange();
         this.onFocusChange();