刘洋 1 year ago
parent
commit
f71e896611
3 changed files with 35 additions and 24 deletions
  1. 22 22
      src/devLoginParams.ts
  2. 12 1
      src/features/mark/MarkDrawTrack.vue
  3. 1 1
      src/features/mark/MarkHistory.vue

+ 22 - 22
src/devLoginParams.ts

@@ -53,19 +53,19 @@
 //   // markerId: "482",
 //   // markerId: "483",
 // };
-// export const LOGIN_CONFIG = {
-//   isAdmin: false,
-//   forceChange: false,
-//   loginName: "spj111-01",
-//   // loginName: "spj432-01",
-//   // loginName: "liuyang",
-//   password: "123456",
-//   examId: "232",
-//   markerId: "2688",
-//   // markerId: "2692",
-//   // markerId: "482",
-//   // markerId: "483",
-// };
+export const LOGIN_CONFIG = {
+  isAdmin: false,
+  forceChange: true,
+  loginName: "spj111-01",
+  // loginName: "spj432-01",
+  // loginName: "liuyang",
+  password: "123456",
+  examId: "235",
+  markerId: "3368",
+  // markerId: "2692",
+  // markerId: "482",
+  // markerId: "483",
+};
 /** 224 管理员 */
 // export const LOGIN_CONFIG = {
 //   isAdmin: true,
@@ -75,15 +75,15 @@
 //   examId: "1",
 //   markerId: null,
 // };
-export const LOGIN_CONFIG = {
-  isAdmin: true,
-  forceChange: true,
-  // loginName: "fh161301",
-  loginName: "admin-1",
-  password: "123456",
-  examId: "295",
-  markerId: null,
-};
+// export const LOGIN_CONFIG = {
+//   isAdmin: true,
+//   forceChange: true,
+//   // loginName: "fh161301",
+//   loginName: "admin-1",
+//   password: "123456",
+//   examId: "295",
+//   markerId: null,
+// };
 
 /** 255 评卷员 */
 // export const LOGIN_CONFIG = {

+ 12 - 1
src/features/mark/MarkDrawTrack.vue

@@ -108,9 +108,20 @@ watch(
       (t) => t.offsetIndex === minImageIndex && t.offsetY === minImageOffsetY
     );
     if (topTrack) {
+      let allHeaderTracks = store.currentTask.questionList
+        .map((item: any) => item.headerTrack || [])
+        .flat();
+      console.log("allHeaderTracks", allHeaderTracks);
+      let find = allHeaderTracks.find(
+        (item: any) =>
+          item.mainNumber == topTrack.mainNumber &&
+          item.subNumber == topTrack.subNumber
+      );
       document
         .querySelector(
-          `#a-${topTrack.mainNumber}-${topTrack.subNumber}-${topTrack.offsetY}-${topTrack.offsetX}`
+          `#a-${topTrack.mainNumber}-${topTrack.subNumber}-${
+            find?.offsetY || topTrack.offsetY
+          }-${find?.offsetX || topTrack.offsetX}`
         )
         ?.scrollIntoView({ behavior: "smooth" });
     }

+ 1 - 1
src/features/mark/MarkHistory.vue

@@ -343,7 +343,7 @@ async function updateHistoryTask({
       void message.error("切换至回评任务失败");
     });
   }
-  if (!res?.data || !res?.data.length) {
+  if (!res?.data || !res?.data.length || remarkCount.value === 0) {
     store.globalMask = false;
   }
 }