|
@@ -43,7 +43,7 @@
|
|
>
|
|
>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
- label="班级排名"
|
|
|
|
|
|
+ :label="dispatchClassId == '' ? '组合排名' : '班级排名'"
|
|
prop="rankInClass"
|
|
prop="rankInClass"
|
|
v-if="type != '1'"
|
|
v-if="type != '1'"
|
|
>
|
|
>
|
|
@@ -54,8 +54,6 @@
|
|
>
|
|
>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
-<!-- <mx-table row-key="studentId" :reserveSelection="true" :propDefines="propDefines" :rows="list" @selection-change="handleSelectionChange">-->
|
|
|
|
-<!-- </mx-table>-->
|
|
|
|
<!-- 操作 确认和分页-->
|
|
<!-- 操作 确认和分页-->
|
|
<pagination class="mt10" :total="pageForm.total" :autoScroll="false" @pagination="onChangePage"
|
|
<pagination class="mt10" :total="pageForm.total" :autoScroll="false" @pagination="onChangePage"
|
|
:page.sync="pageForm.pageNum"
|
|
:page.sync="pageForm.pageNum"
|
|
@@ -76,6 +74,9 @@ export default {
|
|
type: Array,
|
|
type: Array,
|
|
default: () => []
|
|
default: () => []
|
|
},
|
|
},
|
|
|
|
+ dispatchClassId: {
|
|
|
|
+ default: ''
|
|
|
|
+ },
|
|
pageForm: {
|
|
pageForm: {
|
|
type: Object,
|
|
type: Object,
|
|
default: () => {
|
|
default: () => {
|
|
@@ -89,33 +90,6 @@ export default {
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
- propDefines: {
|
|
|
|
- selection: {
|
|
|
|
- label: '选择',
|
|
|
|
- type: 'selection',
|
|
|
|
- hidden: this.type == '2'
|
|
|
|
- },
|
|
|
|
- groupName: {
|
|
|
|
- label: '组合',
|
|
|
|
- hidden: this.type == '1'
|
|
|
|
- },
|
|
|
|
- className: {
|
|
|
|
- label: '班级'
|
|
|
|
- },
|
|
|
|
- name: {
|
|
|
|
- label: '姓名'
|
|
|
|
- },
|
|
|
|
- sex: {
|
|
|
|
- label: '性别'
|
|
|
|
- },
|
|
|
|
- rankInGroup: {
|
|
|
|
- label: '班级排名'
|
|
|
|
- },
|
|
|
|
- rankInGrade: {
|
|
|
|
- label: '年级排名',
|
|
|
|
- hidden: this.type == '1'
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
selected: []
|
|
selected: []
|
|
}
|
|
}
|
|
},
|
|
},
|