刘洋 hai 8 meses
pai
achega
7f93c87966

+ 1 - 1
src/render/store/modules/dataCheck/index.ts

@@ -81,7 +81,7 @@ export const useDataCheckStore = defineStore("dataCheck", {
     modifyPaperType(data: UpdatePaperType) {
       if (!this.curStudent) return;
       const { paperType, pageIndex, paperIndex } = data;
-      this.curStudent.paperType = paperType;
+      this.curStudent.paperType = paperType || "#";
       this.curStudent.papers[paperIndex].pages[pageIndex].paperType.result =
         paperType;
     },

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

@@ -345,7 +345,14 @@ function onSearch() {
   emit("search", searchModel);
 }
 function onCustomSearch() {
-  emit("search", customSearchModel);
+  // emit("search", customSearchModel);
+  emit("search", {
+    ...customSearchModel,
+    examNumber: (customSearchModel.examNumber || "")
+      .split("\n")
+      .filter((item) => item)
+      .join(","),
+  });
 }
 
 function onImageTypeChange() {

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

@@ -28,8 +28,8 @@
       <a-form-item label="更改卷型">
         <ul class="type-list">
           <li
-            :class="['type-item', { 'is-active': paperType === '' }]"
-            @click="selectPaperType('')"
+            :class="['type-item', { 'is-active': paperType === '#' }]"
+            @click="selectPaperType('#')"
           >
           </li>

+ 6 - 6
src/render/views/DataCheck/QuestionPanel.vue

@@ -94,7 +94,7 @@
   />
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name="QuestionPanel">
 import { computed, ref, watch } from "vue";
 import { message } from "ant-design-vue";
 import { SwapOutlined } from "@ant-design/icons-vue";
@@ -108,9 +108,9 @@ import { useDataCheckStore } from "@/store";
 import { vEleClickOutsideDirective } from "@/directives/eleClickOutside";
 import { getSliceFileUrl } from "@/utils/tool";
 
-defineOptions({
-  name: "QuestionPanel",
-});
+// defineOptions({
+//   name: "QuestionPanel",
+// });
 
 const props = withDefaults(
   defineProps<{
@@ -238,13 +238,13 @@ async function paperTypeModified(paperType: string) {
   dataCheckStore.modifyPaperType({
     paperIndex: curPage.value?.paperIndex as number,
     pageIndex: curPage.value?.pageIndex as number,
-    paperType,
+    paperType: paperType || "#",
   });
   await dataCheckStore.updateField({
     field: "PAPER_TYPE",
     value: JSON.stringify({
       ...dataCheckStore.curPage.paperType,
-      result: paperType,
+      result: paperType || "#",
     }),
   });
   dataCheckStore.curPage.paperType.result = paperType;