From 52bababcbe4148efdacf94e08ae65602d216cea9 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 19 Jan 2023 23:50:57 +0800
Subject: [PATCH] =?UTF-8?q?--fix=20bug=20=E8=80=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../drawers/project/ProjectExamManage.vue | 89 +++++++------------
.../router/RouterExaminationManage.vue | 82 ++++++-----------
2 files changed, 58 insertions(+), 113 deletions(-)
diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index ecdf0412..4d7ea2ce 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -183,15 +183,15 @@ export default {
tablecolumns: [
{
title: "工号",
- dataIndex: "studentCode",
- key: "studentCode",
+ dataIndex: "studentUserNo",
+ key: "studentUserNo",
width: 60,
align: "center",
className: "h head",
customRender: (text) => {
return (
- {text.record.studentCode?text.record.studentCode:"-"}
+ {text.record.studentUserNo?text.record.studentUserNo:"-"}
);
},
@@ -245,8 +245,8 @@ export default {
},
{
title: "考试次数",
- dataIndex: "testNumber",
- key: "testNumber",
+ dataIndex: "num",
+ key: "num",
width: 60,
align: "center",
ellipsis: true,
@@ -254,15 +254,15 @@ export default {
customRender: (text) => {
return (
- {text.record.testNumber?text.record.testNumber:"-"}
+ {text.record.num?text.record.num:"-"}
);
},
},
{
title: "成绩",
- dataIndex: "score",
- key: "score",
+ dataIndex: "examinationScore",
+ key: "examinationScore",
width: 60,
align: "center",
ellipsis: true,
@@ -270,7 +270,7 @@ export default {
customRender: (text) => {
return (
- {text.record.score?text.record.score:"-"}
+ {text.record.examinationScore?text.record.examinationScore:"-"}
);
},
@@ -278,8 +278,8 @@ export default {
{
title: "完成时间",
- dataIndex: "finishedTime",
- key: "finishedTime",
+ dataIndex: "examinationSubmitTime",
+ key: "examinationSubmitTime",
width: 60,
align: "center",
ellipsis: true,
@@ -287,27 +287,20 @@ export default {
customRender: (text) => {
return (
- {text.record.finishedTime?text.record.finishedTime:"-"}
+ {text.record.examinationSubmitTime?text.record.examinationSubmitTime:"-"}
);
},
},
{
title: "任务状态",
- dataIndex: "status",
- key: "status",
+ dataIndex: "finishStatus",
+ key: "finishStatus",
width: 60,
align: "center",
ellipsis: true,
className: "h",
- customRender: (text) => {
- console.log(text.record.status);
- return (
-
- {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}
-
- );
- },
+ customRender: ({record:{finishStatus}}) => ({1:'通过',2:'未通过'}[finishStatus] || '未开始'),
},
],
loadingData: true
@@ -354,40 +347,19 @@ export default {
// 获取数据
function getData() {
- console.log('我是传递的参数',{
- "chapterId": props.datasource.stageId,
- "pageNo": state.currentPage,
- "pageSize": state.pageSize,
- "studentName": state.name,
- "status": state.projectName,
- "targetId": props.datasource.projectId,
- "taskId": props.datasource.courseId,
- "type": 1
- })
- api.ExamManagementMessage({
- "chapterId": props.datasource.stageId,
- "pageNo": state.currentPage,
- "pageSize": state.pageSize,
- "studentName": state.name,
- "status": state.projectName,
- "targetId": props.datasource.projectId,
- "taskId": props.datasource.courseId,
- "type": 1
+ api.AssessmentManagementMessage({
+ pageNo: state.currentPage,
+ pageSize: state.pageSize,
+ currentStageId: props.datasource.stageId,
+ type: 1,
+ pid: props.datasource.projectId,
+ taskId: props.datasource.projectTaskId,
+ 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{
- console.log(err)
+ state.tabledata = res.data.data.records;
+ state.tableDataTotal = res.data.data.total;
state.loadingData = false;
})
}
@@ -414,10 +386,9 @@ export default {
{/* 导出数据 */}
function exportData() {
- console.log(props.datasource)
- console.log(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`)
- window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`)
-
+ // window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`)
+ window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`)
+
{/* api.ExportExam({
"chapterId": props.datasource.chapterId,
"targetId": props.datasource.routerId,
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index cc194838..9261da8d 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -186,15 +186,15 @@ export default {
tablecolumns: [
{
title: "工号",
- dataIndex: "studentCode",
- key: "studentCode",
+ dataIndex: "studentUserNo",
+ key: "studentUserNo",
width: 120,
align: "center",
className: "h head",
customRender: (text) => {
return (
- {text.record.studentCode?text.record.studentCode:"-"}
+ {text.record.studentUserNo?text.record.studentUserNo:"-"}
);
},
@@ -263,8 +263,8 @@ export default {
},
{
title: "考试次数",
- dataIndex: "testNumber",
- key: "testNumber",
+ dataIndex: "num",
+ key: "num",
width: 60,
align: "center",
ellipsis: true,
@@ -272,7 +272,7 @@ export default {
customRender: (text) => {
return (
- {text.record.testNumber?text.record.testNumber:"-"}
+ {text.record.num?text.record.num:"-"}
);
},
@@ -288,7 +288,7 @@ export default {
customRender: (text) => {
return (
- {text.record.score?text.record.score:"-"}
+ {text.record.examinationScore?text.record.examinationScore:"-"}
);
},
@@ -296,8 +296,8 @@ export default {
{
title: "完成时间",
- dataIndex: "finishedTime",
- key: "finishedTime",
+ dataIndex: "examinationSubmitTime",
+ key: "examinationSubmitTime",
width: 60,
align: "center",
ellipsis: true,
@@ -305,27 +305,20 @@ export default {
customRender: (text) => {
return (
- {text.record.finishedTime?text.record.finishedTime:"-"}
+ {text.record.examinationSubmitTime?text.record.examinationSubmitTime:"-"}
);
},
},
{
title: "任务状态",
- dataIndex: "status",
- key: "status",
+ dataIndex: "finishStatus",
+ key: "finishStatus",
width: 60,
align: "center",
ellipsis: true,
className: "h",
- customRender: (text) => {
- console.log(text.record.status);
- return (
-
- {text.record.status==0||text.record.status==null?"未开始":text.record.status==10?"未通过":"已通过"}
-
- );
- },
+ customRender: ({record:{finishStatus}}) => ({1:'通过',2:'未通过'}[finishStatus] || '未开始'),
},
],
loadingData: true
@@ -372,40 +365,19 @@ export default {
// 获取数据
function getData() {
- console.log('我是传递的参数',{
- "chapterId": props.datasource.chapterId,
- "pageNo": state.currentPage,
- "pageSize": state.pageSize,
- "studentName": state.name,
- "status": state.projectName,
- "targetId": props.datasource.routerId,
- "taskId": props.datasource.courseId,
- "type": 1
- })
- api.ExamManagementMessage({
- "chapterId": props.datasource.chapterId,
- "pageNo": state.currentPage,
- "pageSize": state.pageSize,
- "studentName": state.name,
- "status": state.projectName,
- "targetId": props.datasource.routerId,
- "taskId": props.datasource.courseId,
- "type": 1
+ 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{
- console.log(err)
+ state.tabledata = res.data.data.records;
+ state.tableDataTotal = res.data.data.total;
state.loadingData = false;
})
}
@@ -433,7 +405,9 @@ export default {
{/* 导出数据 */}
function exportData() {
- window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
+ // window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`)
+ window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`)
+
{/* api.ExportExam({
"chapterId": props.datasource.chapterId,
"targetId": props.datasource.routerId,