提交 dd565ed6 authored 作者: matian's avatar matian

Auto stash before merge of "vite" and "origin/vite"

上级 a415e920
...@@ -31,13 +31,13 @@ export default { ...@@ -31,13 +31,13 @@ export default {
align: 'center' align: 'center'
}, },
{ label: '班级', slots: 'table-name', align: 'center' }, { label: '班级', slots: 'table-name', align: 'center' },
{ label: '平均分', prop: 'cankao_num', align: 'center', sortable: true }, { label: '平均分', prop: 'cankao_num', align: 'center', sortable: 'custom' },
{ label: '客观题平均分', prop: 'efw', align: 'center', sortable: true }, { label: '客观题平均分', prop: 'efw', align: 'center', sortable: 'custom' },
{ label: '客观题最高分', prop: 'average_num', align: 'center', sortable: true }, { label: '客观题最高分', prop: 'average_num', align: 'center', sortable: 'custom' },
{ label: '客观题最低分', prop: 'top', align: 'center', sortable: true }, { label: '客观题最低分', prop: 'top', align: 'center', sortable: 'custom' },
{ label: '主观题平均分', prop: 'low', align: 'center', sortable: true }, { label: '主观题平均分', prop: 'low', align: 'center', sortable: 'custom' },
{ label: '主观题最高分', prop: 'title_num', align: 'center', sortable: true }, { label: '主观题最高分', prop: 'title_num', align: 'center', sortable: 'custom' },
{ label: '主观题最低分', prop: 'title_percent', align: 'center', sortable: true } { label: '主观题最低分', prop: 'title_percent', align: 'center', sortable: 'custom' }
], ],
data: [ data: [
{ {
...@@ -51,11 +51,20 @@ export default { ...@@ -51,11 +51,20 @@ export default {
methods: { methods: {
toPersonal(row) { toPersonal(row) {
this.$router.push({ this.$router.push({
path: '/teacher/data/PersonalList', path: '/teacher/data/exam/PersonalList',
query: { query: {
row: row row: row
} }
}) })
},
sortChange(columns) {
if (columns.order === 'ascending') {
this.tableOptions.remote.params.sort = columns.prop
} else {
columns.prop = '-' + columns.prop
this.tableOptions.remote.params.sort = columns.prop
}
this.$refs.list.refetch()
} }
} }
} }
......
<template> <template>
<el-card class="box-card"> <el-card class="box-card" style="height: 450px">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">题型数据</h1> <h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">题型数据</h1>
</div> </div>
...@@ -12,9 +12,6 @@ ...@@ -12,9 +12,6 @@
<div class="dec dec1">主观题正确率:<span class="dec" style="color: #919191">待评价</span></div> <div class="dec dec1">主观题正确率:<span class="dec" style="color: #919191">待评价</span></div>
</div> </div>
</div> </div>
<div id="type" style="width: 310px; height: 360px"></div>
<div>客观题正确率76%</div>
<div>主观题正确率24%</div>
</el-card> </el-card>
</template> </template>
...@@ -31,9 +28,9 @@ export default { ...@@ -31,9 +28,9 @@ export default {
} }
}, },
grid: { grid: {
left: '30%', left: '10%',
right: '5%', right: '5%',
bottom: '20%', bottom: '10%',
containLabel: true containLabel: true
}, },
xAxis: [ xAxis: [
...@@ -41,7 +38,11 @@ export default { ...@@ -41,7 +38,11 @@ export default {
type: 'category', type: 'category',
data: ['单选题', '多选题', '判断题', '情景题', '实操题'], data: ['单选题', '多选题', '判断题', '情景题', '实操题'],
axisTick: { axisTick: {
alignWithLabel: true alignWithLabel: true,
show: false
},
splitLine: {
show: false
} }
} }
], ],
...@@ -52,6 +53,12 @@ export default { ...@@ -52,6 +53,12 @@ export default {
data: ['0%', '20%', '40%', '60%', '80%', '100%'], data: ['0%', '20%', '40%', '60%', '80%', '100%'],
axisLabel: { axisLabel: {
formatter: '{value} %' formatter: '{value} %'
},
axisLine: {
show: true
},
splitLine: {
show: false
} }
} }
], ],
...@@ -59,7 +66,15 @@ export default { ...@@ -59,7 +66,15 @@ export default {
{ {
type: 'bar', type: 'bar',
barWidth: '30%', barWidth: '30%',
data: [20, 40, 60, 80, 100] data: [20, 40, 60, 80, 100],
itemStyle: {
normal: {
color: function (params) {
const colorList = ['#6F85CC', '#96C080', '#EAC370', '#B170CE', '#D96685']
return colorList[params.dataIndex]
}
}
}
} }
] ]
} }
...@@ -72,4 +87,13 @@ export default { ...@@ -72,4 +87,13 @@ export default {
} }
</script> </script>
<style></style> <style>
.dec {
color: #606266;
font-weight: 400;
font-size: 12px;
}
.dec1 {
margin-left: 80px;
}
</style>
...@@ -27,11 +27,12 @@ export default { ...@@ -27,11 +27,12 @@ export default {
tableOptions() { tableOptions() {
return { return {
remote: {}, remote: {},
height: '200px',
columns: [ columns: [
{ label: '排名', slots: 'paper_title', align: 'center' }, { label: '排名', slots: 'paper_title', align: 'center' },
{ label: '姓名', prop: 'class_name', align: 'center' }, { label: '姓名', prop: 'class_name', align: 'center' },
{ label: '客观题', prop: 'cankao_num', align: 'center', sortable: true }, { label: '客观题', prop: 'cankao_num', align: 'center', sortable: 'custom', minWidth: 100 },
{ label: '主观题', prop: 'efw', align: 'center', sortable: true }, { label: '主观题', prop: 'efw', align: 'center', sortable: true, minWidth: 100 },
{ label: '总分', prop: 'average_num', align: 'center', sortable: true }, { label: '总分', prop: 'average_num', align: 'center', sortable: true },
{ label: '操作', slots: 'table-operate', align: 'center' } { label: '操作', slots: 'table-operate', align: 'center' }
], ],
...@@ -65,7 +66,17 @@ export default { ...@@ -65,7 +66,17 @@ export default {
} }
}, },
methods: { methods: {
toDetail() {} toDetail() {},
// 根据首次缴费时间排序
sortChange(columns) {
if (columns.order === 'ascending') {
this.tableOptions.remote.params.sort = columns.prop
} else {
columns.prop = '-' + columns.prop
this.tableOptions.remote.params.sort = columns.prop
}
this.$refs.list.refetch()
}
} }
} }
</script> </script>
......
...@@ -23,6 +23,7 @@ export default { ...@@ -23,6 +23,7 @@ export default {
tableOptions() { tableOptions() {
return { return {
remote: {}, remote: {},
height: '250px',
columns: [ columns: [
{ label: '排序', prop: 'paper_title', align: 'center' }, { label: '排序', prop: 'paper_title', align: 'center' },
{ label: '题干简述', prop: 'class_name', align: 'center' }, { label: '题干简述', prop: 'class_name', align: 'center' },
...@@ -32,6 +33,24 @@ export default { ...@@ -32,6 +33,24 @@ export default {
{ label: '平均得分', prop: 'top', align: 'center' } { label: '平均得分', prop: 'top', align: 'center' }
], ],
data: [ data: [
{
class_name: 'dsjfks'
},
{
class_name: 'dsjfks'
},
{
class_name: 'dsjfks'
},
{
class_name: 'dsjfks'
},
{
class_name: 'dsjfks'
},
{
class_name: 'dsjfks'
},
{ {
class_name: 'dsjfks' class_name: 'dsjfks'
} }
......
...@@ -4,10 +4,10 @@ const routes = [ ...@@ -4,10 +4,10 @@ const routes = [
component: () => import('@/components/layout/index.vue'), component: () => import('@/components/layout/index.vue'),
children: [ children: [
{ path: '/teacher/data/exam', component: () => import('./views/List.vue') }, { path: '/teacher/data/exam', component: () => import('./views/List.vue') },
{ path: '/teacher/data/class', component: () => import('./views/ClassList.vue') }, { path: '/teacher/data/exam/class', component: () => import('./views/ClassList.vue') },
{ path: '/teacher/data/PersonalList', component: () => import('./views/PersonalList.vue') }, { path: '/teacher/data/exam/PersonalList', component: () => import('./views/PersonalList.vue') },
{ path: '/teacher/data/exam/classDetail', component: () => import('./views/ClassDetail.vue') }, { path: '/teacher/data/exam/classDetail', component: () => import('./views/ClassDetail.vue') },
{ path: '/teacher/data/examData', component: () => import('./views/ExamData.vue') } { path: '/teacher/data/exam/examData', component: () => import('./views/ExamData.vue') }
] ]
} }
] ]
......
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
} }
], ],
columns: [ columns: [
{ label: '考试名称', prop: 'paper_title', slots: 'table-name' }, { label: '考试名称', prop: 'paper_title', align: 'center' },
{ label: '所属课程', prop: 'class_name', align: 'center' }, { label: '所属课程', prop: 'class_name', align: 'center' },
{ label: '参考人数', prop: 'cankao_num', align: 'center' }, { label: '参考人数', prop: 'cankao_num', align: 'center' },
{ label: '参考率', prop: 'rfert', align: 'center' }, { label: '参考率', prop: 'rfert', align: 'center' },
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
{ label: '最低分', prop: 'low', align: 'center' }, { label: '最低分', prop: 'low', align: 'center' },
{ label: '题目总数', prop: 'title_num', align: 'center' }, { label: '题目总数', prop: 'title_num', align: 'center' },
{ label: '及格率', prop: 'title_percent', align: 'center' }, { label: '及格率', prop: 'title_percent', align: 'center' },
{ label: '操作', slots: 'table-operate', align: 'center', width: '150' } { label: '操作', slots: 'table-operate', align: 'center', minWidth: 150 }
], ],
data: [ data: [
{ {
...@@ -76,7 +76,7 @@ export default { ...@@ -76,7 +76,7 @@ export default {
methods: { methods: {
toExamData(row) { toExamData(row) {
this.$router.push({ this.$router.push({
path: '/teacher/data/examData', path: '/teacher/data/exam/examData',
query: { query: {
row: row row: row
} }
...@@ -85,7 +85,7 @@ export default { ...@@ -85,7 +85,7 @@ export default {
// 班级数据 // 班级数据
toClassData(row) { toClassData(row) {
this.$router.push({ this.$router.push({
path: '/teacher/data/class', path: '/teacher/data/exam/class',
query: { query: {
row: row row: row
} }
......
...@@ -37,7 +37,7 @@ export default { ...@@ -37,7 +37,7 @@ export default {
{ label: '最低分', prop: 'et43453', align: 'center' }, { label: '最低分', prop: 'et43453', align: 'center' },
{ label: '题目总数', prop: 'rwr2rq', align: 'center' }, { label: '题目总数', prop: 'rwr2rq', align: 'center' },
{ label: '及格率', prop: 'dwefw', align: 'center' }, { label: '及格率', prop: 'dwefw', align: 'center' },
{ label: '操作', slots: 'table-operate', align: 'center' } { label: '操作', slots: 'table-operate', align: 'center', width: '150' }
], ],
data: [{ paper_title: 'adsada' }] data: [{ paper_title: 'adsada' }]
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论