zhangjie преди 2 години
родител
ревизия
5efcbb3aeb
променени са 1 файла, в които са добавени 12 реда и са изтрити 16 реда
  1. 12 16
      src/features/allAnalysis/AllAnalysis2.vue

+ 12 - 16
src/features/allAnalysis/AllAnalysis2.vue

@@ -31,10 +31,6 @@
             current: pageNo,
             total: totalElements,
             showTotal: () => ``,
-            onChange: (pageNoChanged, pageSizeChanged) => {
-              pageNo = pageNoChanged;
-              pageSize = pageSizeChanged;
-            },
           }"
           @change="tableChange"
         >
@@ -107,8 +103,6 @@ async function search() {
   await fetchData();
 }
 
-watch(() => [pageNo, pageSize], fetchData);
-
 interface fetchParamType {
   courseId?: number;
   projectId: number;
@@ -235,17 +229,19 @@ async function tableChange(
   filters: FilterType[],
   sorter: SorterType
 ) {
-  if (sorter.field) {
-    if (sorter.order) {
-      sortColName = sorter.field;
-      sortOrder = sorter.order.slice(0, -3).toUpperCase();
-    } else {
-      sortColName = "";
-      sortOrder = "";
-    }
-    await search();
-    return;
+  // console.log(pagination, sorter);
+
+  pageNo = pagination.current;
+  pageSize = pagination.pageSize;
+
+  if (sorter.order) {
+    sortColName = sorter.field;
+    sortOrder = sorter.order.slice(0, -3).toUpperCase();
+  } else {
+    sortColName = "";
+    sortOrder = "";
   }
+  await fetchData();
 }
 // async function goProjectPapers(id: number) {
 //   await router.push("/project/papers/" + id);