修改

src/views/system/KindergartenPhysicalTest/index.vue

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

src/views/system/action/index.vue

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

src/views/system/classconstitution/index.vue

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

src/views/system/comprehensive/index.vue

@@ -593,8 +593,8 @@ export default {
       synthesizelist: {
         studentId: "",
         batchCode: "",
-        studentId: "10",
-        batchCode: "PC202208030005",
+        // studentId: "10",
+        // batchCode: "PC202208030005",
       },
       //批次编号
       testqueryParams: {
@@ -607,7 +607,7 @@ export default {
   created() {
     this.getList();
     this.class();
-    this.synthesizeinfo();
+    // this.synthesizeinfo();
   },
   methods: {
     //综合体质分析素质

src/views/system/heightAndWeight/index.vue

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

src/views/system/physique/index.vue

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