feat: id string类改number类型

src/render/ap/recognizeCheck.ts

@@ -0,0 +1,22 @@
+import { request } from "@/utils/request";
+
+import { ExamSubjectPageParams } from "./types/common";
+import { RecognizeConditionItem } from "./types/recognizeCheck";
+
+// 识别对照管理
+export const recognizeCheckList = (
+  data: ExamSubjectPageParams
+): Promise<ImageCheckListPageResult> =>
+  request({
+    url: "/api/admin/check/omr/group/page",
+    method: "post",
+    data,
+  });
+
+// 所有可用的识别对照条件
+export const recognizeConditionsList = (): Promise<RecognizeConditionItem[]> =>
+  request({
+    url: "/api/admin/check/omr/conditions",
+    method: "post",
+    data,
+  });

src/render/ap/types/base.ts

@@ -1,5 +1,5 @@
 export interface SubjectItem {
-  id: string;
+  id: number;
   subjectCode: string;
   subjectName: string;
 }

src/render/ap/types/common.ts

@@ -9,13 +9,13 @@ export type PageParams<T = unknown> = T & {
 };
 
 export interface ExamParams {
-  examId: string;
+  examId: number;
 }
 
 export type ExamPageParams = PageParams<ExamParams>;
 
 export interface ExamSubjectParams {
-  examId: string;
+  examId: number;
   subjectCode: string;
 }
 export type ExamSubjectPageParams = PageParams<ExamSubjectParams>;
@@ -26,6 +26,6 @@ export interface RequestActionResult {
 
 // page
 export interface AbleParams {
-  id: string;
+  id: number;
   enable: boolean;
 }

src/render/ap/types/dataCheck.ts

@@ -5,7 +5,7 @@ export type ExamStatus = "OK" | "ABSENT" | "UNCHECK";
 export type PaperTypeStatus = "OK" | "BLANK" | "ERROR";
 
 export interface DataCheckListFilter {
-  examId: string;
+  examId: number;
   status: DataStatus[];
   examStatus: ExamStatus;
   examNumber: string;
@@ -45,7 +45,7 @@ export interface PaperPageItem {
 
 // 某张缺页时没有id和pages等其他字段
 export interface PaperItem {
-  id?: string;
+  id?: number;
   number: number;
   // 是否人工绑定
   assigned?: boolean;
@@ -54,7 +54,7 @@ export interface PaperItem {
 }
 
 export interface DataCheckListItem {
-  id: string;
+  id: number;
   examNumber: string;
   studentCode: string;
   name: string;
@@ -96,7 +96,7 @@ export type OmrFiledType =
   | "QUESTION";
 
 export interface DataCheckOmrFieldEditParams {
-  examId: string;
+  examId: number;
   examNumber: string;
   paperNumber: string;
   pageIndex: number;
@@ -131,7 +131,7 @@ interface OmrEditPaperInfo {
 }
 
 export interface DataCheckOmrEditParams {
-  examId: string;
+  examId: number;
   examNumber: string;
   papers: OmrEditPaperInfo[];
 }

src/render/ap/types/recognizeCheck.ts

@@ -0,0 +1,35 @@
+import { PageResult, PageParams, ExamSubjectParams } from "./common";
+
+export interface RecognizeConditionItem {
+  code: string;
+  name: string;
+  needValue: boolean;
+}
+
+// 识别对照管理
+export interface RecognizeCheckListItem {
+  id: number;
+  conditions: Array<{
+    code: string;
+    value: string | number;
+  }>;
+  subjectCode: string;
+  subjectName: string;
+  //默认任务组为true，不能修改删除，自动生成任务
+  //非默认任务组允许手动生成任务
+  fixed: boolean;
+  //初始阶段为FIRST
+  stage: string;
+  //是否正在重置任务
+  reseting: boolean;
+  //是否正在生成任务
+  building: boolean;
+  //是否正在删除
+  deleting: boolean;
+  totalCount: number;
+  finishCount: number;
+  unarbitrateCount: number;
+  arbitratedCount: number;
+  updateTime: number;
+}
+export type ImageCheckListPageResult = PageResult<ImageCheckListItem>;

src/render/ap/types/resultExport.ts

@@ -16,7 +16,7 @@ export interface StudentStatusListItem {
 
 // 评卷点
 export interface MarkSiteListItem {
-  id: string;
+  id: number;
   subjectCode: string;
   subjectName: string;
   paperType: string;
@@ -27,8 +27,8 @@ export interface MarkSiteListItem {
 export type MarkSiteListPageResult = PageResult<MarkSiteListItem>;
 
 export interface MarkSiteSaveParams {
-  id?: string;
-  examId: string;
+  id?: number;
+  examId: number;
   subjectCode: string;
   paperType: string;
   oddNumber: number;
@@ -36,12 +36,12 @@ export interface MarkSiteSaveParams {
 }
 
 export interface markSiteSetParams {
-  examId: string;
+  examId: number;
   scanSite: string;
 }
 
 export interface dbfExportParams {
-  examId: string;
+  examId: number;
   subjectCode: string;
 }
 

src/render/components/SelectCourse/index.vue

@@ -40,7 +40,7 @@ const selected = ref("");
 const optionList = ref<optionListItem[]>([]);
 const search = async () => {
   optionList.value = [];
-  const resData = await subjectList({ examId: "" });
+  const resData = await subjectList({ examId: 1 });
 
   optionList.value = (resData || []).map((item) => {
     return { ...item, value: item.subjectCode, label: item.subjectName };

src/render/views/DataCheck/index.vue

@@ -49,7 +49,7 @@ defineOptions({
 });
 
 const searchModel = reactive({
-  examId: route.params.examId,
+  examId: Number(route.params.examId),
   subjectCode: route.params.subjectCode,
 });
 

src/render/views/ImageCheck/ImageFailed.vue

@@ -82,7 +82,7 @@ const columns: TableProps["columns"] = [
 ];
 
 const searchModel = reactive({
-  examId: route.params.examId,
+  examId: Number(route.params.examId),
   subjectCode: route.params.subjectCode,
 });
 

src/render/views/ImageCheck/index.vue

@@ -65,7 +65,7 @@ const loading = ref(false);
 const dataList = ref<ImageCheckListItem[]>([]);
 
 async function getData() {
-  const res = await imageCheckList({ examId: "" });
+  const res = await imageCheckList({ examId: 1 });
   dataList.value = res || [];
 }
 
@@ -74,7 +74,7 @@ function onViewFailed(index: number) {
   router.push({
     name: "ImageFailed",
     params: {
-      examId: "1",
+      examId: 1,
       subjectCode: record.subjectCode,
     },
   });

src/render/views/RecognizeCheck/index.vue

@@ -0,0 +1,9 @@
+<template>
+  <div></div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: "RecognizeCheck",
+});
+</script>

src/render/views/ResultExport/BreachImport.vue

@@ -80,7 +80,7 @@ const columns: TableProps["columns"] = [
 ];
 
 async function getData() {
-  const res = await breachList({ examId: "" });
+  const res = await breachList({ examId: 1 });
   dataList.value = res || [];
 }
 
@@ -89,7 +89,7 @@ const uploadData = ref<Record<string, string>>({});
 async function onImport(index: number) {
   const record = dataList.value[index];
   uploadData.value = {
-    examId: "",
+    examId: 1,
     subjectCode: "",
   };
   importDialogRef.value?.open();

src/render/views/ResultExport/DbfExport.vue

@@ -88,8 +88,8 @@ const columns: TableProps["columns"] = [
 
 const siteCodeData = ref({} as markSiteSetParams);
 async function getScanSiteCode() {
-  const res = await markSiteCodeInfo({ examId: "" });
-  siteCodeData.value = { scanSite: res.scanSite, examId: "" };
+  const res = await markSiteCodeInfo({ examId: 1 });
+  siteCodeData.value = { scanSite: res.scanSite, examId: 1 };
 }
 
 const modifySiteCodeRef = ref();
@@ -101,14 +101,14 @@ function siteCodeModified(data: markSiteSetParams) {
 }
 
 async function getData() {
-  const res = await subjectList({ examId: "" });
+  const res = await subjectList({ examId: 1 });
   dataList.value = res || [];
 }
 
 async function onExportAnswer(index: number) {
   const record = dataList.value[index];
   const res = await dbfAnswerExport({
-    examId: "",
+    examId: 1,
     subjectCode: record.subjectCode,
   });
   curExportTask.value = { id: res.taskId, name: "扫描答案DBF" };
@@ -118,7 +118,7 @@ async function onExportAnswer(index: number) {
 async function onExportPackage(index: number) {
   const record = dataList.value[index];
   const res = await dbfPackageExport({
-    examId: "",
+    examId: 1,
     subjectCode: record.subjectCode,
   });
   curExportTask.value = { id: res.taskId, name: "打包DBF" };

src/render/views/ResultExport/MarkSite.vue

@@ -83,7 +83,7 @@ const columns: TableProps["columns"] = [
 const curRow = ref({} as MarkSiteListItem);
 
 const { dataList, pagination, loading, getList, toPage, deletePageLastItem } =
-  useTable<MarkSiteListItem>(markSiteListPage, { examId: "" }, false);
+  useTable<MarkSiteListItem>(markSiteListPage, { examId: 1 }, false);
 
 const modifyMarkSiteRef = ref();
 function onAdd() {

src/render/views/ResultExport/ModifyMarkSite.vue

@@ -65,8 +65,8 @@ const { visible, open, close } = useModal();
 defineExpose({ open, close });
 
 const defaultFormData = {
-  id: "",
-  examId: "",
+  id: 0,
+  examId: 0,
   subjectCode: "",
   paperType: "",
   oddNumber: 0,

src/render/views/ResultExport/ModifySiteCode.vue

@@ -44,7 +44,7 @@ const { visible, open, close } = useModal();
 defineExpose({ open, close });
 
 const defaultFormData = {
-  examId: "",
+  examId: 0,
   scanSite: "",
 };
 

src/render/views/ResultExport/StudentStatus.vue

@@ -89,7 +89,7 @@ const columns: TableProps["columns"] = [
 const curRow = ref({} as StudentStatusListItem);
 
 async function getData() {
-  const res = await studentStatusList({ examId: "" });
+  const res = await studentStatusList({ examId: 1 });
   dataList.value = res || [];
 }
 
@@ -99,7 +99,7 @@ async function onImport(index: number) {
   const record = dataList.value[index];
   curRow.value = record;
   uploadData.value = {
-    examId: "",
+    examId: 1,
     subjectCode: "",
   };
   importDialogRef.value?.open();