From 0cc3d970d111c1f759a44377de1c66cc9ab54a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Mon, 11 Nov 2024 15:06:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=BE=E8=AE=A1=EF=BC=9A?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../container/newTask/taskTypeView.vue        | 114 +++++++++++++-----
 1 file changed, 83 insertions(+), 31 deletions(-)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index e68b0a4..30f368b 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -150,6 +150,12 @@
                       </ul>
                       <p class="infinite-list-loading" v-if="pageParams.loading">加载中...</p>
                       <p class="infinite-list-noMove" v-if="pageNoMore">无更多试题...</p>
+                      <div v-if="workResource.entpCourseWorkList.length == 0 && !pageParams.loading">
+                        <el-empty
+                          description="未找到相关试题"
+                          style="width: 100%; height: 200px; margin-top: 20px;"
+                        ></el-empty>
+                      </div>
                     </div>
                     <!-- 分页 这里不用-->
                     <!-- <div style="height: 55px;">
@@ -286,8 +292,8 @@ import whiteboard from '@/components/whiteboard/whiteboard.vue'
 import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue'
 import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
 import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo"
-
-import {debounce } from '@/utils/comm'  
+ 
+import {throttle,debounce } from '@/utils/comm'  
 import { useToolState } from '@/store/modules/tool'
 import useUserStore from '@/store/modules/user'
 const userStore = useUserStore().user
@@ -403,7 +409,7 @@ const fileLoading = ref(false); // 常规作业loading
 
 // 下拉滚动参数
 
-const BASE_LIMIT_COUT = 10;   // 总加载额外试题数
+const BASE_LIMIT_COUT = 50;   // 总加载额外试题数
 const pageNoMore = computed( () => workResource.entpCourseWorkList.length >= pageParams.value.originCount+BASE_LIMIT_COUT );
 const pageDisabled  = computed(() => pageParams.value.loading || pageNoMore.value);
 const pageParams = ref({
@@ -434,6 +440,28 @@ const handleQueryParamFromEntpCourseWork = (queryType) => {
   handleQueryFromEntpCourseWork(queryType);
 };
 
+let obj = {};
+
+function Apis(key) {
+   obj[key] = [];
+   return function(task) {
+     return new Promise((resolve, reject) => {
+         obj[key].push(task);
+         Promise.all([...obj[key]]).then(res => {
+           const i = obj[key].findIndex(item => {
+             return item == task;
+           });
+           resolve(obj[key][i]);
+           //arr.splice(i, 1);
+         })
+     })
+   }
+ }
+ 
+ 
+ const client = new Apis('/paht');
+
+
 /**
  * @desc: 1、习题训练 -  新查询试题
  * @return: {*}
@@ -442,42 +470,60 @@ const handleQueryParamFromEntpCourseWork = (queryType) => {
  * 1  -  按条件查询
  * 2  -  按关键词查询
  */
+ const t = function(name, time) {
+   return new Promise(resolve => {
+    const queryForm = {
+      // 分页参数
+      currentPage: paginationParams.pageNum,
+      pageSize: paginationParams.pageSize,
+      // 课程相关参数
+      eid: props.bookobj.levelSecondId,
+      sectionName: props.bookobj.coursetitle,
+      edusubject: userStore.edusubject,
+      edustage: userStore.edustage,
+      //
+      // 题类
+      worktype: entpCourseWorkQueryParams.worktype.label,
+      workTypeId: entpCourseWorkQueryParams.worktype.value,
+      // 题源
+      workgroup: entpCourseWorkQueryParams.workgroup,
+      // 年份
+      yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
+      // 知识点
+      thirdId: entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
+      // 关键字
+      keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
+
+    }
+    const entpcourseworkres = listEntpcourseworkNew(queryForm);
+
+    resolve(entpcourseworkres);
+   })
+  }
 const handleQueryFromEntpCourseWork= async (queryType) => {
   
   pageParams.value.loading = true;
-  const queryForm = {
-    // 分页参数
-    currentPage: paginationParams.pageNum,
-    pageSize: paginationParams.pageSize,
-    // 课程相关参数
-    eid: props.bookobj.levelSecondId,
-    sectionName: props.bookobj.coursetitle,
-    edusubject: userStore.edusubject,
-    edustage: userStore.edustage,
-    //
-    // 题类
-    worktype: entpCourseWorkQueryParams.worktype.label,
-    workTypeId: entpCourseWorkQueryParams.worktype.value,
-    // 题源
-    workgroup: entpCourseWorkQueryParams.workgroup,
-    // 年份
-    yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
-    // 知识点
-    thirdId: entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
-    // 关键字
-    keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
-
-  }
+  
 
   // 初中政治特殊处理( warn: 需确认是否修改 )
   // if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') {
   //   // [初中+政治]需改为[初中+道德与法治]
   //   queryForm.edusubject = '道德与法治';
   // }
+  
+  client(t('任务1', 1500)).then(res => {
+    console.log("请求返回",res);
+    if(paginationParams.pageNum == 1){
+      workResource.entpCourseWorkList = [];
+      workResource.entpCourseWorkTotal = 0;
 
-  const entpcourseworkres = await listEntpcourseworkNew(queryForm);
-  const data = entpcourseworkres.data;
-  if(data && data.length>0){
+       // 初始化下拉滚动条参数
+      // pageParams.value.loading = false;
+      // pageParams.value.isFirst = true;
+      // pageParams.value.originCount = 0;
+    }
+    const data = res.data || [];
+    if(data && data.length>0){
     // workResource.entpCourseWorkList = entpcourseworkres.data;
     // workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
 
@@ -498,6 +544,12 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
     }
   }
   pageParams.value.loading = false;
+  });
+
+  //const entpcourseworkres = await listEntpcourseworkNew(queryForm);
+
+  // const data = entpcourseworkres.data;
+  
 }
 
 // 教学资源，从课标分析、教材分析里来
@@ -921,7 +973,7 @@ const showExamAnalyseDrawer = (row) => {
 const pageLoad = async() => {
   console.log("加载中...")
   paginationParams.pageNum ++ ,
-  paginationParams.pageSize = 2,
+  //paginationParams.pageSize = 2,
   await handleQueryFromEntpCourseWork(0);
 }
 
@@ -956,6 +1008,7 @@ onMounted(async() => {
 
 })
 
+// 防抖
 const debounceQueryData = debounce(() => {
   console.log("防抖 加载数据中...")
   // 初始化滚动加载参数
@@ -968,7 +1021,6 @@ const debounceQueryData = debounce(() => {
   getEntpCourseWorkPointList();
 }, 1000);
 
-
 watch(() => props.propsformobj.uniquekey, (newVal) => {
   console.log(props.propsformobj,'propsformobj')
   if(props.propsformobj.uniquekey){