Merge pull request 'baigl' (#21) from baigl into main

Reviewed-on: #21
This commit is contained in:
baigl 2024-11-11 17:27:09 +08:00
commit 2c1e9923c5
1 changed files with 26 additions and 1 deletions

View File

@ -410,12 +410,19 @@ const fileLoading = ref(false); // 常规作业loading
// //
const BASE_LIMIT_COUT = 50; // 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 pageDisabled = computed(() => pageParams.value.loading || pageNoMore.value);
const pageParams = ref({ const pageParams = ref({
loading: false, // loading: false, //
originCount: 0, // originCount: 0, //
isFirst: true, // isFirst: true, //
total: 0,
}) })
/*** /***
@ -541,6 +548,7 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
if (pageParams.value.isFirst) { if (pageParams.value.isFirst) {
pageParams.value.isFirst = false; pageParams.value.isFirst = false;
pageParams.value.originCount = workResource.entpCourseWorkList.length; pageParams.value.originCount = workResource.entpCourseWorkList.length;
pageParams.value.total = parseInt(res.msg);
} }
} }
pageParams.value.loading = false; pageParams.value.loading = false;
@ -986,6 +994,7 @@ const initPageParams = () => {
pageParams.value.loading = false; pageParams.value.loading = false;
pageParams.value.isFirst = true; pageParams.value.isFirst = true;
pageParams.value.originCount = 0; pageParams.value.originCount = 0;
pageParams.value.total = 0;
// //
paginationParams.pageNum = 1; paginationParams.pageNum = 1;
@ -1008,6 +1017,22 @@ onMounted(async() => {
}) })
// const refreshData = () => {
// console.log("")
// //
// initPageParams();
// //
// handleQueryFromEntpCourseWork(0);
// //
// getQueryFromEvaluationclue();
// //
// getEntpCourseWorkPointList();
// }
// //
// const debounceQueryData = debounce(throttle(refreshData, 1000), 1000);
// //
const debounceQueryData = debounce(() => { const debounceQueryData = debounce(() => {
console.log("防抖 加载数据中...") console.log("防抖 加载数据中...")