From dd64e4e0855a07612ab5e0675a21b21dc39e1513 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: Fri, 8 Nov 2024 15:39:05 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=B9=A0=E9=A2=98=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=9A=E5=8A=A0=E4=B8=8A=E5=88=86=E9=A1=B5=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/classTask/container/newTask/taskTypeView.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 833a403..458cb7d 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -394,10 +394,12 @@ const handleQueryParamFromEntpCourseWork = (queryType) => {
  * 2  -  按关键词查询
  */
 const handleQueryFromEntpCourseWork= (queryType) => {
-  //queryForm.pageNum = this.paginationParams.pageNum;
-  //queryForm.pageSize = this.paginationParams.pageSize;
+  
 
   const queryForm = {
+    // 分页参数
+    currentPage: paginationParams.pageNum,
+    pageSize: paginationParams.pageSize,
     // 课程相关参数
     eid: props.bookobj.levelSecondId,
     sectionName: props.bookobj.coursetitle,
@@ -418,10 +420,6 @@ const handleQueryFromEntpCourseWork= (queryType) => {
 
   }
 
-  // 分页参数
-  // pageNum: paginationParams.pageNum,
-  // pageSize: paginationParams.pageSize,
-
   // 初中政治特殊处理( warn: 需确认是否修改 )
   // if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') {
   //   // [初中+政治]需改为[初中+道德与法治]

From 3b8e36454af119f05cbf8378b477d735098a9b35 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: Fri, 8 Nov 2024 17:22:42 +0800
Subject: [PATCH 02/11] 1

---
 .../container/newTask/taskTypeView.vue        | 70 ++++++++++++++++---
 1 file changed, 61 insertions(+), 9 deletions(-)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 458cb7d..e49c33c 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -90,7 +90,7 @@
                     </el-row>
                     <!-- 习题表格 -->
                     <div class="middle" >
-                      <el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;">
+                      <!-- <el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;">
                         <el-table-column type="index" width="60" />
                         <el-table-column align="left" >
                           <template #header>
@@ -114,7 +114,32 @@
                             <el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button>
                           </template>
                         </el-table-column>
-                      </el-table>
+                      </el-table> -->
+                      <ul v-infinite-scroll="load" class="infinite-list" style="overflow: auto" infinite-scroll-immediate="false">
+                        <li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item">
+                          
+                          <div style="width: 20px;">{{ index +1 }}</div>
+                          <div align="left" >
+                            <!-- <template #header>
+                              <div style="display: flex">
+                                <div style="align-items: center;">题目内容</div>
+                              </div>
+                            </template> -->
+                            <div @click="showExamAnalyseDrawer(item)">
+                              <div style="overflow: hidden; text-overflow: ellipsis" v-html="item.titleFormat"></div>
+                              <div style="overflow: hidden; text-overflow: ellipsis; font-size: 0.9em; margin-top: 6px;" v-html="item.workdescFormat"></div>
+                              <el-col :span="24" style="display: flex">
+                                <div style="font-size: 1em; color: silver; padding-top: 5px">{{ item.entpname }} {{ item.editusername }}</div>
+                                <div style="margin-left: 30px; font-size: 1em; color: silver; padding-top: 5px">{{ item.worktag }}</div>
+                              </el-col>
+                            </div>
+                          </div>
+                          <div align="left" width="60">
+                            <el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', item.id)">添加</el-button>
+                          </div>
+
+                        </li>
+                      </ul>
                     </div>
                     <!-- 分页 这里不用-->
                     <!-- <div style="height: 55px;">
@@ -436,12 +461,12 @@ const handleQueryFromEntpCourseWork= (queryType) => {
     // } else {
     //   workResource.entpCourseWorkList = entpcourseworkres.rows;
     // }
+    const data = entpcourseworkres.data;
+    if(data&&data.length>0){
+      // workResource.entpCourseWorkList = entpcourseworkres.data;
+      // workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
 
-    if(entpcourseworkres.data&&entpcourseworkres.data.length>0){
-      workResource.entpCourseWorkList = entpcourseworkres.data;
-      workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
-
-      workResource.entpCourseWorkList.forEach(item=> {
+      data.forEach(item=> {
         if (item.worktype == '选择题') {
           item.worktype = '单选题'
         }
@@ -449,12 +474,14 @@ const handleQueryFromEntpCourseWork= (queryType) => {
 
 
       //格式化试题信息
-      processList(workResource.entpCourseWorkList);
+      processList(data);
+      workResource.entpCourseWorkList.push(...data);
     }else{
       workResource.entpCourseWorkList = [];
       workResource.entpCourseWorkTotal = 0
     }
   })
+
 }
 
 // 教学资源，从课标分析、教材分析里来
@@ -873,7 +900,15 @@ const showExamAnalyseDrawer = (row) => {
     proxy.$refs.examDetailsDrawerRef.acceptParams(activeParams);
   })
 }
+const load = () => {
+  // count.value += 2
+  console.log("加载中")
+  // workResource.entpCourseWorkList
+  paginationParams.pageNum ++ ,
+  paginationParams.pageSize = 5,
+  handleQueryFromEntpCourseWork(0);
 
+}
 
 
 onMounted(async() => {
@@ -993,7 +1028,24 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
     box-sizing: border-box;
     background-color: rgb(231, 231, 231)
   }
-
+  .infinite-list {
+  height: 100%;
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+.infinite-list .infinite-list-item {
+  display: flex;
+  align-items: center;
+  //justify-content: center;
+  //height: 50px;
+  background: var(--el-color-primary-light-9);
+  margin: 10px;
+  color: var(--el-color-primary);
+}
+.infinite-list .infinite-list-item + .list-item {
+  margin-top: 10px;
+}
 }
 </style>
 <style src="@/assets/styles/JYStyle.css"></style>

From f5c42958f4e81bb39f09a26385f77371e7b20ff9 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: Fri, 8 Nov 2024 17:25:36 +0800
Subject: [PATCH 03/11] 1

---
 .../src/views/classTask/container/newTask/taskTypeView.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index e49c33c..f0c31e5 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -119,7 +119,7 @@
                         <li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item">
                           
                           <div style="width: 20px;">{{ index +1 }}</div>
-                          <div align="left" >
+                          <div align="left" style="width: 100%;" >
                             <!-- <template #header>
                               <div style="display: flex">
                                 <div style="align-items: center;">题目内容</div>

From 15633f065fc71d42f6ecb4d1d0a7c43c4a8594f4 Mon Sep 17 00:00:00 2001
From: zouyf <80906036@qq.com>
Date: Sat, 9 Nov 2024 14:30:26 +0800
Subject: [PATCH 04/11] 1

---
 .../src/views/classTask/container/newTask/taskTypeView.vue     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index f0c31e5..c758870 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -115,7 +115,7 @@
                           </template>
                         </el-table-column>
                       </el-table> -->
-                      <ul v-infinite-scroll="load" class="infinite-list" style="overflow: auto" infinite-scroll-immediate="false">
+                      <ul v-infinite-scroll="load" class="infinite-list" style="overflow: auto" infinite-scroll-immediate="false" infinite-scroll-distance='10'>
                         <li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item">
                           
                           <div style="width: 20px;">{{ index +1 }}</div>
@@ -907,7 +907,6 @@ const load = () => {
   paginationParams.pageNum ++ ,
   paginationParams.pageSize = 5,
   handleQueryFromEntpCourseWork(0);
-
 }
 
 

From 96c074d396a8f5e32e4365e93a029c8c80ddc001 Mon Sep 17 00:00:00 2001
From: zouyf <80906036@qq.com>
Date: Sat, 9 Nov 2024 16:50:28 +0800
Subject: [PATCH 05/11] =?UTF-8?q?[=E4=BD=9C=E4=B8=9A=E8=AE=BE=E8=AE=A1]=20?=
 =?UTF-8?q?-=20=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0=E8=AF=95=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../container/newTask/taskTypeView.vue        | 176 ++++++++++++------
 1 file changed, 116 insertions(+), 60 deletions(-)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index c758870..4b66557 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -89,7 +89,7 @@
                       </el-col>
                     </el-row>
                     <!-- 习题表格 -->
-                    <div class="middle" >
+                    <div class="infinite-list-wrapper" >
                       <!-- <el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;">
                         <el-table-column type="index" width="60" />
                         <el-table-column align="left" >
@@ -115,10 +115,15 @@
                           </template>
                         </el-table-column>
                       </el-table> -->
-                      <ul v-infinite-scroll="load" class="infinite-list" style="overflow: auto" infinite-scroll-immediate="false" infinite-scroll-distance='10'>
+                      <ul 
+                        v-infinite-scroll="pageLoad" 
+                        class="infinite-list" 
+                        infinite-scroll-immediate="false" 
+                        infinite-scroll-distance='1'
+                        infinite-scroll-delay="1000"
+                        :infinite-scroll-disabled="pageDisabled"
+                      >
                         <li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item">
-                          
-                          <div style="width: 20px;">{{ index +1 }}</div>
                           <div align="left" style="width: 100%;" >
                             <!-- <template #header>
                               <div style="display: flex">
@@ -126,7 +131,10 @@
                               </div>
                             </template> -->
                             <div @click="showExamAnalyseDrawer(item)">
-                              <div style="overflow: hidden; text-overflow: ellipsis" v-html="item.titleFormat"></div>
+                              <div>
+                                <span style="width: 20px;">{{ index +1 }}. </span>
+                                <span style="overflow: hidden; text-overflow: ellipsis" v-html="item.titleFormat"></span>
+                              </div>
                               <div style="overflow: hidden; text-overflow: ellipsis; font-size: 0.9em; margin-top: 6px;" v-html="item.workdescFormat"></div>
                               <el-col :span="24" style="display: flex">
                                 <div style="font-size: 1em; color: silver; padding-top: 5px">{{ item.entpname }} {{ item.editusername }}</div>
@@ -134,12 +142,14 @@
                               </el-col>
                             </div>
                           </div>
-                          <div align="left" width="60">
+                          <div align="right" style="width: 72px;">
                             <el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', item.id)">添加</el-button>
                           </div>
 
                         </li>
                       </ul>
+                      <p class="infinite-list-loading" v-if="pageParams.loading">加载中...</p>
+                      <p class="infinite-list-noMove" v-if="pageNoMore">无更多试题...</p>
                     </div>
                     <!-- 分页 这里不用-->
                     <!-- <div style="height: 55px;">
@@ -256,7 +266,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance } from 'vue'
+import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance, computed } from 'vue'
 import { ElMessage } from 'element-plus'
 import { cloneDeep } from 'lodash'
 import { useRouter } from 'vue-router'
@@ -390,6 +400,17 @@ const boardLoading = ref(false);
 //常规作业----------
 const fileLoading = ref(false); // 常规作业loading
 
+// 下拉滚动参数
+
+const BASE_LIMIT_COUT = 10;   // 总加载额外试题数
+const pageNoMore = computed( () => workResource.entpCourseWorkList.length >= pageParams.value.originCount+BASE_LIMIT_COUT );
+const pageDisabled  = computed(() => pageParams.value.loading || pageNoMore.value);
+const pageParams = ref({
+  loading: false,     // 是否正在加载中
+  originCount: 0,     // 初始条目数量
+  isFirst: true,      // 是否是第一次加载
+})
+
 /***
  * 作业类型切换
  */
@@ -407,6 +428,8 @@ const changeFormType = (val) => {
 const handleQueryParamFromEntpCourseWork = (queryType) => {
   // 确保更改了搜索参数后从第一页开始查询
   // this.paginationParams = {pageNum: 1,pageSize: 10}; 分页这里展示弃用了
+  // 清空作业列表
+  initPageParams();
   handleQueryFromEntpCourseWork(queryType);
 };
 
@@ -418,9 +441,9 @@ const handleQueryParamFromEntpCourseWork = (queryType) => {
  * 1  -  按条件查询
  * 2  -  按关键词查询
  */
-const handleQueryFromEntpCourseWork= (queryType) => {
+const handleQueryFromEntpCourseWork= async (queryType) => {
   
-
+  pageParams.value.loading = true;
   const queryForm = {
     // 分页参数
     currentPage: paginationParams.pageNum,
@@ -451,37 +474,29 @@ const handleQueryFromEntpCourseWork= (queryType) => {
   //   queryForm.edusubject = '道德与法治';
   // }
 
-  listEntpcourseworkNew(queryForm).then(entpcourseworkres => {
-    // if (queryType == 1 && this.entpCourseWorkQueryParams.worktype == '主观题') {
-    //   // 因菁优网题型因学科而不固定, 故非常规题重定义定为【主观题】
-    //   const allowedWorkTypes = ['单选题', '填空题', '多选题', '判断题', '复合题'];
-    //   workResource.entpCourseWorkList = entpcourseworkres.rows.filter(item => {
-    //     return !allowedWorkTypes.includes(item.worktype);
-    //   });
-    // } else {
-    //   workResource.entpCourseWorkList = entpcourseworkres.rows;
-    // }
-    const data = entpcourseworkres.data;
-    if(data&&data.length>0){
-      // workResource.entpCourseWorkList = entpcourseworkres.data;
-      // workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
+  const entpcourseworkres = await listEntpcourseworkNew(queryForm);
+  const data = entpcourseworkres.data;
+  if(data && data.length>0){
+    // workResource.entpCourseWorkList = entpcourseworkres.data;
+    // workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
 
-      data.forEach(item=> {
-        if (item.worktype == '选择题') {
-          item.worktype = '单选题'
-        }
-      })
+    data.forEach(item=> {
+      if (item.worktype == '选择题') {
+        item.worktype = '单选题'
+      }
+    })
 
+    // 格式化试题信息
+    processList(data);
+    workResource.entpCourseWorkList.push(...data);    
 
-      //格式化试题信息
-      processList(data);
-      workResource.entpCourseWorkList.push(...data);
-    }else{
-      workResource.entpCourseWorkList = [];
-      workResource.entpCourseWorkTotal = 0
+    // 初次加载时更新当前试题数量
+    if (pageParams.value.isFirst) {
+      pageParams.value.isFirst = false;
+      pageParams.value.originCount = workResource.entpCourseWorkList.length;
     }
-  })
-
+  }
+  pageParams.value.loading = false;
 }
 
 // 教学资源，从课标分析、教材分析里来
@@ -900,13 +915,28 @@ const showExamAnalyseDrawer = (row) => {
     proxy.$refs.examDetailsDrawerRef.acceptParams(activeParams);
   })
 }
-const load = () => {
-  // count.value += 2
-  console.log("加载中")
-  // workResource.entpCourseWorkList
+
+
+const pageLoad = async() => {
+  console.log("加载中...")
   paginationParams.pageNum ++ ,
-  paginationParams.pageSize = 5,
-  handleQueryFromEntpCourseWork(0);
+  paginationParams.pageSize = 2,
+  await handleQueryFromEntpCourseWork(0);
+}
+
+const initPageParams = () => {
+  // 初始化作业习题列表
+  workResource.entpCourseWorkList = [];
+  workResource.entpCourseWorkTotal = 0
+
+  // 初始化下拉滚动条参数
+  pageParams.value.loading = false;
+  pageParams.value.isFirst = true;
+  pageParams.value.originCount = 0;
+
+  // 初始化分页参数
+  paginationParams.pageNum = 1;
+  paginationParams.pageSize = 10;
 }
 
 
@@ -933,6 +963,8 @@ watch(() => props.propsformobj.uniquekey, (newVal) => {
 })
 watch(() => props.bookobj.levelSecondId, (newVal) => {
   console.log(props.bookobj,'课程选择')
+  // 初始化滚动加载参数
+  initPageParams();
   // 习题资源
   handleQueryFromEntpCourseWork(0);
   // 框架梳理
@@ -940,6 +972,7 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
   // 知识点
   getEntpCourseWorkPointList();
 })
+
 </script>
 
 <style lang="scss" scoped>
@@ -1027,24 +1060,47 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
     box-sizing: border-box;
     background-color: rgb(231, 231, 231)
   }
-  .infinite-list {
-  height: 100%;
-  padding: 0;
-  margin: 0;
-  list-style: none;
-}
-.infinite-list .infinite-list-item {
-  display: flex;
-  align-items: center;
-  //justify-content: center;
-  //height: 50px;
-  background: var(--el-color-primary-light-9);
-  margin: 10px;
-  color: var(--el-color-primary);
-}
-.infinite-list .infinite-list-item + .list-item {
-  margin-top: 10px;
-}
+  .infinite-list-wrapper{
+    height: 100%;
+    text-align: center;
+    overflow: auto;
+
+    .infinite-list {
+      padding: 0;
+      margin: 0;
+      list-style: none;
+
+      .infinite-list-item {
+        display: flex;
+        align-items: center;
+        //justify-content: center;
+        //height: 50px;
+        //background: var(--el-color-primary-light-9);
+        padding: 10px;
+        border-top: 1px solid #eee;
+        //color: var(--el-color-primary);
+      }
+      .infinite-list-item:hover {
+        background-color: #F3F5F8;
+      }
+
+      .infinite-list-item + .list-item {
+        margin-top: 10px;
+      }
+    }
+
+    .infinite-list-loading{
+      padding: 10px 0;
+      border-top: 1px solid #eee;
+      color: red;
+    }
+    .infinite-list-noMove{
+      padding: 10px 0;
+      border-top: 1px solid #eee;
+      color: #999;
+    }
+  }
+  
 }
 </style>
 <style src="@/assets/styles/JYStyle.css"></style>

From 2929997d17e7228dc0df2bd706d1dfe43056eadc 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 10:02:23 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=EF=BC=9A=E8=AF=BE=E7=A8=8B=E9=80=89=E6=8B=A9=E8=BF=87=E5=BF=AB?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=B7=BB=E5=8A=A0=E9=98=B2=E6=8A=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../container/newTask/taskTypeView.vue        | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 4b66557..e68b0a4 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -287,6 +287,7 @@ import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-D
 import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
 import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo"
 
+import {debounce } from '@/utils/comm'  
 import { useToolState } from '@/store/modules/tool'
 import useUserStore from '@/store/modules/user'
 const userStore = useUserStore().user
@@ -955,14 +956,8 @@ onMounted(async() => {
 
 })
 
-watch(() => props.propsformobj.uniquekey, (newVal) => {
-  console.log(props.propsformobj,'propsformobj')
-  if(props.propsformobj.uniquekey){
-    classWorkForm.uniquekey = props.propsformobj.uniquekey?cloneDeep(props.propsformobj.uniquekey):''; // 作业唯一标识 作业名称
-  }
-})
-watch(() => props.bookobj.levelSecondId, (newVal) => {
-  console.log(props.bookobj,'课程选择')
+const debounceQueryData = debounce(() => {
+  console.log("防抖 加载数据中...")
   // 初始化滚动加载参数
   initPageParams();
   // 习题资源
@@ -971,6 +966,18 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
   getQueryFromEvaluationclue();
   // 知识点
   getEntpCourseWorkPointList();
+}, 1000);
+
+
+watch(() => props.propsformobj.uniquekey, (newVal) => {
+  console.log(props.propsformobj,'propsformobj')
+  if(props.propsformobj.uniquekey){
+    classWorkForm.uniquekey = props.propsformobj.uniquekey?cloneDeep(props.propsformobj.uniquekey):''; // 作业唯一标识 作业名称
+  }
+})
+watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
+  console.log(props.bookobj,'课程选择')
+  debounceQueryData();
 })
 
 </script>

From 6c66c97e330ea5c813a6288be71ef093d83b589d 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 12:53:16 +0800
Subject: [PATCH 07/11] 1

---
 .../container/newTask/taskTypeView.vue        | 120 +++++++++++++-----
 1 file changed, 91 insertions(+), 29 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..4ad19c4 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -286,8 +286,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
@@ -434,6 +434,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 +464,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 +538,12 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
     }
   }
   pageParams.value.loading = false;
+  });
+
+  //const entpcourseworkres = await listEntpcourseworkNew(queryForm);
+
+  // const data = entpcourseworkres.data;
+  
 }
 
 // 教学资源，从课标分析、教材分析里来
@@ -956,6 +1002,23 @@ onMounted(async() => {
 
 })
 
+// const refreshData = () => {
+//   console.log("刷新数据")
+//   // 初始化滚动加载参数
+//   initPageParams();
+//   // 习题资源
+//   handleQueryFromEntpCourseWork(0);
+//   // 框架梳理
+//   getQueryFromEvaluationclue();
+//   // 知识点
+//   getEntpCourseWorkPointList();
+// }
+// // 结合防抖和节流
+// const debounceQueryData = debounce(throttle(refreshData, 1000), 1000);
+
+
+
+// 防抖
 const debounceQueryData = debounce(() => {
   console.log("防抖 加载数据中...")
   // 初始化滚动加载参数
@@ -968,7 +1031,6 @@ const debounceQueryData = debounce(() => {
   getEntpCourseWorkPointList();
 }, 1000);
 
-
 watch(() => props.propsformobj.uniquekey, (newVal) => {
   console.log(props.propsformobj,'propsformobj')
   if(props.propsformobj.uniquekey){

From f504cee74b18269461928e3fe8315461af2cc838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Mon, 11 Nov 2024 13:43:09 +0800
Subject: [PATCH 08/11] 1

---
 .../container/newTask/taskTypeView.vue        | 55 ++++++++++++++-----
 1 file changed, 42 insertions(+), 13 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..20025f8 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -442,7 +442,7 @@ const handleQueryParamFromEntpCourseWork = (queryType) => {
  * 1  -  按条件查询
  * 2  -  按关键词查询
  */
-const handleQueryFromEntpCourseWork= async (queryType) => {
+const handleQueryFromEntpCourseWork= async (queryType, value) => {
   
   pageParams.value.loading = true;
   const queryForm = {
@@ -476,6 +476,20 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
   // }
 
   const entpcourseworkres = await listEntpcourseworkNew(queryForm);
+  
+  // 当前有更改, 则重新开始流程查询
+  if (nextLevelSecondId != -1) {
+    console.log('再次执行')
+    nextLevelSecondId = -1;
+    const debouncedFunction = debounceQueryData(10);
+    debouncedFunction();
+    return;
+  }
+
+  // 当前为第一页时, 再次重置避免
+  if (paginationParams.pageNum == 1) {
+    initPageParams();
+  }
   const data = entpcourseworkres.data;
   if(data && data.length>0){
     // workResource.entpCourseWorkList = entpcourseworkres.data;
@@ -486,9 +500,12 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
         item.worktype = '单选题'
       }
     })
+    
 
     // 格式化试题信息
     processList(data);
+    
+    
     workResource.entpCourseWorkList.push(...data);    
 
     // 初次加载时更新当前试题数量
@@ -956,17 +973,21 @@ onMounted(async() => {
 
 })
 
-const debounceQueryData = debounce(() => {
-  console.log("防抖 加载数据中...")
-  // 初始化滚动加载参数
-  initPageParams();
-  // 习题资源
-  handleQueryFromEntpCourseWork(0);
-  // 框架梳理
-  getQueryFromEvaluationclue();
-  // 知识点
-  getEntpCourseWorkPointList();
-}, 1000);
+let nextLevelSecondId = -1;
+const debounceQueryData = (wait) => {
+  const debouncedFunction = debounce(() => {
+    console.log("防抖 加载数据中...")
+    // 初始化滚动加载参数
+    initPageParams();
+    // 习题资源
+    handleQueryFromEntpCourseWork(0);
+    // 框架梳理
+    getQueryFromEvaluationclue();
+    // 知识点
+    getEntpCourseWorkPointList();
+  }, wait);
+  return debouncedFunction;
+}
 
 
 watch(() => props.propsformobj.uniquekey, (newVal) => {
@@ -977,7 +998,15 @@ watch(() => props.propsformobj.uniquekey, (newVal) => {
 })
 watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
   console.log(props.bookobj,'课程选择')
-  debounceQueryData();
+  console.log('更改章节id->', newVal);
+  //nextLevelSecondId = newVal;
+  if (pageParams.value.loading) {
+    console.log('更改章节id->', newVal);
+    nextLevelSecondId = newVal;
+    return;
+  }
+  const debouncedFunction = debounceQueryData(1000);
+  debouncedFunction();
 })
 
 </script>

From 768b3e7abf1cfb84a82c0b247d5394b65981fe70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Mon, 11 Nov 2024 13:43:35 +0800
Subject: [PATCH 09/11] Revert "1"

This reverts commit f504cee74b18269461928e3fe8315461af2cc838.
---
 .../container/newTask/taskTypeView.vue        | 55 +++++--------------
 1 file changed, 13 insertions(+), 42 deletions(-)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 20025f8..e68b0a4 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -442,7 +442,7 @@ const handleQueryParamFromEntpCourseWork = (queryType) => {
  * 1  -  按条件查询
  * 2  -  按关键词查询
  */
-const handleQueryFromEntpCourseWork= async (queryType, value) => {
+const handleQueryFromEntpCourseWork= async (queryType) => {
   
   pageParams.value.loading = true;
   const queryForm = {
@@ -476,20 +476,6 @@ const handleQueryFromEntpCourseWork= async (queryType, value) => {
   // }
 
   const entpcourseworkres = await listEntpcourseworkNew(queryForm);
-  
-  // 当前有更改, 则重新开始流程查询
-  if (nextLevelSecondId != -1) {
-    console.log('再次执行')
-    nextLevelSecondId = -1;
-    const debouncedFunction = debounceQueryData(10);
-    debouncedFunction();
-    return;
-  }
-
-  // 当前为第一页时, 再次重置避免
-  if (paginationParams.pageNum == 1) {
-    initPageParams();
-  }
   const data = entpcourseworkres.data;
   if(data && data.length>0){
     // workResource.entpCourseWorkList = entpcourseworkres.data;
@@ -500,12 +486,9 @@ const handleQueryFromEntpCourseWork= async (queryType, value) => {
         item.worktype = '单选题'
       }
     })
-    
 
     // 格式化试题信息
     processList(data);
-    
-    
     workResource.entpCourseWorkList.push(...data);    
 
     // 初次加载时更新当前试题数量
@@ -973,21 +956,17 @@ onMounted(async() => {
 
 })
 
-let nextLevelSecondId = -1;
-const debounceQueryData = (wait) => {
-  const debouncedFunction = debounce(() => {
-    console.log("防抖 加载数据中...")
-    // 初始化滚动加载参数
-    initPageParams();
-    // 习题资源
-    handleQueryFromEntpCourseWork(0);
-    // 框架梳理
-    getQueryFromEvaluationclue();
-    // 知识点
-    getEntpCourseWorkPointList();
-  }, wait);
-  return debouncedFunction;
-}
+const debounceQueryData = debounce(() => {
+  console.log("防抖 加载数据中...")
+  // 初始化滚动加载参数
+  initPageParams();
+  // 习题资源
+  handleQueryFromEntpCourseWork(0);
+  // 框架梳理
+  getQueryFromEvaluationclue();
+  // 知识点
+  getEntpCourseWorkPointList();
+}, 1000);
 
 
 watch(() => props.propsformobj.uniquekey, (newVal) => {
@@ -998,15 +977,7 @@ watch(() => props.propsformobj.uniquekey, (newVal) => {
 })
 watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
   console.log(props.bookobj,'课程选择')
-  console.log('更改章节id->', newVal);
-  //nextLevelSecondId = newVal;
-  if (pageParams.value.loading) {
-    console.log('更改章节id->', newVal);
-    nextLevelSecondId = newVal;
-    return;
-  }
-  const debouncedFunction = debounceQueryData(1000);
-  debouncedFunction();
+  debounceQueryData();
 })
 
 </script>

From cb910068e0e6940cbf921a3c44e580d04d442b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Mon, 11 Nov 2024 14:49:05 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E6=9F=A5=E8=AF=A210?=
 =?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/classTask/container/newTask/taskTypeView.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 4ad19c4..20ef828 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -403,7 +403,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({
@@ -967,7 +967,7 @@ const showExamAnalyseDrawer = (row) => {
 const pageLoad = async() => {
   console.log("加载中...")
   paginationParams.pageNum ++ ,
-  paginationParams.pageSize = 2,
+  //paginationParams.pageSize = 2,
   await handleQueryFromEntpCourseWork(0);
 }
 

From f58a38dcebe12c39569b40c2443f00bac277f094 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:03:17 +0800
Subject: [PATCH 11/11] 1

---
 .../src/views/classTask/container/newTask/taskTypeView.vue  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 20ef828..4c4c8b3 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;">