diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 053bae4d..bf2e85f1 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1999,7 +1999,7 @@ const columns6 = [ // }, // }, { - title: "课程名称", + title: "开课名称", dataIndex: "organization", key: "organization", width: "15%", @@ -2010,72 +2010,34 @@ const columns6 = [ }, }, { - title: "场地", - dataIndex: "address", - key: "saddress", - width: "15%", - align: "center", - ellipsis: true, - customRender: ({ text }) => { - return text ? text : "-"; - }, - }, - { - title: "教师名称", + title: "授课教师", dataIndex: "teacher", key: "teacher", width: "30%", align: "center", ellipsis: true, slots: { customRender: "teacherName" }, - // customRender: ({ record }) => { - // const teachers = record.offteachers; - // return teachers.map((teacher, index) => { - // // 如果需要显示为列表形式 - // return ( - //
- // {teacher.teacherName} - // {index !== teachers.length - 1 && ', '} - //
- // ); - // }); - // return record.offteachers.map(item=>item.teacherName).join(',') - // } }, - { - title: "开始时间", + title: "时长", + dataIndex: "duration", + key: "duration", + width: "12%", + ellipsis: true, + align: "center", + customRender: ({ text }) => { + return text ? Math.floor(text / 60) : "-"; + }, + }, + { + title: "面授时间", dataIndex: "starttime", key: "starttime", - width: "12%", + width: "40%", ellipsis: true, align: "center", - customRender: ({ text }) => { - // return text ? getdateToTime(text * 1000) : "-"; - return text ? text : "-"; - }, - }, - { - title: "创建时间", - dataIndex: "createtime", - key: "createtime", - width: "12%", - ellipsis: true, - align: "center", - customRender: ({ text }) => { - // return text ? getdateToTime(text * 1000) : "-"; - return text ? text : "-"; - }, - }, - { - title: "创建人", - dataIndex: "createName", - key: "createName", - width: "8%", - align: "center", - ellipsis: true, - customRender: ({ text }) => { - return text ? text : "-"; + customRender: ( text ) => { + return text.record.beginTime + ' ~ ' + text.record.endTime }, }, { @@ -2085,11 +2047,11 @@ const columns6 = [ width: 100, align: "center", ellipsis: true, - customRender: ({ text }) => { + customRender: ( text ) => { return(
- {text || '0'} -
downStudent()} title="导出学员信息">
+ {text.record.studentCnt || '0'} +
downStudent(text.record)} title="导出学员信息">
) }, @@ -2101,15 +2063,37 @@ const columns6 = [ width: 100, align: "center", ellipsis: true, - customRender: ({ text }) => { + customRender: ( text ) => { return(
- {text || '0'} -
downPin()} title="导出评估信息">
+ {text.record.courseScore || '0'} +
downPin(text.record)} title="导出评估信息">
) }, }, + { + title: "创建人", + dataIndex: "createName", + key: "createName", + width: "10%", + align: "center", + ellipsis: true, + customRender: ({ text }) => { + return text ? text : "-"; + }, + }, + { + title: "地点", + dataIndex: "address", + key: "saddress", + width: "30%", + align: "center", + ellipsis: true, + customRender: ({ text }) => { + return text ? text : "-"; + }, + }, { title: "操作", width: 300, @@ -2120,11 +2104,23 @@ const columns6 = [ slots: { customRender: "action" }, }, ]; -const downStudent = () => { - console.log('down') +const downStudent = (val) => { + if (val.id != undefined) { + window.open( + `${ + process.env.VUE_APP_BASE_API + }/admin/student/exportTaskStudent?type=${3}&pid=${val.id}&thirdType=2` + ); + } } -const downPin = () => { - console.log('down') +const downPin = (val) => { + if (val.id != undefined) { + window.open( + `${ + process.env.VUE_APP_BASE_API + }/admin/assessment/manage/exportCoursePlanAssessmentMessage?type=3&pid=${val.id}&courseId=${val.offcourseId}&taskId=${val.id}&taskType=11` + ); + } } //开课学员管理 const columns7 = [ @@ -3981,6 +3977,8 @@ function onFocusEnd(){ homeWorkId: state.EditWorkId, name: state.xjkkinputV1, signFlag: state.xjkkradioV1 ? 1 : 0, //是否允许未报名的签到:1是0否 + autoCompleteFlag: state.xjkkradioVEnd ? 1 : 0, + afterDays: state.xjkkradioVEndTime, // signWordFlag: state.xjkkradioV1 === 1 ? 1 : 0, //签到是否需要口令:1是0否 // teacherId: state.member.value, // teacher: state.member.name, @@ -4023,6 +4021,10 @@ function onFocusEnd(){ message.error('权重值不能为0%') return } + if(state.xjkkradioVEnd && (state.xjkkradioVEndTime==null||state.xjkkradioVEndTime==''||state.xjkkradioVEndTime<=0)){ + message.error('请填写结业时间') + return + } console.log(postData,'传输的数据') // if(!postData.duration){ // return message.error("请输入持续时间"); @@ -4094,10 +4096,14 @@ function onFocusEnd(){ state.onceName = item.name; state.beforeValue = item.beforeStart; //考勤 开始前 state.afterStartValue = item.afterStart; //考勤 开始后 + state.xjkkradioVEndTime = item.afterDays; if (item.signFlag === 1) { //是否允许未报名的签到:1是0否 state.xjkkradioV1 = true; } + if(item.autoCompleteFlag === 1){ + state.xjkkradioVEnd = true; + } // state.member = { value: item.teacherId, name: item.teacher }; state.offteachers = [...item.offteachers] state.cstm_hs = true; @@ -4208,40 +4214,57 @@ function onFocusEnd(){ // } }, }, + // { + // title: "作业成绩", + // width: "8%", + // dataIndex: "workScore", + // key: "7", + // align: "center", + // customRender: ({ record }) => { + // return ( + //
+ // {record.workStatus? record.workScore?{record.workScore || '-'}: + // handlJoinStu(record)}> + // 成绩录入 + // + // : - + // } + //
+ // ); + // // switch (String(record.status)) { + // // case "0": + // // return ( + // // { + // // handlJoinStu(record); + // // }} + // // > + // // 成绩录入 + // // + // // ); + // // case "1": + // // return "-"; + // // case "2": + // // return "-"; + // // } + // }, + // }, { - title: "作业成绩", + title: "作业状态", width: "8%", dataIndex: "workScore", - key: "7", + key: "5", align: "center", customRender: ({ record }) => { - return ( -
- {record.workStatus? record.workScore?{record.workScore || '-'}: - handlJoinStu(record)}> - 成绩录入 - - : - - } -
- ); - // switch (String(record.status)) { - // case "0": - // return ( - // { - // handlJoinStu(record); - // }} - // > - // 成绩录入 - // - // ); - // case "1": - // return "-"; - // case "2": - // return "-"; - // } + switch (String(record.workScore)) { + case "0": + return "未完成"; + case "1": + return "已完成"; + case "2": + return "未完成"; + } }, }, {