From f4663d99d6c45922b8600f5d1d98aeeee00404a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 20 Jul 2023 16:25:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/kindergartenCheckReport/index.vue      |  1 +
 src/views/system/kindergartenEcharts/index.vue    | 15 +++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/system/kindergartenCheckReport/index.vue b/src/views/system/kindergartenCheckReport/index.vue
index 0766dd4..05ae624 100644
--- a/src/views/system/kindergartenCheckReport/index.vue
+++ b/src/views/system/kindergartenCheckReport/index.vue
@@ -458,6 +458,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.$delete(this.queryParams, "kindergartenName");
       this.queryParams.pageNum = 1;
       this.info();
     },
diff --git a/src/views/system/kindergartenEcharts/index.vue b/src/views/system/kindergartenEcharts/index.vue
index 72861db..8ddb106 100644
--- a/src/views/system/kindergartenEcharts/index.vue
+++ b/src/views/system/kindergartenEcharts/index.vue
@@ -236,8 +236,7 @@
               </div>
               <div style="display: inline-block; position: relative">
                 <span style="margin: 0 20px">=</span>
-                <span style="display: inline-block; width: 120px">综合得分({{ totalAvgFraction }})</span>
-
+                <span style="display: inline-block; width: 120px">综合得分({{ totalAvgFractionMALE }})</span>
                 <span
                   style="
                     display: inline-block;
@@ -382,7 +381,7 @@
               </div>
               <div style="display: inline-block; position: relative">
                 <span style="margin: 0 20px">=</span>
-                <span style="display: inline-block; width: 120px">综合得分({{ totalAvgFraction }})</span>
+                <span style="display: inline-block; width: 120px">综合得分({{ totalAvgFractionFEMALE }})</span>
 
                 <span
                   style="
@@ -704,7 +703,7 @@ export default {
       categoryAgeFractionListMALE: [],
       categoryScoreListMALE: [],
       firstCategoryScoreListMALE: [],
-      totalAvgFraction: "",
+      totalAvgFractionMALE: "",
       totalAvgFractionFEMALE: "",
       categoryTableNameListFEMALE: [],
       categoryAgeFractionListFEMALE: [],
@@ -781,13 +780,13 @@ export default {
           } else if (!res.data) {
           } else {
             this.classconstitutionlist.push(res.data);
+            this.info();
           }
         });
       });
-      this.info();
     },
     info() {
-      setTimeout(() => {
+      this.$nextTick(e => {
         var myEhart = document.getElementsByClassName("chart");
         for (let k = 0; k < this.classconstitutionlist.length; k++) {
           var yseries = [];
@@ -985,7 +984,7 @@ export default {
           };
           myChart.setOption(option, true);
         }
-      }, 2000);
+      });
     },
     //  <!-- development 动作发展分析 -->
     developmentinfo() {
@@ -1135,7 +1134,7 @@ export default {
           if (res.data == [] || !res.data) {
             this.MALE = false;
           } else {
-            this.totalAvgFraction = res.data.totalAvgFraction;
+            this.totalAvgFractionMALE = res.data.totalAvgFraction;
             this.categoryTableNameListMALE = res.data.categoryTableNameList;
             this.categoryAgeFractionListMALE = res.data.categoryAgeFractionList;
             this.categoryScoreListMALE = res.data.categoryScoreList;