diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue index 6d789c04..2aeb640a 100644 --- a/src/views/lecturer/ExternalLecturer.vue +++ b/src/views/lecturer/ExternalLecturer.vue @@ -58,7 +58,7 @@
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index fb7ff5f1..d730ac99 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -109,9 +109,17 @@
- +
@@ -241,7 +249,9 @@ {{ formParam.courseStatus == 0 ? '未开课' : formParam.courseStatus == 1 ? '已开课' : '' }} {{ formParam.courseTypeName }} - {{ formParam.teachingDate }} + {{ formParam.teachingDate }} + + {{ formParam.teaching }} 分钟 ({{ (formParam.teaching / 60 ).toFixed(2) }}小时) @@ -367,7 +377,6 @@ export default { }, searchdate: undefined, //选择时间 searchParam: { - name: null, recordType: 2, pageNo: 1, pageSize: 10, @@ -495,7 +504,14 @@ export default { dataIndex: 'teachingDate', key: 'teachingDate', ellipsis: true, align: "center", - width: 120, + width: 200, + customRender: (value) => { + return ( +
+ {dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm")} +
+ ); + }, }, // { // title: '开课场地 ', @@ -778,12 +794,7 @@ export default { state.teachingdialog = true state.lookTeacherId = record.id TeacherSystem() - state.formParam.teachingDate= state.teachingDate - - // let id = record.userNo - // router.push({ path: '/lecturer/ExternalTeachingDetail/', query: { id } }) - // router.push({ path: '/ExternalTeachingDetail' }) - } + } //取消查看 const cancelTeachingDialog = () => { state.teachingdialog = false @@ -792,9 +803,10 @@ export default { const TeacherSystem = () => { getTeacherCourseList({ id: state.lookTeacherId }).then((res) => { state.formParam = res.data.data - state.teachingDate = dayjs(res.data.data.teachingDate, 'YYYY-MM-DD HH:mm'), + state.teachingDate = res.data.data.teachingDate ? dayjs(res.data.data.teachingDate, 'YYYY-MM-DD HH:mm'):'', state.formParam.name=state.formParam.teacherName - console.log(state.formParam); + state.formParam.teachingDate = state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : "" + console.log(state.formParam.teachingDate) }) .catch((err) => { }); @@ -803,8 +815,8 @@ export default { console.log(e, l,); state.formParam.mobile=l.mobile state.formParam.teacherId=l.id - state.searchParam.userNo = d; - state.searchParam.name = t; + // state.searchParam.userNo = d; + // state.searchParam.name = t; // state.searchParam.trainorgName=orgName } const clearNonNumber = () => { diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 8df971a0..bdac4617 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -153,7 +153,7 @@
@@ -598,11 +598,11 @@ export default { ]) const scoreList = ref([ { value: '', label: "全部" }, - { value: '90-100', label: "90~100" }, - { value: '80-90', label: "80~90" }, - { value: '70-80', label: "70~80" }, - { value: '60-70', label: "60~70" }, - { value: '10-50', label: "10~50" }, + { value: '9-10', label: "9~10" }, + { value: '8-9', label: "8~9" }, + { value: '7-8', label: "7~8" }, + { value: '6-7', label: "6~7" }, + { value: '1-5', label: "1~5" }, ]) const studysList = ref([ { value: '0-30', label: "0~30" }, @@ -725,7 +725,14 @@ export default { dataIndex: 'teachingDate', key: 'teachingDate', ellipsis: true, align: "center", - width: 120, + width: 200, + customRender: (value) => { + return ( +
+ {dayjs(value.record?.teachingDate).format("YYYY-MM-DD HH:mm")} +
+ ); + }, }, { title: '开课状态 ', @@ -1118,6 +1125,7 @@ export default { state.formParam.orgLists = res.data.data.expertiseNames?.split(',').map(item=>({ name: item })) state.teachingDate=dayjs(res.data.data.teachingDate, 'YYYY-MM-DD HH:mm' ), state.formParam.orgNames = state.formParam.orgName + state.formParam.teachingDate = state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : "" console.log( state.formParam); }) .catch((err) => { diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue index 8591b628..79761c4a 100644 --- a/src/views/lecturer/LookExternalLecturer.vue +++ b/src/views/lecturer/LookExternalLecturer.vue @@ -126,6 +126,7 @@ export default{ console.log("内部讲师详情", res.data); state.formParam = res.data.data state.formParam.photo = state.formParam.photo ===null ?avatar : state.formParam.photo + state.formParam.teachingDate = res.data.data.teachingDate ? dayjs(res.data.data.teachingDate, 'YYYY-MM-DD HH:mm'):'', getteacherrecordstableData() }) .catch((err) => { @@ -168,7 +169,7 @@ export default{ dataIndex: 'teachingDate', key: 'teachingDate', ellipsis: true, align: "center", - width: 120, + width: 200, customRender: (value) => { return (
diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue index dabab523..de9af45e 100644 --- a/src/views/lecturer/LookInsideLecturer.vue +++ b/src/views/lecturer/LookInsideLecturer.vue @@ -97,7 +97,7 @@ v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false" - :hideOnSinglePage="true" + :hideOnSinglePage="false" :pageSize="searchParam.pageSize" :current="searchParam.pageNo" :total="tableDataTotal" @@ -233,7 +233,7 @@ export default{ dataIndex: 'teachingDate', key: 'teachingDate', ellipsis: true, align: "center", - width: 120, + width: 200, customRender: (value) => { return (