修复分页bug

src/api/knowledge.js

@@ -73,12 +73,19 @@ export function getKnowledgeByStatus(offset, pageSize, status) {
  * @param {*} knowledgePoint
  * @returns
  */
-export function searchKnowledge(offset, pageSize, keyword, knowledgePoint) {
+export function searchKnowledge(
+  offset,
+  pageSize,
+  keyword,
+  knowledgeType,
+  knowledgePoint
+) {
   return axios.get("/api/knowledge/search", {
     params: {
       offset: offset,
       pageSize: pageSize,
       keyword: keyword,
+      knowledge_type: knowledgeType,
       knowledge_point: knowledgePoint,
     },
     paramsSerializer: (params) =>

src/components/KnowledgeCreator/KnowledgeCrawler.vue

@@ -84,11 +84,11 @@ export default {
                     { required: true, message: '请输入URL', trigger: 'blur' },
                 ],
                 knowledgeType: [
-                    { required: true, message: '请选择知识点类型', trigger: 'change' },
+                    { required: true, message: '请选择知识类型', trigger: 'change' },
                 ],
             },
             tasks: [],
-            totalNum: 2,
+            totalNum: 0,
             pageSize: 10,
             currentPage: 1,
         };
@@ -121,12 +121,14 @@ export default {
             this.$refs[formName].resetFields();
         },
         handleSizeChange(val) {
-            getCrawlTaskList(0, val).then(res => {
+            this.pageSize = val;
+            getCrawlTaskList(0, this.pageSize).then(res => {
                 this.tasks = res.data.result.content;
                 this.totalNum = res.data.result.totalElements;
             });
         },
         handleCurrentChange(val) {
+            this.currentPage = val;
             getCrawlTaskList(val - 1, this.pageSize).then(res => {
                 this.tasks = res.data.result.content;
                 this.totalNum = res.data.result.totalElements;
@@ -136,7 +138,6 @@ export default {
     mounted() {
         // 获取爬虫任务列表
         getCrawlTaskList(0, this.pageSize).then(res => {
-            console.log(res.data.result.content);
             this.tasks = res.data.result.content;
             this.totalNum = res.data.result.totalElements;
         });

src/views/Bok/Main/KnowledgeRepo.vue

@@ -14,8 +14,8 @@
             <el-collapse-item title="更多筛选条件" name="1">
                 <el-space direction="vertical" alignment="flex-start">
                     <!-- 标题 -->
-                    <search-filter :title="knowledgeFilter.title" :keyword="knowledgeFilter.keyword"
-                        ref="knowledgeFilter" @filterChange="handleknowledgeFilter" />
+                    <search-filter :title="knowledgePointFilter.title" :keyword="knowledgePointFilter.keyword"
+                        ref="knowledgePointFilter" @filterChange="handleknowledgePointFilter" />
                 </el-space>
             </el-collapse-item>
         </el-collapse>
@@ -143,7 +143,7 @@ export default {
             // 搜索
             searchContent: '',
             isCollapsed: true,
-            knowledgeFilter: {
+            knowledgePointFilter: {
                 title: "知识点",
                 group: [],
                 keyword: src.knowledgeKeyword,
@@ -159,10 +159,10 @@ export default {
     },
     methods: {
         handleTabClick(tab) {
-            console.log(tab);
+            this.clickSearch();
         },
         async clickSearch() {
-            searchKnowledge(0, this.pageSize, this.searchContent, this.knowledgeFilter.group).then(res => {
+            searchKnowledge(this.currentPage - 1, this.pageSize, this.searchContent, this.tabActiveName, this.knowledgePointFilter.group).then(res => {
                 console.log(res);
                 this.knowledgeList = res.data.result.content;
                 this.totalNum = res.data.result.totalElements;
@@ -171,10 +171,12 @@ export default {
             });
         },
         handleSizeChange(val) {
-            console.log(`每页 ${val} 条`);
+            this.pageSize = val;
+            this.clickSearch();
         },
         handleCurrentChange(val) {
-            console.log(`当前页: ${val}`);
+            this.currentPage = val;
+            this.clickSearch();
         },
         closeCollapse() {
             this.isCollapsed = !this.isCollapsed;
@@ -182,8 +184,8 @@ export default {
         getAbbreviationByName(group) {
             return group.map(item => mapNameToAbbreviation(item));
         },
-        async handleknowledgeFilter(checkboxGroup) {
-            this.knowledgeFilter.group = this.getAbbreviationByName(checkboxGroup);
+        async handleknowledgePointFilter(checkboxGroup) {
+            this.knowledgePointFilter.group = this.getAbbreviationByName(checkboxGroup);
         },
         handleEdit(item) {
             this.oldKnowledge = item;
@@ -206,14 +208,7 @@ export default {
     },
 
     mounted() {
-        getKnowledgeByStatus(0, this.pageSize, "APPROVED")
-            .then(res => {
-                console.log(res);
-                this.knowledgeList = res.data.result.content;
-                this.totalNum = res.data.result.totalElements;
-            }).catch(error => {
-                console.log(error);
-            })
+        this.clickSearch();
     }
 }
 </script>