From 882d55cac4f793d3409b80226235435cd8330daf Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 6 Jan 2023 17:58:09 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE/=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=E5=85=B1=E4=BA=AB=E6=96=87=E6=A1=A3=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 38 ++++++++++++++++++++++++---- src/views/projectcenter/TaskPage.vue | 38 ++++++++++++++++++++++++---- 2 files changed, 66 insertions(+), 10 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index aac85d5b..f98b857b 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,13 @@ style=" width: 500px; display: flex; + margin-bottom: 30px; justify-content: space-between; align-items: center; " class="docListStyle" > - + /> --> + +
+ +
+ +
+ +
+ +
+ + +
+
+
+
+
{{ item.name }} - --> +
- + +
+ +
+ +
+ +
+ +
+ + +
+
+
+
+
{{ item.name }} - --> + From 4e317b2a1d6fd19e462b776f0f93750be35a3e5d Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 6 Jan 2023 19:18:38 +0800 Subject: [PATCH 2/9] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE/?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=20=E5=85=B1?= =?UTF-8?q?=E4=BA=AB=E6=96=87=E6=A1=A3=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 4 ++++ src/views/projectcenter/TaskPage.vue | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index f98b857b..ee483f78 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -694,6 +694,7 @@ " class="docListStyle" > + ',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 94c5f967..90d5d8c9 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1097,6 +1097,7 @@ :title="item.name" >{{ item.name }} + 下载 Date: Sat, 7 Jan 2023 09:02:59 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=E5=85=B1=E4=BA=AB=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=AD=97=E6=AE=B5=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 2 +- src/views/projectcenter/TaskPage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index ee483f78..1a75f188 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -742,7 +742,7 @@ :title="item.name" >{{ item.name }} - 下载 + 下载 {{ item.name }} - 下载 + 下载 Date: Sat, 7 Jan 2023 11:55:55 +0800 Subject: [PATCH 4/9] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AD=A6=E5=91=98=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexTaskManage.js | 5 +- src/views/research/ManagePage.vue | 82 ++++++++++++++++++++++--------- 2 files changed, 63 insertions(+), 24 deletions(-) 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/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index d40d0f04..748a53cc 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,32 @@ export default { { title: "工号", width: 40, - dataIndex: "userNo", - key: "userNo", + dataIndex: "studentCode", + key: "studentCode", }, { title: "姓名", width: 40, - dataIndex: "name", - key: "name", + dataIndex: "studentName", + key: "studentName", }, { title: "部门", width: 50, - dataIndex: "department", - key: "department", + dataIndex: "studentDepartName", + key: "studentDepartName", }, { width: 50, title: "岗位", - dataIndex: "post", - key: "post", + dataIndex: "studentJobName", + key: "studentJobName", }, { title: "数据来源", width: 50, - dataIndex: "dataSource", - key: "dataSource", + dataIndex: "source", + key: "source", }, // { // title: "项目", @@ -223,8 +258,8 @@ export default { { title: "提交时间", width: 50, - dataIndex: "submit", - key: "submit", + dataIndex: "submitTime", + key: "submitTime", }, { title: "操作", @@ -250,6 +285,7 @@ export default { }, ], showassess, + changePaginationStu }; }, }; From 8241cf8c8bb00d7c036ddf1a50d30a3b15a6965c Mon Sep 17 00:00:00 2001 From: wyx Date: Sat, 7 Jan 2023 12:27:59 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=AD=97=E7=AC=A6=E6=97=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=AA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectEvalManage.vue | 7 +++ .../drawers/project/ProjectExamManage.vue | 51 ++++++++++++++++++- .../drawers/project/ProjectOnlineManage.vue | 37 +++++++++++++- .../drawers/router/RouterCommonManage.vue | 37 +++++++++++++- .../drawers/router/RouterEvaluationManage.vue | 7 +++ .../router/RouterExaminationManage.vue | 51 ++++++++++++++++++- 6 files changed, 186 insertions(+), 4 deletions(-) diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue index dd94d6b9..47cff0b1 100644 --- a/src/components/drawers/project/ProjectEvalManage.vue +++ b/src/components/drawers/project/ProjectEvalManage.vue @@ -243,6 +243,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"} +
+ ); + }, }, { title: "PDF状态", diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 173685a1..9151de8d 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: "任务状态", diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index b9de20f0..25a31217 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,6 +278,13 @@ export default { width: 100, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.lastStudyTime?text.record.lastStudyTime:"-"} +
+ ); + }, }, { title: "任务状态", @@ -261,7 +296,7 @@ export default { customRender: (text) => { return (
- {text.record.status == 0 ? "未完成" : "已完成"} + {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"}
); }, diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index caa56979..08002b48 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,6 +278,13 @@ export default { width: 100, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.lastStudyTime?text.record.lastStudyTime:"-"} +
+ ); + }, }, { title: "任务状态", @@ -261,7 +296,7 @@ export default { customRender: (text) => { return (
- {text.record.status == 0 ? "未完成" : "已完成"} + {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"}
); }, diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index ec8576e8..77ad9f00 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -244,6 +244,13 @@ width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"} +
+ ); + }, }, { title: "PDF状态", diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index 13a3a7fd..f62a5dc9 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: "任务状态", From 29ea775da3cd84861b859fb9c0939c94c655ce72 Mon Sep 17 00:00:00 2001 From: wyx Date: Sat, 7 Jan 2023 13:05:16 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8A=A0=E6=A8=AA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectExamManage.vue | 2 +- .../router/RouterExaminationManage.vue | 2 +- src/views/courselibrary/CoursewareManage.vue | 64 +++++++++++++++++-- 3 files changed, 62 insertions(+), 6 deletions(-) diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 9151de8d..c7b10a0d 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -297,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/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index f62a5dc9..f6425cd5 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -316,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 48b4745f..5a4625af 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: "操作", From fb76357d156b239ac69290aa2aa44319d6a7d8cc Mon Sep 17 00:00:00 2001 From: wyx Date: Sat, 7 Jan 2023 13:14:41 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=E6=B5=8B=E8=AF=84=E7=A9=BA=E5=AD=90?= =?UTF-8?q?=E6=AE=B5=E6=B7=BB=E5=8A=A0=E6=A8=AA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectEvalManage.vue | 44 ++++++++++++++++++- .../drawers/router/RouterEvaluationManage.vue | 44 ++++++++++++++++++- 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue index 47cff0b1..fd2b24bf 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,6 +262,13 @@ export default { width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.endStudyTime?text.record.endStudyTime:"-"} +
+ ); + }, }, { @@ -258,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/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index 77ad9f00..cf6cd5fa 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,6 +263,13 @@ width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.endStudyTime?text.record.endStudyTime:"-"} +
+ ); + }, }, { @@ -259,6 +294,13 @@ width: 60, align: "center", className: "h", + customRender: (text) => { + return ( +
+ {text.record.PDFstatus?text.record.PDFstatus:"-"} +
+ ); + }, } ] From 26e189de84c39cc5e3a33642576f2850c3842bc1 Mon Sep 17 00:00:00 2001 From: wyx Date: Sat, 7 Jan 2023 13:18:00 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=E8=AF=84=E4=BC=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=83=85=E5=86=B5=E5=88=97=E8=A1=A8=E7=A9=BA?= =?UTF-8?q?=E5=AD=90=E6=AE=B5=E6=B7=BB=E5=8A=A0=E6=A8=AA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/research/ManagePage.vue | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index 748a53cc..4388d352 100644 --- a/src/views/research/ManagePage.vue +++ b/src/views/research/ManagePage.vue @@ -218,30 +218,65 @@ export default { width: 40, dataIndex: "studentCode", key: "studentCode", + customRender: (text) => { + return ( +
+ {text.record.studentCode?text.record.studentCode:"-"} +
+ ); + }, }, { title: "姓名", width: 40, dataIndex: "studentName", key: "studentName", + customRender: (text) => { + return ( +
+ {text.record.studentName?text.record.studentName:"-"} +
+ ); + }, }, { title: "部门", width: 50, dataIndex: "studentDepartName", key: "studentDepartName", + customRender: (text) => { + return ( +
+ {text.record.studentDepartName?text.record.studentDepartName:"-"} +
+ ); + }, }, { width: 50, title: "岗位", dataIndex: "studentJobName", key: "studentJobName", + customRender: (text) => { + return ( +
+ {text.record.studentJobName?text.record.studentJobName:"-"} +
+ ); + }, }, { title: "数据来源", width: 50, dataIndex: "source", key: "source", + customRender: (text) => { + return ( +
+ {text.record.source?text.record.source:"-"} +
+ ); + }, }, // { // title: "项目", @@ -260,6 +295,13 @@ export default { width: 50, dataIndex: "submitTime", key: "submitTime", + customRender: (text) => { + return ( +
+ {text.record.submitTime?text.record.submitTime:"-"} +
+ ); + }, }, { title: "操作", From 17b8053cdd73ec5993f9336cd5e2df4b743354a5 Mon Sep 17 00:00:00 2001 From: wyx Date: Sat, 7 Jan 2023 13:28:21 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=E5=85=AC=E7=94=A8=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=AD=97=E6=AE=B5=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectEvalManage.vue | 6 +++--- src/components/drawers/project/ProjectOnlineManage.vue | 8 ++++---- src/components/drawers/router/RouterCommonManage.vue | 8 ++++---- src/components/drawers/router/RouterEvaluationManage.vue | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue index fd2b24bf..eecc3e8d 100644 --- a/src/components/drawers/project/ProjectEvalManage.vue +++ b/src/components/drawers/project/ProjectEvalManage.vue @@ -273,15 +273,15 @@ export default { { title: "任务状态", - dataIndex: "status", - key: "status", + dataIndex: "finishStatus", + key: "finishStatus", width: 60, align: "center", className: "h", customRender: (text) => { return (
- {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"} + {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}
); }, diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 25a31217..b1cd6316 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -288,15 +288,15 @@ export default { }, { title: "任务状态", - dataIndex: "status", - key: "status", + dataIndex: "finishStatus", + key: "finishStatus", width: 60, align: "center", className: "h", customRender: (text) => { return (
- {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"} + {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}
); }, @@ -403,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 08002b48..3a42dc58 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -288,15 +288,15 @@ export default { }, { title: "任务状态", - dataIndex: "status", - key: "status", + dataIndex: "finishStatus", + key: "finishStatus", width: 60, align: "center", className: "h", customRender: (text) => { return (
- {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"} + {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}
); }, @@ -402,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 cf6cd5fa..7482efe6 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -274,15 +274,15 @@ { title: "任务状态", - dataIndex: "status", - key: "status", + dataIndex: "finishStatus", + key: "finishStatus", width: 60, align: "center", className: "h", customRender: (text) => { return (
- {text.record.status == 0 || text.record.status==null ? "未开始" :text.record.status == 1 ?"已完成":"进行中"} + {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}
); },