瀏覽代碼

复核优化

Michael Wang 4 年之前
父節點
當前提交
70f443fd7e

+ 8 - 2
src/features/inspect/Inspect.vue

@@ -2,7 +2,7 @@
   <div class="my-container">
     <mark-header />
     <div class="tw-flex tw-gap-1">
-      <mark-history @reload="fetchTask" />
+      <mark-history @reload="reloadAndfetchTask" />
       <mark-body />
       <MarkBoardInspect @inspect="saveTaskToServer" @reject="rejectQuestions" />
     </div>
@@ -87,7 +87,7 @@ export default defineComponent({
     }
     async function updateTask() {
       // const mkey = "fetch_task_key";
-      message.info({ content: "获取任务中..." });
+      message.info({ content: "获取任务中...", duration: 2 });
       let res;
       if (isSingleStudent) {
         res = await getSingleStuTask();
@@ -100,6 +100,11 @@ export default defineComponent({
       if (store.currentTask) store.setting.subject = store.currentTask.subject;
     }
 
+    async function reloadAndfetchTask() {
+      await updateClearTask();
+      await fetchTask();
+    }
+
     async function fetchTask() {
       !isSingleStudent && (await updateStatus());
       await updateTask();
@@ -162,6 +167,7 @@ export default defineComponent({
     return {
       store,
       fetchTask,
+      reloadAndfetchTask,
       saveTaskToServer,
       rejectQuestions,
     };

+ 11 - 4
src/features/inspect/MarkBoardInspect.vue

@@ -64,16 +64,23 @@
     </div>
 
     <div class="tw-flex tw-justify-center">
-      <div
+      <qm-button
+        type="primary"
         v-if="
           store.currentTask.inspectTime && store.currentTask.inspectTime > 0
         "
         @click="reject"
       >
         打回
-      </div>
-      <div v-else-if="checkedQuestions.length === 0" @click="inspect">复核</div>
-      <div v-else @click="reject">打回</div>
+      </qm-button>
+      <qm-button
+        v-else-if="checkedQuestions.length === 0"
+        @click="inspect"
+        type="primary"
+      >
+        复核
+      </qm-button>
+      <qm-button v-else @click="reject" type="primary">打回</qm-button>
     </div>
   </div>
 </template>

+ 9 - 1
src/features/inspect/MarkHeader.vue

@@ -47,7 +47,10 @@
         store.setting.userName
       }}
     </div>
-    <div class="tw-flex tw-place-items-center">
+    <div
+      class="tw-flex tw-place-items-center tw-cursor-pointer"
+      @click="closeWindow"
+    >
       <PoweroffOutlined class="icon-font icon-with-text" />关闭
     </div>
   </div>
@@ -145,6 +148,10 @@ export default defineComponent({
       }
     }
 
+    const closeWindow = () => {
+      window.close();
+    };
+
     return {
       store,
       isSingleStudent,
@@ -155,6 +162,7 @@ export default defineComponent({
       lessThanOneScale,
       updateHistoryTask,
       toggleHistory,
+      closeWindow,
     };
   },
 });

+ 3 - 1
src/features/inspect/MarkHistory.vue

@@ -55,7 +55,9 @@ export default defineComponent({
 
     watchEffect(async () => {
       if (store.historyOpen) {
+        replaceCurrentTask(undefined);
         await updateHistoryTask({});
+        replaceCurrentTask(store.historyTasks[0]);
       } else {
         emit("reload");
       }
@@ -84,7 +86,7 @@ export default defineComponent({
       }
     }
 
-    function replaceCurrentTask(task: Task) {
+    function replaceCurrentTask(task: Task | undefined) {
       store.currentTask = task;
     }