zhangjie 3 月之前
父節點
當前提交
7d55fce639

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

@@ -6,7 +6,7 @@
       <mark-history showSearch :getHistory="getHistoryTask" />
       <mark-history showSearch :getHistory="getHistoryTask" />
       <mark-body />
       <mark-body />
       <mark-board-track
       <mark-board-track
-        v-if="markStore.isTrackMode"
+        v-if="markStore.isTrackMode && !markStore.isScoreBoardCollapsed"
         @submit="saveTaskToServer"
         @submit="saveTaskToServer"
         @unselectiveSubmit="unselectiveSubmit"
         @unselectiveSubmit="unselectiveSubmit"
       />
       />

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

@@ -253,7 +253,7 @@ watch(
       let allHeaderTracks = markStore.currentTask.questionList
       let allHeaderTracks = markStore.currentTask.questionList
         .map((item: any) => item.headerTrackList || [])
         .map((item: any) => item.headerTrackList || [])
         .flat();
         .flat();
-      console.log("allHeaderTracks", allHeaderTracks);
+      // console.log("allHeaderTracks", allHeaderTracks);
       let find = allHeaderTracks.find(
       let find = allHeaderTracks.find(
         (item: any) =>
         (item: any) =>
           item.mainNumber == topTrack.mainNumber &&
           item.mainNumber == topTrack.mainNumber &&

+ 6 - 3
src/features/mark/composables/useMarkSubmit.ts

@@ -59,7 +59,7 @@ export default function useMarkSubmit() {
       const msg = errors.map((v) => h("div", `${v.error}`));
       const msg = errors.map((v) => h("div", `${v.error}`));
       void message.warning({
       void message.warning({
         content: h("span", ["校验失败", ...msg]),
         content: h("span", ["校验失败", ...msg]),
-        duration: 10,
+        duration: 3,
       });
       });
       return;
       return;
     }
     }
@@ -138,6 +138,9 @@ export default function useMarkSubmit() {
         q.markerScore = q.markerTrackList.reduce((acc, t) => {
         q.markerScore = q.markerTrackList.reduce((acc, t) => {
           return acc + (t.score || 0);
           return acc + (t.score || 0);
         }, 0);
         }, 0);
+        if (!markStore.isTrackMode) {
+          q.markerScore = datas.scoreList[q.__index];
+        }
         return q;
         return q;
       }) as Question[];
       }) as Question[];
 
 
@@ -190,11 +193,11 @@ export default function useMarkSubmit() {
     } else if (!res.data.success) {
     } else if (!res.data.success) {
       void message.error({
       void message.error({
         content: "提交失败,请刷新页面",
         content: "提交失败,请刷新页面",
-        duration: 10,
+        duration: 5,
       });
       });
       return;
       return;
     } else if (!markStore.currentTask) {
     } else if (!markStore.currentTask) {
-      void message.warn({ content: "暂无新任务", duration: 10 });
+      void message.warn({ content: "暂无新任务", duration: 5 });
     }
     }
 
 
     // 获取下一个任务
     // 获取下一个任务

+ 1 - 1
src/features/mark/composables/useSliceTrack.ts

@@ -132,7 +132,7 @@ export default function useSliceTrack(hasMarkResultToRender = false) {
       .map((v) => v.markerTrackList.length + v.tagList.length)
       .map((v) => v.markerTrackList.length + v.tagList.length)
       .reduce((p, c) => p + c);
       .reduce((p, c) => p + c);
     if (numOfTrackAndTagInData !== numOfTrackAndTagInTempSlice) {
     if (numOfTrackAndTagInData !== numOfTrackAndTagInTempSlice) {
-      console.warn({ tagLists, trackLists, tempSliceImagesWithTrackList });
+      // console.warn({ tagLists, trackLists, tempSliceImagesWithTrackList });
       void message.warn("渲染轨迹数量与实际数量不一致");
       void message.warn("渲染轨迹数量与实际数量不一致");
     }
     }
 
 

+ 8 - 8
src/features/mark/toolbar/MarkHeader.vue

@@ -25,9 +25,9 @@
       </div>
       </div>
       <a-tooltip overlayClassName="mark-tooltip">
       <a-tooltip overlayClassName="mark-tooltip">
         <template #title>
         <template #title>
-          问题卷 {{ markStore.curStatus.problemCount }}
+          问题卷 {{ markStore.curStatus?.problemCount }}
           <br />
           <br />
-          待仲裁 {{ markStore.curStatus.arbitrateCount }}
+          待仲裁 {{ markStore.curStatus?.arbitrateCount }}
         </template>
         </template>
         <div class="header-programs">
         <div class="header-programs">
           <img
           <img
@@ -69,11 +69,11 @@
           <span> {{ totalScore }} </span>
           <span> {{ totalScore }} </span>
         </div>
         </div>
       </div>
       </div>
-      <div v-show="markStore.curStatus.totalCount" class="header-total">
+      <div v-show="markStore.curStatus?.totalCount" class="header-total">
         <span class="header-noun">
         <span class="header-noun">
           <span>已评:</span>
           <span>已评:</span>
-          <span :key="markStore.curStatus.personCount || 0">
-            {{ markStore.curStatus.personCount }}
+          <span :key="markStore.curStatus?.personCount || 0">
+            {{ markStore.curStatus?.personCount }}
           </span>
           </span>
         </span>
         </span>
         <span v-if="markStore.setting.topCount" class="header-noun">
         <span v-if="markStore.setting.topCount" class="header-noun">
@@ -82,8 +82,8 @@
         </span>
         </span>
         <span class="header-noun">
         <span class="header-noun">
           <span>未评:</span>
           <span>未评:</span>
-          <span :key="markStore.curStatus.leftCount || 0">
-            {{ markStore.curStatus.leftCount }}
+          <span :key="markStore.curStatus?.leftCount || 0">
+            {{ markStore.curStatus?.leftCount }}
           </span>
           </span>
         </span>
         </span>
         <span class="header-noun">
         <span class="header-noun">
@@ -197,7 +197,7 @@ async function toggleSettingMode() {
 }
 }
 
 
 const progress = $computed(() => {
 const progress = $computed(() => {
-  const { totalCount, markedCount } = markStore.curStatus;
+  const { totalCount, markedCount } = markStore.curStatus || {};
   if (typeof totalCount !== "number" || totalCount === 0) return 0;
   if (typeof totalCount !== "number" || totalCount === 0) return 0;
   let p = markedCount / totalCount;
   let p = markedCount / totalCount;
   if (p < 0.01 && markedCount >= 1) p = 0.01;
   if (p < 0.01 && markedCount >= 1) p = 0.01;