未选做：后台页面处理

src/api/arbitratePage.ts

@@ -99,12 +99,14 @@ export async function saveArbitrateTask(
   libraryId: string,
   studentId: string,
   markerScore: number,
-  scoreList: Array<number>
+  scoreList: Array<number>,
+  unselective: boolean
 ) {
   return httpApp.post("/admin/exam/arbitrate/saveTask", {
     libraryId,
     studentId,
     markerScore,
     scoreList,
+    unselective,
   });
 }

src/api/inspectPage.ts

@@ -28,6 +28,7 @@ export interface InspectedParams {
   mainStartScore?: string;
   mainEndScore?: string;
   questionScore?: string;
+  unselective?: string;
 }
 
 /** 批量复核得到单个学生的复核任务 */
@@ -39,6 +40,7 @@ export async function getOneOfInspectedTask({
   mainStartScore = "",
   mainEndScore = "",
   questionScore = "",
+  unselective = "",
 }: InspectedParams) {
   const form = new FormData();
   form.append("subjectCode", subjectCode);
@@ -48,6 +50,7 @@ export async function getOneOfInspectedTask({
   form.append("mainStartScore", mainStartScore);
   form.append("mainEndScore", mainEndScore);
   form.append("questionScore", questionScore);
+  form.append("unselective", unselective);
   return httpApp.post("/admin/exam/inspected/getTask", form);
 }
 
@@ -60,6 +63,7 @@ export async function getInspectedTaskStatus({
   mainStartScore = "",
   mainEndScore = "",
   questionScore = "",
+  unselective = "",
 }: InspectedParams) {
   const form = new FormData();
   form.append("subjectCode", subjectCode);
@@ -69,6 +73,7 @@ export async function getInspectedTaskStatus({
   form.append("mainStartScore", mainStartScore);
   form.append("mainEndScore", mainEndScore);
   form.append("questionScore", questionScore);
+  form.append("unselective", unselective);
   return httpApp.post("/admin/exam/inspected/getStatus", form);
 }
 

src/features/arbitrate/Arbitrate.vue

@@ -10,9 +10,14 @@
       <mark-body @error="renderError" />
       <mark-board-key-board
         v-if="showMarkBoardKeyBoard"
-        @submit="saveTaskToServer"
+        @submit="saveTaskToServer(false)"
+        @unselectiveSubmit="saveTaskToServer(true)"
+      />
+      <mark-board-mouse
+        v-if="showMarkBoardMouse"
+        @submit="saveTaskToServer(false)"
+        @unselectiveSubmit="saveTaskToServer(true)"
       />
-      <mark-board-mouse v-if="showMarkBoardMouse" @submit="saveTaskToServer" />
     </div>
   </div>
   <AnswerModal />
@@ -78,6 +83,7 @@ async function updateSetting() {
   store.setting.examType = settingRes.data.examType;
   store.setting.fileServer = settingRes.data.fileServer;
   store.setting.userName = settingRes.data.userName;
+  store.setting.selective = settingRes.data.selective;
   store.setting.uiSetting = {
     "answer.paper.scale": 1,
     "score.board.collapse": false,
@@ -85,6 +91,7 @@ async function updateSetting() {
   } as Setting["uiSetting"];
   store.setting.splitConfig = settingRes.data.splitConfig;
   store.setting.subject = settingRes.data.subject;
+
   if (store.setting.subject?.answerUrl) {
     store.setting.subject.answerUrl =
       store.setting.fileServer + store.setting.subject?.answerUrl;
@@ -197,17 +204,29 @@ async function getOneOfStuTask() {
   return getOneOfArbitrateTask(subjectCode, groupNumber);
 }
 
-const saveTaskToServer = async () => {
+const saveTaskToServer = async (unselective: boolean) => {
   if (!store.currentTask) return;
   console.log("save inspect task to server");
   const mkey = "save_task_key";
   message.loading({ content: "保存评卷任务...", key: mkey });
-  const res = (await saveArbitrateTask(
-    store.currentTask.libraryId + "",
-    store.currentTask.studentId + "",
-    store.currentMarkResult?.markerScore as number,
-    store.currentMarkResult?.scoreList as Array<number>
-  )) as any;
+  let res;
+  if (unselective) {
+    res = (await saveArbitrateTask(
+      store.currentTask.libraryId + "",
+      store.currentTask.studentId + "",
+      -1,
+      [],
+      true
+    )) as any;
+  } else {
+    res = (await saveArbitrateTask(
+      store.currentTask.libraryId + "",
+      store.currentTask.studentId + "",
+      store.currentMarkResult?.markerScore as number,
+      store.currentMarkResult?.scoreList as Array<number>,
+      false
+    )) as any;
+  }
   if (res.data.success && store.currentTask) {
     message.success({ content: "仲裁成功", key: mkey, duration: 2 });
     if (!store.historyOpen) {

src/features/arbitrate/ArbitrateMarkList.vue

@@ -17,7 +17,11 @@
         </tr>
         <tr>
           <td>总分</td>
-          <td>{{ markDetail.totalScore }}</td>
+          <td>
+            {{
+              markDetail.totalScore === -1 ? "未选做" : markDetail.totalScore
+            }}
+          </td>
         </tr>
         <tr>
           <td>详情</td>

src/features/mark/MarkHeader.vue

@@ -28,12 +28,13 @@
         "
         :title="store.setting.subject.name"
         href="/mark/subject-select"
-        >{{
+      >
+        {{
           `${store.setting.subject.code ?? ""}-${
             store.setting.subject.name ?? ""
           }`
-        }}</a
-      >
+        }}
+      </a>
     </div>
     <div class="tw-flex" style="margin: 0 -20px 0 -40px">
       <a-tooltip>

src/features/mark/store.ts

@@ -32,6 +32,7 @@ const obj = {
     prefetchCount: 3,
     startTime: 0,
     endTime: 0,
+    selective: false,
   },
   status: <MarkStore["status"]>{},
   groups: [],
@@ -44,7 +45,6 @@ const obj = {
   currentSpecialTag: undefined,
   markResults: [],
   historyOpen: false,
-  MarkBoardTrackCollapse: false,
   historyTasks: [],
   removeScoreTracks: [],
   focusTracks: [],

src/features/student/inspect/Inspect.vue

@@ -44,6 +44,7 @@ const {
   mainStartScore,
   mainEndScore,
   questionScore,
+  unselective,
 } = route.query as {
   studentId: string;
   subjectCode: string;
@@ -53,6 +54,7 @@ const {
   mainStartScore: string;
   mainEndScore: string;
   questionScore: string;
+  unselective: string;
 };
 
 async function updateClearTask() {
@@ -89,6 +91,7 @@ async function updateStatus() {
     mainStartScore,
     mainEndScore,
     questionScore,
+    unselective,
   });
   if (res.data.valid) store.status = res.data;
 }
@@ -152,6 +155,7 @@ async function getOneOfStuTask() {
     mainStartScore,
     mainEndScore,
     questionScore,
+    unselective,
   });
 }
 

src/features/student/inspect/MarkBoardInspect.vue

@@ -1,8 +1,8 @@
 <template>
   <div
     v-if="store.currentTask"
-    :style="{ display: store.MarkBoardTrackCollapse ? 'none' : 'block' }"
     class="mark-board-track-container"
+    :class="[store.setting.uiSetting['score.board.collapse'] ? 'hide' : 'show']"
   >
     <div>
       <h1 class="tw-text-3xl tw-text-center">试卷总分：{{ markerScore }}</h1>
@@ -56,6 +56,7 @@
                   {{ question.score || 0 }}
                 </span>
                 <input
+                  :disabled="question.score === -1"
                   title="打回"
                   type="checkbox"
                   @change="questionCheckChanged(question)"
@@ -218,16 +219,54 @@ function inspect() {
 
 <style scoped>
 .mark-board-track-container {
-  max-width: 250px;
-  min-width: 250px;
-  border-left: 1px solid grey;
-  padding-left: 6px;
-  padding-right: 6px;
-  max-height: calc(100vh - 56px);
+  max-width: 290px;
+  min-width: 290px;
+  padding: 20px;
+  max-height: calc(100vh - 56px - 0px);
   overflow: auto;
+  z-index: 1001;
+  transition: margin-right 0.5s;
+  color: var(--app-small-header-text-color);
+}
+.mark-board-track-container.show {
+  margin-right: 0;
+}
+.mark-board-track-container.hide {
+  margin-right: -290px;
+}
+
+.top-container {
+  background-color: var(--app-container-bg-color);
+}
+.total-score {
+  color: var(--app-main-text-color);
+  font-size: 32px;
 }
 .question {
-  min-width: 100px;
-  border-bottom: 1px dotted grey;
+  min-width: 80px;
+  padding: 10px;
+  background-color: var(--app-container-bg-color);
+}
+.current-question .score {
+  color: var(--high-light-score-color);
+}
+
+.current-score {
+  color: var(--app-score-color);
+}
+.current-score-indicator {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 5px;
+  height: 5px;
+  background-color: #5c69f6;
+}
+.all-zero-unselective-button {
+  height: v-bind(buttonHeightForSelective);
+  border-radius: 10px;
+  padding: 7px;
+  background-color: #4db9ff;
+  border: none;
 }
 </style>

src/features/student/inspect/MarkHeader.vue

@@ -1,13 +1,32 @@
 <template>
   <div
-    class="
-      tw-flex tw-gap-4 tw-justify-between tw-items-center
-      header-container
-      tw-px-1
-    "
+    class="tw-flex tw-gap-4 tw-justify-start tw-items-center header-container"
     v-if="store.setting"
   >
-    <div>
+    <div
+      v-if="!isSingleStudent"
+      class="tw-flex tw-place-content-center tw-cursor-pointer tw-relative menu"
+      :class="[store.historyOpen && 'menu-toggled']"
+      @click="toggleHistory"
+    >
+      <span title="回看" class="tw-inline-flex tw-place-content-center">
+        <img
+          src="../../mark/images/left-menu.svg"
+          :class="[store.historyOpen && 'svg-red']"
+        />
+      </span>
+      <div v-if="store.historyOpen" class="triangle"></div>
+    </div>
+    <div
+      class="
+        tw-text-white
+        tw-block
+        tw-overflow-ellipsis
+        tw-overflow-hidden
+        tw-whitespace-nowrap
+        header-big-text
+      "
+    >
       {{
         `${store.setting.subject.code ?? ""}-${
           store.setting.subject.name ?? ""
@@ -16,26 +35,25 @@
     </div>
     <div class="tw-flex tw-gap-1">
       <div>
-        编号<span class="highlight-text">{{
-          store.currentTask?.secretNumber
-        }}</span>
+        <span class="header-small-text">编号</span>
+        <span class="highlight-text">
+          {{ store.currentTask?.secretNumber ?? "-" }}
+        </span>
       </div>
     </div>
-    <ul v-if="!isSingleStudent" class="tw-flex tw-gap-2 tw-mb-0">
-      <li>
-        待复核<span class="highlight-text">{{ store.status.totalCount }}</span>
-      </li>
-    </ul>
-    <ZoomPaper v-if="isScanImage()" :store="store" />
-    <div @click="toggleHistory" v-if="!isSingleStudent" title="回看">
-      <SnippetsOutlined
-        class="icon-font icon-font-size-20 tw-cursor-pointer"
-        :style="{
-          color: store.historyOpen ? 'red' : 'white',
-        }"
-      />
+    <div
+      v-if="!isSingleStudent"
+      class="tw-flex tw-gap-2 tw-items-center tw-flex-1"
+    >
+      <span>
+        <span class="header-small-text">待复核</span
+        ><span class="highlight-text">{{
+          store.status.totalCount ?? "-"
+        }}</span>
+      </span>
     </div>
-    <div class="tw-flex tw-place-items-center">
+    <ZoomPaper v-if="isScanImage()" :store="store" />
+    <div class="tw-flex tw-place-items-center tw-justify-end">
       {{ store.setting.userName }}
     </div>
     <div
@@ -44,6 +62,36 @@
     >
       <PoweroffOutlined class="icon-font icon-with-text" />关闭
     </div>
+    <div
+      class="
+        tw-flex tw-place-content-center tw-cursor-pointer tw-justify-self-end
+        menu
+      "
+      :class="[
+        !store.setting.uiSetting['score.board.collapse'] &&
+          store.currentTask &&
+          'menu-toggled',
+      ]"
+      @click="toggleScoreBoard"
+    >
+      <span
+        title="给分板"
+        class="tw-inline-flex tw-place-content-center tw-relative"
+      >
+        <img
+          src="../../mark/images/right-menu.svg"
+          :class="[
+            !store.setting.uiSetting['score.board.collapse'] && 'svg-red',
+          ]"
+        />
+      </span>
+      <div
+        v-if="
+          !store.setting.uiSetting['score.board.collapse'] && store.currentTask
+        "
+        class="triangle"
+      ></div>
+    </div>
   </div>
 </template>
 
@@ -85,28 +133,92 @@ onMounted(() => {
     updateClearTask();
   });
 });
+
+const toggleScoreBoard = () => {
+  store.setting.uiSetting["score.board.collapse"] =
+    !store.setting.uiSetting["score.board.collapse"];
+};
 </script>
 
 <style scoped>
+.header-bg-color {
+  background-color: var(--header-bg-color);
+}
 .header-container {
   position: relative;
-  font-size: 16px;
-  height: 40px;
+  height: 56px;
+  line-height: 16px;
 
   background-color: var(--header-bg-color);
   color: rgba(255, 255, 255, 0.5);
 }
+.menu {
+  width: 56px;
+  height: 56px;
+  padding: 20px;
+}
+.menu:hover,
+.menu-toggled {
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
+.header-container span {
+  vertical-align: middle;
+}
+.header-big-text {
+  font-size: 20px;
+  line-height: 30px;
+}
+.header-small-text {
+  font-size: var(--app-secondary-font-size);
+}
 .highlight-text {
   color: white;
+  font-size: var(--app-title-font-size);
 }
-.icon-font {
-  display: block;
+.header-bg-color.ant-btn:hover {
+  background-color: var(--app-ant-select-bg-override-color) !important;
 }
-.icon-font-size-20 {
-  font-size: 20px;
+
+.assistant-table {
+  z-index: 5500;
+  border-collapse: separate;
+  border-spacing: 0 1em;
+  color: var(--app-bold-text-color);
+  width: 240px;
+}
+.assistant-table tr td:nth-child(2) {
+  text-align: right;
+}
+.svg-red {
+  filter: invert(27%) sepia(51%) saturate(2878%) hue-rotate(346deg)
+    brightness(104%) contrast(97%);
+}
+.triangle {
+  background-color: white;
+  width: 10px;
+  height: 10px;
+  clip-path: polygon(0 100%, 100% 100%, 50% 0);
+
+  position: absolute;
+  bottom: -2px;
+}
+.dropdown-triangle {
+  background-color: #8c8d9b;
+  width: 7px;
+  height: 5px;
+  clip-path: polygon(0 0, 100% 0, 50% 100%);
+  margin-left: 4px;
+}
+.markcount-animation {
+  animation: change-color 3s ease-in-out;
 }
-.icon-with-text {
-  font-size: 18px;
-  line-height: 18px;
+@keyframes change-color {
+  0% {
+    color: red;
+  }
+  100% {
+    color: white;
+  }
 }
 </style>

src/types/index.ts

@@ -19,7 +19,6 @@ export interface MarkStore {
   currentSpecialTag?: string;
   markResults: Array<MarkResult>;
   historyOpen: boolean; // 是否打开回评侧边栏
-  MarkBoardTrackCollapse: boolean; // 是否收缩评分版
   historyTasks: Array<Task>;
   removeScoreTracks: Array<Track>;
   focusTracks: Array<Track>; // 暂时无用
@@ -209,7 +208,6 @@ export interface InspectStore {
   };
   currentTask?: Task; // 用来切换task，还有回看
   historyOpen: boolean; // 是否打开回评侧边栏
-  MarkBoardTrackCollapse: boolean; // 是否收缩评分版
   historyTasks: Array<Task>;
   focusTracks: Array<Track>;
   message: string | null;