zhangjie 7 月之前
父節點
當前提交
3a84256036

+ 1 - 0
src/render/ap/imageCheck.ts

@@ -19,6 +19,7 @@ export const imageCheckList = (
     url: "/api/admin/check/image/list",
     url: "/api/admin/check/image/list",
     method: "post",
     method: "post",
     params: data,
     params: data,
+    loading: true,
   });
   });
 
 
 export const imageCheckFailedList = (
 export const imageCheckFailedList = (

+ 1 - 0
src/render/ap/types/absentCheck.ts

@@ -8,6 +8,7 @@ export interface AbsentCheckListFilter {
   name: string;
   name: string;
   subjectCode: string;
   subjectCode: string;
   examStatus: string;
   examStatus: string;
+  status: string;
 }
 }
 
 
 export type AbsentCheckListParams = PageParams<AbsentCheckListFilter>;
 export type AbsentCheckListParams = PageParams<AbsentCheckListFilter>;

+ 1 - 0
src/render/views/AbsentCheck/CheckAction.vue

@@ -201,6 +201,7 @@ const initSearchModel = {
   name: "",
   name: "",
   subjectCode: "",
   subjectCode: "",
   examStatus: "",
   examStatus: "",
+  status: "SCANNED",
 };
 };
 const searchModel = reactive<AbsentCheckListFilter>({ ...initSearchModel });
 const searchModel = reactive<AbsentCheckListFilter>({ ...initSearchModel });
 const imageType = ref(dataCheckStore.imageType);
 const imageType = ref(dataCheckStore.imageType);

+ 0 - 1
src/render/views/AbsentCheck/index.vue

@@ -75,7 +75,6 @@ async function getList() {
     ...searchModel,
     ...searchModel,
     pageNumber: pageNumber.value,
     pageNumber: pageNumber.value,
     pageSize: pageSize.value,
     pageSize: pageSize.value,
-    status: "SCANNED",
   };
   };
   const res = await absentCheckList(datas).catch(() => null);
   const res = await absentCheckList(datas).catch(() => null);
   loading.value = false;
   loading.value = false;

+ 1 - 1
src/render/views/DataCheck/CheckAction.vue

@@ -235,7 +235,7 @@ const fieldNames = { label: "name", value: "code" };
 // search
 // search
 const initSearchModel = {
 const initSearchModel = {
   examId: userStore.curExam.id,
   examId: userStore.curExam.id,
-  status: "",
+  status: "SCANNED",
   examStatus: "",
   examStatus: "",
   examNumber: "",
   examNumber: "",
   studentCode: "",
   studentCode: "",

+ 0 - 1
src/render/views/DataCheck/index.vue

@@ -74,7 +74,6 @@ async function getList() {
     ...searchModel,
     ...searchModel,
     pageNumber: pageNumber.value,
     pageNumber: pageNumber.value,
     pageSize: pageSize.value,
     pageSize: pageSize.value,
-    status: "SCANNED",
   };
   };
   const res = await dataCheckList(datas).catch(() => null);
   const res = await dataCheckList(datas).catch(() => null);
   loading.value = false;
   loading.value = false;

+ 5 - 1
src/render/views/ResultExport/BreachImport.vue

@@ -34,7 +34,11 @@
   />
   />
 
 
   <!-- TaskProgressDialog -->
   <!-- TaskProgressDialog -->
-  <TaskProgressDialog ref="taskProgressDialogRef" :task="curExportTask" />
+  <TaskProgressDialog
+    ref="taskProgressDialogRef"
+    :task="curExportTask"
+    @finished="getData"
+  />
 </template>
 </template>
 
 
 <script setup lang="ts">
 <script setup lang="ts">

+ 12 - 2
src/render/views/ResultExport/ModifyMarkSite.vue

@@ -31,14 +31,14 @@
       <a-form-item name="oddNumber" label="奇数考场评卷点代码">
       <a-form-item name="oddNumber" label="奇数考场评卷点代码">
         <a-input
         <a-input
           v-model:value="formData.oddNumber"
           v-model:value="formData.oddNumber"
-          :maxlength="30"
+          :maxlength="6"
           placeholder="请输入"
           placeholder="请输入"
         />
         />
       </a-form-item>
       </a-form-item>
       <a-form-item name="evenNumber" label="偶数考场评卷点代码">
       <a-form-item name="evenNumber" label="偶数考场评卷点代码">
         <a-input
         <a-input
           v-model:value="formData.evenNumber"
           v-model:value="formData.evenNumber"
-          :maxlength="30"
+          :maxlength="6"
           placeholder="请输入"
           placeholder="请输入"
         />
         />
       </a-form-item>
       </a-form-item>
@@ -115,6 +115,11 @@ const rules: FormRules<keyof MarkSiteSaveParams> = {
       message: "请输入",
       message: "请输入",
       trigger: "change",
       trigger: "change",
     },
     },
+    {
+      pattern: /^[0-9]{1,6}$/,
+      message: "只能输入最多6个数字",
+      trigger: "change",
+    },
   ],
   ],
   evenNumber: [
   evenNumber: [
     {
     {
@@ -122,6 +127,11 @@ const rules: FormRules<keyof MarkSiteSaveParams> = {
       message: "请输入",
       message: "请输入",
       trigger: "change",
       trigger: "change",
     },
     },
+    {
+      pattern: /^[0-9]{1,6}$/,
+      message: "只能输入最多6个数字",
+      trigger: "change",
+    },
   ],
   ],
 };
 };
 
 

+ 2 - 0
src/render/views/ResultExport/TaskProgressDialog.vue

@@ -43,6 +43,7 @@ const props = defineProps<{
   };
   };
   downloadHandle?: PromiseFunc;
   downloadHandle?: PromiseFunc;
 }>();
 }>();
+const emit = defineEmits(["finished"]);
 
 
 const curProgress = ref(0);
 const curProgress = ref(0);
 
 
@@ -83,6 +84,7 @@ async function getProgress() {
   // 文件生成成功,开始下载
   // 文件生成成功,开始下载
   if (result.status === "SUCCESS") {
   if (result.status === "SUCCESS") {
     stop();
     stop();
+    emit("finished");
     if (props.downloadHandle) {
     if (props.downloadHandle) {
       await props.downloadHandle();
       await props.downloadHandle();
     }
     }