From ca15f0ab9b58e87e51e3afe76aa1eb85a19a7042 Mon Sep 17 00:00:00 2001 From: wangxuemei <283912718@qq.com> Date: Wed, 14 Aug 2024 15:55:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Teaching.js | 3 +- src/components/NavLeft.vue | 50 +- src/views/lecturer/ExternalLecturer.vue | 214 ++-- src/views/lecturer/ExternalTeaching.vue | 38 +- src/views/lecturer/InsideLecturer.vue | 1223 ++++++++++--------- src/views/lecturer/InsideTeaching.vue | 262 ++-- src/views/lecturer/LecturerApproval.vue | 2 +- src/views/lecturer/LookExternalLecturer.vue | 7 +- src/views/lecturer/LookInsideLecturer.vue | 33 +- 9 files changed, 968 insertions(+), 864 deletions(-) diff --git a/src/api/Teaching.js b/src/api/Teaching.js index dca1895f..7299287a 100644 --- a/src/api/Teaching.js +++ b/src/api/Teaching.js @@ -1,7 +1,6 @@ import http from "./config"; //列表查询内部讲师授课记录 -// http://127.0.0.1:30001/admin/teacher/getTeacherCourseList -// export const getNewInTeacherCourseList = (obj) => http.post('/admin/teacher/getNewInTeacherCourseList', obj) +export const getNewInTeacherCourseList = (obj) => http.post('/admin/teacher/getNewInTeacherCourseList', obj) //内部讲师授课记录详情 // export const getTeacherCourseList = (obj) => http.post(`/admin/teacher/getTeacherCourseList?id=${obj}`) export const getTeacherCourseList = (obj) => http.post('/admin/teacher/getTeacherCourseList', obj) diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index abcf574e..4114f489 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -622,7 +622,7 @@ @@ -1029,30 +1029,30 @@ export default { selectedKeys: "sub23-1", pagename: "测评上传", }, - { - href: "/insideteaching", - openKeys: "sub24", - selectedKeys: "sub23-1", - pagename: "内部讲师", - }, - { - href: "/externallecturer", - openKeys: "sub25", - selectedKeys: "sub25", - pagename: "外部讲师", - }, - { - href: "/insideteaching", - openKeys: "sub26", - selectedKeys: "sub26", - pagename: "内部授课", - }, - { - href: "/externalteaching", - openKeys: "sub27", - selectedKeys: "sub27", - pagename: "外部授课", - }, + // { + // href: "/lecturerlist", + // openKeys: "sub24", + // selectedKeys: "sub24", + // pagename: "讲师列表", + // }, + // { + // href: "/externallecturer", + // openKeys: "sub25", + // selectedKeys: "sub25", + // pagename: "外部讲师", + // }, + // { + // href: "/insideteaching", + // openKeys: "sub26", + // selectedKeys: "sub26", + // pagename: "内部授课", + // }, + // { + // href: "/externalteaching", + // openKeys: "sub27", + // selectedKeys: "sub27", + // pagename: "外部授课", + // }, { href: "/download", openKeys: "sub15", diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue index 58305d51..21d6b5cc 100644 --- a/src/views/lecturer/ExternalLecturer.vue +++ b/src/views/lecturer/ExternalLecturer.vue @@ -150,6 +150,8 @@ + + @@ -195,7 +197,7 @@
-
+ 提示
@@ -220,7 +222,7 @@
-
+ 提示
@@ -240,10 +242,14 @@
+ + + +
\ No newline at end of file diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 9959a581..60adda06 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -5,16 +5,13 @@
- -
+ + +
--> + allowClear showSearch suffix="分钟" @blur="clearNonNumber"> {{ (formParam.duration /60 ).toFixed(2)}}小时 @@ -331,7 +328,7 @@
-
+ 提示
@@ -393,6 +390,7 @@ export default { const router = useRouter(); const state = reactive({ moreid:1, + vf:false, showWork: false, currentPage1: 1, pageSize1: 10, @@ -417,8 +415,10 @@ export default { duration:0 }, searchParam: { - userNo: null,//工号姓名 - teacher:null, + teacherType:'0', + // userNo: null,//工号姓名 + // teacher:null, + teacherNameOrUserNo:null, name: null,//课程编号 tsystemName: null,//讲师体系 payrollPlaceName: null,//发薪地 @@ -514,8 +514,8 @@ export default { { title: '讲师姓名 ', - dataIndex: 'teacher', - key: 'teacher', + dataIndex: 'teacherName', + key: 'teacherName', elipsis: true, align: "center", width: 120, }, @@ -535,8 +535,8 @@ export default { }, { title: '所属组织 ', - dataIndex: 'orgName', - key: 'orgName', + dataIndex: 'organizationName', + key: 'organizationName', elipsis: true, align: "center", width: 120, // customRender: (value, record) => { @@ -712,11 +712,11 @@ export default { //重置 const searchReset = () => { state.searchParam = { + teacherType:'0', pageNo: 1, pageSize: 10, managerId: null, - name: null, - manager:null, + teacherNameOrUserNo: null, entryType: null, status: null, trainorgId:null, @@ -755,20 +755,19 @@ export default { state.teacherdialog1 = 0 state.teacherdialog = true; state.teacherdialogtitle = '添加授课记录' - //获取内部讲师级别 - + state.vf = true } //修改信息弹窗 const handleModify = (record) => { - // state.teacherdialog1 = 0 state.teacherdialog = true; state.teacherdialogtitle = '修改授课记录' state.lookTeacherId = record.teacherId + state.vf = false TeacherSystem(record) } //保存 const createTeacherDialog = () => { - if (state.formParam.offcourseId != null) { + if (state.vf==false) { updateInTeacherCourse(state.formParam).then(response => { message.success("修改成功"); }); @@ -833,17 +832,22 @@ export default { } } - //页面内部姓名 - const infoteacherList = ref([ - ]); - const getinfoteacher = (obj) => { - state.tableLoading = true - infoteacher() - .then((res) => { - infoteacherList.value = res.data.data.records - }) - }; - + // //页面内部姓名 + // const infoteacherList = ref([ + // ]); + // const getinfoteacher = (obj) => { + // state.tableLoading = true + // infoteacher() + // .then((res) => { + // infoteacherList.value = res.data.data.records + // }) + // }; + function managerChange(e, l, d, t, orgName) { + console.log(e, l); + state.searchParam.userNo = d; + state.searchParam.name = t; + // state.searchParam.trainorgName=orgName + } //表格内查看数据操作 const handleLook = (record) => { // state.teacherdialog1 = 1 @@ -863,7 +867,6 @@ export default { } //内部授课详情 const TeacherSystem = (record) => { - console.log(record.teacher); // getTeacherCourseList( state.lookTeacherId).then((res) => { // console.log("内部授课详情", res.data); // state.formParam= res.data.data @@ -872,7 +875,7 @@ export default { // console.log("内部授课详情", err); // }); state.formParam = { - teacher: record.teacher, + name: record.name, userNo: record.userNo, departId:record.departId, systemId:record.systemId, @@ -880,11 +883,10 @@ export default { type: record.type, name: record.name, status:record.status, - beginTime: moment(record.beginTime, 'YYYY-MM-DD'), + // beginTime: moment(record.beginTime, 'YYYY-MM-DD'), // ref< moment.Moment >(moment(record.beginTime,'YYYY-MM-DD')), // record.beginTime, duration: record.duration, - duration: record.duration, score: record.score, studys: record.studys, remark: record.remark, @@ -1020,17 +1022,19 @@ export default { }); return false; }; + const clearNonNumber=()=>{ + state.formParam.defaultteachingTime = state.formParam.defaultteachingTime.replace(/\D/g, ''); +} return { ...toRefs(state), managerChange, + clearNonNumber, beforeUpload2, rules, column, tableDatas, gettableDatas, handlemoreid, - infoteacherList, - getinfoteacher, handleExport, handleImport, LecturerSystemList, @@ -1162,108 +1166,116 @@ export default { } } -.delete { - z-index: 9999; - width: 424px; - background: #ffffff; - box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); - border-radius: 4px; - position: absolute; - left: 30%; - top: 10%; - // transform: translate(-50%, -50%); +.ant-modal { + .ant-modal-content { + width: 424px !important; - .del_header { - position: absolute; - width: calc(100%); - height: 40px; - background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, - rgba(78, 166, 255, 0) 100%); - } + .ant-modal-body { + .delete { + width: 424px; + background: #ffffff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21); + border-radius: 4px; + position: absolute; + left: 50%; + top: 10%; + transform: translate(-50%, -50%); - .del_main { - width: 100%; - position: relative; + .del_header { + position: absolute; + width: calc(100%); + height: 40px; + background: linear-gradient( + rgba(78, 166, 255, 0.2) 0%, + rgba(78, 166, 255, 0) 100% + ); + } - .header { - display: flex; - align-items: center; - padding-top: 20px; - padding-left: 26px; - font-size: 16px; + .del_main { + width: 100%; + position: relative; - .del-icon { - width: 16px; - height: 16px; - margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/notice.png); - background-size: 100% 100%; - } + .header { + display: flex; + align-items: center; + padding-top: 20px; + padding-left: 26px; + font-size: 16px; - .icon { - width: 16px; - height: 16px; - margin-right: 10px; - background-image: url(@/assets/images/coursewareManage/QR.png); - background-size: 100% 100%; - } + .del-icons { + width: 16px; + height: 16px; + position: relative; + margin-right: 10px; - .close_exit { - position: absolute; - right: 42px; - cursor: pointer; - width: 20px; - height: 20px; - background-image: url(@/assets/images/coursewareManage/close.png); - background-size: 100% 100%; - } - } + img { + width: 100%; + height: 100%; + position: absolute; + top: 0px; + left: 0px; + background-size: 100% 100%; + } + } - .body { - width: 100%; - margin: 34px auto 56px auto; - display: flex; - justify-content: center; - align-items: center; - } + .close_exit { + position: absolute; + right: 42px; + cursor: pointer; + width: 20px; + height: 20px; + background-image: url(@/assets/images/coursewareManage/close.png); + background-size: 100% 100%; + } + } - .del_btnbox { - display: flex; - margin: 30px auto; - justify-content: center; + .body { + width: 100%; + margin: 34px auto 56px auto; + display: flex; + justify-content: center; + align-items: center; + } - .del_btn { - width: 100px; - height: 40px; - background: rgba(64, 158, 255, 0); - border-radius: 8px; - display: flex; - align-items: center; - justify-content: center; - margin-right: 14px; - flex-shrink: 0; - cursor: pointer; + .del_btnbox { + display: flex; + margin: 30px auto; + justify-content: center; - .btnText { - font-size: 14px; - font-weight: 400; - line-height: 40px; + .del_btn { + width: 100px; + height: 40px; + background: rgba(64, 158, 255, 0); + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 14px; + flex-shrink: 0; + cursor: pointer; + + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 40px; + } + } + + .btn1 { + border: 1px solid rgba(64, 158, 255, 1); + color: #4ea6ff; + } + + .btn2 { + background-color: #4ea6ff; + color: #ffffff; + } + } + } } } - - .btn1 { - border: 1px solid rgba(64, 158, 255, 1); - color: #4ea6ff; - } - - .btn2 { - background-color: #4ea6ff; - color: #ffffff; - } } } -} - .CreatePath { .out { z-index: 9999; diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 4909cf41..3fdfd884 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -166,7 +166,7 @@
-
diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue index 80e56295..b6859e51 100644 --- a/src/views/lecturer/LookExternalLecturer.vue +++ b/src/views/lecturer/LookExternalLecturer.vue @@ -19,7 +19,10 @@ ExternalLecturer - {{formParam.url }} + {{formParam.userNo}} {{formParam.mobile}} {{formParam.email}} @@ -96,6 +99,7 @@ export default{ teacherrecordstableDataTotal: -1,//授课记录列表总条数 teacherrepromotableDataTotal: -1,//晋级记录总条数 teacherrecords: { + teacherType:'1', pageNo: "1", pageSize: "10", id: null @@ -112,6 +116,7 @@ export default{ getOuterTeacherById(state.id).then((res) => { console.log("内部讲师详情", res.data); state.formParam = res.data.data + state.formParam.photo = state.formParam.photo ===null ? 'https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png' : state.formParam.photo }) .catch((err) => { console.log("内部讲师详情", err); diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue index b16b8eb6..6c9facd2 100644 --- a/src/views/lecturer/LookInsideLecturer.vue +++ b/src/views/lecturer/LookInsideLecturer.vue @@ -20,8 +20,8 @@ {{formParam.userNo}} {{formParam.name}} @@ -36,16 +36,23 @@ {{formParam.waitStatus==0?'在职' :formParam.waitStatus==1 ?'离职':''}} {{formParam.status==0?'临时' :formParam.status==1 ?'启用':formParam.status==1 ?'停用':''}} - {{formParam.departId}} + + + {{ formParam.neworgName }} + +
-
{{formParam.description}}
 - {{formParam.workExperience}} - {{formParam.courses}} - {{formParam.TeacherExpertise}} +
+ {{formParam.description ===null ? ' --' :formParam.description}}
+ {{formParam.workExperience ===null?'--':formParam.workExperience}} + {{formParam.courses===null?'--':formParam.courses}} + {{formParam.expertise===null?'--':formParam.expertise}}
@@ -130,6 +137,7 @@ export default{ teacherrecordstableDataTotal: -1,//授课记录列表总条数 teacherrepromotableDataTotal: -1,//晋级记录总条数 teacherrecords: { + teacherType:'0', pageNo: "1", pageSize: "10", id: null @@ -144,8 +152,15 @@ export default{ //内部讲师详情 const TeacherSystem = () => { getTeacherById(state.id).then((res) => { - console.log("内部讲师详情", res.data); - state.formParam = res.data.data[0]; + let objA= res.data.data[0] + if( objA.orgName !==null ){ + objA.neworgName=objA.orgName.split('/') + + objA.neworgName= objA.neworgName[objA.neworgName.length-1] + } + // console.log(objA ,'11111111111') + state.formParam = objA + state.formParam.photo = state.formParam.photo ===null ? 'https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png' : state.formParam.photo state.teacherrepromo.userId=res.data.data[0].kid console.log(state.teacherrepromo.kid); getpromotionrecordstableData()