刘洋 7 luni în urmă
părinte
comite
7d0c6d6113

+ 21 - 4
src/render/views/Audit/Review/ReviewAction.vue

@@ -75,12 +75,12 @@
         </a-collapse-panel>
       </a-collapse>
       <div class="history-list">
-        <div class="task-list">
+        <div class="task-list h-full flex flex-col">
           <ul class="list-head">
             <li class="li-grow">考号</li>
             <li style="width: 80px">状态</li>
           </ul>
-          <div class="list-body">
+          <div class="list-body flex-1 overflow-auto">
             <ul
               v-for="(item, index) in dataList"
               :key="item.examNumber"
@@ -102,6 +102,14 @@
               </li>
             </ul>
           </div>
+          <div style="padding: 10px 0">
+            <SimplePagination
+              v-model="pageNumber"
+              :total="total"
+              :page-size="pageSize"
+              @change="pageChange"
+            />
+          </div>
         </div>
       </div>
     </div>
@@ -117,6 +125,7 @@ import { getSubjectList } from "@/ap/base";
 import { reviewAuditTaskHistory } from "@/ap/review";
 import { ReviewTaskListItem } from "@/ap/types/review";
 import { SubjectItem } from "@/ap/types/base";
+import SimplePagination from "@/components/SimplePagination/index.vue";
 
 import { useUserStore, useReviewStore } from "@/store";
 
@@ -167,16 +176,24 @@ getCourses();
 // history
 const curHistoryTaskIndex = ref(0);
 const dataList = ref<ReviewTaskListItem[]>([]);
+const pageNumber = ref(1);
+const pageSize = ref(20);
+const total = ref(0);
 async function getHistory() {
   const res = await reviewAuditTaskHistory({
     examId: userStore.curExam.id,
     subjectCode: searchCourseCode.value,
-    pageNumber: 1,
-    pageSize: 20,
+    pageNumber: pageNumber.value,
+    pageSize: pageSize.value,
   });
   dataList.value = res.result || [];
+  total.value = res?.totalCount || 0;
 }
 
+const pageChange = () => {
+  getHistory();
+};
+
 function updateTaskStatus(assignedSuspect: boolean) {
   const row = dataList.value.find(
     (item) => item.id === reviewStore.curTask?.id

+ 21 - 5
src/render/views/Review/ReviewAction.vue

@@ -116,12 +116,12 @@
         </a-collapse-panel>
       </a-collapse>
       <div class="history-list">
-        <div class="task-list">
+        <div class="task-list h-full flex flex-col">
           <ul class="list-head">
             <li class="li-grow">考号</li>
             <li style="width: 80px">状态</li>
           </ul>
-          <div class="list-body">
+          <div class="list-body flex-1 overflow-auto">
             <ul
               v-for="(item, index) in dataList"
               :key="item.examNumber"
@@ -143,6 +143,14 @@
               </li>
             </ul>
           </div>
+          <div style="padding: 10px 0">
+            <SimplePagination
+              v-model="pageNumber"
+              :total="total"
+              :page-size="pageSize"
+              @change="pageChange"
+            />
+          </div>
         </div>
       </div>
     </div>
@@ -164,7 +172,7 @@ import {
 import { message } from "ant-design-vue";
 
 import { showConfirm } from "@/utils/uiUtils";
-
+import SimplePagination from "@/components/SimplePagination/index.vue";
 import { reviewWarningTaskExport, reviewTaskHistory } from "@/ap/review";
 import { ReviewTaskListItem, ReviewExportType } from "@/ap/types/review";
 import { SubjectItem } from "@/ap/types/base";
@@ -223,16 +231,24 @@ getCourses();
 // history
 const curHistoryTaskIndex = ref(0);
 const dataList = ref<ReviewTaskListItem[]>([]);
+const pageNumber = ref(1);
+const pageSize = ref(20);
+const total = ref(0);
 async function getHistory() {
   const res = await reviewTaskHistory({
     examId: userStore.curExam.id,
     subjectCode: searchCourseCode.value,
-    pageNumber: 1,
-    pageSize: 20,
+    pageNumber: pageNumber.value,
+    pageSize: pageSize.value,
   });
   dataList.value = res.result || [];
+  total.value = res?.totalCount || 0;
 }
 
+const pageChange = () => {
+  getHistory();
+};
+
 function updateTaskStatus(assignedSuspect: boolean) {
   const row = dataList.value.find(
     (item) => item.id === reviewStore.curTask?.id