diff --git a/src/api/index1.js b/src/api/index1.js index 8043bd73..290a69c1 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-04 22:45:31 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-01-05 11:06:02 + * @LastEditTime: 2023-01-05 14:22:29 * @FilePath: /fe-manage/src/api/index1.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -159,9 +159,10 @@ export const noticeList = (projectId) => // 获取任务学员的信息 export const AssessmentManagementMessage = (obj) => http.get(`/admin/student/getTaskStudent`, { params: obj }) -// 考试导出任务学员信息 +// 导出任务学员信息 export const exportTaskStudent = (obj) => http.post('/admin/student/exportTaskStudent', obj) - +//导出任务作业 +export const exportHomeWork = (obj) => http.post('/admin/student/exportHomeWork', obj) // //面授课批量导入成绩 export const batchImportScore = (offcoursePlanId, obj) => diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index b5631d7c..4f05c48f 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -82,7 +82,7 @@
导出数据
-
+
导出作业
@@ -129,8 +129,8 @@
- - + +
@@ -194,20 +194,20 @@ export default { projectName: null, projectNameList: [ { - id: 1, - value: "-1", + id: 0, + value: "0", label: "未开始", }, { - id: 2, - value: "0", - label: "未完成", - }, - { - id: 3, + id: 1, value: "1", label: "已完成", }, + { + id: 2, + value: "2", + label: "未完成", + }, ], selectedRowKeys: [], @@ -362,11 +362,26 @@ export default { }, { title: "任务状态", - dataIndex: "status", - key: "status", + dataIndex: "finishStatus", + key: "finishStatus", width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ + {text.record.finishStatus == 0 + ? "未开始" + : text.record.finishStatus == 1 + ? "已完成" + : text.record.finishStatus == 2 + ? "未完成" + : "-"} + +
+ ); + }, }, { title: "操作", @@ -382,7 +397,7 @@ export default { const ListOpera = () => { let arr = state.tabledata; arr.map((value) => { - if (value.status == "已完成") { + if (value.finishStatus == 1) { value.operation = (
{ ctx.emit("update:Fvisible", false); state.name = ""; @@ -463,9 +477,9 @@ export default { state.projectName = value; }; const onSelectChange = (selectedRowKeys) => { - if (selectedRowKeys.length > 2) { - return; - } + // if (selectedRowKeys.length > 2) { + // return; + // } state.selectedRowKeys = selectedRowKeys; }; @@ -493,7 +507,7 @@ export default { currentStageId: props.projectTaskInfo.stageId, type: 1, pid: props.projectTaskInfo.projectId, - status: state.projectName, + status: Number(state.projectName), studentName: state.name, currentTaskId: props.projectTaskInfo.projectTaskId, }); @@ -504,14 +518,21 @@ export default { currentStageId: props.projectTaskInfo.stageId, type: 1, pid: props.projectTaskInfo.projectId, - status: state.projectName, + status: Number(state.projectName), studentName: state.name, currentTaskId: props.projectTaskInfo.projectTaskId, + taskType: props.projectTaskInfo.type, }) .then((res) => { console.log("获取面授管理学员", res); if (res.data.code == 200) { - state.tabledata = res.data.data.records; + let newData = []; + for (let i = 0; i < res.data.data.records.length; i++) { + res.data.data.records[i].key = res.data.data.records[i].id; + newData.push(res.data.data.records[i]); + } + state.tabledata = newData; + ListOpera(); state.tableDataTotal = res.data.data.total; state.tableDataTotal2 = res.data.data.total; } @@ -547,21 +568,44 @@ export default { // 导出数据 function exportTaskStu() { - api - .exportTaskStudent({ - pageNo: state.currentPage, - pageSize: state.pageSize, - currentStageId: props.projectTaskInfo.stageId, - currentTaskId: props.projectTaskInfo.projectTaskId, - type: 1, - pid: props.projectTaskInfo.projectId, - }) - .then((res) => { - console.log(res); - }) - .catch((err) => { - console.log(err); - }); + console.log("props.projectTaskInfo", props.projectTaskInfo); + window.open( + `${ + process.env.VUE_APP_PROXY_URL + }admin/student/exportTaskStudent?currentStageId=${ + props.projectTaskInfo.stageId + }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${ + props.projectTaskInfo.projectTaskId + }&taskType=${props.projectTaskInfo.type}` + ); + // api + // .exportTaskStudent({ + // pageNo: state.currentPage, + // pageSize: state.pageSize, + // currentStageId: props.projectTaskInfo.stageId, + // currentTaskId: props.projectTaskInfo.projectTaskId, + // type: 1, + // pid: props.projectTaskInfo.projectId, + // }) + // .then((res) => { + // console.log(res); + // }) + // .catch((err) => { + // console.log(err); + // }); + } + //导出作业 + function exportHomeWork() { + console.log("props.projectTaskInfo", props.projectTaskInfo); + window.open( + `${ + process.env.VUE_APP_PROXY_URL + }admin/student/exportHomeWork?currentStageId=${ + props.projectTaskInfo.stageId + }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${ + props.projectTaskInfo.projectTaskId + }&taskType=${props.projectTaskInfo.type}` + ); } return { ...toRefs(state), @@ -577,6 +621,7 @@ export default { resetTaskList, changePaginationStu, exportTaskStu, + exportHomeWork, }; }, }; diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index 29dc41f2..5414fdc3 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -68,11 +68,11 @@
-
+
导出数据
-
+
导出作业
@@ -189,20 +189,20 @@ export default { projectName: null, projectNameList: [ { - id: 1, - value: "-1", + id: 0, + value: "0", label: "未开始", }, { - id: 2, - value: "0", - label: "未完成", - }, - { - id: 3, + id: 1, value: "1", label: "已完成", }, + { + id: 2, + value: "2", + label: "未完成", + }, ], selectedRowKeys: [], @@ -231,6 +231,15 @@ export default { width: 50, align: "left", className: "h head", + customRender: (text) => { + return ( +
+ + {text.record.studentUserNo ? text.record.studentUserNo : "-"} + +
+ ); + }, }, { title: "姓名", @@ -239,6 +248,15 @@ export default { width: 50, align: "left", className: "h head", + customRender: (text) => { + return ( +
+ + {text.record.studentName ? text.record.studentName : "-"} + +
+ ); + }, }, { title: "所在部门", @@ -247,6 +265,17 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ + {text.record.studentDepartName + ? text.record.studentDepartName + : "-"} + +
+ ); + }, }, { title: "所在岗位", @@ -255,6 +284,17 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ + {text.record.studentJobName + ? text.record.studentJobName + : "-"} + +
+ ); + }, }, { title: "所属小组", @@ -263,31 +303,77 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ + {text.record.studentOrgName + ? text.record.studentOrgName + : "-"} + +
+ ); + }, }, { title: "成绩", - dataIndex: "score", - key: "score", + dataIndex: "workScore", + key: "workScore", width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ + {text.record.workScore || text.record.workScore == 0 + ? text.record.workScore + : "-"} + +
+ ); + }, }, { title: "完成时间", - dataIndex: "comptime", - key: "comptime", + dataIndex: "lastStudyTime", + key: "lastStudyTime", width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ + {text.record.lastStudyTime ? text.record.lastStudyTime : "-"} + +
+ ); + }, }, { title: "任务状态", - dataIndex: "status", - key: "status", + dataIndex: "finishStatus", + key: "finishStatus", width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ + {text.record.finishStatus == 0 + ? "未开始" + : text.record.finishStatus == 1 + ? "已完成" + : text.record.finishStatus == 2 + ? "未完成" + : "-"} + +
+ ); + }, }, { title: "操作", @@ -303,7 +389,7 @@ export default { const ListOpera = () => { let arr = state.tabledata; arr.map((value) => { - if (value.status == "已完成") { + if (value.finishStatus == 1) { value.operation = (
{ ctx.emit("update:Wvisible", false); state.name = ""; @@ -366,9 +451,9 @@ export default { state.projectName = value; }; const onSelectChange = (selectedRowKeys) => { - if (selectedRowKeys.length > 2) { - return; - } + // if (selectedRowKeys.length > 2) { + // return; + // } state.selectedRowKeys = selectedRowKeys; }; @@ -396,9 +481,10 @@ export default { currentStageId: props.projectTaskInfo.stageId, type: 1, pid: props.projectTaskInfo.projectId, - status: state.projectName, + status: Number(state.projectName), studentName: state.name, currentTaskId: props.projectTaskInfo.projectTaskId, + taskType: props.projectTaskInfo.type, }); api .AssessmentManagementMessage({ @@ -407,14 +493,21 @@ export default { currentStageId: props.projectTaskInfo.stageId, type: 1, pid: props.projectTaskInfo.projectId, - status: state.projectName, + status: Number(state.projectName), studentName: state.name, currentTaskId: props.projectTaskInfo.projectTaskId, + taskType: props.projectTaskInfo.type, }) .then((res) => { console.log(res); - if (res.status == 200) { - state.tabledata = res.data.data.records; + if (res.data.code == 200) { + let newData = []; + for (let i = 0; i < res.data.data.records.length; i++) { + res.data.data.records[i].key = res.data.data.records[i].id; + newData.push(res.data.data.records[i]); + } + state.tabledata = newData; + ListOpera(); state.tableDataTotal = res.data.data.total; state.tableDataTotal2 = res.data.data.total; } @@ -450,21 +543,43 @@ export default { // 导出数据 function exportTaskStu() { - api - .exportTaskStudent({ - pageNo: state.currentPage, - pageSize: state.pageSize, - currentStageId: props.projectTaskInfo.stageId, - currentTaskId: props.projectTaskInfo.projectTaskId, - type: 1, - pid: props.projectTaskInfo.projectId, - }) - .then((res) => { - console.log(res); - }) - .catch((err) => { - console.log(err); - }); + window.open( + `${ + process.env.VUE_APP_PROXY_URL + }admin/student/exportTaskStudent?currentStageId=${ + props.projectTaskInfo.stageId + }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${ + props.projectTaskInfo.projectTaskId + }&taskType=${props.projectTaskInfo.type}` + ); + // api + // .exportTaskStudent({ + // pageNo: state.currentPage, + // pageSize: state.pageSize, + // currentStageId: props.projectTaskInfo.stageId, + // currentTaskId: props.projectTaskInfo.projectTaskId, + // type: 1, + // pid: props.projectTaskInfo.projectId, + // }) + // .then((res) => { + // console.log(res); + // }) + // .catch((err) => { + // console.log(err); + // }); + } + //导出作业 + function exportHomeWork() { + console.log("props.projectTaskInfo", props.projectTaskInfo); + window.open( + `${ + process.env.VUE_APP_PROXY_URL + }admin/student/exportHomeWork?currentStageId=${ + props.projectTaskInfo.stageId + }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${ + props.projectTaskInfo.projectTaskId + }&taskType=${props.projectTaskInfo.type}` + ); } return { ...toRefs(state), @@ -481,6 +596,7 @@ export default { resetTaskList, changePaginationStu, exportTaskStu, + exportHomeWork, }; }, }; diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index b209c42e..8f02716d 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -1,729 +1,937 @@ +
+ + +
+
+ + + + + + + + + + + setup(props, ctx) { + const state = reactive({ + Evisible: false, //录入成绩抽屉 + CWvisible: false, //查看作业抽屉 + CQvisible: false, //查看答卷抽屉 + ASOvervisible: false, //批量标注完成弹窗 + name: "", + + open: false, + projectName: null, + projectNameList: [ + { + id: 0, + value: "0", + label: "未开始", + }, + { + id: 1, + value: "1", + label: "已完成", + }, + { + id: 2, + value: "2", + label: "未完成", + }, + ], + selectedRowKeys: [], + + pageNo: 1, + pageSize: 10, + currentPage: 1, + tableDataTotal: -1, + tableDataTotal2: 0, + tabledata: [ + // { + // workNum: "123", + // userName: "li", + // deptName: "开发", + // jobName: "前端开发", + // score: 89, + // exam: 98, + // testscore: 80, + // status: "已完成", + // }, + ], + tablecolumns: [ + { + title: "工号", + dataIndex: "studentUserNo", + key: "studentUserNo", + width: 50, + align: "left", + className: "h head", + customRender: (text) => { + return ( +
+ + {text.record.studentUserNo ? text.record.studentUserNo : "-"} + +
+ ); + }, + }, + { + title: "姓名", + dataIndex: "studentName", + key: "studentName", + width: 50, + align: "left", + className: "h head", + customRender: (text) => { + return ( +
+ + {text.record.studentName ? text.record.studentName : "-"} + +
+ ); + }, + }, + { + title: "所在部门", + dataIndex: "studentDepartName", + key: "studentDepartName", + width: 60, + align: "center", + className: "h", + customRender: (text) => { + return ( +
+ + {text.record.studentDepartName + ? text.record.studentDepartName + : "-"} + +
+ ); + }, + }, + { + title: "所在岗位", + dataIndex: "studentJobName", + key: "studentJobName", + width: 60, + align: "center", + className: "h", + customRender: (text) => { + return ( +
+ + {text.record.studentJobName + ? text.record.studentJobName + : "-"} + +
+ ); + }, + }, + { + title: "学员关卡", + dataIndex: "chapterName", + key: "chapterName", + width: 60, + align: "center", + className: "h", + customRender: (text) => { + return ( +
+ + {text.record.chapterName ? text.record.chapterName : "-"} + +
+ ); + }, + }, + { + title: "作业成绩", + dataIndex: "workScore", + key: "workScore", + width: 60, + align: "center", + className: "h", + customRender: (text) => { + return ( +
+ + {text.record.workScore || text.record.workScore == 0 + ? text.record.workScore + : "-"} + +
+ ); + }, + }, + { + title: "考试成绩", + dataIndex: "examinationScore", + key: "examinationScore", + width: 60, + align: "center", + className: "h", + customRender: (text) => { + return ( +
+ + {text.record.examinationScore || + text.record.examinationScore == 0 + ? text.record.examinationScore + : "-"} + +
+ ); + }, + }, + { + title: "评分", + dataIndex: "assessmentScore", + key: "assessmentScore", + width: 60, + align: "center", + className: "h", + customRender: (text) => { + return ( +
+ + {text.record.assessmentScore || + text.record.assessmentScore == 0 + ? text.record.examinationScore + : "-"} + +
+ ); + }, + }, + { + title: "任务状态", + dataIndex: "finishStatus", + key: "finishStatus", + width: 60, + align: "center", + className: "h", + customRender: (text) => { + return ( +
+ + {text.record.finishStatus == 0 + ? "未开始" + : text.record.finishStatus == 1 + ? "已完成" + : text.record.finishStatus == 2 + ? "未完成" + : "-"} + +
+ ); + }, + }, + { + title: "操作", + dataIndex: "operation", + key: "operation", + width: 100, + align: "center", + className: "h", + }, + ], + }); + //面授直播管理列表操作 + const ListOpera = () => { + let arr = state.tabledata; + arr.map((value) => { + if (value.finishStatus == 1) { + value.operation = ( +
+ { + state.CWvisible = true; + }} + > + 查看作业 + + { + state.CQvisible = true; + }} + > + 查看答卷 + +
+ ); + } else { + value.operation = ( +
+ + 查看作业 + + + 查看答卷 + +
+ ); + } + }); + }; + const closeDrawer = () => { + ctx.emit("update:FaceTeachModelVisible", false); + state.name = ""; + state.projectName = ""; + state.selectedRowKeys = []; + state.currentPage = 1; + state.tableDataTotal = -1; + state.tableDataTotal2 = 0; + state.tabledata = []; + }; + const afterVisibleChange = (bol) => { + if (bol == true) { + getStudent(); + } + }; + const selectProjectName = (value) => { + state.projectName = value; + }; + const onSelectChange = (selectedRowKeys) => { + // if (selectedRowKeys.length > 2) { + // return; + // } + state.selectedRowKeys = selectedRowKeys; + }; + + const allStuOver = () => { + state.ASOvervisible = true; + }; + const showEntryScore = () => { + state.Evisible = true; + }; + //催促学员学习 + const godie = () => { + message.destroy(); + message.success("催促" + props.title + "成功"); + }; + //表头清空 + const clearLine = () => { + state.selectedRowKeys = []; + }; + + // 获取数据 + //获取学员 + const getStudent = () => { + console.log("我是传递的查询参数", { + pageNo: state.currentPage, + pageSize: state.pageSize, + currentStageId: props.datasource.chapterId, + type: 2, + pid: props.datasource.routerId, + taskId: props.datasource.routerTaskId, + taskType: props.datasource.type, + status: state.projectName, + studentName: state.name, + }); + api + .AssessmentManagementMessage({ + pageNo: state.currentPage, + pageSize: state.pageSize, + currentStageId: props.datasource.chapterId, + type: 2, + pid: props.datasource.routerId, + taskId: props.datasource.routerTaskId, + taskType: props.datasource.type, + status: state.projectName, + studentName: state.name, + }) + .then((res) => { + console.log("获取面授管理学员", res); + if (res.data.code == 200) { + let newData = []; + for (let i = 0; i < res.data.data.records.length; i++) { + res.data.data.records[i].key = res.data.data.records[i].id; + newData.push(res.data.data.records[i]); + } + state.tabledata = newData; + ListOpera(); + state.tableDataTotal = res.data.data.total; + state.tableDataTotal2 = res.data.data.total; + } + }) + .catch((err) => { + console.log(err); + state.tabledata = []; + }); + }; + //搜索学员 + const searchTaskList = () => { + state.currentPage = 1; + state.tableDataTotal = -1; + state.tableDataTotal2 = 0; + getStudent(); + }; + // 重置按钮 + function resetTaskList() { + state.currentPage = 1; + state.name = ""; + state.projectName = ""; + state.tableDataTotal = -1; + state.tableDataTotal2 = 0; + getStudent(); + } + //分页 + const changePaginationStu = (page) => { + state.currentPage = page; + state.tableDataTotal = -1; + state.tableDataTotal2 = 0; + getStudent(); + }; + + // 导出数据 + function exportTaskStu() { + console.log("props.datasource", props.datasource); + window.open( + `${ + process.env.VUE_APP_PROXY_URL + }admin/student/exportTaskStudent?currentStageId=${ + props.datasource.chapterId + }&type=${2}&pid=${props.datasource.routerId}&taskId=${ + props.datasource.routerTaskId + }&taskType=${props.datasource.type}` + ); + // api + // .exportTaskStudent({ + // pageNo: state.currentPage, + // pageSize: state.pageSize, + // currentStageId: props.datasource.stageId, + // currentTaskId: props.datasource.projectTaskId, + // type: 1, + // pid: props.datasource.projectId, + // }) + // .then((res) => { + // console.log(res); + // }) + // .catch((err) => { + // console.log(err); + // }); + } + //导出作业 + function exportHomeWork() { + console.log("props.datasource", props.datasource); + window.open( + `${ + process.env.VUE_APP_PROXY_URL + }admin/student/exportHomeWork?currentStageId=${ + props.datasource.chapterId + }&type=${2}&pid=${props.datasource.routerId}&taskId=${ + props.datasource.routerTaskId + }&taskType=${props.datasource.type}` + ); + } + return { + ...toRefs(state), + selectProjectName, + closeDrawer, + afterVisibleChange, + onSelectChange, + allStuOver, + showEntryScore, + godie, + clearLine, + searchTaskList, + resetTaskList, + changePaginationStu, + exportTaskStu, + exportHomeWork, + }; + }, +}; + +} + \ No newline at end of file diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index ce7ea64f..abffb6de 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -1,74 +1,80 @@ +
+ + +
+
+ + + + + + + + + + + }; + const selectProjectName = (value) => { + state.projectName = value; + }; + const onSelectChange = (selectedRowKeys) => { + // if (selectedRowKeys.length > 2) { + // return; + // } + state.selectedRowKeys = selectedRowKeys; + }; + + const allStuOver = () => { + state.ASOvervisible = true; + }; + const showEntryScore = () => { + state.Evisible = true; + }; + //催促学员学习 + const godie = () => { + message.destroy(); + message.success("催促" + props.title + "成功"); + }; + //表头清空 + const clearLine = () => { + state.selectedRowKeys = []; + }; + + //获取学员 + const getStudent = () => { + console.log("我是传递的查询参数", { + pageNo: state.currentPage, + pageSize: state.pageSize, + currentStageId: props.datasource.chapterId, + type: 2, + pid: props.datasource.routerId, + taskId: props.datasource.routerTaskId, + taskType: props.datasource.type, + status: state.projectName, + studentName: state.name, + }); + api + .AssessmentManagementMessage({ + pageNo: state.currentPage, + pageSize: state.pageSize, + currentStageId: props.datasource.chapterId, + type: 2, + pid: props.datasource.routerId, + taskId: props.datasource.routerTaskId, + taskType: props.datasource.type, + status: state.projectName, + studentName: state.name, + }) + .then((res) => { + console.log("获取作业管理学员", res); + if (res.data.code == 200) { + let newData = []; + for (let i = 0; i < res.data.data.records.length; i++) { + res.data.data.records[i].key = res.data.data.records[i].id; + newData.push(res.data.data.records[i]); + } + state.tabledata = newData; + ListOpera(); + state.tableDataTotal = res.data.data.total; + } + }) + .catch((err) => { + console.log(err); + state.tabledata = []; + }); + }; + //搜索学员 + const searchTaskList = () => { + state.currentPage = 1; + state.tableDataTotal = -1; + getStudent(); + }; + // 重置按钮 + function resetTaskList() { + state.currentPage = 1; + state.name = ""; + state.projectName = ""; + state.tableDataTotal = -1; + getStudent(); + } + //分页 + const changePaginationStu = (page) => { + state.currentPage = page; + state.tableDataTotal = -1; + getStudent(); + }; + + // 导出数据 + function exportTaskStu() { + console.log("props.datasource", props.datasource); + window.open( + `${ + process.env.VUE_APP_PROXY_URL + }admin/student/exportTaskStudent?currentStageId=${ + props.datasource.chapterId + }&type=${2}&pid=${props.datasource.routerId}&taskId=${ + props.datasource.routerTaskId + }&taskType=${props.datasource.type}` + ); + // api + // .exportTaskStudent({ + // pageNo: state.currentPage, + // pageSize: state.pageSize, + // currentStageId: props.datasource.stageId, + // currentTaskId: props.datasource.projectTaskId, + // type: 1, + // pid: props.datasource.projectId, + // }) + // .then((res) => { + // console.log(res); + // }) + // .catch((err) => { + // console.log(err); + // }); + } + //导出作业 + function exportHomeWork() { + console.log("props.datasource", props.datasource); + window.open( + `${ + process.env.VUE_APP_PROXY_URL + }admin/student/exportHomeWork?currentStageId=${ + props.datasource.chapterId + }&type=${2}&pid=${props.datasource.routerId}&taskId=${ + props.datasource.routerTaskId + }&taskType=${props.datasource.type}` + ); + } + + return { + ...toRefs(state), + selectProjectName, + closeDrawer, + afterVisibleChange, + onSelectChange, + allStuOver, + showEntryScore, + godie, + clearLine, + searchTaskList, + resetTaskList, + changePaginationStu, + exportTaskStu, + exportHomeWork, + }; + }, +}; + +} + \ No newline at end of file diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 94c83c0e..36d580ff 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1491,7 +1491,6 @@
-
@@ -1510,8 +1509,6 @@
- -
报名设置 @@ -6034,113 +6031,111 @@ export default defineComponent({ } } - - .items_fj { margin-bottom: 1px; - .fujian{ - display: none; - } - .mbl_items12 { - width: 440px; - margin-right:56px; + .fujian { + display: none; + } + .mbl_items12 { + width: 440px; + margin-right: 56px; - .i12_box1 { - display: flex; - align-items: center; - padding: 17px 0px 17px 21px; - border: 1px solid #eff4fc; - border-radius: 8px; - margin-bottom: 10px; + .i12_box1 { + display: flex; + align-items: center; + padding: 17px 0px 17px 21px; + border: 1px solid #eff4fc; + border-radius: 8px; + margin-bottom: 10px; - .file_img { - width: 27px; - height: 32px; - background-image: url(@/assets/images/coursewareManage/imgs.png); - margin-right: 22px; + .file_img { + width: 27px; + height: 32px; + background-image: url(@/assets/images/coursewareManage/imgs.png); + margin-right: 22px; - img { - width: 100%; - height: 100%; - } - } + img { + width: 100%; + height: 100%; + } + } - .file_detail { - width: 250px; - margin-right: 21px; + .file_detail { + width: 250px; + margin-right: 21px; - .file_updata { - display: flex; - align-items: center; + .file_updata { + display: flex; + align-items: center; - .updatabox { - position: relative; - width: 230px; - height: 5px; - background-color: rgba(192, 192, 192, 0.25); - border-radius: 3px; + .updatabox { + position: relative; + width: 230px; + height: 5px; + background-color: rgba(192, 192, 192, 0.25); + border-radius: 3px; - .updatacolor { - position: absolute; - left: 0; - width: 100%; - height: 5px; - background-color: #57c887; - border-radius: 3px; - } + .updatacolor { + position: absolute; + left: 0; + width: 100%; + height: 5px; + background-color: #57c887; + border-radius: 3px; + } - .updatacolor2 { - position: absolute; - left: 0; - width: 80%; - height: 5px; - background-color: #ff7474; - border-radius: 3px; - } + .updatacolor2 { + position: absolute; + left: 0; + width: 80%; + height: 5px; + background-color: #ff7474; + border-radius: 3px; + } - .updatacolor3 { - position: absolute; - left: 0; - width: 60%; - height: 5px; - background-color: #4ea6ff; - border-radius: 3px; - } + .updatacolor3 { + position: absolute; + left: 0; + width: 60%; + height: 5px; + background-color: #4ea6ff; + border-radius: 3px; + } - .updataxq { - position: absolute; - right: 2px; - top: -30px; - color: #57c887; - } + .updataxq { + position: absolute; + right: 2px; + top: -30px; + color: #57c887; + } - .updataxq2 { - position: absolute; - right: 2px; - top: -30px; - color: #ff7474; - } + .updataxq2 { + position: absolute; + right: 2px; + top: -30px; + color: #ff7474; + } - .updataxq3 { - position: absolute; - right: 2px; - top: -30px; - color: #4ea6ff; - } - } - } - } + .updataxq3 { + position: absolute; + right: 2px; + top: -30px; + color: #4ea6ff; + } + } + } + } - .file_operation { - display: flex; + .file_operation { + display: flex; - .fobox { - margin-right: 5px; - cursor: pointer; - } - } - } - } + .fobox { + margin-right: 5px; + cursor: pointer; + } + } + } + } } .items_btn { @@ -6989,8 +6984,6 @@ export default defineComponent({ } } } - - } } diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index a243885d..487a4401 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -440,11 +440,13 @@ /> {{ - item.totalStuNum == 0 ? 0 : - item.finishStuNum == 0 ? 0 : - parseInt( - (item.finishStuNum / item.totalStuNum) * 100 - ) + item.totalStuNum == 0 + ? 0 + : item.finishStuNum == 0 + ? 0 + : parseInt( + (item.finishStuNum / item.totalStuNum) * 100 + ) }}%
@@ -473,6 +475,12 @@ > 考勤
+
- + - + - + - + - + - + - +
@@ -1156,7 +1187,7 @@ import RouterExaminationManage from "../../components/drawers/router/RouterExami import RouterEvaluationManage from "../../components/drawers/router/RouterEvaluationManage"; import RouterHomeworkManage from "../../components/drawers/router/RouterHomeworkManage"; import RouterCommonManage from "../../components/drawers/router/RouterCommonManage"; - + export default { name: "LevelAdd", components: { @@ -1178,7 +1209,7 @@ export default { RouterExaminationManage, RouterEvaluationManage, RouterHomeworkManage, - RouterCommonManage + RouterCommonManage, }, setup() { const router = useRouter(); @@ -1346,24 +1377,24 @@ export default { studyEndNum: 0, faceTeachModelVisible: false, - examinationModelVisible: false, - evaluationModelVisible: false, - homeworkModelVisible: false, + examinationModelVisible: false, + evaluationModelVisible: false, + homeworkModelVisible: false, commonModelVisible: false, - faceTeachModelVisibleTitle: '', - examinationModelVisibleTitle: '', - evaluationModelVisibleTitle: '', - homeworkModelVisibleTitle: '', - commonModelVisibleTitle: '', + faceTeachModelVisibleTitle: "", + examinationModelVisibleTitle: "", + evaluationModelVisibleTitle: "", + homeworkModelVisibleTitle: "", + commonModelVisibleTitle: "", - faceData: '', - examinationData: '', - evaluationData: '', - homeworkData: '', - commonData: '', - commonLevelName: '', - examLevelName: '', - evaluationLevelName: '' + faceData: "", + examinationData: "", + evaluationData: "", + homeworkData: "", + commonData: "", + commonLevelName: "", + examLevelName: "", + evaluationLevelName: "", }); const levelList = reactive({ @@ -1628,50 +1659,50 @@ export default { getStudent(); } }; - + // 面授课点击管理弹框 const faceTeachModel = (data) => { - console.log(data) + console.log(data); state.faceTeachModelVisible = true; state.faceTeachModelVisibleTitle = data.name; - state.faceData = data; + state.faceData = data; // 面授课弹框名称 RouterFaceTeachManage - } + }; // 考试点击管理弹框 const examinationModel = (data, levelname) => { - console.log(data) + console.log(data); state.examLevelName = levelname; state.examinationModelVisible = true; state.examinationModelVisibleTitle = data.name; state.examinationData = data; // 考试弹框名称 RouterExaminationManage - } + }; // 测评点击管理弹框 const evaluationModel = (data, levelname) => { - console.log(data) + console.log(data); state.evaluationLevelName = levelname; state.evaluationModelVisible = true; state.evaluationModelVisibleTitle = data.name; state.evaluationData = data; // 测评弹框名称 RouterEvaluationManage - } + }; // 作业点击管理弹框 const homeworkModel = (data) => { - console.log(data) + console.log(data); state.homeworkModelVisible = true; state.homeworkModelVisibleTitle = data.name; state.homeworkData = data; // 作业弹框名称 RouterHomeworkManage - } + }; // 在线、案例、外链、评估、直播、活动点击管理弹框 const commonModel = (data, levelname) => { state.commonLevelName = levelname; - console.log(data) + console.log(data); state.commonModelVisible = true; state.commonModelVisibleTitle = data.name; state.commonData = data; // 公共模块弹框名称 RouterCommonManage - } + }; //学员管理------------------------------------------------ //获取学员列表 @@ -2366,7 +2397,7 @@ export default { examinationModel, evaluationModel, homeworkModel, - commonModel + commonModel, }; }, }; @@ -3940,7 +3971,7 @@ export default { .operations { display: flex; - width: 200px; + width: 240px; //flex-grow: 1; .operation { @@ -3948,6 +3979,8 @@ export default { font-size: 14px; padding: 10px; margin-left: auto; + width: 63px; + text-align: center; } } }