修复阅卷轨迹显示及其他潜在bug

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/dao/MarkLibraryDao.java

@@ -59,7 +59,7 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
             LibraryStatus status);
 
     @Modifying(clearAutomatically = true)
-    @Query("update MarkLibrary m set m.status=?2, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null where m.markerId=?1 and m.headerId==null ")
+    @Query("update MarkLibrary m set m.status=?2, m.tags=null, m.markerId=null, m.markerTime=null, m.markerScore=null, m.markerScoreList=null where m.markerId=?1 and m.headerId=null ")
     void resetByMarkerId(Integer markerId, LibraryStatus status);
 
     @Modifying(clearAutomatically = true)

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

@@ -49,7 +49,8 @@ public class LibraryController extends BaseExamController {
     private MarkService markService;
 
     @RequestMapping
-    public String list(Model model, HttpServletRequest request, MarkLibrarySearchQuery query,LibraryStatus status) {
+    public String list(Model model, HttpServletRequest request, MarkLibrarySearchQuery query,
+            @RequestParam(required = false) LibraryStatus status) {
         int examId = getSessionExamId(request);
         WebUser wu = RequestUtils.getWebUser(request);
         List<ExamSubject> subjectList = getExamSubject(examId, wu);
@@ -68,7 +69,7 @@ public class LibraryController extends BaseExamController {
         if (query.getGroupNumber() == 0) {
             query.setGroupNumber(groupList.get(0).getNumber());
         }
-        if (status!=null) {
+        if (status != null) {
             query.addStatus(status);
         }
         query = libraryService.findByQuery(query);
@@ -78,7 +79,7 @@ public class LibraryController extends BaseExamController {
             }
         }
         model.addAttribute("query", query);
-        model.addAttribute("subjectList", subjectList);
+        model.addAttribute("subjectList", getExamSubject(examId, wu));
         model.addAttribute("groupList", groupList);
         model.addAttribute("statusList", LibraryStatus.values());
         model.addAttribute("status", status);

stmms-web/src/main/webapp/WEB-INF/views/include/trackView.jsp

@@ -70,10 +70,6 @@ function buildImages (imageServer,picUrls,config,canvas,ctx,markTracks,markSpeci
         var maxWidth = 0;
         var totalHeight = 0;
         for (var i = 0; i < config.length; i++) {
-            //计算最大宽度与合计高度
-            var image = images[i];
-            maxWidth = Math.max(maxWidth, image.width);
-            totalHeight += image.height;
             //计算最大宽度与合计高度
             if(config[i].w<=0){
                 config[i].w=images[config[i].i-1].width;

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/libraryList.jsp

@@ -83,7 +83,7 @@
                 </td>
 				<td>
 				    <c:if test="${result.markerScore!=null}">
-				    ${result.markerScore}
+				    <fmt:formatNumber pattern="###.#" value="${result.markerScore}"/>
 				    </c:if>
 				    <c:if test="${result.markerScore==null}">
 				    &nbsp;
@@ -106,9 +106,11 @@
                     </c:if>
 				</td>
 				<td>
-				    <c:if test="${result.status.value==1}">
+				    <c:if test="${result.status.value!=0}">
 				    <a class="track-link" href="##" data-image-url="${ctx}/admin/exam/track/byLibrary?libraryId=${result.id}" data-title="${result.examNumber}">阅卷轨迹</a>
-                    &nbsp;
+				    </c:if>
+				    <c:if test="${result.status.value==1}">
+				    &nbsp;
                     <a href="##" data-id="${result.id}" class="back-link">打回</a>
 					</c:if>
 				</td>