fix: 考试名称问题,部分字段空值错误处理

electron/db/modelApi/trackTask.ts

@@ -156,3 +156,17 @@ export async function updateTrackTaskDetailStatus(data: {
     }
   );
 }
+
+export async function releaseAllRunningTaskDetail(trackTaskId: number) {
+  await TrackTaskDetail.update(
+    {
+      status: TRACK_TASK_DETAIL_STATUS.INIT,
+    },
+    {
+      where: {
+        status: TRACK_TASK_DETAIL_STATUS.RUNNING,
+        trackTaskId,
+      },
+    }
+  );
+}

electron/preload/apiDb.ts

@@ -9,6 +9,7 @@ import {
   getUnfinishTrackTaskDetail,
   updateTrackTaskDetailStatus,
   finishAllUnfinishTask,
+  releaseAllRunningTaskDetail,
 } from '../db/modelApi/trackTask';
 
 createDb();
@@ -24,6 +25,7 @@ const dbApi = {
   getUnfinishTrackTaskDetail,
   updateTrackTaskDetailStatus,
   finishAllUnfinishTask,
+  releaseAllRunningTaskDetail,
 };
 
 export type DbApi = typeof dbApi;

src/api/interceptor.ts

@@ -16,7 +16,7 @@ import { DEVICE_ID, PLATFORM } from '../constants/app';
 import { objTypeOf, pickByNotNull } from '../utils/utils';
 import { useUserStore, useAppStore } from '../store';
 
-axios.defaults.timeout = 10 * 1000;
+axios.defaults.timeout = 2 * 60 * 1000;
 
 let load: MessageReturn | null = null;
 // 同一时间有多个请求时，会形成队列。在第一个请求创建loading，在最后一个响应关闭loading

src/components/select-exam/index.vue

@@ -63,7 +63,7 @@
       (item) => selected.value === item.value
     );
     emit('update:modelValue', selected.value || null);
-    emit('change', selectedData);
+    emit('change', selectedData[0]);
   };
 
   watch(

src/components/select-semester/index.vue

@@ -62,7 +62,7 @@
       (item) => selected.value === item.value
     );
     emit('update:modelValue', selected.value || null);
-    emit('change', selectedData);
+    emit('change', selectedData[0]);
   };
 
   watch(

src/views/base/track-export/index.vue

@@ -16,6 +16,7 @@
         select-default
         placeholder="请选择"
         prefix
+        :style="{ width: '260px' }"
         @default-selected="toPage(1)"
         @change="examChange"
       />

src/views/base/track-export/taskProgress.vue

@@ -112,6 +112,8 @@
       return;
     }
 
+    await window.db.releaseAllRunningTaskDetail(res.id);
+
     task.value = res;
     taskInfo.value = [
       {

src/views/base/track-export/useDraw.ts

@@ -159,7 +159,9 @@ export default function useDraw(winId: number) {
       const e = error as Error;
       console.log(e);
       addLog(
-        `[${curStudentId}] 08-任务失败，原因：${e.message || '未知'}`,
+        `[${curStudentId}-${rawTask.studentCode}] 08-任务失败，原因：${
+          e.message || '未知'
+        }`,
         'error'
       );
       return Promise.reject(error);
@@ -267,14 +269,14 @@ export default function useDraw(winId: number) {
         .forEach((item) => {
           drawTrackList.push(getDrawTrackItem(item));
         });
-      rawTask.specialTagList
+      (rawTask.specialTagList || [])
         .filter((item) => item.offsetIndex === i + 1)
         .forEach((item) => {
           drawTrackList.push(getDrawTagTrackItem(item));
         });
       const answerTags = paserRecogData(i);
       drawTrackList.push(...answerTags);
-      drawTrackList.push(...markDeailList[i]);
+      drawTrackList.push(...(markDeailList[i] || []));
       drawTrackList.push(getTotalTrack(img));
 
       trackData[i] = {

src/views/login/login/index.vue

@@ -27,6 +27,7 @@
             placeholder="请选择学校"
             name="schoolCode"
             :options="schools"
+            allow-search
           >
           </a-select>
         </a-form-item>