提交 9856087c authored 作者: lihuihui's avatar lihuihui

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

...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
// 翻页参数设置 // 翻页参数设置
if (this.hasPagination) { if (this.hasPagination) {
params.page = this.page.currentPage.toString() params.page = this.page.currentPage.toString()
params.limit = this.page.size.toString() params.page_size = this.page.size.toString()
} }
// 接口请求之前 // 接口请求之前
if (beforeRequest) { if (beforeRequest) {
...@@ -202,6 +202,7 @@ export default { ...@@ -202,6 +202,7 @@ export default {
} }
}, },
beforeMount() { beforeMount() {
console.log(this.limit, '-----')
this.fetchList() this.fetchList()
} }
} }
......
...@@ -84,7 +84,7 @@ export default { ...@@ -84,7 +84,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: function (params) { color: function (params) {
const colorList = ['#6F85CC', '#96C080', '#EAC370', '#B170CE', '#D96685'] const colorList = ['#6F85CC', '#96C080', '#EAC370', '#B170CE', '#D96685', '#33ff99', '#EEA9B8']
return colorList[params.dataIndex] return colorList[params.dataIndex]
} }
} }
......
...@@ -33,7 +33,7 @@ export default { ...@@ -33,7 +33,7 @@ export default {
data: this.scoreRanking.list, data: this.scoreRanking.list,
columns: [ columns: [
{ label: '排名', slots: 'paper_title', prop: 'ranking', align: 'center' }, { label: '排名', slots: 'paper_title', prop: 'ranking', align: 'center' },
{ label: '姓名', prop: 'personal_name', align: 'center' }, { label: '姓名', prop: 'personal_name', align: 'center', minWidth: 150 },
{ label: '客观题', prop: 'subjective', align: 'center', sortable: 'custom', minWidth: 100 }, { label: '客观题', prop: 'subjective', align: 'center', sortable: 'custom', minWidth: 100 },
{ label: '主观题', prop: 'objective', align: 'center', sortable: 'custom', minWidth: 100 }, { label: '主观题', prop: 'objective', align: 'center', sortable: 'custom', minWidth: 100 },
{ label: '总分', prop: 'score', align: 'center', sortable: 'custom' }, { label: '总分', prop: 'score', align: 'center', sortable: 'custom' },
...@@ -108,4 +108,7 @@ export default { ...@@ -108,4 +108,7 @@ export default {
} }
} }
} }
::v-deep .table-list-filter {
display: none;
}
</style> </style>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<el-tab-pane :label="`已完成${scoreRanking.checked_count}`" name="finished"> <el-tab-pane :label="`已完成${scoreRanking.checked_count}`" name="finished">
<RankingAll :tabActive="tabActive" :scoreRanking="scoreRanking" /> <RankingAll :tabActive="tabActive" :scoreRanking="scoreRanking" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="`已完成${scoreRanking.commit_count}`" name="toEvaluate" lazy> <el-tab-pane :label="`待评价${scoreRanking.commit_count}`" name="toEvaluate" lazy>
<RankingAll :tabActive="tabActive" :scoreRanking="scoreRanking" /> <RankingAll :tabActive="tabActive" :scoreRanking="scoreRanking" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="`未作答${scoreRanking.no_sheet_count}`" name="noAnswer" lazy> <el-tab-pane :label="`未作答${scoreRanking.no_sheet_count}`" name="noAnswer" lazy>
...@@ -86,7 +86,8 @@ export default { ...@@ -86,7 +86,8 @@ export default {
chapter_id: this.chapter_id, chapter_id: this.chapter_id,
type: this.type, type: this.type,
status: this.status, status: this.status,
class_id: this.classValue class_id: this.classValue,
page_size: 10
} }
getScoreRanking(params).then(res => { getScoreRanking(params).then(res => {
this.scoreRanking = res.data this.scoreRanking = res.data
......
...@@ -119,7 +119,8 @@ export default { ...@@ -119,7 +119,8 @@ export default {
{ label: '总分', prop: 'total_score', align: 'center' }, { label: '总分', prop: 'total_score', align: 'center' },
{ label: '平均得分', prop: 'average', align: 'center', sortable: 'custom', minWidth: 150 } { label: '平均得分', prop: 'average', align: 'center', sortable: 'custom', minWidth: 150 }
], ],
pagationLayout: 'prev, pager, next' pagationLayout: 'prev, pager, next',
limit: 10
} }
} }
}, },
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论