fix: BUG修改
This commit is contained in:
kun
parent
77df5422fd
commit
37bb04f76b
@ -112,6 +112,11 @@
|
|||||||
<!-- {{scope.row.passRadio}}% -->
|
<!-- {{scope.row.passRadio}}% -->
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
align="center"
|
||||||
|
prop="examNum"
|
||||||
|
label="重考次数"
|
||||||
|
></el-table-column>
|
||||||
<el-table-column width="220" label="操作" align="center">
|
<el-table-column width="220" label="操作" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div style="display: flex; justify-content: center">
|
<div style="display: flex; justify-content: center">
|
||||||
@ -296,7 +301,7 @@
|
|||||||
></el-date-picker>
|
></el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="item-flex">
|
<div class="item-flex" v-if="addCourseForm.examPaperId">
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="重考次数"
|
label="重考次数"
|
||||||
prop="examNum"
|
prop="examNum"
|
||||||
|
|||||||
@ -10,58 +10,128 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div> -->
|
</div> -->
|
||||||
<el-tabs v-model="activeName" @tab-click="handleClick" style="padding: 0 15px">
|
<el-tabs
|
||||||
|
v-model="activeName"
|
||||||
|
@tab-click="handleClick"
|
||||||
|
style="padding: 0 15px"
|
||||||
|
>
|
||||||
<el-tab-pane :label="'学习记录'" name="study">
|
<el-tab-pane :label="'学习记录'" name="study">
|
||||||
<div class="rewards_wrap">
|
<div class="rewards_wrap">
|
||||||
<el-table class="tables" align="center" :data="tableList">
|
<el-table class="tables" align="center" :data="tableList">
|
||||||
<el-table-column prop="workerName" :label="'姓名'"></el-table-column>
|
<el-table-column
|
||||||
<el-table-column prop="courseName" :label="'课程名称'"></el-table-column>
|
prop="workerName"
|
||||||
<el-table-column prop="workerCard" :label="'身份证号'"></el-table-column>
|
:label="'姓名'"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="courseName"
|
||||||
|
:label="'课程名称'"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="workerCard"
|
||||||
|
:label="'身份证号'"
|
||||||
|
></el-table-column>
|
||||||
<el-table-column :label="'培训计划名称'">
|
<el-table-column :label="'培训计划名称'">
|
||||||
<template>
|
<template>
|
||||||
{{ trainPlan.name }}
|
{{ trainPlan.name }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="beginTime" :label="'开始学习时间'"></el-table-column>
|
<el-table-column
|
||||||
<el-table-column prop="endTime" :label="'结束学习时间'"></el-table-column>
|
prop="beginTime"
|
||||||
|
:label="'开始学习时间'"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="endTime"
|
||||||
|
:label="'结束学习时间'"
|
||||||
|
></el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<el-pagination class="pagerBox" @size-change="sizeChange" @current-change="currentChange" :current-page="pagInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pagInfo.pageSize" layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background></el-pagination>
|
<el-pagination
|
||||||
|
class="pagerBox"
|
||||||
|
@size-change="sizeChange"
|
||||||
|
@current-change="currentChange"
|
||||||
|
:current-page="pagInfo.pageNo"
|
||||||
|
:page-sizes="$store.state.PAGESIZRS"
|
||||||
|
:page-size="pagInfo.pageSize"
|
||||||
|
layout="total, sizes, prev, pager, next"
|
||||||
|
:total="Number(pagInfo.total)"
|
||||||
|
background
|
||||||
|
></el-pagination>
|
||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
|
|
||||||
<el-tab-pane :label="'考试记录'" name="exam">
|
<el-tab-pane :label="'考试记录'" name="exam">
|
||||||
<div class="rewards_wrap">
|
<div class="rewards_wrap">
|
||||||
<el-table class="tables" :align="'center'" :data="tableList">
|
<el-table class="tables" :align="'center'" :data="tableList">
|
||||||
<el-table-column prop="workerName" :label="'姓名'"></el-table-column>
|
<el-table-column
|
||||||
|
prop="workerName"
|
||||||
|
:label="'姓名'"
|
||||||
|
></el-table-column>
|
||||||
<el-table-column prop="subjectName" :label="'科目名称'">
|
<el-table-column prop="subjectName" :label="'科目名称'">
|
||||||
<template>
|
<template>
|
||||||
{{ trainPlan.subjectName }}
|
{{ trainPlan.subjectName }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="examPaperName" :label="'考试名称'"></el-table-column>
|
<el-table-column
|
||||||
|
prop="examPaperName"
|
||||||
|
:label="'考试名称'"
|
||||||
|
></el-table-column>
|
||||||
<el-table-column :label="'培训计划名称'">
|
<el-table-column :label="'培训计划名称'">
|
||||||
<template>
|
<template>
|
||||||
{{ trainPlan.name }}
|
{{ trainPlan.name }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="workerCard" :label="'身份证号'"></el-table-column>
|
<el-table-column
|
||||||
<el-table-column prop="startExamTime" :label="'开始考试时间'"></el-table-column>
|
prop="workerCard"
|
||||||
<el-table-column prop="duration" :label="'作答时长'"></el-table-column>
|
:label="'身份证号'"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="startExamTime"
|
||||||
|
:label="'开始考试时间'"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="duration"
|
||||||
|
:label="'作答时长'"
|
||||||
|
></el-table-column>
|
||||||
<el-table-column prop="isPass" :label="'考试结果'">
|
<el-table-column prop="isPass" :label="'考试结果'">
|
||||||
<template slot-scope="scope">{{scope.row.isPass === 1 ? '合格':'不合格'}}</template>
|
<template slot-scope="scope">{{
|
||||||
|
scope.row.isPass === 1 ? "合格" : "不合格"
|
||||||
|
}}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="totalScore" :label="'考试总分'"></el-table-column>
|
<el-table-column
|
||||||
|
prop="totalScore"
|
||||||
|
:label="'考试总分'"
|
||||||
|
></el-table-column>
|
||||||
<el-table-column prop="score" :label="'考得分'"></el-table-column>
|
<el-table-column prop="score" :label="'考得分'"></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
align="center"
|
||||||
|
prop="examCount"
|
||||||
|
label="剩余重考次数"
|
||||||
|
></el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<el-pagination class="pagerBox" @size-change="sizeChange" @current-change="currentChange" :current-page="pagInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pagInfo.pageSize" layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background></el-pagination>
|
<el-pagination
|
||||||
|
class="pagerBox"
|
||||||
|
@size-change="sizeChange"
|
||||||
|
@current-change="currentChange"
|
||||||
|
:current-page="pagInfo.pageNo"
|
||||||
|
:page-sizes="$store.state.PAGESIZRS"
|
||||||
|
:page-size="pagInfo.pageSize"
|
||||||
|
layout="total, sizes, prev, pager, next"
|
||||||
|
:total="Number(pagInfo.total)"
|
||||||
|
background
|
||||||
|
></el-pagination>
|
||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
|
|
||||||
<el-tab-pane :label="'未学习统计'" name="noStudy">
|
<el-tab-pane :label="'未学习统计'" name="noStudy">
|
||||||
<div class="rewards_wrap">
|
<div class="rewards_wrap">
|
||||||
<el-table class="tables" align="center" :data="tableList">
|
<el-table class="tables" align="center" :data="tableList">
|
||||||
<el-table-column prop="workerName" :label="'姓名'"></el-table-column>
|
<el-table-column
|
||||||
<el-table-column prop="workerCard" :label="'身份证号'"></el-table-column>
|
prop="workerName"
|
||||||
|
:label="'姓名'"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="workerCard"
|
||||||
|
:label="'身份证号'"
|
||||||
|
></el-table-column>
|
||||||
<el-table-column :label="'培训计划名称'">
|
<el-table-column :label="'培训计划名称'">
|
||||||
<template>
|
<template>
|
||||||
{{ trainPlan.name }}
|
{{ trainPlan.name }}
|
||||||
@ -78,15 +148,31 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<el-pagination class="pagerBox" @size-change="sizeChange" @current-change="currentChange" :current-page="pagInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pagInfo.pageSize" layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background></el-pagination>
|
<el-pagination
|
||||||
|
class="pagerBox"
|
||||||
|
@size-change="sizeChange"
|
||||||
|
@current-change="currentChange"
|
||||||
|
:current-page="pagInfo.pageNo"
|
||||||
|
:page-sizes="$store.state.PAGESIZRS"
|
||||||
|
:page-size="pagInfo.pageSize"
|
||||||
|
layout="total, sizes, prev, pager, next"
|
||||||
|
:total="Number(pagInfo.total)"
|
||||||
|
background
|
||||||
|
></el-pagination>
|
||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
|
|
||||||
<el-tab-pane :label="'未考试统计'" name="noExam">
|
<el-tab-pane :label="'未考试统计'" name="noExam">
|
||||||
<div class="rewards_wrap">
|
<div class="rewards_wrap">
|
||||||
<el-table class="tables" align="center" :data="tableList">
|
<el-table class="tables" align="center" :data="tableList">
|
||||||
<el-table-column prop="workerName" :label="'姓名'"></el-table-column>
|
<el-table-column
|
||||||
<el-table-column prop="workerCard" :label="'身份证号'"></el-table-column>
|
prop="workerName"
|
||||||
|
:label="'姓名'"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="workerCard"
|
||||||
|
:label="'身份证号'"
|
||||||
|
></el-table-column>
|
||||||
<el-table-column :label="'培训计划名称'">
|
<el-table-column :label="'培训计划名称'">
|
||||||
<template>
|
<template>
|
||||||
{{ trainPlan.name }}
|
{{ trainPlan.name }}
|
||||||
@ -103,7 +189,17 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<el-pagination class="pagerBox" @size-change="sizeChange" @current-change="currentChange" :current-page="pagInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pagInfo.pageSize" layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background></el-pagination>
|
<el-pagination
|
||||||
|
class="pagerBox"
|
||||||
|
@size-change="sizeChange"
|
||||||
|
@current-change="currentChange"
|
||||||
|
:current-page="pagInfo.pageNo"
|
||||||
|
:page-sizes="$store.state.PAGESIZRS"
|
||||||
|
:page-size="pagInfo.pageSize"
|
||||||
|
layout="total, sizes, prev, pager, next"
|
||||||
|
:total="Number(pagInfo.total)"
|
||||||
|
background
|
||||||
|
></el-pagination>
|
||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
@ -114,19 +210,15 @@
|
|||||||
import {
|
import {
|
||||||
pageStudyRecordApi,
|
pageStudyRecordApi,
|
||||||
pageRecordApi,
|
pageRecordApi,
|
||||||
getExamTrainRecordApi
|
getExamTrainRecordApi,
|
||||||
} from '@/assets/js/api/examSystem/examSystem'
|
} from "@/assets/js/api/examSystem/examSystem";
|
||||||
export default {
|
export default {
|
||||||
props: ["trainPlan", "isSuperDanger"],
|
props: ["trainPlan", "isSuperDanger"],
|
||||||
computed:{
|
computed: {},
|
||||||
|
|
||||||
},
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
projectSn: "",
|
||||||
|
activeName: "study", //tab切换
|
||||||
projectSn: '',
|
|
||||||
activeName: 'study', //tab切换
|
|
||||||
pagInfo: {
|
pagInfo: {
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
@ -134,104 +226,104 @@ export default {
|
|||||||
},
|
},
|
||||||
tableList: [],
|
tableList: [],
|
||||||
dialogVisible: false, //弹窗
|
dialogVisible: false, //弹窗
|
||||||
}
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.projectSn = this.$store.state.projectSn
|
this.projectSn = this.$store.state.projectSn;
|
||||||
this.getRecordList()
|
this.getRecordList();
|
||||||
console.log('11111111111111111')
|
console.log("11111111111111111");
|
||||||
console.log(this.trainPlan)
|
console.log(this.trainPlan);
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
"activeName"() {
|
activeName() {
|
||||||
this.pagInfo.pageNo = 1;
|
this.pagInfo.pageNo = 1;
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
arrayLength(val) {
|
arrayLength(val) {
|
||||||
console.log('==================================')
|
console.log("==================================");
|
||||||
// console.log(val.correctAnswers.length)
|
// console.log(val.correctAnswers.length)
|
||||||
let arr = val.correctAnswers
|
let arr = val.correctAnswers;
|
||||||
let len = arr.reduce((acc) => acc + 1, 0)
|
let len = arr.reduce((acc) => acc + 1, 0);
|
||||||
return len;
|
return len;
|
||||||
},
|
},
|
||||||
//分页查询
|
//分页查询
|
||||||
getRecordList() {
|
getRecordList() {
|
||||||
let data = {}
|
let data = {};
|
||||||
data.pageNo = this.pagInfo.pageNo;
|
data.pageNo = this.pagInfo.pageNo;
|
||||||
data.pageSize = this.pagInfo.pageSize;
|
data.pageSize = this.pagInfo.pageSize;
|
||||||
|
|
||||||
data.projectSn = this.projectSn;
|
data.projectSn = this.projectSn;
|
||||||
data.trainId = this.trainPlan.id
|
data.trainId = this.trainPlan.id;
|
||||||
|
|
||||||
if (this.activeName == 'study') {
|
if (this.activeName == "study") {
|
||||||
data.number = 1
|
data.number = 1;
|
||||||
// data.userEnterpriseId = this.$store.state.userInfo.userEnterpriseId;
|
// data.userEnterpriseId = this.$store.state.userInfo.userEnterpriseId;
|
||||||
pageStudyRecordApi(data).then((res) => {
|
pageStudyRecordApi(data).then((res) => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
this.tableList = res.result.records
|
this.tableList = res.result.records;
|
||||||
this.pagInfo.total = res.result.total
|
this.pagInfo.total = res.result.total;
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
if (this.activeName == 'exam') {
|
if (this.activeName == "exam") {
|
||||||
data.examNum = 1
|
data.examNum = 1;
|
||||||
// pageRecordApi(data).then((res) => {
|
// pageRecordApi(data).then((res) => {
|
||||||
getExamTrainRecordApi(data).then((res) => {
|
getExamTrainRecordApi(data).then((res) => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
this.tableList = res.result.records
|
this.tableList = res.result.records;
|
||||||
this.pagInfo.total = res.result.total
|
this.pagInfo.total = res.result.total;
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
if (this.activeName == 'noStudy') {
|
if (this.activeName == "noStudy") {
|
||||||
data.number = 0
|
data.number = 0;
|
||||||
// data.userEnterpriseId = this.$store.state.userInfo.userEnterpriseId;
|
// data.userEnterpriseId = this.$store.state.userInfo.userEnterpriseId;
|
||||||
pageStudyRecordApi(data).then((res) => {
|
pageStudyRecordApi(data).then((res) => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
this.tableList = res.result.records
|
this.tableList = res.result.records;
|
||||||
this.pagInfo.total = res.result.total
|
this.pagInfo.total = res.result.total;
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
if (this.activeName == 'noExam') {
|
if (this.activeName == "noExam") {
|
||||||
data.examNum = 0
|
data.examNum = 0;
|
||||||
// pageRecordApi(data).then((res) => {
|
// pageRecordApi(data).then((res) => {
|
||||||
getExamTrainRecordApi(data).then((res) => {
|
getExamTrainRecordApi(data).then((res) => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
this.tableList = res.result.records
|
this.tableList = res.result.records;
|
||||||
this.pagInfo.total = res.result.total
|
this.pagInfo.total = res.result.total;
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
//切换Tab记录类型
|
//切换Tab记录类型
|
||||||
handleClick(val) {
|
handleClick(val) {
|
||||||
this.activeName = val.name
|
this.activeName = val.name;
|
||||||
this.pagInfo = {
|
this.pagInfo = {
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
total: 0,
|
total: 0,
|
||||||
}
|
};
|
||||||
this.getRecordList()
|
this.getRecordList();
|
||||||
},
|
},
|
||||||
//详情按钮
|
//详情按钮
|
||||||
detailInfoBtn(val) {
|
detailInfoBtn(val) {
|
||||||
this.dialogVisible = true
|
this.dialogVisible = true;
|
||||||
},
|
},
|
||||||
//切换条数
|
//切换条数
|
||||||
sizeChange(val) {
|
sizeChange(val) {
|
||||||
this.pagInfo.pageSize = val
|
this.pagInfo.pageSize = val;
|
||||||
this.getRecordList()
|
this.getRecordList();
|
||||||
},
|
},
|
||||||
//切换页数
|
//切换页数
|
||||||
currentChange(val) {
|
currentChange(val) {
|
||||||
this.pagInfo.pageNo = val
|
this.pagInfo.pageNo = val;
|
||||||
this.getRecordList()
|
this.getRecordList();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@ -293,11 +385,11 @@ export default {
|
|||||||
margin-left: 20px;
|
margin-left: 20px;
|
||||||
}
|
}
|
||||||
::v-deep .is-checked .el-checkbox__inner {
|
::v-deep .is-checked .el-checkbox__inner {
|
||||||
background-color: #5181F6;
|
background-color: #5181f6;
|
||||||
border-color: #5181F6;
|
border-color: #5181f6;
|
||||||
}
|
}
|
||||||
::v-deep .el-checkbox__inner::after {
|
::v-deep .el-checkbox__inner::after {
|
||||||
border-color:#fff
|
border-color: #fff;
|
||||||
}
|
}
|
||||||
.el-checkbox {
|
.el-checkbox {
|
||||||
// background-color: #5181F6;
|
// background-color: #5181F6;
|
||||||
@ -306,7 +398,6 @@ export default {
|
|||||||
}
|
}
|
||||||
.isCorrect {
|
.isCorrect {
|
||||||
margin-left: 20px;
|
margin-left: 20px;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user