Merge remote-tracking branch 'boe121/master-0705' into zcwy-teacher-manage

src/api/ThirdApi.js

@@ -18,4 +18,4 @@ export const REFRESH_TOKEN_API = "/userbasic/refreshToken";
 
 export const COURSE_AUDIT = "/systemapi/xboe/m/course/manage/audit post formData";
 export const OTHER_AUDIT = "/systemapi/xboe/m/course/audit/appoint post formData";
-export const ONLINE_COURSE_DEL = (id, courseId) => `/systemapi/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId} post`;
+export const ONLINE_COURSE_DEL = (id, courseId,studentId) => `/systemapi/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId}&studentId=${studentId} post`;

src/api/configPublic.js

@@ -7,7 +7,7 @@ import Cookies from 'vue-cookies'
 axios.defaults.withCredentials = true;
 const http = axios.create({
     timeout: 1000 * 15,
-    headers: { "Content-Type": "application/json", },
+    headers: { "Content-Type":"application/json", },
 });
 
 http.interceptors.request.use(

src/api/examineApi.js

@@ -0,0 +1,165 @@
+import { data } from "jquery";
+import http from "./configPublic";
+//认证审批项目列表
+export const getexamineList = (data) => {
+    return http({
+        url: "/activityApi/examine/list",
+        method: "post",
+        data: data
+    })
+  
+}
+export const getexamine = (data) => {
+    return http({
+        url: "/activityApi/teacher/list",
+        method: "post",
+        data: data
+    })
+  
+}
+//创建认证
+export const CreateAuthentication = (data)=>{
+    return http({
+        url:'/activityApi/examine/launchOrUpdate',
+        method: "post",
+        data: data
+    })
+}
+//删除认证
+export const delExamine = (data)=>{
+    return http({
+        url:'/activityApi/examine/deleteExamine',
+        method: "post",
+        data: data
+    })
+}
+//讲师列表
+export const getTeacherList = (data)=>{
+    return http({
+        url:'/activityApi/teacher/list',
+        method: "post",
+        data: data
+    })
+}
+//删除教师
+export const deleTeTeacher = (data)=>{
+    return http({
+        url:'/activityApi//teacher/deleTeTeacher',
+        method: "post",
+        data: data
+    })
+}
+//发起评审列表
+export const getReview = (data) =>{
+    return http({
+        url:'/activityApi/review/list',
+        method: "post",
+        data: data
+    })
+}
+//删除评审
+export const delreview=(data) =>{
+    return http({
+        url:'/activityApi/review/delete',
+        method: "post",
+        data: data
+    })
+}
+//查看评审
+export const reviewdetail =(data)=>{
+    return http({
+        url:'/activityApi/review/detail',
+        method: "post", 
+        data: data
+    })
+}
+//发起评审
+export const reviewSave = (data) =>{
+    return http({
+        url:'/activityApi/review/save',
+        method: "post", 
+        data: data
+    })
+}
+//添加教师
+export const addTeacher= (data)=>{
+    return http({
+        url:'/activityApi/review/selectTeacher',
+        method: "post", 
+        data: data
+    })
+}
+//结束评审并通知结果
+export const endreview = (data) =>{
+    return http({
+        url:'/activityApi/review/endReview',
+        method: "post", 
+        data: data
+    })
+}
+//编辑评审
+export const editreview = (data) =>{
+    return http({
+        url:'/activityApi/review/edit',
+        method: "post", 
+        data: data
+    })
+}
+//添加导师
+export const addTutor = (data) =>{
+    return http({
+        url:'/activityApi/teacher/saveTeacher',
+        method: "post", 
+        data: data
+    })
+}
+//线上学习课列表
+export const getOnlineLearningList = (data) => http.post('/activityApi/examine/getOnlineLearningList',data)
+//删除线上学习课
+export const deleteCourse = (data) => http.post('/activityApi/examine/deleteCourse',data)
+//新增线上学习课
+export const addCourse = (data) => http.post('/activityApi/examine/addCourse',data)
+//保存导入的教师信息
+export const saveTeacher = (data) => http.post('/activityApi/teacher/saveTeacher',data)
+//退回初稿或终稿
+export const backDraft = (data) => http.post('/activityApi/examine/rejected',data)
+//获取教师详情
+export const getDataById = (data) => http.post('/activityApi/teacher/getDataById',data)
+//获取认证状态
+export const getCertificationProcess = (data) => http.post('/activityApi/teacher/getCertificationProcess',data)
+//编辑认证
+export const updateExamine = (data) => http.post('/activityApi/examine/updateExamine',data)
+//添加权限 0: 查看 2: 管理
+export const addPermission = (data) => http.post('/activityApi/examinePermission/addPermission',data)
+
+//权限列表
+export const removePermission = (data)=>{
+    return http({
+        url:'/activityApi/examinePermission/list',
+        method: "post",
+        data:data
+    })
+}
+//转移归属权
+export const transferPermission =(data)=>{
+        return http({
+            url:'/activityApi/examinePermission/transferPermission',
+            method: "post",
+            data:data
+        })
+}
+//删除权限
+export const deletedPermission = (data) => http.get('/activityApi/examinePermission/deletedPermission',{params:data})
+//添加权限
+// export const addPermission = (data)=>{
+//     return http({
+//         url:'/activityApi/permission/addPermission',
+//         method: "post",
+//             data:data
+//     })
+// }
+
+//依旧id查找教师
+export const getTeacherId = (data) => http.get('/activityApi/teacher/getTeacherId',{params:data})
+//更改状态
+export const updateStatus = (data) => http.post('/activityApi/examine/updateStatus',data)

src/api/index.js

@@ -80,3 +80,5 @@ export const getProjectCount = (projectId) => http.get('/admin/project/projectCo
 export const login = (obj) => http.post('/admin/CheckUser/userLogin', obj)
 export const userInfo = () => http.get('/admin/CheckUser/userInfo')
 
+//修改备注
+export const editStudent = (obj) => http.post('/admin/student/editStudent', obj)

src/api/indexProject.js

@@ -19,4 +19,6 @@ export const dataStatisticsSelectV1= (obj) => http.post('/data/statistics/select
 //柱状体右侧获取数据接口
 export const dataStatisticsSelectV2= (obj) => http.post('/data/statistics/select/v2', obj )
 // 图表2 学习情况数据接口
-export const boeuStudyDataGetStudyStaisticsList= (obj) => http.post('/boeu/studyData/getStudyStatisticsList', obj )
+export const boeuStudyDataGetStudyStaisticsList= (obj) => http.post('/boeu/studyData/getStudyStatisticsList', obj )
+//查看用户有无权限
+export const reportOrgs = (obj) => https.get('/orgHrbp/reportOrgs', {params:obj} )

src/api/request.js

@@ -163,7 +163,11 @@ export function useNewRowsPageNoInit(_url, params) {
       state.data = r.data.list;
       state.total = r.data.total;
       state.loading = false;
-    });
+    }).catch((err)=>{
+      state.data = [];
+      state.total = 0;
+      state.loading = false;
+    })
   }
 
   return {
@@ -370,7 +374,9 @@ export function usePage(_url, params, init = true,listing = false) {
       state.totalPage = r.data.total/10 || 1;
       state.total = r.data.total;
       state.loading = false;
-    });
+    }).catch(err => {
+      state.loading = false;
+    })
   }
 
   init && fetch();
@@ -494,6 +500,9 @@ export async function request(_url, params) {
     if (res.code === 0 || res.code === 200) {
       return res;
     }
+    if (res.code === 4 ){
+      return Promise.reject(res);
+    }
     if (res.code === 1000 || res.code === 1002) {
       window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)
       localStorage.removeItem('refreshPage')
@@ -506,7 +515,7 @@ export async function request(_url, params) {
       })
     }
     //刷新token
-    res.show ? message.error(res.msg):message.error('系统接口数据异常，请联系管理员');
+    res.show ? message.error(res.msg):res.msg=='无数据'?null:message.error('系统接口数据异常，请联系管理员');
     return Promise.reject(res);
   });
 }