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

zouyf_dev #403

Merged
zouyf merged 4 commits from zouyf_dev into main 2024-11-12 15:45:33 +08:00
Conversation 0 Commits 4 Files Changed 1 +47 -36
1 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f2dbf12f3c - Show all commits

83
src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
View File

@ -90,7 +90,11 @@
</el-row> </el-row>
<!-- 习题表格 --> <!-- 习题表格 -->
<div class="infinite-list-wrapper" > <div class="infinite-list-wrapper" >
<!-- <el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;"> <el-table
:data="workResource.entpCourseWorkList"
style="width: 100%; height: 100%;"
v-loading="pageParams.loading"
>
<el-table-column type="index" width="60" /> <el-table-column type="index" width="60" />
<el-table-column align="left" > <el-table-column align="left" >
<template #header> <template #header>
@ -114,22 +118,18 @@
<el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button> <el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> --> </el-table>
<ul
<!-- <ul
v-infinite-scroll="pageLoad" v-infinite-scroll="pageLoad"
class="infinite-list" class="infinite-list"
infinite-scroll-immediate="false" infinite-scroll-immediate="false"
infinite-scroll-distance='1' infinite-scroll-distance='100'
infinite-scroll-delay="1000" infinite-scroll-delay="1000"
:infinite-scroll-disabled="pageDisabled" :infinite-scroll-disabled="pageDisabled"
> >
<li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item"> <li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item">
<div align="left" style="width: 100%;" > <div align="left" style="width: 100%;" >
<!-- <template #header>
<div style="display: flex">
<div style="align-items: center;">题目内容</div>
</div>
</template> -->
<div @click="showExamAnalyseDrawer(item)"> <div @click="showExamAnalyseDrawer(item)">
<div> <div>
<span style="width: 20px;">{{ index +1 }}. </span> <span style="width: 20px;">{{ index +1 }}. </span>
@ -155,18 +155,18 @@
description="未找到相关试题" description="未找到相关试题"
style="width: 100%; height: 200px; margin-top: 20px;" style="width: 100%; height: 200px; margin-top: 20px;"
></el-empty> ></el-empty>
</div> </div> -->
</div> </div>
<!-- 分页 这里不用--> <!-- 分页 这里不用-->
<!-- <div style="height: 55px;"> <div style="height: 55px;">
<pagination <el-pagination
v-show="entpCourseWorkTotal > 0" v-show="pageParams.total > 0"
v-model:page="paginationParams.pageNum" v-model:page="paginationParams.pageNum"
v-model:limit="paginationParams.pageSize" v-model:limit="paginationParams.pageSize"
:total="entpCourseWorkTotal" :total="pageParams.total"
:style="{ position: 'relative', 'margin-top': '5px' }" :style="{ position: 'relative', 'margin-top': '5px' }"
@pagination="getPaginationList" /> @change="getPaginationList" />
</div> --> </div>
</div> </div>
<!-- 非习题训练：常规作业、 --> <!-- 非习题训练：常规作业、 -->
<div v-if="classWorkForm.worktype!='习题训练'"> <div v-if="classWorkForm.worktype!='习题训练'">
@ -276,6 +276,7 @@ import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance, computed
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { cloneDeep } from 'lodash' import { cloneDeep } from 'lodash'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { Search } from '@element-plus/icons-vue'
import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork' import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
import { addClassworkReturnId } from '@/api/teaching/classwork' import { addClassworkReturnId } from '@/api/teaching/classwork'
@ -284,6 +285,7 @@ import { listEvaluation } from '@/api/subject'
import { listEntpcoursefile } from '@/api/education/entpcoursefile' import { listEntpcoursefile } from '@/api/education/entpcoursefile'
import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint"; import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
import { useGetHomework } from '@/hooks/useGetHomework' import { useGetHomework } from '@/hooks/useGetHomework'
import { processList } from '@/hooks/useProcessList' import { processList } from '@/hooks/useProcessList'
import { getCurrentTime } from '@/utils/date' import { getCurrentTime } from '@/utils/date'
@ -409,15 +411,15 @@ const fileLoading = ref(false); // 常规作业loading
// 下拉滚动参数 // 下拉滚动参数
const BASE_LIMIT_COUT = 50; // 总加载额外试题数 // const BASE_LIMIT_COUT = 50; // 总加载额外试题数
const pageNoMore = computed( () => { // const pageNoMore = computed( () => {
if (pageParams.value.total < 1) { // if (pageParams.value.total < 1) {
return false; // return false;
} // }
let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT; // let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT;
return workResource.entpCourseWorkList.length >= count; // 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, // 初始条目数量
@ -519,16 +521,16 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
// } // }
client(t('任务1', 1500)).then(res => { client(t('任务1', 1500)).then(res => {
console.log("请求返回",res); //console.log("请求返回",res);
if(paginationParams.pageNum == 1){ // if(paginationParams.pageNum == 1){
workResource.entpCourseWorkList = []; // workResource.entpCourseWorkList = [];
workResource.entpCourseWorkTotal = 0; // workResource.entpCourseWorkTotal = 0;
// 初始化下拉滚动条参数 // // 初始化下拉滚动条参数
// pageParams.value.loading = false; // // pageParams.value.loading = false;
// pageParams.value.isFirst = true; // // pageParams.value.isFirst = true;
// pageParams.value.originCount = 0; // // pageParams.value.originCount = 0;
} // }
const data = res.data || []; const data = res.data || [];
if(data && data.length>0){ if(data && data.length>0){
// workResource.entpCourseWorkList = entpcourseworkres.data; // workResource.entpCourseWorkList = entpcourseworkres.data;
@ -542,17 +544,20 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
// 格式化试题信息 // 格式化试题信息
processList(data); processList(data);
workResource.entpCourseWorkList.push(...data); //workResource.entpCourseWorkList.push(...data);
workResource.entpCourseWorkList = data;
// 初次加载时更新当前试题数量 // 初次加载时更新当前试题数量
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.total = parseInt(res.msg);
paginationParams.pageNum = Math.ceil(parseInt(res.msg)/paginationParams.pageSize);
console.log('first->', pageParams.value, paginationParams);
} }
} }
pageParams.value.loading = false; pageParams.value.loading = false;
}); });
//const entpcourseworkres = await listEntpcourseworkNew(queryForm); //const entpcourseworkres = await listEntpcourseworkNew(queryForm);
@ -977,6 +982,12 @@ const showExamAnalyseDrawer = (row) => {
}) })
} }
const getPaginationList = ( page, limit ) => {
paginationParams.pageNum = page;
paginationParams.pageSize = limit;
console.log(page, limit)
handleQueryFromEntpCourseWork(0);
}
const pageLoad = async() => { const pageLoad = async() => {
console.log("加载中...") console.log("加载中...")