Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl

src/renderer/src/views/classTask/container/newTask/taskTypeView.vue

@@ -287,7 +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 {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,9 +464,8 @@ const handleQueryParamFromEntpCourseWork = (queryType) => {
  * 1  -  按条件查询
  * 2  -  按关键词查询
  */
-const handleQueryFromEntpCourseWork= async (queryType) => {
+ const t = function(name, time) {
-  
+   return new Promise(resolve => {
-  pageParams.value.loading = true;
     const queryForm = {
       // 分页参数
       currentPage: paginationParams.pageNum,
@@ -468,6 +489,15 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
       keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
 
     }
+    const entpcourseworkres = listEntpcourseworkNew(queryForm);
+
+    resolve(entpcourseworkres);
+   })
+  }
+const handleQueryFromEntpCourseWork= async (queryType) => {
+  
+  pageParams.value.loading = true;
+  
 
   // 初中政治特殊处理( warn: 需确认是否修改 )
   // if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') {
@@ -475,8 +505,18 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
   //   queryForm.edusubject = '道德与法治';
   // }
   
-  const entpcourseworkres = await listEntpcourseworkNew(queryForm);
+  client(t('任务1', 1500)).then(res => {
-  const data = entpcourseworkres.data;
+    console.log("请求返回",res);
+    if(paginationParams.pageNum == 1){
+      workResource.entpCourseWorkList = [];
+      workResource.entpCourseWorkTotal = 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){