diff --git a/src/api/indexTaskManage.js b/src/api/indexTaskManage.js index 12da1b92..4c219e57 100644 --- a/src/api/indexTaskManage.js +++ b/src/api/indexTaskManage.js @@ -15,4 +15,7 @@ export const ExportExam = (obj) => http.post('/admin/exam/manage/exportExam', ob export const QueryOnlineManagementDetail = (obj) => http.post('/admin/online/manage/queryOnlineManagementDetail', obj) // 获取 课程库-面授管理-管理-学习记录 信息 -export const GetCourseStudent = (obj) => http.get('/admin/student/getCourseStudent', {params: obj}) \ No newline at end of file +export const GetCourseStudent = (obj) => http.get('/admin/student/getCourseStudent', {params: obj}) + +// 查询评估管理-管理学员的学习信息 +export const QueryAssessmentManageMessage = (obj) => http.post('/admin/assessment/manage/queryAssessmentManageMessage', obj) \ No newline at end of file diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue index dd94d6b9..eecc3e8d 100644 --- a/src/components/drawers/project/ProjectEvalManage.vue +++ b/src/components/drawers/project/ProjectEvalManage.vue @@ -187,6 +187,13 @@ export default { width: 50, align: "center", className: "h head", + customRender: (text) => { + return ( +
+ {text.record.studentUserNo?text.record.studentUserNo:"-"} +
+ ); + }, }, { title: "姓名", @@ -195,6 +202,13 @@ export default { width: 50, align: "left", className: "h head", + customRender: (text) => { + return ( +
+ {text.record.studentName?text.record.studentName:"-"} +
+ ); + }, }, { title: "所在部门", @@ -203,6 +217,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.studentDepartName?text.record.studentDepartName:"-"} +
+ ); + }, }, { title: "所在岗位", @@ -211,6 +232,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.studentJobName?text.record.studentJobName:"-"} +
+ ); + }, }, { title: "学员关卡", @@ -222,7 +250,7 @@ export default { customRender: () => { return (
- {props.levelName} + {props.levelName?props.levelName:'-'}
); }, @@ -234,15 +262,29 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.endStudyTime?text.record.endStudyTime:"-"} +
+ ); + }, }, { 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==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"} +
+ ); + }, }, { title: "PDF状态", @@ -251,6 +293,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.PDFstatus?text.record.PDFstatus:"-"} +
+ ); + }, } ] return columns; diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 173685a1..c7b10a0d 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -186,7 +186,14 @@ export default { key: "studentCode", width: 50, align: "center", - className: "h head" + className: "h head", + customRender: (text) => { + return ( +
+ {text.record.studentCode?text.record.studentCode:"-"} +
+ ); + }, }, { title: "姓名", @@ -195,6 +202,13 @@ export default { width: 50, align: "left", className: "h head", + customRender: (text) => { + return ( +
+ {text.record.studentName?text.record.studentName:"-"} +
+ ); + }, }, { title: "所在部门", @@ -203,6 +217,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.studentDepartName?text.record.studentDepartName:"-"} +
+ ); + }, }, { title: "所在岗位", @@ -211,6 +232,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.studentJobName?text.record.studentJobName:"-"} +
+ ); + }, }, { title: "考试次数", @@ -219,6 +247,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.testNumber?text.record.testNumber:"-"} +
+ ); + }, }, { title: "成绩", @@ -227,6 +262,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.score?text.record.score:"-"} +
+ ); + }, }, { @@ -236,6 +278,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.finishedTime?text.record.finishedTime:"-"} +
+ ); + }, }, { title: "任务状态", @@ -248,7 +297,7 @@ export default { console.log(text.record.status); return (
- {text.record.status==0?"未开始":text.record.status==10?"未通过":"已通过"} + {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}
); }, diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index b9de20f0..b1cd6316 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -203,6 +203,13 @@ export default { width: 50, align: "center", className: "h head", + customRender: (text) => { + return ( +
+ {text.record.studentUserNo?text.record.studentUserNo:"-"} +
+ ); + }, }, { title: "姓名", @@ -211,6 +218,13 @@ export default { width: 50, align: "center", className: "h head", + customRender: (text) => { + return ( +
+ {text.record.studentName?text.record.studentName:"-"} +
+ ); + }, }, { title: "所在部门", @@ -219,6 +233,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.studentDepartName?text.record.studentDepartName:"-"} +
+ ); + }, }, { title: "所在岗位", @@ -227,6 +248,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.studentJobName?text.record.studentJobName:"-"} +
+ ); + }, }, { title: "学员关卡", @@ -250,18 +278,25 @@ export default { width: 100, 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.status == 0 ? "未完成" : "已完成"} + {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}
); }, @@ -368,7 +403,7 @@ export default { studentDepartName: res.data.data.studyDetailList[i].studentDepartName, studentJobName: res.data.data.studyDetailList[i].studentJobName, lastStudyTime: res.data.data.studyDetailList[i].finishedTime, - status: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0 + finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0 } newData.push(obj) } diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index caa56979..3a42dc58 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -203,6 +203,13 @@ export default { width: 50, align: "center", className: "h head", + customRender: (text) => { + return ( +
+ {text.record.studentUserNo?text.record.studentUserNo:"-"} +
+ ); + }, }, { title: "姓名", @@ -211,6 +218,13 @@ export default { width: 50, align: "center", className: "h head", + customRender: (text) => { + return ( +
+ {text.record.studentName?text.record.studentName:"-"} +
+ ); + }, }, { title: "所在部门", @@ -219,6 +233,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.studentDepartName?text.record.studentDepartName:"-"} +
+ ); + }, }, { title: "所在岗位", @@ -227,6 +248,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.studentJobName?text.record.studentJobName:"-"} +
+ ); + }, }, { title: "学员关卡", @@ -250,18 +278,25 @@ export default { width: 100, 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.status == 0 ? "未完成" : "已完成"} + {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}
); }, @@ -367,7 +402,7 @@ export default { studentDepartName: res.data.data.studyDetailList[i].studentDepartName, studentJobName: res.data.data.studyDetailList[i].studentJobName, lastStudyTime: res.data.data.studyDetailList[i].finishedTime, - status: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0 + finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0 } newData.push(obj) } diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index ec8576e8..7482efe6 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -188,6 +188,13 @@ width: 50, align: "center", className: "h head", + customRender: (text) => { + return ( +
+ {text.record.studentUserNo?text.record.studentUserNo:"-"} +
+ ); + }, }, { title: "姓名", @@ -196,6 +203,13 @@ width: 50, align: "left", className: "h head", + customRender: (text) => { + return ( +
+ {text.record.studentName?text.record.studentName:"-"} +
+ ); + }, }, { title: "所在部门", @@ -204,6 +218,13 @@ width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.studentDepartName?text.record.studentDepartName:"-"} +
+ ); + }, }, { title: "所在岗位", @@ -212,6 +233,13 @@ width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.studentJobName?text.record.studentJobName:"-"} +
+ ); + }, }, { title: "学员关卡", @@ -223,7 +251,7 @@ customRender: () => { return (
- {props.levelName} + {props.levelName?props.levelName:'-'}
); }, @@ -235,15 +263,29 @@ width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.endStudyTime?text.record.endStudyTime:"-"} +
+ ); + }, }, { 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==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"} +
+ ); + }, }, { title: "PDF状态", @@ -252,6 +294,13 @@ width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.PDFstatus?text.record.PDFstatus:"-"} +
+ ); + }, } ] diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index 13a3a7fd..f6425cd5 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -190,7 +190,14 @@ key: "studentCode", width: 50, align: "center", - className: "h head" + className: "h head", + customRender: (text) => { + return ( +
+ {text.record.studentCode?text.record.studentCode:"-"} +
+ ); + }, }, { title: "姓名", @@ -199,6 +206,13 @@ width: 50, align: "left", className: "h head", + customRender: (text) => { + return ( +
+ {text.record.studentName?text.record.studentName:"-"} +
+ ); + }, }, { title: "所在部门", @@ -207,6 +221,13 @@ width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.studentDepartName?text.record.studentDepartName:"-"} +
+ ); + }, }, { title: "所在岗位", @@ -215,6 +236,13 @@ width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.studentJobName?text.record.studentJobName:"-"} +
+ ); + }, }, { title: "学员关卡", @@ -238,6 +266,13 @@ width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.testNumber?text.record.testNumber:"-"} +
+ ); + }, }, { title: "成绩", @@ -246,6 +281,13 @@ width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.score?text.record.score:"-"} +
+ ); + }, }, { @@ -255,6 +297,13 @@ width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.finishedTime?text.record.finishedTime:"-"} +
+ ); + }, }, { title: "任务状态", @@ -267,7 +316,7 @@ console.log(text.record.status); return (
- {text.record.status==0?"未开始":text.record.status==10?"未通过":"已通过"} + {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}
); }, diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index cf87027e..f66675fc 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2538,6 +2538,13 @@ const columns2 = [ key: "studentName", width: "12%", align: "center", + customRender: (text) => { + return ( +
+ {text.record.studentName?text.record.studentName:"-"} +
+ ); + }, }, { title: "工号", @@ -2545,13 +2552,27 @@ const columns2 = [ key: "studentUserNo", width: "12%", align: "center", + customRender: (text) => { + return ( +
+ {text.record.studentUserNo?text.record.studentUserNo:"-"} +
+ ); + }, }, { title: "开课名称", - dataIndex: "courseName", - key: "courseName", + dataIndex: "name", + key: "name", width: "12%", align: "center", + customRender: (text) => { + return ( +
+ {text.record.name?text.record.name:"-"} +
+ ); + }, }, { title: "地点", @@ -2559,6 +2580,13 @@ const columns2 = [ key: "address", width: "12%", align: "center", + customRender: (text) => { + return ( +
+ {text.record.address?text.record.address:"-"} +
+ ); + }, }, { title: "数据来源", @@ -2566,13 +2594,27 @@ const columns2 = [ key: "courseSource", width: "12%", align: "center", + customRender: (text) => { + return ( +
+ {text.record.courseSource?text.record.courseSource:"-"} +
+ ); + }, }, { title: "学习时间", - dataIndex: "beginTime", - key: "beginTime", + dataIndex: "lastStudyTime", + key: "lastStudyTime", width: "12%", align: "center", + customRender: (text) => { + return ( +
+ {text.record.lastStudyTime?text.record.lastStudyTime:"-"} +
+ ); + }, }, { title: "签到时间", @@ -2580,6 +2622,13 @@ const columns2 = [ key: "signTime", width: "12%", align: "center", + customRender: (text) => { + return ( +
+ {text.record.signTime?text.record.signTime:"-"} +
+ ); + }, }, { title: "状态", @@ -2587,6 +2636,13 @@ const columns2 = [ key: "status", width: "12%", align: "center", + customRender: (text) => { + return ( +
+ {text.record.finishStatus==0 || text.record.finishStatus == null ?"未开始":"已完成"} +
+ ); + }, }, // { // title: "操作", diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index aac85d5b..1a75f188 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -531,7 +531,7 @@ :columns="tableDataFunc()" > -
@@ -647,6 +647,7 @@
上传共享文档
@@ -667,7 +668,7 @@ > @@ -687,12 +688,14 @@ style=" width: 500px; display: flex; + margin-bottom: 30px; justify-content: space-between; align-items: center; " class="docListStyle" > - + /> --> + +
+ +
+ +
+ +
+ +
+ + +
+
+
+
+
{{ item.name }} + 下载 - --> + { console.log("router-list", res); state.fileList = JSON.parse(res.data.data.routerInfo.attach); + console.log('asdasdasd-------->',state.fileList) state.docChecked = res.data.data.routerInfo.attachSwitch == 1 ? true : false; if (res.data.data.routerInfo.status == 1) { diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 1dca75bd..773bf3b5 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -993,7 +993,7 @@
- + +
+ +
+ +
+ +
+ +
+ + +
+
+
+
+
{{ item.name }} + 下载 - --> + @@ -2469,6 +2498,7 @@ export default { evaltype: "", evalData: "", facestudent: "", + locationHref: location.href.indexOf('http://') !== -1 ? 'http://111.231.196.214:12016/' : location.href.slice(0, location.href.indexOf('/m')) + '/upload/' }); const levelList = reactive({ diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index d40d0f04..4388d352 100644 --- a/src/views/research/ManagePage.vue +++ b/src/views/research/ManagePage.vue @@ -62,8 +62,8 @@ + + + @@ -81,6 +94,7 @@ import ViewAssess from "../../components/drawers/ViewAssess"; import { reactive, toRefs } from "vue"; import { queryAssessmentDetailList } from "@/api/indexResearch"; import { useRouter } from "vue-router"; +import * as api from "@/api/indexTaskManage"; export default { name: "ManagePage", @@ -95,7 +109,11 @@ export default { tableDataTotalLoading: true, tabledata: [], tableDataTotal: 0, - evalDataSource: "" + evalDataSource: "", + evalStuListData: [], + evalStuListLoading:true, + evalStuListDataTotal:0, + evalCurrentPage:1 }); const getInfoDate = async () => { @@ -112,18 +130,35 @@ export default { }); // 获取学员信息 - console.log('传递的请求学员信息的参数',{ - pageNo: state.currentPage, - pageSize: state.pageSize, - type: 3, - taskId: router.currentRoute.value.params.id, - pid: router.currentRoute.value.params.id - }) - // createName + state.evalStuListLoading = true; + api.QueryAssessmentManageMessage({ + "assessmentId": router.currentRoute.value.params.id, + "pageNo": state.currentPage, + "pageSize": state.pageSize + }).then(res=>{ + console.log('获取学员信息',res) + // evalStuListDataTotal evalCurrentPage + state.evalStuListLoading = false; + if(res.data.code==200){ + state.evalStuListDataTotal = res.data.data.total; + state.evalStuListData = res.data.data.rows; + state.evalStuListLoading = false; + } + }).catch(err=>{ + console.log(err) + state.evalStuListLoading = false; + }) }; getInfoDate(); + //分页 + const changePaginationStu = (page) => { + state.evalStuListLoading = true; + state.evalCurrentPage = page; + getInfoDate(); + }; + const showassess = (data) => { state.evalDataSource = data; state.Assessvisible = true; @@ -181,32 +216,67 @@ export default { { title: "工号", width: 40, - dataIndex: "userNo", - key: "userNo", + dataIndex: "studentCode", + key: "studentCode", + customRender: (text) => { + return ( +
+ {text.record.studentCode?text.record.studentCode:"-"} +
+ ); + }, }, { title: "姓名", width: 40, - dataIndex: "name", - key: "name", + dataIndex: "studentName", + key: "studentName", + customRender: (text) => { + return ( +
+ {text.record.studentName?text.record.studentName:"-"} +
+ ); + }, }, { title: "部门", width: 50, - dataIndex: "department", - key: "department", + dataIndex: "studentDepartName", + key: "studentDepartName", + customRender: (text) => { + return ( +
+ {text.record.studentDepartName?text.record.studentDepartName:"-"} +
+ ); + }, }, { width: 50, title: "岗位", - dataIndex: "post", - key: "post", + dataIndex: "studentJobName", + key: "studentJobName", + customRender: (text) => { + return ( +
+ {text.record.studentJobName?text.record.studentJobName:"-"} +
+ ); + }, }, { title: "数据来源", width: 50, - dataIndex: "dataSource", - key: "dataSource", + dataIndex: "source", + key: "source", + customRender: (text) => { + return ( +
+ {text.record.source?text.record.source:"-"} +
+ ); + }, }, // { // title: "项目", @@ -223,8 +293,15 @@ export default { { title: "提交时间", width: 50, - dataIndex: "submit", - key: "submit", + dataIndex: "submitTime", + key: "submitTime", + customRender: (text) => { + return ( +
+ {text.record.submitTime?text.record.submitTime:"-"} +
+ ); + }, }, { title: "操作", @@ -250,6 +327,7 @@ export default { }, ], showassess, + changePaginationStu }; }, };