diff --git a/src/api/Teaching.js b/src/api/Teaching.js index 8f20d3c7..60c1ae24 100644 --- a/src/api/Teaching.js +++ b/src/api/Teaching.js @@ -3,11 +3,11 @@ import {getCookieForName} from "@/api/method"; //列表查询授课记录 export const getNewInTeacherCourseList = (obj) => http.get('/admin/teacherRecord/list', {params: obj}) //新增授课记录 -export const insertInTeacherCourse = (obj) => http.post('/admin/teacherRecord/addTeacherRecord', obj) +export const insertInTeacherCourse = (obj) => http.post('/admin/teacher/addTeacherRecord', obj) //删除讲师授课记录 export const deleteInTeacherCourse= (obj) => http.post(`/admin/teacherRecord/delById?id=${obj}`) //修改讲师授课记录 -export const updateInTeacherCourse = (obj) => http.post('/admin/teacherRecord/editTeacher', obj) +export const updateInTeacherCourse = (obj) => http.post('/admin/teacherRecord/editTeacherRecord', obj) //讲师授课记录详情 export const getTeacherCourseList = (obj) => http.get('/admin/teacherRecord/queryById', {params: obj}) //获取培训组织 diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index 45451850..15c3a1e8 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -9,7 +9,7 @@ - @@ -60,7 +60,7 @@ - @@ -139,17 +139,17 @@ - + - - + + - + 未开课 已开课 @@ -226,8 +226,8 @@ {{ formParam.mobile }} {{ formParam.type == 1 ? '在线课' : formParam.type == 0 ? '面授课' : '' }} - {{ formParam.coursename }} - {{ formParam.status == 0 ? '未开课' : formParam.status == 1 + {{ formParam.courseName }} + {{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1 ? '已开课' : '' }} {{ formParam.courseTypeName }} {{ formParam.teachingDate }} @@ -340,7 +340,7 @@ export default { teachingDate: undefined, //选择时间 tableDataTotal: -1,//table列表总条数 formParam: { - status: 1, + courseStatus: 1, entryType: 1, teaching: null, teachingDate: null, @@ -354,7 +354,7 @@ export default { teacherName: null, name: null, address: null, - status: null, + courseStatus: null, beginTime: null, endTime: null, entryType: null, @@ -376,7 +376,7 @@ export default { name: [{ required: true, message: '', log: '讲师不能为空' }], courseTypeId: [{ required: true, message: '', log: '内容分类不能为空' }], courseName: [{ required: true, message: '', log: '课程名称不能为空' }], - status: [{ required: true, message: '', log: '讲开课状态不能为空' }], + courseStatus: [{ required: true, message: '', log: '讲开课状态不能为空' }], teaching: [{ required: true, message: '', log: '授课时长不能为空' }], teachingDate: [{ required: true, message: '', log: '授课日期不能为空' }], @@ -442,8 +442,8 @@ export default { }, { title: '课程名称 ', - dataIndex: 'name', - key: 'name', + dataIndex: 'courseName', + key: 'courseName', elipsis: true, align: "center", width: 120, }, @@ -468,8 +468,8 @@ export default { }, { title: '授课时间 ', - dataIndex: 'beginTime', - key: 'beginTime', + dataIndex: 'teachingDate', + key: 'teachingDate', elipsis: true, align: "center", width: 120, }, @@ -482,18 +482,18 @@ export default { // }, { title: '开课状态 ', - dataIndex: 'status', - key: 'status', + dataIndex: 'courseStatus', + key: 'courseStatus', elipsis: true, align: "center", width: 120, customRender: (value) => { return (
- {value.record.status == 0 || value.record.status == 1 + {value.record.courseStatus == 0 || value.record.courseStatus == 1 ? { "0": "未开课", "1": "已开课", - }[value.record.status + ""] || "" + }[value.record.courseStatus + ""] || "" : "-"}
) @@ -589,7 +589,7 @@ export default { name: null, manager: null, entryType: null, - status: 1, + courseStatus: null, entryType: null, systemId: null, endTime: null, @@ -720,7 +720,7 @@ export default { //清空数据 const cancel = () => { state.formParam = { - status: 1, + courseStatus: 1, recordType: 2, teacherName: null, mobile: null, @@ -741,7 +741,7 @@ export default { else if (state.moreid == 2) { state.moreid = 1 state.searchParam.type = null - state.searchParam.status = null + state.searchParam.courseStatus = null state.searchParam.id = null state.searchParam.entryType = null } @@ -794,7 +794,7 @@ export default { &beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""} &endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""} &courseTypeId=${state.searchParam.courseTypeId ? state.searchParam.courseTypeId : ""} - &status=${state.searchParam.status ? state.searchParam.status : ""}` + &courseStatus=${state.searchParam.courseStatus ? state.searchParam.courseStatus : ""}` ); } const clearstudysNumber = () => { diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 404862dd..1bdfc505 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -1566,7 +1566,7 @@ display: flex; justify-content: right; } } -.item_inp .i_upload_img[data-v-e369ffe0] { +.item_inp .i_upload_img[data-v-6b882d01] { border-radius:50% } \ No newline at end of file diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 204a652a..44298ccf 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -227,8 +227,8 @@ - 未开课 - 已开课 + 未开课 + 已开课 @@ -296,14 +296,13 @@ {{ formParam.teacherName }} {{ formParam.userNo }} - {{ formParam.organizationName }} + {{ formParam.orgName }} {{ formParam.tsystemName }} {{ formParam.tlevelName }} {{ formParam.createFrom == 0 ? '系统生成' : formParam.createFrom == 1 ? '手动录入' : '' }} - {{ formParam.type == 1 ? '项目开课' : formParam.type == 2 ? '路径开课' : formParam.type == 3 - ? '面授开课' : '' }} + {{ formParam.type == 1 ? '在线课' : formParam.type == 0 ? '面授课' : '' }} {{ formParam.courseName }} {{ formParam.courseStatus == 1? '未开课' : formParam.courseStatus == 0 ? '已开课' : '' }} @@ -448,7 +447,7 @@ export default { levelVoList: [] }, formParam: { - courseStatus: '1', + courseStatus: 1, createFrom: 1, teaching: null, name:null, @@ -525,8 +524,8 @@ export default { { value: 3, label: "面授开课" }, ]) const AuthenticationStatusList = ref([ - { value: 0, label: "未开课" }, - { value: 1, label: "已开课" }, + { value: 1, label: "未开课" }, + { value: 0, label: "已开课" }, ]) const entryTypeList = ref([ { value: 0, label: "系统生成" }, @@ -806,7 +805,8 @@ export default { endTime: null, beginTime: null, studysranges: [], - score: null + score: null, + status:null, }; getTableDate(); }; @@ -936,7 +936,7 @@ export default { const cancel = () => { state.formParam = { recordType: 1, - courseStatus:'1', + courseStatus:1, teacher: null, orgName: null, tsystemName: null,