刘洋 1 жил өмнө
parent
commit
6f305adc65

+ 16 - 16
src/devLoginParams.ts

@@ -67,14 +67,14 @@
 //   // markerId: "483",
 // };
 /** 224 管理员 */
-export const LOGIN_CONFIG = {
-  isAdmin: true,
-  forceChange: true,
-  loginName: "admin-test",
-  password: "123456",
-  examId: "1",
-  markerId: null,
-};
+// export const LOGIN_CONFIG = {
+//   isAdmin: true,
+//   forceChange: true,
+//   loginName: "admin-test",
+//   password: "123456",
+//   examId: "1",
+//   markerId: null,
+// };
 // export const LOGIN_CONFIG = {
 //   isAdmin: true,
 //   forceChange: true,
@@ -97,14 +97,14 @@ export const LOGIN_CONFIG = {
 
 /** 225 管理员 */
 
-// export const LOGIN_CONFIG = {
-//   isAdmin: true,
-//   forceChange: true,
-//   loginName: "admin3",
-//   password: "123456",
-//   examId: "130",
-//   markerId: "null",
-// };
+export const LOGIN_CONFIG = {
+  isAdmin: true,
+  forceChange: true,
+  loginName: "admin-01",
+  password: "123456",
+  examId: "341",
+  markerId: "null",
+};
 
 // export const loginName = "admin-ch";
 // export const password = "123456";

+ 1 - 0
src/features/student/scoreVerify/MarkHeader.vue

@@ -3,6 +3,7 @@
     :isSingleStudent="isSingleStudent"
     :clearTasks="clearTasks"
     showScoreBoard
+    showPaperAndAnswer
     :notShowHistoryToggle="true"
   >
     <slot name="taskInfo">

+ 12 - 1
src/features/student/scoreVerify/ScoreVerify.vue

@@ -13,6 +13,7 @@
     </div>
   </div>
   <MinimapModal />
+  <PaperModal />
 </template>
 
 <script setup lang="ts">
@@ -30,6 +31,7 @@ import {
 import { store } from "@/store/store";
 import MarkHeader from "./MarkHeader.vue";
 import MinimapModal from "@/features/mark/MinimapModal.vue";
+import PaperModal from "@/features/mark/PaperModal.vue";
 import { useRoute } from "vue-router";
 // import MarkBody from "../studentInspect/MarkBody.vue";
 import MarkBody from "./markBody.vue";
@@ -80,6 +82,7 @@ async function updateTask() {
     key: mkey,
   });
   isCurrentTagged = !!res.data.flagged;
+  store.setting.subject.paperUrl = res.data.paperUrl || "";
   if (res.data.task?.studentId) {
     let rawTask = res.data.task;
     store.currentTask = addFileServerPrefixToTask(rawTask);
@@ -108,8 +111,16 @@ async function fetchTask(next: boolean, init?: boolean) {
   }
   if (!currentStudentId) return; // 无currentStudentId不调用
   store.status.totalCount = studentIds.length;
-  store.status.markedCount = studentIds.indexOf(currentStudentId) + 1;
+  // store.status.markedCount = studentIds.indexOf(currentStudentId) + 1;
   await updateTask();
+  if (!store.status.markedCountStuIds) {
+    store.status.markedCountStuIds = [currentStudentId];
+  } else {
+    store.status.markedCountStuIds = Array.from(
+      new Set([...store.status.markedCountStuIds, currentStudentId])
+    );
+  }
+  store.status.markedCount = store.status.markedCountStuIds.length;
 }
 
 onMounted(async () => {

+ 2 - 0
src/types/index.ts

@@ -30,6 +30,8 @@ export interface MarkStore {
     problemCount: number;
     /** 待仲裁卷数量 */
     arbitrateCount: number;
+    /**成绩校验,批量校验时,已校验的学生id的集合 */
+    markedCountStuIds?: any;
   };
   /** 保持数量为3(prefetchCount) */
   tasks: Array<Task>;

+ 1 - 1
vite.config.ts

@@ -3,7 +3,7 @@ import vue from "@vitejs/plugin-vue";
 import ViteComponents from "unplugin-vue-components/vite";
 import { AntDesignVueResolver } from "unplugin-vue-components/resolvers";
 
-const SERVER_URL = "http://192.168.10.224";
+const SERVER_URL = "http://192.168.10.225";
 // const SERVER_URL = "http://192.168.11.103:8090";
 
 const path = require("path");