|
@@ -511,7 +511,7 @@ const getStudentList = () => {
|
|
};
|
|
};
|
|
|
|
|
|
//获取班级排名
|
|
//获取班级排名
|
|
-const getGradeList = (grade: any) => {
|
|
|
|
|
|
+const getGradeList = async (grade: any) => {
|
|
let index = gradeData.value.findIndex((item: any) => {
|
|
let index = gradeData.value.findIndex((item: any) => {
|
|
return item.value == grade;
|
|
return item.value == grade;
|
|
})
|
|
})
|
|
@@ -531,7 +531,7 @@ const getGradeList = (grade: any) => {
|
|
if (type.value == 2) {
|
|
if (type.value == 2) {
|
|
params.gender = 0;
|
|
params.gender = 0;
|
|
}
|
|
}
|
|
- proxy?.$http.ranking.studentRanking(params).then((res: any) => {
|
|
|
|
|
|
+ await proxy?.$http.ranking.studentRanking(params).then((res: any) => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
let list = res.data
|
|
let list = res.data
|
|
.map((item: any) => {
|
|
.map((item: any) => {
|
|
@@ -562,9 +562,10 @@ const getGradeList = (grade: any) => {
|
|
};
|
|
};
|
|
|
|
|
|
//年级排名
|
|
//年级排名
|
|
-const getIniGrade = () => {
|
|
|
|
|
|
+const getIniGrade = async () => {
|
|
gradeData.value = [];
|
|
gradeData.value = [];
|
|
- gradeType.value.forEach((item: any) => {
|
|
|
|
|
|
+ for(let i:any = 0;i<gradeType.value.length;i++){
|
|
|
|
+ let item = gradeType.value[i]
|
|
//构建年级数据结构
|
|
//构建年级数据结构
|
|
let obj: any = {
|
|
let obj: any = {
|
|
label: item.label,
|
|
label: item.label,
|
|
@@ -577,8 +578,10 @@ const getIniGrade = () => {
|
|
list: [],
|
|
list: [],
|
|
}
|
|
}
|
|
gradeData.value.push(obj);
|
|
gradeData.value.push(obj);
|
|
- getGradeList(item.value);
|
|
|
|
- })
|
|
|
|
|
|
+ await getGradeList(item.value);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
};
|
|
};
|
|
|
|
|
|
const getScroll = (event?: any, grade?: any) => {
|
|
const getScroll = (event?: any, grade?: any) => {
|
|
@@ -631,7 +634,6 @@ const clickType = (data: any) => {
|
|
};
|
|
};
|
|
|
|
|
|
//切换项目
|
|
//切换项目
|
|
-
|
|
|
|
const clickProject = (data: any) => {
|
|
const clickProject = (data: any) => {
|
|
projectObj.value = data;
|
|
projectObj.value = data;
|
|
getData();
|
|
getData();
|
|
@@ -639,8 +641,6 @@ const clickProject = (data: any) => {
|
|
};
|
|
};
|
|
|
|
|
|
//时间类型
|
|
//时间类型
|
|
-
|
|
|
|
-
|
|
|
|
const getDateType = (data: any) => {
|
|
const getDateType = (data: any) => {
|
|
date.value.type = data;
|
|
date.value.type = data;
|
|
getTypeTime();
|
|
getTypeTime();
|