|
@@ -34,7 +34,6 @@
|
|
|
<DropdownMenu slot="list">
|
|
<DropdownMenu slot="list">
|
|
|
<DropdownItem name="id">{{$t('schoolBaseInfo.listOrder1')}}</DropdownItem>
|
|
<DropdownItem name="id">{{$t('schoolBaseInfo.listOrder1')}}</DropdownItem>
|
|
|
<DropdownItem name="state">{{$t('schoolBaseInfo.listOrder2')}}</DropdownItem>
|
|
<DropdownItem name="state">{{$t('schoolBaseInfo.listOrder2')}}</DropdownItem>
|
|
|
- <!--<DropdownItem name="total">依學生數排序</DropdownItem>-->
|
|
|
|
|
</DropdownMenu>
|
|
</DropdownMenu>
|
|
|
</Dropdown>
|
|
</Dropdown>
|
|
|
</div>
|
|
</div>
|
|
@@ -735,10 +734,10 @@ export default {
|
|
|
},
|
|
},
|
|
|
dataSort(data) {
|
|
dataSort(data) {
|
|
|
switch (this.orderBy) {
|
|
switch (this.orderBy) {
|
|
|
- case 'id': // ID 排序
|
|
|
|
|
|
|
+ case 'id': // no=>编号 排序
|
|
|
data.sort(function (a, b) {
|
|
data.sort(function (a, b) {
|
|
|
- let nameA = a.id.toUpperCase(); // ignore upper and lowercase
|
|
|
|
|
- let nameB = b.id.toUpperCase(); // ignore upper and lowercase
|
|
|
|
|
|
|
+ let nameA = a.no.toUpperCase(); // ignore upper and lowercase
|
|
|
|
|
+ let nameB = b.no.toUpperCase(); // ignore upper and lowercase
|
|
|
if (nameA < nameB) {
|
|
if (nameA < nameB) {
|
|
|
return -1;
|
|
return -1;
|
|
|
}
|
|
}
|
|
@@ -753,9 +752,9 @@ export default {
|
|
|
case 'state': // 智慧教室排序
|
|
case 'state': // 智慧教室排序
|
|
|
data.sort(function (a, b) {
|
|
data.sort(function (a, b) {
|
|
|
if (a.style == 'smart') {
|
|
if (a.style == 'smart') {
|
|
|
- return 1
|
|
|
|
|
- } else {
|
|
|
|
|
return -1
|
|
return -1
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return 1
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
break; // 學生總數排序
|
|
break; // 學生總數排序
|
