Sfoglia il codice sorgente

feat: 复核数据调整

zhangjie 9 mesi fa
parent
commit
2dd424f0a9

+ 4 - 4
src/render/ap/review.ts

@@ -14,12 +14,12 @@ import {
   ReviewWarningTaskExportParams,
 } from "./types/review";
 
-// 违纪导入
+// 复核任务
 export const reviewTaskList = (
   data: ExamSubjectParams
 ): Promise<ReviewTaskListItem[]> =>
   request({
-    url: "/api/admin/subject/breach/page",
+    url: "/api/admin/check/inspect/task/get",
     method: "post",
     data,
   });
@@ -59,7 +59,7 @@ export const reviewTaskReset = (
   data: ExamSubjectParams
 ): Promise<RequestActionResult> =>
   request({
-    url: "/api/admin/check/omr/arbitrate/save",
+    url: "/api/admin/check/assigned/reset",
     method: "post",
     data,
   });
@@ -69,7 +69,7 @@ export const reviewWarningTaskExport = (
   data: ReviewWarningTaskExportParams
 ): Promise<AxiosResponse<Blob>> =>
   request({
-    url: "/api/admin/subject/image-check/failed/export",
+    url: "/api/admin/check/assigned/export",
     method: "post",
     data,
     responseType: "blob",

+ 15 - 5
src/render/ap/types/review.ts

@@ -3,18 +3,28 @@ import { PageResult } from "./common";
 // 复核校验
 export interface ReviewTaskItemPage {
   index: number;
-  uri: string;
+  sheetUri: string;
+  sliceUri: string[];
+}
+export interface ReviewTaskItemPaper {
+  number: number;
+  assigned: boolean;
+  assignedSuspect: boolean;
+  pages: ReviewTaskItemPage[];
 }
 export interface ReviewTaskListItem {
   id: number;
+  examNumber: string;
   name: string;
   studentCode: string;
   subjectCode: string;
   subjectName: string;
-  examNumber: string;
-  markStatus: boolean;
-  breachCount: number;
-  pages: ReviewTaskItemPage[];
+  cardNumber: number;
+  omrAbsent: boolean;
+  assigned: boolean;
+  assignedCheckCount: number;
+  assignedSuspect: boolean;
+  papers: ReviewTaskItemPaper[];
 }
 
 export interface ReviewProgressResult {

+ 1 - 1
src/render/views/Audit/Review/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>ReviewAudit</div>
+  <div>ReviewAudit 复用Review,通过角色区分页面差异</div>
 </template>
 
 <script setup lang="ts">

+ 4 - 2
src/render/views/Review/ReviewAction.vue

@@ -113,9 +113,11 @@
               <li class="li-grow">{{ item.examNumber }}</li>
               <li style="width: 80px">
                 <span
-                  :class="item.markStatus ? 'color-success' : 'color-error'"
+                  :class="
+                    item.assignedSuspect ? 'color-success' : 'color-error'
+                  "
                 >
-                  {{ item.markStatus ? "正常" : "异常" }}
+                  {{ item.assignedSuspect ? "正常" : "异常" }}
                 </span>
               </li>
             </ul>

+ 4 - 4
src/render/views/Review/ReviewImage.vue

@@ -2,7 +2,7 @@
   <div v-if="reviewStore.curTask" class="review-image">
     <div
       class="review-image-box"
-      v-for="(item, index) in reviewStore.curTask.pages"
+      v-for="(item, index) in reviewStore.curTask.papers"
       :key="index"
       :style="boxStyle"
     >
@@ -16,7 +16,7 @@
           src="../RecognizeCheck/data/202302040117-1.jpg"
           :alt="`第${index + 1}页`"
         />
-        <!-- <img :src="item.uri" :alt="`第${index + 1}页`" /> -->
+        <!-- <img :src="item.pages[0].sheetUri" :alt="`第${index + 1}页`" /> -->
       </div>
     </div>
   </div>
@@ -33,10 +33,10 @@ defineOptions({
 const reviewStore = useReviewStore();
 
 const boxStyle = computed(() => {
-  if (!reviewStore.curTask || !reviewStore.curTask.pages.length) return {};
+  if (!reviewStore.curTask || !reviewStore.curTask.papers.length) return {};
 
   return {
-    height: `${100 / reviewStore.curTask.pages.length}%`,
+    height: `${100 / reviewStore.curTask.papers.length}%`,
   };
 });
 

+ 2 - 2
src/render/views/Review/index.vue

@@ -166,7 +166,7 @@ async function onMark(result: boolean) {
     await reviewTaskSave({ id: reviewStore.curTask.id, result });
     reviewStore.setInfo({
       curTask: Object.assign({}, reviewStore.curTask, {
-        markStatus: result,
+        assignedSuspect: result,
       }),
     });
 
@@ -219,7 +219,7 @@ onMounted(() => {
       subjectCode: "SX0001",
       subjectName: "数学",
       examNumber: "360080241304012",
-      markStatus: false,
+      assignedSuspect: false,
       breachCount: 1,
       pages: [
         {