Skip to content

X
x-learn
提交 1ddb3ed2 authored 作者: lihuihui's avatar lihuihui
浏览文件
操作

Merge branch 'vite' of https://gitlab.ezijing.com/ezijing/x-learn into vite

# Conflicts: # src/modules/teacher/data/exam/components/Result.vue # src/modules/teacher/data/exam/components/ScoreRange.vue
上级 48aa9258 21fd47ec
隐藏空白字符变更
内嵌 并排
正在显示 包含 101 行增加 和 60 行删除
src/modules/teacher/data/exam/components/Finished.vue
浏览文件 @ 1ddb3ed2
......@@ -20,7 +20,11 @@ export default {
remote: {},
columns: [
{ label: '排名', prop: 'paper_title', align: 'center' },
{
label: '排名',
prop: 'paper_title',
align: 'center'
},
{ label: '班级', slots: 'table-name', align: 'center' },
{ label: '平均分', prop: 'cankao_num', align: 'center', sortable: true },
{ label: '客观题平均分', prop: 'efw', align: 'center', sortable: true },
......
src/modules/teacher/data/exam/components/QuestionType.vue
浏览文件 @ 1ddb3ed2
<template>
<el-card class="box-card">
<el-card class="box-card" style="height: 450px">
<div slot="header" class="clearfix">
<h1 style="font-size: 28px">题型数据</h1>
<h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">题型数据</h1>
</div>
<div style="height: 350px; width: 90%; margin: 0 auto">
<div id="type" style="width: 100%; height: 90%"></div>
<div style="margin-bottom: 10px">
<div class="dec dec1">客观题正确率：<span class="dec" style="color: #aa1941">待评价</span></div>
<div class="dec dec1">主观题正确率：<span class="dec" style="color: #919191">待评价</span></div>
</div>
</div>
<div id="type" style="width: 310px; height: 360px"></div>
<div>客观题正确率76%</div>
<div>主观题正确率24%</div>
</el-card>
</template>
......@@ -22,9 +26,9 @@ export default {
}
},
grid: {
left: '30%',
left: '10%',
right: '5%',
bottom: '20%',
bottom: '10%',
containLabel: true
},
xAxis: [
......@@ -32,7 +36,11 @@ export default {
type: 'category',
data: ['单选题', '多选题', '判断题', '情景题', '实操题'],
axisTick: {
alignWithLabel: true
alignWithLabel: true,
show: false
},
splitLine: {
show: false
}
}
],
......@@ -43,6 +51,12 @@ export default {
data: ['0%', '20%', '40%', '60%', '80%', '100%'],
axisLabel: {
formatter: '{value} %'
},
axisLine: {
show: true
},
splitLine: {
show: false
}
}
],
......@@ -51,7 +65,15 @@ export default {
name: 'Direct',
type: 'bar',
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]
}
}
}
}
]
}
......@@ -64,4 +86,13 @@ export default {
}
</script>
<style></style>
<style>
.dec {
color: #606266;
font-weight: 400;
font-size: 12px;
}
.dec1 {
margin-left: 80px;
}
</style>
src/modules/teacher/data/exam/components/Result.vue
浏览文件 @ 1ddb3ed2
<template>
<el-card class="box-card">
<div style="width: 90%; margin: 0 auto">
<div slot="header" class="clearfix">
<h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">结果统计</h1>
</div>
<div id="main" style="width: 100%; height: 400px"></div>
<el-card class="box-card" style="height: 450px">
<div slot="header" class="clearfix">
<h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">结果统计</h1>
</div>
<div style="height: 400px; width: 90%; margin: 0 auto">
<div id="main" style="width: 100%; height: 90%"></div>
</div>
<div id="main" style="width: 310px; height: 400px"></div>
</el-card>
</template>
......@@ -17,7 +16,11 @@ export default {
return {
option: {
tooltip: {
trigger: 'item'
trigger: 'item',
formatter: function (params) {
const str = params.data.name + '<br/>' + params.data.value + '<br/>' + params.percent + '%'
return str
}
},
legend: {
bottom: '5%',
......@@ -36,8 +39,8 @@ export default {
show: false
},
data: [
{ value: 1048, name: '及格人数' },
{ value: 735, name: '不及格人数' }
{ value: 1048, name: '及格人数', itemStyle: { color: '#6C83CE' }, percent: '70%' },
{ value: 735, name: '不及格人数', itemStyle: { color: '#D96685' }, percent: '30%' }
]
}
]
......
src/modules/teacher/data/exam/components/ScoreRange.vue
浏览文件 @ 1ddb3ed2
<template>
<div class="score-range-box">
<el-card class="box-card">
<div slot="header" class="clearfix">
<h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">考分区间</h1>
<el-button type="text" style="font-size: 16px; color: #aa1941; float: right; margin-top: -35px">设置</el-button>
</div>
<div id="score" style="width: 310px; height: 400px"></div>
</el-card>
<el-card class="box-card" style="height: 450px">
<div slot="header" class="clearfix">
<h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">考分区间</h1>
<el-button type="text" style="font-size: 16px; color: #aa1941; float: right; margin-top: -35px">设置</el-button>
</div>
<div style="height: 400px; width: 90%; margin: 0 auto">
<div id="score" style="width: 100%; height: 90%"></div>
</div>
</el-card>
<set-score-range class="pop"></set-score-range>
</div>
</template>
......@@ -23,7 +25,7 @@ export default {
trigger: 'item'
},
legend: {
bottom: '5%',
bottom: '0',
left: 'center'
},
grid: {
......@@ -34,10 +36,10 @@ export default {
{
name: 'Access From',
type: 'pie',
radius: ['40%', '70%'],
radius: ['50%', '70%'],
avoidLabelOverlap: false,
itemStyle: {
borderRadius: 10,
borderRadius: 3,
borderColor: '#fff',
borderWidth: 2
},
......@@ -56,11 +58,11 @@ export default {
show: false
},
data: [
{ value: 1048, name: 'Search Engine' },
{ value: 735, name: 'Direct' },
{ value: 580, name: 'Email' },
{ value: 484, name: 'Union Ads' },
{ value: 300, name: 'Video Ads' }
{ value: 1048, name: 'Search Engine', itemStyle: { color: '#6F85CC' } },
{ value: 735, name: 'Direct', itemStyle: { color: '#96C080' } },
{ value: 580, name: 'Email', itemStyle: { color: '#EAC370' } },
{ value: 484, name: 'Union Ads', itemStyle: { color: '#D96685' } },
{ value: 300, name: 'Video Ads', itemStyle: { color: '#B170CE' } }
]
}
]
......@@ -73,6 +75,7 @@ export default {
}
}
</script>
<<<<<<< HEAD
<style lang="scss" scoped>
.score-range-box{
......@@ -86,3 +89,5 @@ export default {
}
}
</style>
=======
>>>>>>> 21fd47ec6e436a323257a3f4bb63e4971b1987b1
src/modules/teacher/data/exam/components/ScoreRanking.vue
浏览文件 @ 1ddb3ed2
<template>
<el-card>
<app-card>
<h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">班级排名</h1>
<el-button type="text" style="font-size: 16px;color:#AA1941; float: right; margin-top: -40px">导出</el-button>
<el-tabs v-model="tabActive" style="margin-top: 30px">
<el-tab-pane label="已完成" name="baseInfo">
<RankingAll />
</el-tab-pane>
<el-tab-pane label="待评价" name="contacts" lazy>
<RankingAll />
</el-tab-pane>
<el-tab-pane label="未作答" name="project" lazy>
<RankingAll />
</el-tab-pane>
<el-tab-pane label="待提交" name="toSubmit" lazy>
<RankingAll />
</el-tab-pane>
</el-tabs>
</app-card>
<el-card style="height: 400px">
<h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">分数排名</h1>
<el-button type="text" style="font-size: 16px; color: #aa1941; float: right; margin-top: -40px">导出</el-button>
<el-tabs v-model="tabActive" style="margin-top: 30px">
<el-tab-pane label="已完成" name="baseInfo">
<RankingAll />
</el-tab-pane>
<el-tab-pane label="待评价" name="contacts" lazy>
<RankingAll />
</el-tab-pane>
<el-tab-pane label="未作答" name="project" lazy>
<RankingAll />
</el-tab-pane>
<el-tab-pane label="待提交" name="toSubmit" lazy>
<RankingAll />
</el-tab-pane>
</el-tabs>
</el-card>
</template>
......
src/modules/teacher/data/exam/components/TitleData.vue
浏览文件 @ 1ddb3ed2
<template>
<el-card style="margin-right: -20px">
<el-card style="margin-right: -20px; height: 400px">
<app-container>
<h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">题目数据</h1>
<el-button type="text" style="font-size: 16px; color: #aa1941; float: right; margin-top: -40px">导出</el-button>
......
src/modules/teacher/data/exam/views/ExamData.vue
浏览文件 @ 1ddb3ed2
<template>
<div class="container">
<el-row type="flex" class="row-bg" justify="space-between" style="margin-bottom: 30px">
<el-col><h1 style="padding-left: 50px; font-size: 30px">模拟测试一</h1></el-col>
<el-col :span="11">
<el-col><h1 style="padding-left: 0px; font-size: 30px">模拟测试一</h1></el-col>
<el-col :span="10">
<el-select v-model="label" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select>
<el-button type="text" style="margin-left: 20px">导出pdf</el-button>
<el-button type="text" style="margin-left: 30px">导出pdf</el-button>
</el-col>
</el-row>
<el-row :gutter="10" class="row-bg">
......
src/modules/teacher/data/exam/views/List.vue
浏览文件 @ 1ddb3ed2
......@@ -63,7 +63,7 @@ export default {
{ label: '最低分', prop: 'low', align: 'center' },
{ label: '题目总数', prop: 'title_num', align: 'center' },
{ label: '及格率', prop: 'title_percent', align: 'center' },
{ label: '操作', slots: 'table-operate', align: 'center' }
{ label: '操作', slots: 'table-operate', align: 'center', width: '150' }
],
data: [
{
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论