hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-21 08:46:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并

Browse Source
This commit is contained in:
lixg
2023-01-07 14:41:45 +08:00
parent 8346807ce0 17b8053cdd
commit ec61608e52
11 changed files with 521 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/components/drawers/project/ProjectEvalManage.vue
View File

@@ -187,6 +187,13 @@ export default {
width: 50,
align: "center",
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
</div>
);
},
},
{
title: "姓名",
@@ -195,6 +202,13 @@ export default {
width: 50,
align: "left",
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentName?text.record.studentName:"-"}</span>
</div>
);
},
},
{
title: "所在部门",
@@ -203,6 +217,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
</div>
);
},
},
{
title: "所在岗位",
@@ -211,6 +232,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
</div>
);
},
},
{
title: "学员关卡",
@@ -222,7 +250,7 @@ export default {
customRender: () => {
return (
<div class="racona">
<span> {props.levelName}</span>
<span> {props.levelName?props.levelName:'-'}</span>
</div>
);
},
@@ -234,15 +262,29 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.endStudyTime?text.record.endStudyTime:"-"}</span>
</div>
);
},
},
{
title: "任务状态",
dataIndex: "status",
key: "status",
dataIndex: "finishStatus",
key: "finishStatus",
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}</span>
</div>
);
},
},
{
title: "PDF状态",
@@ -251,6 +293,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.PDFstatus?text.record.PDFstatus:"-"}</span>
</div>
);
},
}
]
return columns;

53
src/components/drawers/project/ProjectExamManage.vue
View File

@@ -186,7 +186,14 @@ export default {
key: "studentCode",
width: 50,
align: "center",
className: "h head"
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentCode?text.record.studentCode:"-"}</span>
</div>
);
},
},
{
title: "姓名",
@@ -195,6 +202,13 @@ export default {
width: 50,
align: "left",
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentName?text.record.studentName:"-"}</span>
</div>
);
},
},
{
title: "所在部门",
@@ -203,6 +217,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
</div>
);
},
},
{
title: "所在岗位",
@@ -211,6 +232,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
</div>
);
},
},
{
title: "考试次数",
@@ -219,6 +247,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.testNumber?text.record.testNumber:"-"}</span>
</div>
);
},
},
{
title: "成绩",
@@ -227,6 +262,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.score?text.record.score:"-"}</span>
</div>
);
},
},
{
@@ -236,6 +278,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.finishedTime?text.record.finishedTime:"-"}</span>
</div>
);
},
},
{
title: "任务状态",
@@ -248,7 +297,7 @@ export default {
console.log(text.record.status);
return (
<div class="racona">
<span> {text.record.status==0?"未开始":text.record.status==10?"未通过":"已通过"}</span>
<span> {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}</span>
</div>
);
},

43
src/components/drawers/project/ProjectOnlineManage.vue
View File

@@ -203,6 +203,13 @@ export default {
width: 50,
align: "center",
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
</div>
);
},
},
{
title: "姓名",
@@ -211,6 +218,13 @@ export default {
width: 50,
align: "center",
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentName?text.record.studentName:"-"}</span>
</div>
);
},
},
{
title: "所在部门",
@@ -219,6 +233,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
</div>
);
},
},
{
title: "所在岗位",
@@ -227,6 +248,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
</div>
);
},
},
{
title: "学员关卡",
@@ -250,18 +278,25 @@ export default {
width: 100,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.lastStudyTime?text.record.lastStudyTime:"-"}</span>
</div>
);
},
},
{
title: "任务状态",
dataIndex: "status",
key: "status",
dataIndex: "finishStatus",
key: "finishStatus",
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.status == 0 ? "未完成" : "已完成"}</span>
<span> {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}</span>
</div>
);
},
@@ -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)
}

43
src/components/drawers/router/RouterCommonManage.vue
View File

@@ -203,6 +203,13 @@ export default {
width: 50,
align: "center",
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
</div>
);
},
},
{
title: "姓名",
@@ -211,6 +218,13 @@ export default {
width: 50,
align: "center",
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentName?text.record.studentName:"-"}</span>
</div>
);
},
},
{
title: "所在部门",
@@ -219,6 +233,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
</div>
);
},
},
{
title: "所在岗位",
@@ -227,6 +248,13 @@ export default {
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
</div>
);
},
},
{
title: "学员关卡",
@@ -250,18 +278,25 @@ export default {
width: 100,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.lastStudyTime?text.record.lastStudyTime:"-"}</span>
</div>
);
},
},
{
title: "任务状态",
dataIndex: "status",
key: "status",
dataIndex: "finishStatus",
key: "finishStatus",
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.status == 0 ? "未完成" : "已完成"}</span>
<span> {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}</span>
</div>
);
},
@@ -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)
}

55
src/components/drawers/router/RouterEvaluationManage.vue
View File

@@ -188,6 +188,13 @@
width: 50,
align: "center",
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentUserNo?text.record.studentUserNo:"-"}</span>
</div>
);
},
},
{
title: "姓名",
@@ -196,6 +203,13 @@
width: 50,
align: "left",
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentName?text.record.studentName:"-"}</span>
</div>
);
},
},
{
title: "所在部门",
@@ -204,6 +218,13 @@
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
</div>
);
},
},
{
title: "所在岗位",
@@ -212,6 +233,13 @@
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
</div>
);
},
},
{
title: "学员关卡",
@@ -223,7 +251,7 @@
customRender: () => {
return (
<div class="racona">
<span> {props.levelName}</span>
<span> {props.levelName?props.levelName:'-'}</span>
</div>
);
},
@@ -235,15 +263,29 @@
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.endStudyTime?text.record.endStudyTime:"-"}</span>
</div>
);
},
},
{
title: "任务状态",
dataIndex: "status",
key: "status",
dataIndex: "finishStatus",
key: "finishStatus",
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.finishStatus == 0 || text.record.finishStatus==null ? "未开始" :text.record.finishStatus == 1 ?"已完成":"进行中"}</span>
</div>
);
},
},
{
title: "PDF状态",
@@ -252,6 +294,13 @@
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.PDFstatus?text.record.PDFstatus:"-"}</span>
</div>
);
},
}
]

53
src/components/drawers/router/RouterExaminationManage.vue
View File

@@ -190,7 +190,14 @@
key: "studentCode",
width: 50,
align: "center",
className: "h head"
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentCode?text.record.studentCode:"-"}</span>
</div>
);
},
},
{
title: "姓名",
@@ -199,6 +206,13 @@
width: 50,
align: "left",
className: "h head",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentName?text.record.studentName:"-"}</span>
</div>
);
},
},
{
title: "所在部门",
@@ -207,6 +221,13 @@
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentDepartName?text.record.studentDepartName:"-"}</span>
</div>
);
},
},
{
title: "所在岗位",
@@ -215,6 +236,13 @@
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.studentJobName?text.record.studentJobName:"-"}</span>
</div>
);
},
},
{
title: "学员关卡",
@@ -238,6 +266,13 @@
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.testNumber?text.record.testNumber:"-"}</span>
</div>
);
},
},
{
title: "成绩",
@@ -246,6 +281,13 @@
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.score?text.record.score:"-"}</span>
</div>
);
},
},
{
@@ -255,6 +297,13 @@
width: 60,
align: "center",
className: "h",
customRender: (text) => {
return (
<div class="racona">
<span> {text.record.finishedTime?text.record.finishedTime:"-"}</span>
</div>
);
},
},
{
title: "任务状态",
@@ -267,7 +316,7 @@
console.log(text.record.status);
return (
<div class="racona">
<span> {text.record.status==0?"未开始":text.record.status==10?"未通过":"已通过"}</span>
<span> {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}</span>
</div>
);
},