1

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;
@@ -487,8 +501,11 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
       }
     })
     
+
     // 格式化试题信息
     processList(data);
+    
+    
     workResource.entpCourseWorkList.push(...data);    
 
     // 初次加载时更新当前试题数量
@@ -956,17 +973,21 @@ onMounted(async() => {
 
 })
 
-const debounceQueryData = debounce(() => {
+let nextLevelSecondId = -1;
-  console.log("防抖 加载数据中...")
+const debounceQueryData = (wait) => {
-  // 初始化滚动加载参数
+  const debouncedFunction = debounce(() => {
-  initPageParams();
+    console.log("防抖 加载数据中...")
-  // 习题资源
+    // 初始化滚动加载参数
-  handleQueryFromEntpCourseWork(0);
+    initPageParams();
-  // 框架梳理
+    // 习题资源
-  getQueryFromEvaluationclue();
+    handleQueryFromEntpCourseWork(0);
-  // 知识点
+    // 框架梳理
-  getEntpCourseWorkPointList();
+    getQueryFromEvaluationclue();
-}, 1000);
+    // 知识点
+    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>