zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 25 Wiki Activity

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
parent 28ba027407 1844af01da
commit a4a839931d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
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;