This commit is contained in:
曹辉 2022-08-23 11:12:00 +08:00
parent 6dde8e62e3
commit bf5c229238
6 changed files with 505 additions and 477 deletions

View File

@ -261,7 +261,7 @@
<div slot="header" style="text-align: center"> <div slot="header" style="text-align: center">
<img style="width: 40px" src="@/icons/笑脸.png" alt="" /> <img style="width: 40px" src="@/icons/笑脸.png" alt="" />
<div><!-- card title -->学生此批次暂没数据</div> <div><!-- card title -->幼儿园此批次暂无数据</div>
</div> </div>
<!-- card body --> <!-- card body -->
</el-card> </el-card>
@ -344,6 +344,10 @@ export default {
methods: { methods: {
analysisinfo() { analysisinfo() {
analysis(this.analysisqueryParams).then((res) => { analysis(this.analysisqueryParams).then((res) => {
if (res.data == [] || !res.data) {
this.itemshow2 = true;
this.itemshow = false;
} else {
this.analysislist = res.data; this.analysislist = res.data;
console.log(this.analysislist); console.log(this.analysislist);
this.options(); this.options();
@ -500,8 +504,9 @@ export default {
}; };
option && myChart.setOption(option); option && myChart.setOption(option);
this.itemshow = ture; this.itemshow = true;
this.itemshow2 = false; this.itemshow2 = false;
}
}); });
}, },
options() { options() {

View File

@ -552,8 +552,8 @@ export default {
pageSize: 10, pageSize: 10,
// studentId: "10", // studentId: "10",
// batchCode: "PC202208030005", // batchCode: "PC202208030005",
studentId: "", // studentId: "",
batchCode: "", // batchCode: "",
}, },
}; };
}, },
@ -658,6 +658,10 @@ export default {
}, },
// //
batchCodeshowclick() { batchCodeshowclick() {
this.spanArr = [];
this.position = 0; //
this.spanArr2 = [];
this.position2 = 0; //
if (this.queryParams.studentId == "") { if (this.queryParams.studentId == "") {
this.$message.error("请先选择学生"); this.$message.error("请先选择学生");
} else { } else {
@ -669,9 +673,9 @@ export default {
batchCodeclick(row) { batchCodeclick(row) {
this.batchCodeName = row.batchName; this.batchCodeName = row.batchName;
this.batchCodeId = row.id; this.batchCodeId = row.id;
this.analysisqueryParams.batchCode = row.batchCode; this.queryParams.batchCode = row.batchCode;
this.batchCodeshow = false; this.batchCodeshow = false;
// this.listActioninfo(); this.listActioninfo();
}, },
// //
testScore() { testScore() {
@ -685,7 +689,7 @@ export default {
this.studentname = row.studentName; this.studentname = row.studentName;
this.studentId = row.id; this.studentId = row.id;
this.studentshow = false; this.studentshow = false;
this.analysisqueryParams.studentId = row.id; this.queryParams.studentId = row.id;
}, },
// //
studentlist() { studentlist() {

View File

@ -263,14 +263,19 @@
<el-col :span="24" :offset="0"> <el-col :span="24" :offset="0">
<div style="margin: 0 auto"> <div style="margin: 0 auto">
<div <div
style="display: flex; text-align: center; justify-content: center" style="
display: flex;
text-align: center;
justify-content: center;
color: #fff;
"
> >
<div <div
style=" style="
width: 120px; width: 120px;
line-height: 60px; line-height: 60px;
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
background: #f0f0f0; background: #3c9299;
" "
> >
年龄 年龄
@ -280,7 +285,7 @@
width: 120px; width: 120px;
line-height: 60px; line-height: 60px;
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
background: #f0f0f0; background: #3c9299;
" "
> >
平均总分 平均总分
@ -291,7 +296,7 @@
text-align: center; text-align: center;
line-height: 30px; line-height: 30px;
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
background: #f0f0f0; background: #3c9299;
" "
> >
{{ item.parentName }} {{ item.parentName }}
@ -301,8 +306,8 @@
display: flex; display: flex;
line-height: 30px; line-height: 30px;
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
background: #f0f0f0; background: #3c9299;
font-size: 20px; font-size: 14px;
" "
> >
<div <div
@ -363,7 +368,7 @@
<div slot="header" style="text-align: center"> <div slot="header" style="text-align: center">
<img style="width: 40px" src="@/icons/笑脸.png" alt="" /> <img style="width: 40px" src="@/icons/笑脸.png" alt="" />
<div><!-- card title -->学生此批次暂没成绩</div> <div><!-- card title -->班级此批次暂无成绩</div>
</div> </div>
<!-- card body --> <!-- card body -->
</el-card> </el-card>
@ -386,7 +391,7 @@ export default {
name: "classconstitution", name: "classconstitution",
data() { data() {
return { return {
itemshow: true, itemshow: false,
itemshow2: false, itemshow2: false,
total1: 0, total1: 0,
total2: 0, total2: 0,
@ -445,10 +450,13 @@ export default {
testScorelist: [], testScorelist: [],
// //
ClassListlist: { ClassListlist: {
// batchCode: "", batchCode: "",
batchCode: "PC202208030005", kindergartenId: "",
kindergartenId: "18", classId: "",
classId: "2",
// batchCode: "PC202208030005",
// kindergartenId: "18",
// classId: "2",
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
@ -468,22 +476,21 @@ export default {
created() { created() {
this.getList(); this.getList();
this.class(); this.class();
this.ClassListinfo(); // this.ClassListinfo();
}, },
methods: { methods: {
ClassListinfo() { ClassListinfo() {
ClassList(this.ClassListlist).then((res) => { ClassList(this.ClassListlist).then((res) => {
console.log(res); console.log(res);
this.totalAvgFraction = res.data.totalAvgFraction;
this.categoryTableNameList = res.data.categoryTableNameList;
this.categoryAgeFractionList = res.data.categoryAgeFractionList;
this.categoryScoreList = res.data.categoryScoreList;
if (res.data == [] || !res.data) { if (res.data == [] || !res.data) {
this.itemshow2 = true; this.itemshow2 = true;
this.itemshow = false; this.itemshow = false;
} else { } else {
this.totalAvgFraction = res.data.totalAvgFraction;
this.categoryTableNameList = res.data.categoryTableNameList;
this.categoryAgeFractionList = res.data.categoryAgeFractionList;
this.categoryScoreList = res.data.categoryScoreList;
var list = []; var list = [];
this.categoryTableNameList.forEach((e) => { this.categoryTableNameList.forEach((e) => {
e.childrenTableNameList.forEach((el) => { e.childrenTableNameList.forEach((el) => {
@ -683,6 +690,7 @@ export default {
this.batchCodeId = row.id; this.batchCodeId = row.id;
this.ClassListlist.batchCode = row.batchCode; this.ClassListlist.batchCode = row.batchCode;
this.batchCodeshow = false; this.batchCodeshow = false;
this.ClassListinfo();
}, },
// //
testScore() { testScore() {
@ -723,6 +731,7 @@ export default {
}, },
// //
kindergartenNameclick(row) { kindergartenNameclick(row) {
this.classqueryParams.kindergartenId = row.id;
this.ClassListlist.kindergartenId = row.id; this.ClassListlist.kindergartenId = row.id;
this.kindergartenName = row.kindergartenName; this.kindergartenName = row.kindergartenName;
this.kindergartenId = row.id; this.kindergartenId = row.id;

View File

@ -593,8 +593,8 @@ export default {
synthesizelist: { synthesizelist: {
studentId: "", studentId: "",
batchCode: "", batchCode: "",
studentId: "10", // studentId: "10",
batchCode: "PC202208030005", // batchCode: "PC202208030005",
}, },
// //
testqueryParams: { testqueryParams: {
@ -607,7 +607,7 @@ export default {
created() { created() {
this.getList(); this.getList();
this.class(); this.class();
this.synthesizeinfo(); // this.synthesizeinfo();
}, },
methods: { methods: {
// //

View File

@ -211,7 +211,7 @@
<div slot="header" style="text-align: center"> <div slot="header" style="text-align: center">
<img style="width: 40px" src="@/icons/笑脸.png" alt="" /> <img style="width: 40px" src="@/icons/笑脸.png" alt="" />
<div><!-- card title -->学生此批次暂没数据</div> <div><!-- card title -->批次暂无数据</div>
</div> </div>
<!-- card body --> <!-- card body -->
</el-card> </el-card>
@ -321,6 +321,10 @@ export default {
methods: { methods: {
analysisinfo() { analysisinfo() {
analysis(this.analysisqueryParams).then((res) => { analysis(this.analysisqueryParams).then((res) => {
if (!res.data) {
this.itemshow2=true;
this.itemshow=false;
} else {
this.analysislist = res.data; this.analysislist = res.data;
console.log(this.analysislist); console.log(this.analysislist);
var yclassname = []; var yclassname = [];
@ -552,6 +556,7 @@ export default {
option2 && myChart2.setOption(option2); option2 && myChart2.setOption(option2);
this.itemshow = true; this.itemshow = true;
this.itemshow2 = false; this.itemshow2 = false;
}
}); });
}, },
// //

View File

@ -332,7 +332,7 @@
<div slot="header" style="text-align: center"> <div slot="header" style="text-align: center">
<img style="width: 40px" src="@/icons/笑脸.png" alt="" /> <img style="width: 40px" src="@/icons/笑脸.png" alt="" />
<div><!-- card title -->学生此批次暂没数据</div> <div><!-- card title -->幼儿园此批次暂无数据</div>
</div> </div>
<!-- card body --> <!-- card body -->
</el-card> </el-card>
@ -427,6 +427,10 @@ export default {
methods: { methods: {
analysisinfo() { analysisinfo() {
analysis(this.analysisqueryParams).then((res) => { analysis(this.analysisqueryParams).then((res) => {
if (res.data == [] || !res.data) {
this.itemshow2 = true;
this.itemshow = false;
} else {
this.totalAvgFraction = res.data.totalAvgFraction; this.totalAvgFraction = res.data.totalAvgFraction;
this.categoryTableNameList = res.data.categoryTableNameList; this.categoryTableNameList = res.data.categoryTableNameList;
this.categoryAgeFractionList = res.data.categoryAgeFractionList; this.categoryAgeFractionList = res.data.categoryAgeFractionList;
@ -457,7 +461,6 @@ export default {
el.list = list1; el.list = list1;
}); });
let seriesData = []; let seriesData = [];
let yindicator = []; let yindicator = [];
this.categoryScoreList.forEach((el) => { this.categoryScoreList.forEach((el) => {
@ -467,7 +470,8 @@ export default {
el.avgCategoryName = "暂无"; el.avgCategoryName = "暂无";
} }
yindicator.push({ yindicator.push({
name: el.categoryName + " " + "(" + el.avgCategoryName + "" + ")", name:
el.categoryName + " " + "(" + el.avgCategoryName + "" + ")",
max: el.maxFraction, max: el.maxFraction,
}); });
}); });
@ -521,6 +525,7 @@ export default {
this.itemshow2 = false; this.itemshow2 = false;
this.itemshow = true; this.itemshow = true;
} }
}
}); });
}, },
// //