diff --git a/src/views/system/KindergartenPhysicalTest/index.vue b/src/views/system/KindergartenPhysicalTest/index.vue index a5898c7..0b65ce9 100644 --- a/src/views/system/KindergartenPhysicalTest/index.vue +++ b/src/views/system/KindergartenPhysicalTest/index.vue @@ -381,10 +381,10 @@ export default { show: false }, data: [ - { value: this.analysislist.excellentRate, name: ">31(优秀)" }, - { value: this.analysislist.qualifyRate, name: "28-31(良好)" }, - { value: this.analysislist.unQualifyRate, name: "20-27(合格)" }, - { value: this.analysislist.unQualifyRate, name: "<20(不合格)" } + { value: this.analysislist.thirtyOneScoreCount, name: ">31(优秀)" }, + { value: this.analysislist.twentySevenScoreCount, name: "28-31(良好)" }, + { value: this.analysislist.twentyScoreCount, name: "20-27(合格)" }, + { value: this.analysislist.twentyCount, name: "<20(不合格)" } ] } ] diff --git a/src/views/system/kindergartenEcharts/index.vue b/src/views/system/kindergartenEcharts/index.vue index e83f720..23c16c1 100644 --- a/src/views/system/kindergartenEcharts/index.vue +++ b/src/views/system/kindergartenEcharts/index.vue @@ -2014,19 +2014,19 @@ export default { }, data: [ { - value: this.KindergartenPhysicalTestlist.excellentRate, + value: this.KindergartenPhysicalTestlist.thirtyOneScoreCount, name: ">31(优秀)" }, { - value: this.KindergartenPhysicalTestlist.qualifyRate, + value: this.KindergartenPhysicalTestlist.twentySevenScoreCount, name: "28-31(良好)" }, { - value: this.KindergartenPhysicalTestlist.qualifyRate, + value: this.KindergartenPhysicalTestlist.twentyScoreCount, name: "20-27(合格)" }, { - value: this.KindergartenPhysicalTestlist.excellentRate, + value: this.KindergartenPhysicalTestlist.twentyCount, name: "<20(不合格)" } ]