diff --git a/.env b/.env index e1aa8cf2..41024463 100644 --- a/.env +++ b/.env @@ -2,6 +2,7 @@ VUE_APP_BASE=/manage # api项目基础url VUE_APP_BASE_API=/manageApi +VUE_APP_BASE_API1=https://pretest.zcwytd.com/ # systemApi VUE_APP_SYS_API=/systemapi # activityApi @@ -13,11 +14,12 @@ VUE_APP_TOOL_FOLDERID=1147577145918910464 #文件路径 VUE_APP_FILE_PATH=/upload/ # 代理url 本地调试,不可以用在其他地方 -VUE_APP_PROXY_URL=//u-pre.boe.com/manageApi +VUE_APP_PROXY_URL=//47.97.44.123:30001/ +# VUE APP PROXY URL=//u-pre.boe.com/manageApi # 登录url -VUE_APP_LOGIN_URL=//u-pre.boe.com/web?returnUrl= +VUE_APP_LOGIN_URL=//pretest.zcwytd.com/web?returnUrl= # boe域名 -VUE_APP_BOE_API_URL=//u-pre.boe.com +VUE_APP_BOE_API_URL=//47.97.44.123:30001 #打包路径 VUE_APP_OUTPUT_DIR=./dist diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index 47a660d9..fe29dedd 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -13,7 +13,7 @@ export const getTeacherSystemList = (obj) => http.post('/admin/teacher/getSystem // 获取内部讲师列表 export const getTeacherList = (obj) => http.post('/admin/teacher/getInTeacherList', obj) //获取内部讲师发薪地 -export const getTeacherPayRollPriceList = (obj) => http.post('/admin/teacher/getPayRollPlace', obj) +export const getPayRollPlace = (obj) => http.post('/admin/teacher/getPayRollPlace', obj) //获取内部讲师级别 export const getLevel = (obj) => http.post('/admin/teacher/getLevel', obj) //新增内部讲师 @@ -21,7 +21,7 @@ export const insertTeacher = (obj) => http.post('/admin/teacher/insertInTeacher' //修改 内部讲师 export const updateInTeacher = (obj) => http.post('/admin/teacher/updateInTeacher' ,obj) //内部讲师详情 -export const getTeacherById= (obj) => http.post(`/admin/teacher/getTeacherById?userNo=${obj}`) +export const getTeacherById= (obj) => http.post(`/admin/teacher/getTeacherById?id=${obj}`) //删除内部讲师 export const deleteInTeacher= (obj) => http.post(`/admin/teacher/deleteInTeacher?id=${obj}`) //修改内部讲师状态 diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 9af4cc76..126fe924 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -613,69 +613,35 @@ - 内部讲师 + 讲师列表 - 外部讲师 + 授课记录 - - - - - + - 内部授课 - - - - 外部授课 - - - - - - - 讲师费管理 - + 讲师费统计 @@ -696,20 +662,18 @@ mode="inline" @click="handleClick" > - - 内部讲师 + 讲师列表 - - 外部讲师 + + 授课记录 - 内部授课 + 讲师费管理 - 外部授课 + 讲师费统计 - 审核 diff --git a/src/components/project/Editor.vue b/src/components/project/Editor.vue index 2d547789..3e4eafbe 100644 --- a/src/components/project/Editor.vue +++ b/src/components/project/Editor.vue @@ -7,10 +7,11 @@ --> + \ No newline at end of file diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue new file mode 100644 index 00000000..c126aa99 --- /dev/null +++ b/src/views/lecturer/LookInsideLecturer.vue @@ -0,0 +1,369 @@ + + + \ No newline at end of file