Prechádzať zdrojové kódy

fix一个bug要看他人好多代码

刘洋 8 mesiacov pred
rodič
commit
3027b7227a

+ 1 - 1
src/render/ap/types/base.ts

@@ -35,7 +35,7 @@ export interface UploadFileResult {
 // base config
 export interface ConfigInfo {
   examId: number;
-  paperTypeBarcodeContent: string[];
+  paperTypeBarcodeContent: any;
   imageCheckRatio: string | number;
   imageCheckOrder: string;
   enableSyncVerify: boolean;

+ 6 - 2
src/render/utils/recog/recog.ts

@@ -99,7 +99,8 @@ export function parseDetailSize(
   data: RecogDataFillResult,
   type: RecogAreaType,
   index: number,
-  fillResult?: number[]
+  fillResult?: number[],
+  isJingHao?: boolean
 ): RecognizeArea {
   const result: RecognizeArea = {
     index,
@@ -163,7 +164,10 @@ export function parseDetailSize(
     const options = abc.substring(0, data.fill_position.length).split("");
     // 空用“#”表示
     result.options = ["#", ...options];
-    result.result = options.filter((r, ind) => fillResultList[ind] === 1);
+    console.log(result.options, options, fillResultList);
+    result.result = isJingHao
+      ? ["#"]
+      : options.filter((r, ind) => fillResultList[ind] === 1);
     result.multiple = true;
   }
 

+ 7 - 2
src/render/views/DataCheck/ModifyPaperType.vue

@@ -52,13 +52,14 @@ import { onMounted, ref, watch } from "vue";
 import { message } from "ant-design-vue";
 
 import { getBaseDataConfig } from "@/ap/baseDataConfig";
-import { useUserStore } from "@/store";
+import { useUserStore, useDataCheckStore } from "@/store";
 import useModal from "@/hooks/useModal";
 
 defineOptions({
   name: "ModifyPaperType",
 });
 
+const dataCheckStore = useDataCheckStore();
 const editing = ref(false);
 /* modal */
 const { visible, open, close } = useModal();
@@ -77,7 +78,11 @@ const paperType = ref("");
 
 async function getConfig() {
   const res = await getBaseDataConfig({ examId: userStore.curExam.id });
-  paperTypeBarcodeContent.value = res.paperTypeBarcodeContent || [];
+  // paperTypeBarcodeContent.value = res.paperTypeBarcodeContent || [];
+  paperTypeBarcodeContent.value =
+    (res.paperTypeBarcodeContent || []).find((item: any) => {
+      return item.code == dataCheckStore.curStudent?.subjectCode;
+    })?.paperTypeBarcodeContent || [];
 }
 
 function selectPaperType(val: string) {

+ 3 - 1
src/render/views/DataCheck/ScanImage/index.vue

@@ -215,11 +215,13 @@ function updateRecogList() {
       qRecog.index = ++index;
 
       const questionResult = result ? result.split("") : [];
+
       const recogItem = parseDetailSize(
         qRecog,
         "question",
         qRecog.index,
-        getNumberResult(questionResult, ABC)
+        getNumberResult(questionResult, ABC),
+        result === "#"
       );
       recogList.value.push(recogItem);
     });

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

@@ -55,6 +55,7 @@ defineOptions({
 });
 
 const dataCheckStore = useDataCheckStore();
+dataCheckStore.resetInfo();
 const userStore = useUserStore();
 
 let searchModel = {} as DataCheckListFilter;