Merge pull request 'zouyf_dev' (#397) from zouyf_dev into main

Reviewed-on: #397

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "2.1.27",
+  "version": "2.1.28",
   "description": "",
   "main": "./out/main/index.js",
   "author": "上海交大重庆人工智能研究院",

src/renderer/src/views/classTask/container/newTask/taskTypeView.vue

@@ -410,12 +410,19 @@ const fileLoading = ref(false); // 常规作业loading
 // 下拉滚动参数
 
 const BASE_LIMIT_COUT = 50;   // 总加载额外试题数
-const pageNoMore = computed( () => workResource.entpCourseWorkList.length >= pageParams.value.originCount+BASE_LIMIT_COUT );
+const pageNoMore = computed( () => {
+  if (pageParams.value.total < 1) {
+    return false;
+  }
+  let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT;
+  return workResource.entpCourseWorkList.length >= count;
+});
 const pageDisabled  = computed(() => pageParams.value.loading || pageNoMore.value);
 const pageParams = ref({
   loading: false,     // 是否正在加载中
   originCount: 0,     // 初始条目数量
   isFirst: true,      // 是否是第一次加载
+  total: 0,
 })
 
 /***
@@ -541,6 +548,7 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
     if (pageParams.value.isFirst) {
       pageParams.value.isFirst = false;
       pageParams.value.originCount = workResource.entpCourseWorkList.length;
+      pageParams.value.total = parseInt(res.msg);
     }
   }
   pageParams.value.loading = false;
@@ -986,6 +994,7 @@ const initPageParams = () => {
   pageParams.value.loading = false;
   pageParams.value.isFirst = true;
   pageParams.value.originCount = 0;
+  pageParams.value.total = 0;
 
   // 初始化分页参数
   paginationParams.pageNum = 1;