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

Reviewed-on: #397
This commit is contained in:
zouyf 2024-11-11 16:58:11 +08:00
commit a4a839931d
1 changed files with 10 additions and 1 deletions

View File

@ -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;