@focus-teach/ui 1.0.60 → 1.1.0

package/api/index.js

@@ -3,9 +3,9 @@
  */
 import axios from "axios";
 import qs from "qs";
-
+import { Message } from 'element-ui';
 const VUE_APP_SSO_LOGIN_URL = 'http://ssoedu.focusteach.com/sso/authentication/require?client_id=focusteachsmartclass&equipmentType=epxIumhmRz0'
-
+let timer = null
 let token = "";
 axios.defaults.timeout = 30000;
 //axios请求时，如果不显示的设置Content-Type，那么默认是text/plain，这时服务器就不知道怎么解析数据
@@ -15,57 +15,76 @@ axios.defaults.crossDomain = true;
 axios.defaults.withCredentials = true; //设置cross跨域
 axios.defaults.baseURL = window.location.port && window.location.port != 8085 && window.location.port != 8086 ? '/backend' : ''
 axios.interceptors.request.use(
-    (config) => {
-        if (config.method === "post") {
-            let data = qs.parse(config.data);
-            config.data = qs.stringify({
-                // token: token,
-                ...data,
-            }, {
-                arrayFormat: "brackets"
-            });
-        } else if (config.method === "get") {
-            config.params = {
-                // token: token,
-                ...config.params,
-            };
-        }
-        return config;
-    },
-    (error) => { }
+  (config) => {
+    if (config.method === "post") {
+      let data = qs.parse(config.data);
+      config.data = qs.stringify({
+        // token: token,
+        ...data,
+      }, {
+        arrayFormat: "brackets"
+      });
+    } else if (config.method === "get") {
+      config.params = {
+        // token: token,
+        ...config.params,
+      };
+    }
+    //判断没网的情况下 只提示一次
+    if (!timer && !navigator.onLine) {
+      Message({ message: '网络异常，请检查网络', type: 'error' })
+      timer = setTimeout(() => {
+        timer = null
+        clearTimeout(timer)
+      }, 2000)
+    }
+    return config;
+  },
+  (error) => { }
 );
 
 axios.interceptors.response.use(
-    (res) => {
-        if ((res.data&&res.data.code=='1005') || res.code == "10005") {
-            //跳转到登录页
-            window.location.href = VUE_APP_SSO_LOGIN_URL;
-            // return false
-        }
-        return res.data || res ;
-    },
-    (error) => { }
+  (res) => {
+    if ((res.data && res.data.code == '1005') || res.code == "10005") {
+      //跳转到登录页
+      window.location.href = VUE_APP_SSO_LOGIN_URL;
+      // return false
+    }
+    return res.data || res;
+  },
+  (error) => { }
 );
 
 //资源库-首页接口
 export function getResourcePoolIndex(options, success, error) {
-    axios.get("/resource/pool/index", { params: options }).then(
-        (res) => {
-            success && success(res);
-        },
-        (res) => {
-            error && error(res);
+  axios.get("/resource/pool/index", { params: options }).then(
+    (res) => {
+      let data = {
+        ...res,
+        value: {
+          ...res?.value,
+          ResourceSourceTypeList: res?.value?.ResourceSourceTypeList || [],
+          examTopicDto:res?.value?.examTopicDto,
+          examTopicDtos:res?.value?.examTopicDtos || [],
+          resourceShareCategoryTypeList:res?.value?.resourceShareCategoryTypeList || [],
         }
-    );
+      }
+      res = data
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
 }
 export function getEditorData(options, success, error) {
   axios.get('/ybk/editor/data', { params: options }).then(
-      (res) => {
-          success && success(res);
-      },
-      (res) => {
-          error && error(res);
-      }
+    (res) => {
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
   );
 }
 
@@ -82,28 +101,43 @@ export function aWaitGetGradeList(options, success, error) {
 }
 //资源库-分页接口
 export function getResourcePoolList(options, success, error) {
-    axios.get("/resource/pool/list", { params: options }).then(
-        (res) => {
-            success && success(res);
-        },
-        (res) => {
-            error && error(res);
+  axios.get("/resource/pool/list", { params: options }).then(
+    (res) => {
+      let data = {
+        ...res,
+        value:{
+         ...res?.value,
+         result:res?.value?.result || [],
         }
-    );
+      }
+      res = data
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
 }
 
 //同步练习>试卷编辑>教材版本（张磊）
 export function getMaterialsGrades(options, success, error) {
-    axios.get("/ybk/item/materialsGrades", {
-        params: options
-    }).then(
-        (res) => {
-            success && success(res);
-        },
-        (res) => {
-            error && error(res);
-        }
-    );
+  axios.get("/ybk/item/materialsGrades", {
+    params: options
+  }).then(
+    (res) => {
+      let data = {
+        ...res,
+        value: res?.value,
+        checkTeachMaterialId: res?.value?.checkTeachMaterialId,
+        list: res?.value?.list || [],
+      }
+      res = data
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
 }
 //同步练习>试卷编辑>教材版本（张磊）
 export function getMaterialsGradesApi(options) {
@@ -112,6 +146,13 @@ export function getMaterialsGradesApi(options) {
       params: options
     }).then(
       (res) => {
+        let data = {
+          ...res,
+          value: res?.value,
+          checkTeachMaterialId: res?.value?.checkTeachMaterialId,
+          list: res?.value?.list || [],
+        }
+        res = data
         resolve([null, res])
       },
       (err) => {
@@ -123,16 +164,23 @@ export function getMaterialsGradesApi(options) {
 
 //同步练习>试卷编辑>课程集合（张磊）
 export function getEditorCourse(options, success, error) {
-    axios.get("/ybk/item/course", {
-        params: options
-    }).then(
-        (res) => {
-            success && success(res);
-        },
-        (res) => {
-            error && error(res);
-        }
-    );
+  axios.get("/ybk/item/course", {
+    params: options
+  }).then(
+    (res) => {
+      let data = {
+        ...res,
+        value: res?.value,
+        checkTeachMaterialId: res?.value?.checkTeachMaterialId,
+        list: res?.value?.list || [],
+      }
+      res = data
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
 }
 //同步练习>试卷编辑>课程集合（张磊）
 export function getEditorCourseApi(options) {
@@ -141,6 +189,13 @@ export function getEditorCourseApi(options) {
       params: options
     }).then(
       (res) => {
+        let data = {
+          ...res,
+          value: res?.value,
+          checkTeachMaterialId: res?.value?.checkTeachMaterialId,
+          list: res?.value?.list || [],
+        }
+        res = data
         resolve([null, res])
       },
       (err) => {
@@ -152,93 +207,111 @@ export function getEditorCourseApi(options) {
 
 //通用-获取国家省市
 export function getProvince(options, success, error) {
-    axios.get("/region/common/index", { params: options })
-        .then((res) => {
-            success && success(res)
-        }, (res) => {
-            error && error(res)
-        })
+  axios.get("/region/common/index", { params: options })
+    .then((res) => {
+      let data = {
+        ...res,
+        value:{
+          ...res?.value,
+          countryList:res?.value?.countryList || [],
+        },
+      }
+      res = data
+      success && success(res)
+    }, (res) => {
+      error && error(res)
+    })
 }
 
 //【同步】hq_studyfun 获取历史记录  2云备课，3智慧教学
 export function getUserOperate(options, success, error) {
-    return axios.get("/user/operate/get", {
-        params: options
-    });
+  return axios.get("/user/operate/get", {
+    params: options
+  });
 }
 
 //hq_studyfun 保存记录  2云备课，3智慧教学
 export function setUserOperate(options, success, error) {
-    axios.post("/user/operate/save", options).then(
-        (res) => {
-            success && success(res);
-        },
-        (res) => {
-            error && error(res);
-        }
-    );
+  axios.post("/user/operate/save", options).then(
+    (res) => {
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
 }
 
 //获取册别
 export function getClassifications(options, success, error) {
-    axios.get("/ybk/editor/classifications", { params: options }).then(
-        (res) => {
-            success && success(res);
-        },
-        (res) => {
-            error && error(res);
-        }
-    );
+  axios.get("/ybk/editor/classifications", { params: options }).then(
+    (res) => {
+      let data = {
+        ...res,
+        value:res?.value || [],
+      }
+      res= data
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
 }
 
 //云备课左侧全部课程专区接口：
 export function getZoneList(options, success, error) {
-    axios.get("/ybk/editor/zone", { params: options }).then(
-        (res) => {
-            success && success(res);
-        },
-        (res) => {
-            error && error(res);
-        }
-    );
+  axios.get("/ybk/editor/zone", { params: options }).then(
+    (res) => {
+      let data = {
+        ...res,
+        value: res?.value || [],
+      }
+      res= data
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
 }
 
 //通用-根据省份获取城市信息【USP】（张磊>chenxianyong）
 export function getAreas(options, success, error) {
-    axios.get("/region/common/areas", {
-        params: options
-    }).then(
-        (res) => {
-            success && success(res);
-        },
-        (res) => {
-            error && error(res);
-        }
-    );
+  axios.get("/region/common/areas", {
+    params: options
+  }).then(
+    (res) => {
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
 }
 // 获取全品题目科目ID
 export function getQptkSubjectID(options, success, error) {
-    axios.get("/qptk/subject", { params: options }).then(
-        (res) => {
-            success && success(res);
-        },
-        (res) => {
-            error && error(res);
-        }
-    );
+  axios.get("/qptk/subject", { params: options }).then(
+    (res) => {
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
 }
 //题库列表查询【USP】（chenxianyong）
 export function getBankIndex(options, success, error) {
-    axios.get("/ybk/item/index", {
-      params: options
-    }).then((res) => {
-        success && success(res);
-      },
-      (err) => {
-        error && error(err);
-      }
-    );
-  }
+  axios.get("/ybk/item/index", {
+    params: options
+  }).then((res) => {
+    success && success(res);
+  },
+    (err) => {
+      error && error(err);
+    }
+  );
+}
 //题库列表查询【USP】（chenxianyong）
 export function getBankIndexApi(options) {
   return new Promise(resolve => {
@@ -254,65 +327,84 @@ export function getBankIndexApi(options) {
     );
   })
 }
-  //题库分页查询【USP】（chenxianyong）
+//题库分页查询【USP】（chenxianyong）
 export function getBankData(options, success, error) {
-    axios.get("/ybk/item/bank", {
-      params: options
-    }).then(
-      (res) => {
-        success && success(res);
-      },
-      (res) => {
-        error && error(res); 
+  axios.get("/ybk/item/bank", {
+    params: options
+  }).then(
+    (res) => {
+      let data = {
+        ...res,
+        value: {
+          ...res?.value,
+          ItemBankQuery:res?.value?.ItemBankQuery,
+          itemInfoList:res?.value?.itemInfoList || [],
+        }
       }
-    );
-  }
-  //题库分页查询【USP】（chenxianyong）
+      res = data
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
+}
+//题库分页查询【USP】（chenxianyong）
 export function getBankDataApi(options) {
-  return new Promise(resolve=> {
+  return new Promise(resolve => {
     axios.get("/ybk/item/bank", {
       params: options
     }).then(
       (res) => {
-        resolve([null,res])
+        resolve([null, res])
       },
       (err) => {
-        resolve([err,null])
+        resolve([err, null])
       }
     );
   })
 }
-  //通用-获取知识点【后台管理】（chenxianyong）
+//通用-获取知识点【后台管理】（chenxianyong）
 export function getKnowledge(options, success, error) {
-    axios.get("/item/common/kl", {
-      params: options
-    }).then(
-      (res) => {
-        success && success(res);
-      },
-      (res) => {
-        error && error(res);
-      }
-    );
-  }
-  //通用-获取专题【USP】（张磊>chenxianyong）
+  axios.get("/item/common/kl", {
+    params: options
+  }).then(
+    (res) => {
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
+}
+//通用-获取专题【USP】（张磊>chenxianyong）
 export function getTopic(options, success, error) {
-    axios.get("/ybk/item/topic", {
-        params: options
-      })
-      .then((res) => {
-        success && success(res)
-      }, (res) => {
-        error && error(res)
-      })
-  }
-  //通用-获取专题【USP】（张磊>chenxianyong）
+  axios.get("/ybk/item/topic", {
+    params: options
+  })
+    .then((res) => {
+      let data = {
+        ...res,
+        value: res?.value || [],
+      }
+      res = data
+      success && success(res)
+    }, (res) => {
+      error && error(res)
+    })
+}
+//通用-获取专题【USP】（张磊>chenxianyong）
 export function getTopicApi(options) {
   return new Promise(resolve => {
     axios.get("/ybk/item/topic", {
       params: options
     }).then(
       (res) => {
+        let data = {
+          ...res,
+          value: res?.value || [],
+        }
+        res = data
         resolve([null, res])
       },
       (err) => {
@@ -323,15 +415,15 @@ export function getTopicApi(options) {
 }
 //难度知识点是否必填【hq_studyfun】（sunqb）
 export function getKldftNecessary(options, success, error) {
-    axios.get("/kldft/necessary", {
-        params: options
-      })
-      .then((res) => {
-        success && success(res)
-      }, (res) => {
-        error && error(res)
-      })
-  }
+  axios.get("/kldft/necessary", {
+    params: options
+  })
+    .then((res) => {
+      success && success(res)
+    }, (res) => {
+      error && error(res)
+    })
+}
 //难度知识点是否必填【hq_studyfun】（sunqb）
 export function getKldftNecessaryApi(options) {
   return new Promise(resolve => {
@@ -350,72 +442,72 @@ export function getKldftNecessaryApi(options) {
 
 //获取题目
 export function getQuestion(options, success, error) {
-    return new Promise((resolve) => {
-      // const instance = axios.create();
-      // instance.defaults.headers.post["Content-Type"] = "text/html;charset=UTF-8";
-      // instance.defaults.responseType = 'json'
-      axios.get(`/files/${options.itemId}?type=2`).then(
-        (res) => {
-          // console.log('全品题目',res);
-          success && success(res);
-          resolve(res);
-        },
-        (res) => {
-          error && error(res);
-        }
-      );
-    });
-  }
-//获取题目
-export function getQuestionApi(options) {
-    return new Promise((resolve) => {
-      axios.get(`/files/${options.itemId}?type=2`).then(
-        (res) => {
-          resolve([null, res]);
-        },
-        (err) => {
-          resolve([err, null]);
-        }
-      );
-    });
-  }
-export function getTitleHtml(options, params) {
-    return new Promise((resolve) => {
-        axios.get(`/files/${options.itemId}?type=2`, params, {
-            header: {
-                "Content-Type": "text/html;charset=UTF-8"
-            }
-        }).then(res => {
-            resolve([null, res])
-        }).catch(err => {
-            resolve([err, null])
-        })
-    });
-}
-  //通用-获取单题的答案与解析【后台管理】（chenxianyong）
-export function getAnswer(options, success, error) {
-    axios.get("/ybk/item/detail", {
-      params: options
-    }).then(
+  return new Promise((resolve) => {
+    // const instance = axios.create();
+    // instance.defaults.headers.post["Content-Type"] = "text/html;charset=UTF-8";
+    // instance.defaults.responseType = 'json'
+    axios.get(`/files/${options.itemId}?type=2`).then(
       (res) => {
+        // console.log('全品题目',res);
         success && success(res);
+        resolve(res);
       },
       (res) => {
         error && error(res);
       }
     );
-  }
-  //试卷编辑>引用题目（张磊）
-export function quoteQuestion(options, success, error) {
-    axios.post("/ybk/item/quote", options).then(
+  });
+}
+//获取题目
+export function getQuestionApi(options) {
+  return new Promise((resolve) => {
+    axios.get(`/files/${options.itemId}?type=2`).then(
       (res) => {
-        success && success(res);
+        resolve([null, res]);
       },
-      (res) => {
-        error && error(res);
+      (err) => {
+        resolve([err, null]);
       }
     );
-  }
+  });
+}
+export function getTitleHtml(options, params) {
+  return new Promise((resolve) => {
+    axios.get(`/files/${options.itemId}?type=2`, params, {
+      header: {
+        "Content-Type": "text/html;charset=UTF-8"
+      }
+    }).then(res => {
+      resolve([null, res])
+    }).catch(err => {
+      resolve([err, null])
+    })
+  });
+}
+//通用-获取单题的答案与解析【后台管理】（chenxianyong）
+export function getAnswer(options, success, error) {
+  axios.get("/ybk/item/detail", {
+    params: options
+  }).then(
+    (res) => {
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
+}
+//试卷编辑>引用题目（张磊）
+export function quoteQuestion(options, success, error) {
+  axios.post("/ybk/item/quote", options).then(
+    (res) => {
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  );
+}
 //获取题目类别
 export function getItemType(options, success, error) {
   //参数subjectId
@@ -423,6 +515,11 @@ export function getItemType(options, success, error) {
     params: options
   }).then(
     (res) => {
+      let data = {
+        ...res,
+        value:res?.value || [],
+      }
+      res = data
       success && success(res);
       return Promise.resolve(res);
     },
@@ -454,6 +551,19 @@ export function getMistakeIndex(options, success, error) {
     params: options
   }).then(
     (res) => {
+      let data = {
+        ...res,
+        value: {
+         ...res?.value,
+         clazzGradeList:res?.value?.clazzGradeList || [],
+         difficultyList:res?.value?.difficultyList || [],
+         errorRateList:res?.value?.errorRateList || [],
+         examSourceList:res?.value?.examSourceList || [],
+         itemCategoryList:res?.value?.itemCategoryList || [],
+         termList:res?.value?.termList || [],
+        }
+      }
+      res = data
       success && success(res);
     },
     (res) => {
@@ -468,6 +578,19 @@ export function getMistakeData(options, success, error) {
     params: options
   }).then(
     (res) => {
+      let data = {
+       ...res,
+       value:{
+        ...res?.value,
+        chapterList:res?.value?.chapterList || [],
+        classId:res?.value?.classId,
+        errorRateId:res?.value?.errorRateId,
+        gradeId:res?.value?.gradeId,
+        knowledgeSource:res?.value?.knowledgeSource,
+        subjectId:res?.value?.subjectId,
+       },
+      }
+      res = data
       success && success(res);
     },
     (res) => {
@@ -496,6 +619,18 @@ export function getMistakeNewItems(options, success, error) {
     params: options
   }).then(
     (res) => {
+      let data = {
+        ...res,
+        value:{
+         ...res?.value,
+         itemIds:res?.value?.itemIds || [],
+         commonPageDto:{
+          ...res?.value?.commonPageDto,
+          lists:res?.value?.commonPageDto?.lists || [],
+         }
+        }
+      }
+      res = data
       success && success(res);
     },
     (res) => {
@@ -536,13 +671,13 @@ export function quoteWrongQuestion(options, success, error) {
 }
 
 //根据试卷id，题目id获取变式题
-export function getVariantListbyqdui(options,success,error){
+export function getVariantListbyqdui(options, success, error) {
   return axios.get("/ybk/variant/list", { params: options }).then(
     (res) => {
-        success && success(res);
+      success && success(res);
     },
     (res) => {
-        error(res);
+      error(res);
     }
   );
 }
@@ -550,15 +685,15 @@ export function getVariantListbyqdui(options,success,error){
 //获取资源分享 的类型list
 export function reqShareCategoryTypeList(options, success, error) {
   axios.get("/ybk/resource/share", {
-      params: options
-    }).then(
-      (res) => {
-        success && success(res);
-      },
-      (res) => {
-        error && error(res);
-      }
-    )
+    params: options
+  }).then(
+    (res) => {
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
+  )
     .catch(() => {
       error();
     });
@@ -576,27 +711,32 @@ export function doShareExam(options, success, error) {
   );
 }
 //获取试卷概述统计
-export function getExamStatistics (options, success, error) {
+export function getExamStatistics(options, success, error) {
   axios.get("/ybk/editor/exam/title", {
     params: options
   }).then(
     (res) => {
+      let data = {
+        ...res,
+        value:res?.value || [],
+      }
+      res = data
       success && success(res);
     },
     (res) => {
       error && error(res);
     }
   )
-  .catch(() => {
-    error();
-  });
+    .catch(() => {
+      error();
+    });
 }
 
 /**
  * 新增/编辑模板
  */
 //获取学段
-export function eduLevelList_temp (options, success, error) {
+export function eduLevelList_temp(options, success, error) {
   axios.get("/exam-paper/template/index.json", {}).then(
     (res) => {
       success && success(res);
@@ -605,12 +745,12 @@ export function eduLevelList_temp (options, success, error) {
       error && error(res);
     }
   )
-  .catch(() => {
-    error();
-  });
+    .catch(() => {
+      error();
+    });
 }
 //获取科目
-export function subjectList_temp (options, success, error) {
+export function subjectList_temp(options, success, error) {
   axios.get("/exam-paper/template/list/subject", {
     params: options
   }).then(
@@ -621,12 +761,12 @@ export function subjectList_temp (options, success, error) {
       error && error(res);
     }
   )
-  .catch(() => {
-    error();
-  });
+    .catch(() => {
+      error();
+    });
 }
 //新增和修改试卷模板
-export function aouExam_temp (options, success, error) {
+export function aouExam_temp(options, success, error) {
   axios.post("/exam-paper/template/aou", options).then(
     (res) => {
       success && success(res);
@@ -637,7 +777,7 @@ export function aouExam_temp (options, success, error) {
   );
 }
 //获取试卷模板详情
-export function examTemplateInfo (options, success, error) {
+export function examTemplateInfo(options, success, error) {
   axios.get("/exam-paper/template/get", {
     params: options
   }).then(
@@ -648,13 +788,13 @@ export function examTemplateInfo (options, success, error) {
       error && error(res);
     }
   )
-  .catch(() => {
-    error();
-  });
+    .catch(() => {
+      error();
+    });
 }
 
 //获取模板年级
-export function examTemplateGradeList (options, success, error) {
+export function examTemplateGradeList(options, success, error) {
   axios.get("/exam-paper/template/list-grade", {
     params: options
   }).then(
@@ -665,13 +805,13 @@ export function examTemplateGradeList (options, success, error) {
       error && error(res);
     }
   )
-  .catch(() => {
-    error();
-  });
+    .catch(() => {
+      error();
+    });
 }
 
 //检测作业模板上限
-export function checkTemplateLimit (options, success, error) {
+export function checkTemplateLimit(options, success, error) {
   axios.get("/exam-paper/template/check", {
     params: options
   }).then(
@@ -682,26 +822,31 @@ export function checkTemplateLimit (options, success, error) {
       error && error(res);
     }
   )
-  .catch(() => {
-    error();
-  });
+    .catch(() => {
+      error();
+    });
 }
 
 /**
  * 教辅相关
  */
 //获取教辅列表
-export function getTeachaidList(options, success, error) {
+export function getTeachaidListApi(options, success, error) {
   return new Promise((resolve) => {
     axios.get(`/teach-aid/list/data`, { params: options }).then(res => {
-        resolve([null, res])
+      let data = {
+        ...res,
+        value:res?.value || [],
+      }
+      res = data
+      resolve([null, res])
     }).catch(err => {
-        resolve([err, null])
+      resolve([err, null])
     })
-});
-  return axios.get("/teach-aid/list/data", {
-    params: options
-  })
+  });
+  // return axios.get("/teach-aid/list/data", {
+  //   params: options
+  // })
 }
 
 //获取学年
@@ -710,21 +855,29 @@ export function getTeachaidYearGrade(options, success, error) {
     params: options
   }).then(
     (res) => {
+      let data = {
+        ...res,
+        value:{
+          ...res?.value,
+          clazzGradeDtos:res?.value?.clazzGradeDtos || [],
+          schoolYears:res?.value?.schoolYears || [],
+        }
+      }
+      res = data
       success && success(res);
     },
     (res) => {
       error && error(res);
     }
   )
-  .catch(() => {
-    error();
-  });
+    .catch(() => {
+      error();
+    });
 }
-
-//获取教辅目录列表
-export function getTeachaidCatalogue(options, success, error) {
+//获取学年
+export function getTeachaidYearGradeApi(options) {
   return new Promise((resolve) => {
-    axios.get("/teach-aid/catalogue/list/data", { params: options }).then(
+    axios.get("/teach-aid/list/year-grade", { params: options }).then(
         (res) => {
             resolve([null, res])
         },
@@ -732,21 +885,44 @@ export function getTeachaidCatalogue(options, success, error) {
             resolve([err, null])
         }
     );
-})
+  })
+}
+//获取教辅目录列表
+export function getTeachaidCatalogue(options, success, error) {
+  return new Promise((resolve) => {
+    axios.get("/teach-aid/catalogue/list/data", { params: options }).then(
+      (res) => {
+        let data = {
+          ...res,
+          value:res?.value || [],
+        }
+        res = data
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
+    );
+  })
 }
 
 //根据教辅id和目录获取试卷
 export function getTeachaidPaper(options, success, error) {
   return new Promise((resolve) => {
     axios.get("/teach-aid/resource/list/data", { params: options }).then(
-        (res) => {
-            resolve([null, res])
-        },
-        (err) => {
-            resolve([err, null])
+      (res) => {
+        let data = {
+          ...res,
+          value:res?.value || [],
         }
+        res = data
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
     );
-})
+  })
 }
 
 /**
@@ -777,59 +953,81 @@ export function removeResource(options, success, error) {
 export function addPaper(options) {
   return new Promise((resolve) => {
     axios.post("/ybk/editor/exam", options).then(
-        (res) => {
-            resolve([null, res])
-        },
-        (err) => {
-            resolve([err, null])
+      (res) => {
+        let data = {
+          ...res,
+          value: {
+            ...res?.value,
+            coreResourceCfgDto: res?.value?.coreResourceCfgDto,
+            exam:res?.value?.exam,
+            itemList:res?.value?.itemList || [],
+            layoutJson:res?.value?.layoutJson
+          }
         }
+        res = data
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
     );
-});
+  });
 }
 
 // 获取试卷题目信息
 export function getExamQuestion(options) {
   return new Promise((resolve) => {
-      axios.get("/ybk/editor/exam/list-score", { params: options }).then(
-          (res) => {
-              resolve([null, res])
-          },
-          (err) => {
-              resolve([err, null])
+    axios.get("/ybk/editor/exam/list-score", { params: options }).then(
+      (res) => {
+        let data = {
+          ...res,
+          value:{
+            ...res?.value,
+            examCardInfoDto:res?.value?.examCardInfoDto,
+            examCardItemResultDtoList:res?.value?.examCardItemResultDtoList || [],
+            layout:res?.value?.layout,
+            layoutJson:res?.value?.layoutJson,
           }
-      );
+        }
+        res = data
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
+    );
   })
 }
 
 //获取题目自增试卷配置
-export function getResourceCfg (options) {
+export function getResourceCfg(options) {
   return new Promise((resolve) => {
     axios.get("/ybk/item/getResourceCfg", { params: options }).then(
-        (res) => {
-            resolve([null, res])
-        },
-        (err) => {
-            resolve([err, null])
-        }
+      (res) => {
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
     );
-})
+  })
 }
 export function getExamCard(params) {
   return new Promise((resolve) => {
-      axios.get('/ybk/exam-card/edit.json', {params}).then(res => {
-          resolve([null, res])
-      }).catch(err => {
-          resolve([err, null])
-      })
+    axios.get('/ybk/exam-card/edit.json', { params }).then(res => {
+      resolve([null, res])
+    }).catch(err => {
+      resolve([err, null])
+    })
   });
 }
 export function getPreviewJSON(params) {
   return new Promise((resolve) => {
-      axios.get('/ybk/editor/exam/preview.json', {params}).then(res => {
-          resolve([null, res])
-      }).catch(err => {
-          resolve([err, null])
-      })
+    axios.get('/ybk/editor/exam/preview.json', { params }).then(res => {
+      resolve([null, res])
+    }).catch(err => {
+      resolve([err, null])
+    })
   });
 }
 //引用试卷内题目【异步】
@@ -847,22 +1045,27 @@ export function quotePaperQuestion(options, success, error) {
 //获取模板列表
 export function getExamTemplateList(params) {
   return new Promise((resolve) => {
-    axios.get('/exam-paper/template/list/data', {params}).then(res => {
-        resolve([null, res])
+    axios.get('/exam-paper/template/list/data', { params }).then(res => {
+      resolve([null, res])
     }).catch(err => {
-        resolve([err, null])
+      resolve([err, null])
     })
-});
+  });
 }
 //获取题型列表
 export function getCategoryList(params) {
   return new Promise((resolve) => {
-    axios.get('/item/common/category/list', {params}).then(res => {
-        resolve([null, res])
+    axios.get('/item/common/category/list', { params }).then(res => {
+      let data = {
+        ...res,
+        value:res?.value || [],
+      }
+      res = data
+      resolve([null, res])
     }).catch(err => {
-        resolve([err, null])
+      resolve([err, null])
     })
-});
+  });
 }
 
 //获取智能打标知识点集合
@@ -876,72 +1079,73 @@ export function getAIKlList(options) {
         resolve([err, null])
       }
     );
-  }); 
+  });
 }
 
 // 获取当前试卷题目列表
 export function getItemList(options) {
   return new Promise((resolve) => {
-      axios.get("/ybk/editor/exam", { params: options }).then(
-          (res) => {
-              resolve([null, res])
-          },
-          (err) => {
-              resolve([err, null])
-          }
-      );
+    axios.get("/ybk/editor/exam", { params: options }).then(
+      (res) => {
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
+    );
   })
 }
 //获取当前目录下面的试卷列表（异步）
 export function getExamListAsync(options, success, error) {
   axios.get('/teach-aid/resource/list/data', { params: options }).then(
-      (res) => {
-          success && success(res);
-      },
-      (res) => {
-          error && error(res);
-      }
+    (res) => {
+      success && success(res);
+    },
+    (res) => {
+      error && error(res);
+    }
   );
 }
 //答题是否下载过
 export function getAnswerDownload(options, success, error) {
   return new Promise((resolve) => {
     axios.get("/ybk/exam-card/edit.json", { params: options }).then(
-        (res) => {
-            resolve([null, res])
-        },
-        (err) => {
-            resolve([err, null])
-        }
+      (res) => {
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
     );
   })
 }
 
 //下载试卷>是否下载听力
-export function getPaperAudio (options) {
+export function getPaperAudio(options) {
   return new Promise((resolve) => {
     axios.get("/ybk/editor/exam/check-audio", { params: options }).then(
-        (res) => {
-            resolve([null, res])
-        },
-        (err) => {
-            resolve([err, null])
-        }
+      (res) => {
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
     );
-})}
+  })
+}
 
 
 // 获取题目难度列表
 export function getItemDiffList(options) {
   return new Promise((resolve) => {
-      axios.get("/ybk/item/difficult", { params: options }).then(
-          (res) => {
-              resolve([null, res])
-          },
-          (err) => {
-              resolve([err, null])
-          }
-      );
+    axios.get("/ybk/item/difficult", { params: options }).then(
+      (res) => {
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
+    );
   })
 }
 
@@ -956,7 +1160,7 @@ export function getJYWVariantList(options) {
         resolve([err, null])
       }
     );
-  }); 
+  });
 }
 
 //保存或者移除变式题目
@@ -970,7 +1174,7 @@ export function saveOrRemoveVariantItem(options,) {
         resolve([err, null])
       }
     );
-  }); 
+  });
 }
 
 //查询菁优网答案与解析
@@ -984,7 +1188,7 @@ export function getJYWVariantDetailList(options,) {
         resolve([err, null])
       }
     );
-  }); 
+  });
 }
 
 //引用菁优网变式题到教育系统
@@ -998,19 +1202,24 @@ export function getItemToVariant(options) {
         resolve([err, null])
       }
     );
-  }); 
+  });
 }
 
 //根据试卷id，题目id获取变式题列表
-export function getVariantList(options){
+export function getVariantList(options) {
   return new Promise((resolve) => {
     axios.get("/ybk/variant/list", { params: options }).then(
-        (res) => {
-            resolve([null, res])
-        },
-        (err) => {
-            resolve([err, null])
+      (res) => {
+        let data = {
+          ...res,
+          value:res?.value || [],
         }
+        res = data
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
     );
   })
 }
@@ -1031,7 +1240,7 @@ export function getItem(itemFileId) {
 //上下移动变式题
 export function moveVariantItem(options) {
   return new Promise((resolve) => {
-    axios.post('/ybk/variant/reorder',options).then(
+    axios.post('/ybk/variant/reorder', options).then(
       (res) => {
         resolve([null, res])
       },
@@ -1056,44 +1265,44 @@ export function getStudyfunEnv(options) {
 }
 
 // 获取自制卡题目信息(分值、答案)
-export function getCustomCardInfo(options){
+export function getCustomCardInfo(options) {
   return new Promise((resolve) => {
-      axios.get("/ybk/exam/blank/item/list/score", { params:options }).then(res => {
-          resolve([null, res])
-      }).catch(err => {
-          resolve([err, null])
-      })
+    axios.get("/ybk/exam/blank/item/list/score", { params: options }).then(res => {
+      resolve([null, res])
+    }).catch(err => {
+      resolve([err, null])
+    })
   });
 }
 
 //获取资源分享信息
 export function getResourceShareInfo(options) {
-  return new Promise(resolve=>{
-      axios.get("/ybk/resource/share", {
-          params: options
-      }).then(
-          (res) => {
-              resolve([null, res])
-          },
-          (err) => {
-              resolve([err, null])
-          }
-      );
+  return new Promise(resolve => {
+    axios.get("/ybk/resource/share", {
+      params: options
+    }).then(
+      (res) => {
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
+    );
   })
 }
 //获取自制卡信息
 export function getCustomCardRecord(options) {
-  return new Promise(resolve=>{
-      axios.get("/ybk/exam/blank/item/get/record", {
-          params: options
-      }).then(
-          (res) => {
-              resolve([null, res])
-          },
-          (err) => {
-              resolve([err, null])
-          }
-      );
+  return new Promise(resolve => {
+    axios.get("/ybk/exam/blank/item/get/record", {
+      params: options
+    }).then(
+      (res) => {
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
+    );
   })
 }
 //获取用户搜索内容
@@ -1101,9 +1310,9 @@ export function getSearchList(options, success, error) {
   axios.get("/paper-exam/user/like-name", {params: options})
       .then((res) => {
       success && success(res)
-}, (res) => {
+    }, (res) => {
       error && error(res)
-  })
+    })
 }
 //搜索学生列表
 export const getSearchStudentList = (params) => {
@@ -1191,7 +1400,7 @@ export function getPermissionList(options) {
         resolve([err, null])
       }
     );
-  })
+  });
 }
 /* 获取学科网变式题 */
 export function getXkwRecVariantList(options) {
@@ -1217,10 +1426,10 @@ export function uploadUrlApi(options) {
   return new Promise((resolve) => {
     axios.post("/item/common/upload/url", options).then(
       (res) => {
-        resolve([null,res]);
+        resolve([null, res]);
       },
       (err) => {
-        resolve([err,null]);
+        resolve([err, null]);
       }
     );
   });
@@ -1228,9 +1437,43 @@ export function uploadUrlApi(options) {
 
 
 //根据试卷id，题目id获取变式题个数
-export function getVariantCountApi(options){
+export function getVariantCountApi(options) {
   return new Promise((resolve) => {
     axios.get("/ybk/variant/count", { params: options }).then(
+      (res) => {
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
+    );
+  })
+}
+
+//获取知识点
+export function getKnowledgeListApi(options) {
+  return new Promise((resolve) => {
+    axios.get("/ybk/item/get-knowledge-list", { params: options }).then(
+      (res) => {
+        let data = {
+          ...res,
+          value: res?.value || [],
+        }
+        res = data
+        resolve([null, res])
+      },
+      (err) => {
+        resolve([err, null])
+      }
+    );
+  })
+}
+
+
+//【同步】hq_studyfun 获取历史记录
+export function getUserOperateApi(options){
+  return new Promise((resolve) => {
+    axios.get("/user/operate/get", { params: options }).then(
         (res) => {
             resolve([null, res])
         },
@@ -1239,4 +1482,18 @@ export function getVariantCountApi(options){
         }
     );
   })
-}
+}
+
+//hq_studyfun 保存记录  2云备课，3智慧教学
+export function setUserOperateApi(options) {
+  return new Promise((resolve) => {
+    axios.post("/user/operate/save", options).then(
+      (res) => {
+        resolve([null,res]);
+      },
+      (err) => {
+        resolve([err,null]);
+      }
+    );
+  });
+}