Browse Source

Merge branch 'release_1.5.3' of http://git.qmth.com.cn/markingcloud/stmms-web into release_1.5.2

刘洋 6 months ago
parent
commit
1b8163a031

+ 4 - 2
src/features/mark/use/focusTracks.ts

@@ -54,7 +54,8 @@ function _addFocusTrack(
   if (groupNumber) {
   if (groupNumber) {
     store.currentTask?.questionList
     store.currentTask?.questionList
       ?.filter((q) => q.groupNumber === groupNumber)
       ?.filter((q) => q.groupNumber === groupNumber)
-      ?.map((q) => q.trackList)
+      // ?.map((q) => q.trackList)
+      ?.map((q) => [...q.trackList, ...(q.headerTrack || [])])
       .flat()
       .flat()
       .forEach((t) => {
       .forEach((t) => {
         // 回评时,如果没被删除
         // 回评时,如果没被删除
@@ -65,7 +66,8 @@ function _addFocusTrack(
       });
       });
   } else {
   } else {
     store.currentTask?.questionList
     store.currentTask?.questionList
-      ?.map((q) => q.trackList)
+      // ?.map((q) => q.trackList)
+      ?.map((q) => [...q.trackList, ...(q.headerTrack || [])])
       .flat()
       .flat()
       .filter((t) => {
       .filter((t) => {
         if (mainNumber) {
         if (mainNumber) {

+ 3 - 0
src/features/student/scoreVerify/markBody.vue

@@ -160,6 +160,9 @@ async function processImage() {
             q.groupNumber
             q.groupNumber
           );
           );
         }
         }
+        if (q.score == -1) {
+          return [];
+        }
         return q.headerTrack?.length
         return q.headerTrack?.length
           ? addHeaderTrackColorAttr(q.headerTrack)
           ? addHeaderTrackColorAttr(q.headerTrack)
           : addColorAttr(
           : addColorAttr(

+ 3 - 0
src/features/student/studentInspect/MarkBody.vue

@@ -159,6 +159,9 @@ async function processImage() {
             q.groupNumber
             q.groupNumber
           );
           );
         }
         }
+        if (q.score == -1) {
+          return [];
+        }
         return q.headerTrack?.length
         return q.headerTrack?.length
           ? addHeaderTrackColorAttr(q.headerTrack)
           ? addHeaderTrackColorAttr(q.headerTrack)
           : addColorAttr(
           : addColorAttr(