zhangjie 3 месяцев назад
Родитель
Сommit
56c623528f

+ 2 - 3
src/api/arbitratePage.ts

@@ -3,7 +3,6 @@ import { CommonResponse, MarkDetail, Setting, Task } from "@/types";
 
 interface paramType {
   paperNumber?: string;
-  groupNumber?: number;
   examId?: string;
   arbitrateId?: string;
 }
@@ -108,7 +107,7 @@ export async function getArbitrateHistory({
 
 /** 保存仲裁任务 */
 export async function saveArbitrateTask(
-  taskId: string,
+  arbitrateId: string,
   studentId: string,
   markerScore: number,
   scoreList: Array<number>,
@@ -117,7 +116,7 @@ export async function saveArbitrateTask(
   markerTagList?: any
 ) {
   return httpApp.post<CommonResponse>("/api/admin/mark/arbitrate/saveTask", {
-    taskId,
+    arbitrateId,
     studentId,
     markerScore,
     scoreList,

+ 4 - 9
src/features/arbitrate/Arbitrate.vue

@@ -83,15 +83,10 @@ import useTaskWatch from "../mark/composables/useTaskWatch";
 
 const markStore = useMarkStore();
 useTaskWatch();
-const { paperNumber, groupNumber, examId, arbitrateId } = vls.get(
-  "arbitrate",
-  {}
-);
+const { paperNumber, examId, arbitrateId } = vls.get("arbitrate", {});
 let isSingleStudent = !!arbitrateId;
 
-const params = isSingleStudent
-  ? { arbitrateId }
-  : { paperNumber, groupNumber, examId };
+const params = isSingleStudent ? { arbitrateId } : { paperNumber, examId };
 
 async function updateClearTask() {
   await clearArbitrateTask(params);
@@ -236,8 +231,8 @@ const saveTaskToServer = async (
       });
     }
     res = await saveArbitrateTask(
-      markStore.currentTask.taskId + "",
-      markStore.currentTask.studentId + "",
+      markStore.currentTask.arbitrateId,
+      markStore.currentTask.studentId,
       markStore.currentTask.markResult.markerScore,
       markStore.currentTask.markResult.scoreList,
       false,

+ 1 - 1
src/features/arbitrate/ArbitrateBody.vue

@@ -76,7 +76,7 @@ const makeScoreTrack = (event: MouseEvent, item: SliceImage) => {
   markResult.scoreList[__index] =
     markResult.markerTrackList
       .filter((t) => t.mainNumber === mainNumber && t.subNumber === subNumber)
-      .map((t) => t.markerScore)
+      .map((t) => t.score)
       .reduce((acc, v) => (acc += Math.round(v * 1000)), 0) / 1000;
   item.markerTrackList.push(track);
 };

+ 3 - 22
src/features/arbitrate/ArbitrateMarkList.vue

@@ -18,15 +18,11 @@
         </div>
       </div>
       <div class="noun-item">
-        <div class="noun-item-title">分</div>
+        <div class="noun-item-title">分</div>
         <div class="noun-item-content">
-          {{ markDetail.totalScore === -1 ? "未选做" : markDetail.totalScore }}
+          {{ markDetail.totalScore }}
         </div>
       </div>
-      <div class="noun-item">
-        <div class="noun-item-title">详情</div>
-        <div class="noun-item-content">{{ markDetail.scoreList }}</div>
-      </div>
     </div>
   </div>
 </template>
@@ -46,7 +42,7 @@ watch(
   async () => {
     if (markStore.currentTask) {
       const res = await getArbitrateList(
-        markStore.currentTask?.taskId as unknown as string
+        markStore.currentTask?.arbitrateId as unknown as string
       );
       if (Array.isArray(res.data)) {
         list.splice(0);
@@ -58,18 +54,3 @@ watch(
   }
 );
 </script>
-
-<style scoped>
-.container {
-  min-width: 200px;
-}
-.container .col-1 {
-  width: 50px;
-  text-align: right;
-  margin-right: 8px;
-}
-.container .col-2 {
-  max-width: 140px;
-  word-wrap: break-word;
-}
-</style>

+ 1 - 1
src/features/mark/scoring/MarkBoardTrack.vue

@@ -274,7 +274,7 @@ EventBus.on("draw-change", (list: any) => {
 watch(
   () => markStore.currentQuestion,
   (val) => {
-    console.log("currentQuestion:", val);
+    // console.log("currentQuestion:", val);
     markStore.currentScore = undefined;
     if (!val) return;
     // eslint-disable-next-line @typescript-eslint/no-floating-promises

+ 0 - 6
src/features/track/TrackBody.vue

@@ -150,12 +150,6 @@ import useTrack from "./composables/useTrack";
 
 const markStore = useMarkStore();
 const { answerPaperScale } = useBodyScroll();
-// const answerPaperScale = $computed(() => {
-//   const scale = markStore.setting.uiSetting["answer.paper.scale"];
-//   console.log("scale", scale);
-//   return scale * 100 + "%";
-// });
-
 const {
   parseMarkDetailList,
   paserRecogData,

+ 2 - 0
src/types/index.ts

@@ -225,6 +225,8 @@ interface RawTask {
   message: string | null;
   /** 评卷员名称 */
   markerName: string | null;
+  // 仲裁id
+  arbitrateId?: string;
 }
 
 type ElementType =