Merge branch 'teacher' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into dev

# Conflicts:
#	.gitignore
#	src/components/Course/weikeContent.vue

src/api/boe/teacher.js

@@ -41,8 +41,8 @@ const teacherSystem = function(id) {
     teacher_id 教师id
  * } data 查询条件
  */
-    const teacherInfo = function(data) {
-        return ajax.get('/b1/system/teacher/teacher-info',data);
+    const teacherInfo = function(sysId) {
+        return ajax.get('/b1/system/teacher/teacher-info?teacher_id='+sysId);
     }
 /**
  * 教师删除接口
@@ -56,18 +56,90 @@ const teacherSystem = function(id) {
 /**
  * 教师启用禁用接口
  * @param {
-    teacher_id     
+    teacher_id
     status 状态；0：临时；1：正式；2：停用
  * }  查询条件
  */
     const updateStatus = function(data) {
         return ajax.postJson('/b1/system/teacher/update-status',data);
     }
+/**
+ * 教师授课记录查询接口
+ * @param {
+     ```json
+    id // 教师id
+    courseType // 课程类型：‘1,2’:面授,训练班；‘0’：在线班
+    pageSize // 每页数据条数
+    page // 返回第几页数据
+    isPage // 是否分页：0分页返回，1：不分页直接返回全部
+    ```
+ */
+    const getCourseScore = function(data) {
+        return ajax.get(`/b1/system/teacher/course-score?id=${data.id}&courseType=${data.courseType}&pageSize=${data.pageSize}&page=${data.page}&isPage=${data.isPage}`);
+    }
+/**
+ * 内部讲师-授课资格 查询接口
+ * @param {
+   id // 教师id
+    pageSize // 每页数据条数
+    page // 返回第几页数据
+    ```}
+ */
+    const getTeachingQualify = function(data) {
+        return ajax.get(`/b1/system/teacher/teaching-qualify?id=${data.id}&pageSize=${data.pageSize}&page=${data.page}`);
+    }
+/**
+ * 内部讲师-未开班资源查询接口
+ * @param {
+   id // 教师id
+    ```
+ */
+    const getCourseInfo = function(id) {
+        return ajax.get('/b1/system/teacher/course-info?id='+id);
+    }
+/**
+ * 内部讲师-晋级过程查询接口
+ * @param {
+   id // 教师id
+    ```
+ */
+    const teacherUpgradePrecess = function(id) {
+        return ajax.get('/b1/system/teacher/teacher-upgrade-precess?id='+id);
+    }
+/**
+ * 内部讲师-修改模块讲师信息
+ * @param {
+    courseId   // 课程id
+    modId   // 模块id
+    teacherId  // 教师id
+    teachingTime   // 授课时间
+ */
+    const editModelTeacher = function(data) {
+        return ajax.postJson('/b1/system/teacher/edit-model-teacher',data);
+    }
+/**
+ * 内部讲师-删除模块讲师接口
+ * @param {
+    courseId   // 课程id
+    modId   // 模块id
+    teacherId  // 教师id
+    remark   // 备注
+ */
+    const deleteModelTeacher = function(data) {
+        return ajax.postJson('/b1/system/teacher/delete-model-teacher',data);
+    }
+
 
 export default {
     editTeacher,
     teacherSystem,
     teacherInfo,
     deleteTeacher,
-    updateStatus
-}
+    updateStatus,
+    getCourseScore,
+    getTeachingQualify,
+    getCourseInfo,
+    teacherUpgradePrecess,
+    deleteModelTeacher,
+    editModelTeacher
+}

src/api/modules/teacher.js

@@ -173,6 +173,17 @@ const end=function(id){
 const exports=function(query){
 	return ajax.post('/xboe/teacher/export',query);
 }
+
+/**
+ * courseType // 课程类型：‘1,2’:面授,训练班；‘0’：在线班
+ * sysId:教师的sysId
+ * tid： 教师的id
+ * @param {tid,sysId,countType,pageSize:100,pageIndex} query
+ */
+const findAllCourses=function(query){
+	return ajax.post('/xboe/teacher/compose/find/courses',query);
+}
+
 export default {
     findByName,
     getInfoById,