- // {teacher.teacherName}
- // {index !== teachers.length - 1 && ', '}
- //
- // );
- // });
- return record.offteachers.map(item=>item.teacherName).join(',')
- }
+ slots: { customRender: "teacherName" },
},
-
{
- title: "开始时间",
+ 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
},
},
{
@@ -2049,19 +2039,94 @@ const columns6 = [
width: 100,
align: "center",
ellipsis: true,
+ customRender: ( text ) => {
+ return(
+
- {record.assessmentScore || "-"}
+ {record.assessmentScore && record.assessmentScore!=0 && record.assessmentScore!=-1 ? record.assessmentScore?.toFixed(2) : "-"}
);
// switch (String(record.status)) {
@@ -4142,61 +4265,88 @@ function onFocusEnd(){
// }
},
},
+ // {
+ // title: "作业成绩",
+ // width: "8%",
+ // dataIndex: "workScore",
+ // key: "7",
+ // align: "center",
+ // customRender: ({ record }) => {
+ // return (
+ //
- {record.finishStatus == 1 &&
- record.workScore != -2 &&
- record.signStatus == 1 ? (
+ {
+ record.signStatus == 1 && record.completionStatus != 1 && record.completionStatus != 2 ? (
{
@@ -4207,6 +4357,8 @@ function onFocusEnd(){
) : record.completionStatus == 1 ? (
已结业
+ ) : record.completionStatus == 2 ?(
+
不结业
) : (
-
)}
@@ -4236,6 +4388,8 @@ function onFocusEnd(){
state.currentPlanItem = itm;
state.newCourseName = itm.name;
+ state.isAssessmentId = itm.assessmentId;
+ state.isHomeWorkId = itm.homeWorkId;
console.log(89877766666);
console.log(state.currentPlanItem);
@@ -4289,6 +4443,7 @@ function onFocusEnd(){
const graduate_exit = () => {
state.graduate_hs = false;
state.addLoading = false;
+ state.jyradioV1 = 1;
};
const agreereject_exit = () => {
state.agreereject_hs = false;
@@ -4308,6 +4463,7 @@ function onFocusEnd(){
state.rg_hs = false;
state.graduate_hs = false;
state.addLoading = false;
+ state.jyradioV1 = 1;
};
const handleRejectExit = (id, index, record) => {
dialog({
@@ -4360,13 +4516,14 @@ function onFocusEnd(){
// console.log("state.studentItem.id", state.studentItem.id);
api1
.batchUpdateStatus({
- completionStatus: 1,
+ completionStatus: state.jyradioV1,
ids: [state.studentItem?.id],
// status: 1,
})
.then((res) => {
if (res.data.code === 200) {
- getTableDate2();
+ // getTableDate2();
+ state.tableStudentChange.getStuList()
delete_exit1();
}
});
@@ -4424,8 +4581,13 @@ function onFocusEnd(){
if (res.data.code === 200) {
getTableDate3();
delete_exit1();
+ }else{
+ message.error(res.data.msg)
}
- });
+ }).catch(err=>{
+ message.destroy()
+ message.error(err.data.msg)
+ })
} else if (state.offcourseId) {
handle({
offcourseId: state.offcourseId,
@@ -4769,7 +4931,8 @@ function onFocusEnd(){
state.offcourseId = item.id;
state.newCourseName = item.name;
state.permissions = item.permissions;
- getTableDate3(1);
+ // getTableDate3(1);
+ handleRestTable()
state.stm_hs = true;
};
@@ -4793,20 +4956,22 @@ function onFocusEnd(){
console.log(state.kk_inputV1);
console.log(state.kk_inputV2);
console.log(state.selectTime);
- state.pageSize222 = 10
- state.currentPage1 = 1
- getTableDate();
+ // state.pageSize222 = 10
+ // state.currentPage1 = 1
+ // getTableDate();
+ state.currentPage2 = 1;
getTableDate3();
};
const handleRestTable = () => {
+ state.kk_inputV0 = '';
state.kk_inputV1 = "";
state.kk_inputV2 = "";
state.selectTime = "";
state.currentPage2 = 1;
state.tableDataTotal2 = [];
- state.pageSize222 = 10
- state.currentPage1 = 1
- getTableDate();
+ // state.pageSize222 = 10
+ // state.currentPage1 = 1
+ // getTableDate();
getTableDate3();
};
@@ -5112,21 +5277,22 @@ function onFocusEnd(){
const qrcodeVisible = (record, type) => {
// `${location.protocol}//${location.host}${import.meta.env.VUE_APP_BASE_API}/stu/project/redirectDetail?courseId=${record.id}`
state.codevisible = true;
- let teacherNames = record.offteachers?.filter(teacher => teacher.teacherName !== null).map(teacher => teacher.teacherName);
+ let teacherNames = record.offteachers?.filter(teacher => teacher.name !== null).map(teacher => teacher.name);
state.codeInfo = {
- title: type == 1 ? "【课程】二维码" : "【签到】二维码",
- name: record.name ? record.name+'签到' : "",
- teacherName: teacherNames.length > 0 ? teacherNames.join(' ') : "",
+ title: type == 1 ? "【课程】二维码" : type == 2 ? "【签到】二维码" : "【评估】二维码",
+ name: record.name,
+ teacherName: teacherNames.length > 3 ? teacherNames.slice(0,3).join(',')+'...' : teacherNames.join(','),
url:
type == 1
? process.env.VUE_APP_BASE_API +
`/stu/project/redirectDetail?courseId=${record.id}`
- : process.env.VUE_APP_BASE_API +
+ : type == 2 ? process.env.VUE_APP_BASE_API +
`/admin/student/studentSign?taskId=${
record.id
}&taskType=${2}&type=${3}&openCourseId=${
record.id
- }`,
+ }` : `${location.protocol}//${location.host}/student-h5/investigatpage?id=${record.id}&type=3&infoId=${record.id}&courseId=${record.assessmentId}&chapterOrStageId=0&level=${record.name}`,
+ titleTeacherName: moreLine(record.offteachers),
};
console.log("codeInfo", state.codeInfo, record);
state.codeIndex = 0;
@@ -5171,6 +5337,7 @@ function onFocusEnd(){
handleEdit,
handleDelete,
changevalue,
+ moreLine,
columns2,
columns4,
columns6,
@@ -5286,12 +5453,28 @@ function onFocusEnd(){
inputWeightChange,
totalWeightSum,
inputAdd,
- inputRemove
+ inputRemove,
+ downStudent,
+ downPin
};
},
});