diff --git a/src/api/baseurl.js b/src/api/baseurl.js
deleted file mode 100644
index 993228f..0000000
--- a/src/api/baseurl.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var baseurl = "https://kindergarten.xinelu.cn";
-
-export default baseurl
diff --git a/src/views/system/KindergartenPhysicalTest/index.vue b/src/views/system/KindergartenPhysicalTest/index.vue
index 762e7eb..2f53d3b 100644
--- a/src/views/system/KindergartenPhysicalTest/index.vue
+++ b/src/views/system/KindergartenPhysicalTest/index.vue
@@ -1,62 +1,46 @@
 <template>
   <div class="app-container">
-    <el-form
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-    >
-      <kindergarten
-        @kinbatlist="kinbatlist"
-        style="width: 500px; display: inline"
-      ></kindergarten>
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <kindergarten @kinbatlist="kinbatlist" style="width: 500px; display: inline"></kindergarten>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >查看</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-row v-show="itemshow">
-      <el-col :span="24" class="card-box" style="">
+      <el-col :span="24" class="card-box" style>
         <el-card>
           <div slot="header" style="text-align: center; font-size: 20px">
             <span>体测达标分析</span>
           </div>
           <div style="margin-left: 50px; text-align: center; margin-top: 20px">
-            <span>幼儿园名称:</span
-            ><span style="margin-left: 20px; margin-right: 10px">{{
+            <span>幼儿园名称:</span>
+            <span style="margin-left: 20px; margin-right: 10px">
+              {{
               analysislist.kindergartenName
-            }}</span>
+              }}
+            </span>
 
-            <span style="margin-left: 50px">幼儿园性质:</span
-            ><span style="margin-left: 20px; margin-right: 20px">{{
+            <span style="margin-left: 50px">幼儿园性质:</span>
+            <span style="margin-left: 20px; margin-right: 20px">
+              {{
               analysislist.kindergartenType == type.dictValue
-                ? type.dictLabel
-                : type2.dictLabel
-            }}</span>
+              ? type.dictLabel
+              : type2.dictLabel
+              }}
+            </span>
 
-            <span style="margin-left: 50px">参与体测人数:</span
-            ><span style="margin-left: 20px">{{
+            <span style="margin-left: 50px">参与体测人数:</span>
+            <span style="margin-left: 20px">
+              {{
               analysislist.testItemStudentCount
-            }}</span
-            >人
-
+              }}
+            </span>
+            人
             <div style="display: flex; margin-top: 40px">
-              <div
-                slot="header"
-                style="width: 50%; text-align: center; font-size: 18px"
-              >
+              <div slot="header" style="width: 50%; text-align: center; font-size: 18px">
                 <span class="title">本园参加体测各年龄阶段人数分部</span>
                 <div
                   id="main"
@@ -78,17 +62,16 @@
                   position: relative;
                 "
               >
-                <span class="title">本园体测成绩达标率(%)</span>
+                <span class="title">国民体质测定达标率(%)</span>
                 <span>
                   <span
                     style="
                       position: absolute;
                       top: 58%;
-                      left: 47.5%;
+                      left: 46.5%;
                       font-size: 25px;
                     "
-                    >{{ analysislist.standardRate }}%</span
-                  >
+                  >{{ analysislist.standardRate }}%</span>
                   <span
                     style="
                       position: absolute;
@@ -96,8 +79,7 @@
                       left: 46.5%;
                       font-size: 16px;
                     "
-                    >达标率</span
-                  >
+                  >达标率</span>
                 </span>
                 <div
                   id="main2"
@@ -119,9 +101,12 @@
       <el-col :span="24" :offset="0">
         <el-card>
           <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>
           <!-- card body -->
         </el-card>
@@ -152,10 +137,10 @@ export default {
       //查询传值
       analysisqueryParams: {
         kindergartenId: "",
-        batchCode: "",
+        batchCode: ""
         // kindergartenId: "18",
         // batchCode: "PC202208030005",
-      },
+      }
     };
   },
   mounted() {},
@@ -175,7 +160,7 @@ export default {
     },
 
     analysisinfo() {
-      KindergartenPhysicalTestanalysis(this.analysisqueryParams).then((res) => {
+      KindergartenPhysicalTestanalysis(this.analysisqueryParams).then(res => {
         if (res.data == [] || !res.data) {
           this.itemshow2 = true;
           this.itemshow = false;
@@ -200,37 +185,37 @@ export default {
             "insideTopLeft",
             "insideTopRight",
             "insideBottomLeft",
-            "insideBottomRight",
+            "insideBottomRight"
           ];
           app.configParameters = {
             rotate: {
               min: 0,
-              max: 90,
+              max: 90
             },
             align: {
               options: {
                 left: "left",
                 center: "center",
-                right: "right",
-              },
+                right: "right"
+              }
             },
             verticalAlign: {
               options: {
                 top: "top",
                 middle: "middle",
-                bottom: "bottom",
-              },
+                bottom: "bottom"
+              }
             },
             position: {
-              options: posList.reduce(function (map, pos) {
+              options: posList.reduce(function(map, pos) {
                 map[pos] = pos;
                 return map;
-              }, {}),
+              }, {})
             },
             distance: {
               min: 0,
-              max: 100,
-            },
+              max: 100
+            }
           };
           app.config = {
             rotate: 0,
@@ -238,31 +223,31 @@ export default {
             verticalAlign: "middle",
             position: "top",
             distance: 15,
-            onChange: function () {
+            onChange: function() {
               const labelOption = {
                 rotate: app.config.rotate,
                 align: app.config.align,
                 verticalAlign: app.config.verticalAlign,
                 position: app.config.position,
-                distance: app.config.distance,
+                distance: app.config.distance
               };
               myChart.setOption({
                 series: [
                   {
-                    label: labelOption,
+                    label: labelOption
                   },
                   {
-                    label: labelOption,
+                    label: labelOption
                   },
                   {
-                    label: labelOption,
+                    label: labelOption
                   },
                   {
-                    label: labelOption,
-                  },
-                ],
+                    label: labelOption
+                  }
+                ]
               });
-            },
+            }
           };
           const labelOption = {
             show: true,
@@ -274,30 +259,30 @@ export default {
             formatter: "{c}",
             fontSize: 16,
             rich: {
-              name: {},
-            },
+              name: {}
+            }
           };
           option = {
             tooltip: {
               trigger: "axis",
               axisPointer: {
-                type: "shadow",
-              },
+                type: "shadow"
+              }
             },
             legend: {
-              data: ["男", "女"],
+              data: ["男", "女"]
             },
             xAxis: [
               {
                 type: "category",
                 axisTick: { show: false },
-                data: ["3-4岁", "4-5岁", "5-6岁", "6岁以上"],
-              },
+                data: ["3-4岁", "4-5岁", "5-6岁", "6岁以上"]
+              }
             ],
             yAxis: [
               {
-                type: "value",
-              },
+                type: "value"
+              }
             ],
             series: [
               {
@@ -307,14 +292,14 @@ export default {
                 color: "#60C5F1",
                 label: labelOption,
                 emphasis: {
-                  focus: "series",
+                  focus: "series"
                 },
                 data: [
                   this.analysislist.threeAndFourMaleCount,
                   this.analysislist.fourAndFiveMaleCount,
                   this.analysislist.fiveAndSixMaleCount,
-                  this.analysislist.sixAndMoreMaleCount,
-                ],
+                  this.analysislist.sixAndMoreMaleCount
+                ]
               },
               {
                 name: "女",
@@ -322,16 +307,16 @@ export default {
                 color: "#98E0AD",
                 label: labelOption,
                 emphasis: {
-                  focus: "series",
+                  focus: "series"
                 },
                 data: [
                   this.analysislist.threeAndFourFeMaleCount,
                   this.analysislist.fourAndFiveFeMaleCount,
                   this.analysislist.fiveAndSixFeMaleCount,
-                  this.analysislist.sixAndMoreFeMaleCount,
-                ],
-              },
-            ],
+                  this.analysislist.sixAndMoreFeMaleCount
+                ]
+              }
+            ]
           };
 
           option && myChart.setOption(option);
@@ -348,10 +333,13 @@ export default {
       option2 = {
         tooltip: {
           trigger: "item",
+          formatter: function(params) {
+            return params.name + ":" + params.data.value + "人";
+          }
         },
         legend: {
-          top: "5%",
-          left: "center",
+          top: "10%",
+          left: "center"
         },
         series: [
           {
@@ -361,21 +349,21 @@ export default {
                 label: {
                   show: true,
                   formatter: "{d}%", //只要百分比
-                  position: "inside",
+                  position: "inside"
                 },
                 labelLine: { show: true },
-                color: function (colors) {
+                color: function(colors) {
                   var colorList = [
                     "#5470c6",
                     "#fc8251",
                     "#91cd77",
                     "#ef6567",
                     "#f9c956",
-                    "#75bedc",
+                    "#75bedc"
                   ];
                   return colorList[colors.dataIndex];
-                },
-              },
+                }
+              }
             },
             name: "",
             type: "pie",
@@ -383,36 +371,45 @@ export default {
             avoidLabelOverlap: false,
             label: {
               show: false,
-              position: "center",
+              position: "center"
             },
             emphasis: {
               label: {
                 show: false,
                 fontSize: "20",
-                fontWeight: "bold",
-              },
+                fontWeight: "bold"
+              }
             },
             labelLine: {
-              show: false,
+              show: false
             },
             data: [
-              { value: this.analysislist.excellentRate, name: ">80优秀" },
-              { value: this.analysislist.qualifyRate, name: "60-80合格" },
-              { value: this.analysislist.unQualifyRate, name: "<60不合格" },
-            ],
-          },
-        ],
+              {
+                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(不合格)" }
+            ]
+          }
+        ]
       };
-
       option2 && myChart.setOption(option2);
     },
     getList() {
-      tKindergartenInfo(this.kindergartenType).then((res) => {
+      tKindergartenInfo(this.kindergartenType).then(res => {
         this.type = res.data[0];
         this.type2 = res.data[1];
       });
       //用户权限
-      getRoleInfo().then((res) => {
+      getRoleInfo().then(res => {
         var user = res.data.roleKeys;
         if (user.includes("enchou")) {
           return;
@@ -427,8 +424,8 @@ export default {
     reset() {
       this.form = {};
       this.resetForm("form");
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped='scss'>
diff --git a/src/views/system/action/index.vue b/src/views/system/action/index.vue
index 3c11c74..ced1f19 100644
--- a/src/views/system/action/index.vue
+++ b/src/views/system/action/index.vue
@@ -1,32 +1,14 @@
 <template>
   <div class="app-container">
-    <el-form
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-    >
-      <student
-        style="width: 500px; display: inline"
-        @itemlist="itemlists"
-      ></student>
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <student style="width: 500px; display: inline" @itemlist="itemlists"></student>
 
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >查看</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-row :gutter="24">
       <div v-if="itemshow" style="margin: 10px auto; width: 100%">
@@ -36,23 +18,11 @@
           :span-method="arraySpanMethod"
           style="width: 95%; margin: 0 auto"
         >
-          <el-table-column prop="categoryName" label="测试分类" align="center">
-          </el-table-column>
-          <el-table-column prop="itemName" label="测试项目" align="center">
-          </el-table-column>
-          <el-table-column
-            prop="itemFraction"
-            label="动作技能总分"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="unifiedStandardScore"
-            label="统一最高得分"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
+          <el-table-column prop="categoryName" label="测试分类" align="center"></el-table-column>
+          <el-table-column prop="itemName" label="测试项目" align="center"></el-table-column>
+          <el-table-column prop="itemFraction" label="动作技能总分" align="center"></el-table-column>
+          <el-table-column prop="unifiedStandardScore" label="统一最高得分" align="center"></el-table-column>
+          <!-- <el-table-column
             prop="smallStandardScore"
             label="小班最高得分"
             align="center"
@@ -69,34 +39,12 @@
             label="大班最高得分"
             align="center"
           >
-          </el-table-column>
-          <el-table-column prop="itemScoreAll" label="综合得分" align="center">
-          </el-table-column>
-          <el-table-column
-            prop="rootCategoryScoreAll"
-            label="国民体质测定总得分"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="nationalPhysiqueRank"
-            label="国民体质测定等级"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="syntheticalAssess"
-            label="综合评价"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="remark"
-            label="测试目的"
-            align="center"
-            show-overflow-tooltip
-          >
-          </el-table-column>
+          </el-table-column>-->
+          <el-table-column prop="itemScoreAll" label="综合得分" align="center"></el-table-column>
+          <el-table-column prop="rootCategoryScoreAll" label="国民体质测定总得分" align="center"></el-table-column>
+          <el-table-column prop="nationalPhysiqueRank" label="国民体质测定等级" align="center"></el-table-column>
+          <el-table-column prop="remark" label="测试目的" align="center"></el-table-column>
+          <el-table-column prop="syntheticalAssess" label="备注" align="center"></el-table-column>
         </el-table>
       </div>
     </el-row>
@@ -104,9 +52,12 @@
       <el-col :span="24" :offset="0">
         <el-card>
           <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>
           <!-- card body -->
         </el-card>
@@ -144,8 +95,8 @@ export default {
         // studentId: "10",
         // batchCode: "PC202208030005",
         studentId: "",
-        batchCode: "",
-      },
+        batchCode: ""
+      }
     };
   },
   created() {},
@@ -225,7 +176,7 @@ export default {
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
-          colspan: _col,
+          colspan: _col
         };
       }
       if (columnIndex == 7) {
@@ -233,7 +184,7 @@ export default {
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
-          colspan: _col,
+          colspan: _col
         };
       }
       if (columnIndex == 8) {
@@ -241,7 +192,7 @@ export default {
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
-          colspan: _col,
+          colspan: _col
         };
       }
       if (columnIndex == 9) {
@@ -249,13 +200,13 @@ export default {
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
-          colspan: _col,
+          colspan: _col
         };
       }
     },
     //动作发展检测
     listActioninfo() {
-      listAction(this.queryParams).then((res) => {
+      listAction(this.queryParams).then(res => {
         this.spanArr = [];
         this.position = 0;
         this.spanArr2 = [];
@@ -301,7 +252,7 @@ export default {
 
     getList() {
       //用户权限
-      getRoleInfo().then((res) => {
+      getRoleInfo().then(res => {
         this.classqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
         if (user.includes("enchou")) {
@@ -317,8 +268,8 @@ export default {
     reset() {
       this.form = {};
       this.resetForm("form");
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped='scss'>
diff --git a/src/views/system/classconstitution/index.vue b/src/views/system/classconstitution/index.vue
index 5d07b16..08cc04e 100644
--- a/src/views/system/classconstitution/index.vue
+++ b/src/views/system/classconstitution/index.vue
@@ -1,48 +1,27 @@
 <template>
   <div class="app-container">
-    <el-form
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-    >
-      <kindergarten
-        @kinbatlist="kinbatlist"
-        style="width: 500px; display: inline"
-      ></kindergarten>
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <kindergarten @kinbatlist="kinbatlist" style="width: 500px; display: inline"></kindergarten>
       <el-form-item label="所属班级" prop="categoryName" label-width="70px">
         <el-button
           @click="classshowclick"
           style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
           v-if="className == '请选择班级'"
-          >{{ className }}</el-button
-        >
+        >{{ className }}</el-button>
 
         <el-button
           @click="classshowclick"
           style="width: 250px; text-align: left; height: 32px"
           v-else
-          >{{ className }}</el-button
-        >
+        >{{ className }}</el-button>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >查看</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
     <!-- //班级 -->
     <el-dialog
       width="1000px"
@@ -74,25 +53,9 @@
             ></el-button>
           </template>
         </el-table-column>
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="classType"
-          label="班级类型"
-          width="160"
-          align="center"
-        >
+        <el-table-column property="kindergartenName" label="幼儿园名称" width="190" align="center" />
+        <el-table-column property="className" label="班级名称" width="180" align="center"></el-table-column>
+        <el-table-column property="classType" label="班级类型" width="160" align="center">
           <template slot-scope="scope">
             {{ scope.row.classType == dictValue1 ? "大班" : "" }}
             {{ scope.row.classType == dictValue2 ? "中班" : "" }}
@@ -101,20 +64,8 @@
           </template>
         </el-table-column>
 
-        <el-table-column
-          property="classTeacher"
-          label="班主任姓名"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="190"
-          align="center"
-        >
-        </el-table-column>
+        <el-table-column property="classTeacher" label="班主任姓名" width="180" align="center"></el-table-column>
+        <el-table-column property="phone" label="联系电话" width="190" align="center"></el-table-column>
       </el-table>
       <pagination
         v-show="total2 > 0"
@@ -124,7 +75,6 @@
         @pagination="classinfo"
       />
     </el-dialog>
-
     <el-row v-show="itemshow">
       <el-col :span="24" :offset="0">
         <div style="margin: 0 auto; width: 1000px">
@@ -146,11 +96,8 @@
                     border: 1px solid #f0f0f0;
                     background: #f5f7fa;
                   "
-                >
-                  年龄
-                </div>
+                >年龄</div>
               </div>
-
               <div>
                 <div
                   style="
@@ -158,11 +105,8 @@
                     border: 1px solid #f0f0f0;
                     background: #f5f7fa;
                   "
-                >
-                  平均总分
-                </div>
+                >平均总分</div>
               </div>
-
               <div v-for="item in categoryTableNameList" :key="item.prentId">
                 <div
                   style="
@@ -171,9 +115,7 @@
                     border: 1px solid #f0f0f0;
                     background: #f5f7fa;
                   "
-                >
-                  {{ item.parentName }}
-                </div>
+                >{{ item.parentName }}</div>
                 <div
                   style="
                     display: flex;
@@ -187,9 +129,7 @@
                     v-for="uitem in item.childrenTableNameList"
                     :key="uitem.categoryId"
                     style="width: 120px"
-                  >
-                    {{ uitem.categoryName }}
-                  </div>
+                  >{{ uitem.categoryName }}</div>
                 </div>
               </div>
             </div>
@@ -205,14 +145,10 @@
                 :key="item.prentId"
               >
                 <div style="border: 1px solid #f0f0f0">
-                  <div style="width: 120px">
-                    {{ item.className }}
-                  </div>
+                  <div style="width: 120px">{{ item.className }}</div>
                 </div>
                 <div style="border: 1px solid #f0f0f0">
-                  <div style="width: 120px">
-                    {{ item.totalAvScore }}
-                  </div>
+                  <div style="width: 120px">{{ item.totalAvScore }}</div>
                 </div>
                 <div>
                   <div style="display: flex; line-height: 60px">
@@ -220,9 +156,7 @@
                       v-for="uitem in item.list"
                       :key="uitem.categoryId"
                       style="width: 120px; border: 0.5px solid #f0f0f0"
-                    >
-                      {{ uitem }}
-                    </div>
+                    >{{ uitem }}</div>
                   </div>
                 </div>
               </div>
@@ -235,12 +169,8 @@
         <div style="text-align: center">
           <span></span>
         </div>
-        <div class="">
-          <div
-            ref="chart"
-            id="chart"
-            style="width: 1300px; height: 600px; margin: 50px auto"
-          ></div>
+        <div class>
+          <div ref="chart" id="chart" style="width: 1300px; height: 600px; margin: 50px auto"></div>
         </div>
       </el-col>
     </el-row>
@@ -249,9 +179,12 @@
       <el-col :span="24" :offset="0">
         <el-card>
           <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>
           <!-- card body -->
         </el-card>
@@ -290,7 +223,7 @@ export default {
         pageSize: 10,
         kindergartenId: "",
         className: null,
-        classType: null,
+        classType: null
       },
       //班级list
       classinfoList: [],
@@ -302,7 +235,7 @@ export default {
       ClassListlist: {
         batchCode: "",
         kindergartenId: "",
-        classId: "",
+        classId: ""
         // batchCode: "PC202208030005",
         // kindergartenId: "18",
         // classId: "2"
@@ -311,7 +244,7 @@ export default {
       categoryAgeFractionList: [],
       categoryScoreList: [],
       totalAvgFraction: "",
-      listname: [],
+      listname: []
     };
   },
 
@@ -337,13 +270,12 @@ export default {
           this.classId = "";
         }
       }
-
       this.ClassListlist.kindergartenId = kindergartenId;
       this.ClassListlist.batchCode = batchCode;
       this.classqueryParams.kindergartenId = kindergartenId;
     },
     ClassListinfo() {
-      ClassList(this.ClassListlist).then((res) => {
+      ClassList(this.ClassListlist).then(res => {
         var yseries = [];
         var name = "";
         var names = [];
@@ -364,19 +296,19 @@ export default {
           var list = [];
           if (res.data.categoryTableNameList && res.data.categoryScoreList) {
             this.categoryTableNameList = res.data.categoryTableNameList;
-            this.categoryTableNameList.forEach((e) => {
-              e.childrenTableNameList.forEach((el) => {
+            this.categoryTableNameList.forEach(e => {
+              e.childrenTableNameList.forEach(el => {
                 list.push(el.categoryId);
               });
             });
             this.categoryScoreList = res.data.categoryScoreList;
             let yname = [];
-            this.categoryScoreList.forEach((el) => {
+            this.categoryScoreList.forEach(el => {
               yname.push(el.className);
-              var listname = list.map((e) => {
+              var listname = list.map(e => {
                 var num = 0;
                 var number = el.categoryScoreList.findIndex(
-                  (o) => o.categoryId == e
+                  o => o.categoryId == e
                 );
                 if (number != -1) {
                   num = el.categoryScoreList[number].categoryName;
@@ -384,10 +316,10 @@ export default {
                 return num;
               });
               this.listname = listname;
-              var list1 = list.map((e) => {
+              var list1 = list.map(e => {
                 var num = 0;
                 var number = el.categoryScoreList.findIndex(
-                  (o) => o.categoryId == e
+                  o => o.categoryId == e
                 );
                 if (number != -1) {
                   num = el.categoryScoreList[number].avgScore;
@@ -401,21 +333,21 @@ export default {
               el.list = list1;
             });
             for (var i = 0; i < this.listname.length; i++) {
-              name =
-                this.categoryScoreList[0].categoryScoreList[i].categoryName;
+              name = this.categoryScoreList[0].categoryScoreList[i]
+                .categoryName;
               ydata = [
                 this.categoryScoreList[0].list[i],
                 this.categoryScoreList[1].list[i],
-                this.categoryScoreList[2].list[i],
+                this.categoryScoreList[2].list[i]
               ];
               var obj = {
                 name: name,
                 type: "bar",
                 label: labelOption,
                 emphasis: {
-                  focus: "series",
+                  focus: "series"
                 },
-                data: ydata,
+                data: ydata
               };
               yseries.push(obj);
               names.push(name);
@@ -436,37 +368,37 @@ export default {
               "insideTopLeft",
               "insideTopRight",
               "insideBottomLeft",
-              "insideBottomRight",
+              "insideBottomRight"
             ];
             app.configParameters = {
               rotate: {
                 min: 0,
-                max: 90,
+                max: 90
               },
               align: {
                 options: {
                   left: "left",
                   center: "center",
-                  right: "right",
-                },
+                  right: "right"
+                }
               },
               verticalAlign: {
                 options: {
                   top: "top",
                   middle: "middle",
-                  bottom: "bottom",
-                },
+                  bottom: "bottom"
+                }
               },
               position: {
-                options: posList.reduce(function (map, pos) {
+                options: posList.reduce(function(map, pos) {
                   map[pos] = pos;
                   return map;
-                }, {}),
+                }, {})
               },
               distance: {
                 min: 0,
-                max: 100,
-              },
+                max: 100
+              }
             };
             app.config = {
               rotate: 0,
@@ -474,31 +406,31 @@ export default {
               verticalAlign: "middle",
               position: "top",
               distance: 15,
-              onChange: function () {
+              onChange: function() {
                 const labelOption = {
                   rotate: app.config.rotate,
                   align: app.config.align,
                   verticalAlign: app.config.verticalAlign,
                   position: app.config.position,
-                  distance: app.config.distance,
+                  distance: app.config.distance
                 };
                 myChart.setOption({
                   series: [
                     {
-                      label: labelOption,
+                      label: labelOption
                     },
                     {
-                      label: labelOption,
+                      label: labelOption
                     },
                     {
-                      label: labelOption,
+                      label: labelOption
                     },
                     {
-                      label: labelOption,
-                    },
-                  ],
+                      label: labelOption
+                    }
+                  ]
                 });
-              },
+              }
             };
             const labelOption = {
               show: true,
@@ -510,33 +442,32 @@ export default {
               formatter: "{c}",
               fontSize: 16,
               rich: {
-                name: {},
-              },
+                name: {}
+              }
             };
-
             option = {
               tooltip: {
                 trigger: "axis",
                 axisPointer: {
-                  type: "",
-                },
+                  type: ""
+                }
               },
               legend: {
-                data: names,
+                data: names
               },
               xAxis: [
                 {
                   type: "category",
                   axisTick: { show: false },
-                  data: yname,
-                },
+                  data: yname
+                }
               ],
               yAxis: [
                 {
-                  type: "value",
-                },
+                  type: "value"
+                }
               ],
-              series: yseries,
+              series: yseries
             };
 
             option && myChart.setOption(option, true);
@@ -564,7 +495,7 @@ export default {
     },
     //班级类型
     class() {
-      tKindergartenInfo(this.ClassType).then((res) => {
+      tKindergartenInfo(this.ClassType).then(res => {
         this.dictValue1 = res.data[0].dictValue;
         this.dictValue2 = res.data[1].dictValue;
         this.dictValue3 = res.data[2].dictValue;
@@ -573,7 +504,7 @@ export default {
     },
     //班级list
     classinfo() {
-      listClassinfo(this.classqueryParams).then((response) => {
+      listClassinfo(this.classqueryParams).then(response => {
         this.classinfoList = response.rows;
         this.total2 = response.total;
       });
@@ -581,7 +512,7 @@ export default {
 
     getList() {
       //用户权限
-      getRoleInfo().then((res) => {
+      getRoleInfo().then(res => {
         var user = res.data.roleKeys;
         if (user.includes("enchou")) {
           return;
@@ -596,8 +527,8 @@ export default {
     reset() {
       this.form = {};
       this.resetForm("form");
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped='scss'>
diff --git a/src/views/system/comprehensive/index.vue b/src/views/system/comprehensive/index.vue
index 772feb1..700a51a 100644
--- a/src/views/system/comprehensive/index.vue
+++ b/src/views/system/comprehensive/index.vue
@@ -37,7 +37,6 @@
               <div class="cell" style="width: 20%">民族:{{ sythesizestudent.nationName }}</div>
               <div class="cell" style="width: 20%">ID:{{ sythesizestudent.studentNumber }}</div>
             </div>
-
             <div style="display: flex; margin-top: 20px">
               <div class="cell" style="width: 60%">所属幼儿园:{{ sythesizestudent.kindergartenName }}</div>
               <div class="cell">班级:{{ sythesizestudent.className }}</div>
@@ -66,25 +65,22 @@
                 style="
                   position: relative;
                   display: inline-block;
-                  width: 160px;
                   text-align: center;
                 "
                 v-for="(item, index) in sythesizestudent.firstItemCategoryList"
                 :key="index"
               >
-                <span :style="index == 0 ? '' : 'margin-right:20px'">
+                <span :style="index == 0 ? '' : 'margin:0 20px'">
                   {{
                   index == 0 ? null : "+"
                   }}
                 </span>
-
                 <span>{{ item.categoryName }}( {{ item.categoryScore }})</span>
               </span>
             </div>
             <div style="display: inline-block; position: relative">
               <span style="margin: 0 20px">=</span>
               <span>综合得分({{ sythesizestudent.totalCategoryScore }})</span>
-
               <span
                 style="
                   display: inline-block;
@@ -222,7 +218,7 @@ export default {
               el.levelName = "暂无";
             }
             yindicator.push({
-              name: el.categoryName + " " + "(" + el.levelName + "" + ")",
+              name: el.categoryName,
               max: el.maxScore
             });
           });
diff --git a/src/views/system/development/index.vue b/src/views/system/development/index.vue
index c496e9b..337b03f 100644
--- a/src/views/system/development/index.vue
+++ b/src/views/system/development/index.vue
@@ -1,110 +1,51 @@
 <template>
   <div class="app-container">
-    <el-form
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-    >
-      <kindergarten
-        @kinbatlist="kinbatlist"
-        style="width: 500px; display: inline"
-      ></kindergarten>
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <kindergarten @kinbatlist="kinbatlist" style="width: 500px; display: inline"></kindergarten>
       <el-form-item label="班级类型" prop="categoryName" label-width="70px">
-        <el-select
-          v-model="analysislist.classType"
-          clearable
-          placeholder="请选择"
-        >
+        <el-select v-model="analysislist.classType" clearable placeholder="请选择">
           <el-option
             v-for="item in dictValues"
             :key="item.name"
             :label="item.name"
             :value="item.type"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >查看</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
     <el-row v-show="itemshow">
-      <el-table
-        :data="physicalActionList"
-        style="width: 1111px; margin: 20px auto"
-      >
-        <el-table-column :label="classTypeName" width="150" align="center">
-          <el-table-column
-            prop="itemName"
-            label="项目"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
+      <el-table :data="physicalActionList">
+        <el-table-column :label="classTypeName" align="center">
+          <el-table-column prop="itemName" label="项目" align="center"></el-table-column>
           <el-table-column label="男孩" align="center">
-            <el-table-column
-              prop="maleAvgScore"
-              label="平均值"
-              width="120"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="maleCityAvgScore"
-              label="全市平均值"
-              width="120"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
+            <el-table-column prop="maleAvgScore" label="平均值" align="center"></el-table-column>
+            <el-table-column prop="maleCityAvgScore" label="全市平均值" align="center"></el-table-column>
+            <!-- <el-table-column
               prop="malePassCount"
               label="合格人数"
-              width="120"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="malePassRate"
               label="合格率"
-              width="120"
               align="center"
             >
               <template slot-scope="scope"
                 >{{ scope.row.malePassRate }}%</template
               >
-            </el-table-column>
+            </el-table-column>-->
           </el-table-column>
           <el-table-column label="女孩" align="center">
-            <el-table-column
-              prop="feMaleAvgScore"
-              label="平均值"
-              width="120"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="feMaleCityAvgScore"
-              label="全市平均值"
-              width="120"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
+            <el-table-column prop="feMaleAvgScore" label="平均值" align="center"></el-table-column>
+            <el-table-column prop="feMaleCityAvgScore" label="全市平均值" align="center"></el-table-column>
+            <!-- <el-table-column
               prop="feMalePassCount"
               label="合格人数"
               width="120"
@@ -120,19 +61,21 @@
               <template slot-scope="scope"
                 >{{ scope.row.feMalePassRate }}%</template
               >
-            </el-table-column>
+            </el-table-column>-->
           </el-table-column>
         </el-table-column>
       </el-table>
     </el-row>
-
     <el-row :gutter="20" v-if="itemshow2">
       <el-col :span="24" :offset="0">
         <el-card>
           <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>
           <!-- card body -->
         </el-card>
@@ -161,14 +104,14 @@ export default {
       analysislist: {
         kindergartenId: "",
         classType: "",
-        batchCode: "",
+        batchCode: ""
         // kindergartenId: "21",
         // classType: "SMALL_CLASS",
         // batchCode: "PC202208030005",
       },
       dictValues: [],
       classTypeName: "",
-      physicalActionList: [],
+      physicalActionList: []
     };
   },
 
@@ -190,7 +133,7 @@ export default {
     },
     //动作发展状况
     analysisinfo() {
-      developmentanalysis(this.analysislist).then((res) => {
+      developmentanalysis(this.analysislist).then(res => {
         if (res.data) {
           var obj = res.data;
           this.physicalActionList = obj.physicalActionList;
@@ -213,11 +156,11 @@ export default {
     },
     //班级类型
     class() {
-      tKindergartenInfo(this.ClassType).then((res) => {
-        res.data.forEach((e) => {
+      tKindergartenInfo(this.ClassType).then(res => {
+        res.data.forEach(e => {
           var obj = {
             name: e.dictLabel,
-            type: e.dictValue,
+            type: e.dictValue
           };
           this.dictValues.push(obj);
         });
@@ -225,7 +168,7 @@ export default {
     },
     getList() {
       //用户权限
-      getRoleInfo().then((res) => {
+      getRoleInfo().then(res => {
         var user = res.data.roleKeys;
         if (user.includes("enchou")) {
           return;
@@ -240,8 +183,8 @@ export default {
     reset() {
       this.form = {};
       this.resetForm("form");
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped='scss'>
diff --git a/src/views/system/heightAndWeight/index.vue b/src/views/system/heightAndWeight/index.vue
index df5bab3..0076008 100644
--- a/src/views/system/heightAndWeight/index.vue
+++ b/src/views/system/heightAndWeight/index.vue
@@ -232,7 +232,7 @@ export default {
             verticalAlign: app.config.verticalAlign,
             rotate: app.config.rotate,
             formatter: "{c}",
-            fontSize: 16,
+            fontSize: 14,
             rich: {
               name: {}
             }
@@ -264,7 +264,6 @@ export default {
                 name: "男",
                 type: "bar",
                 barWidth: 35,
-                barGap: 0,
                 color: "#00B050",
                 label: labelOption,
                 emphasis: {
@@ -312,7 +311,6 @@ export default {
                 name: "男",
                 barWidth: 35,
                 type: "bar",
-                barGap: 0,
                 color: "#00B050",
                 label: labelOption,
                 emphasis: {
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 27cd949..4839020 100644
--- a/src/views/system/kindergartenEcharts/index.vue
+++ b/src/views/system/kindergartenEcharts/index.vue
@@ -40,7 +40,7 @@
               KindergartenPhysicalTestlist.testItemStudentCount
               }}
             </span>
-人
+            人
             <div style="display: flex; margin-top: 40px">
               <div slot="header" style="width: 50%; text-align: center; font-size: 18px">
                 <span class="title">本园参加体测各年龄阶段人数分部</span>
@@ -64,13 +64,13 @@
                   position: relative;
                 "
               >
-                <span class="title">本园体测成绩达标率(%)</span>
+                <span class="title">国民体质测定达标率(%)</span>
                 <span>
                   <span
                     style="
                       position: absolute;
                       top: 58%;
-                      left: 47.5%;
+                      left: 45%;
                       font-size: 25px;
                     "
                   >{{ KindergartenPhysicalTestlist.standardRate }}%</span>
@@ -109,19 +109,19 @@
             <div style="display: flex; margin-top: 20px">
               <div style="width: 50%">
                 <div slot="header" class="header">
-                  <span>班级综合体测成绩排名</span>
+                  <span>班级体测总成绩统计图</span>
                 </div>
                 <div v-if="yclassname1.length != 0" style="position: relative">
                   <div class="surveytitle">大班</div>
-                  <div id="survey1" style="width: 500px; height: 350px; margin: 0 auto"></div>
+                  <div id="survey1" style="width: 500px; height: 400px; margin: 0 auto"></div>
                 </div>
                 <div v-if="yclassname2.length != 0" style="position: relative">
                   <div class="surveytitle">中班</div>
-                  <div id="survey2" style="width: 500px; height: 350px; margin: 0 auto"></div>
+                  <div id="survey2" style="width: 500px; height: 400px; margin: 0 auto"></div>
                 </div>
                 <div v-if="yclassname3.length != 0" style="position: relative">
                   <div class="surveytitle">小班</div>
-                  <div id="survey3" style="width: 500px; height: 350px; margin: 0 auto"></div>
+                  <div id="survey3" style="width: 500px; height: 400px; margin: 0 auto"></div>
                 </div>
               </div>
               <div style="width: 50%">
@@ -205,7 +205,7 @@
         <el-card v-show="MALE">
           <div class="test" style="height: 90px">
             <div style="text-align: center; line-height: 40px; font-size: 20px">
-              <span>本园幼儿综合体质评估综合得分(男)</span>
+              <span>本园幼儿综合体质评估平均得分(男)</span>
             </div>
             <div
               class="el-table--enable-row-hover el-table--medium"
@@ -221,13 +221,12 @@
                   style="
                     position: relative;
                     display: inline-block;
-                    width: 200px;
                     text-align: center;
                   "
                   v-for="(item, index) in firstCategoryScoreListMALE"
                   :key="index"
                 >
-                  <span :style="index == 0 ? '' : 'margin-right:40px'">
+                  <span :style="index == 0 ? '' : 'margin: 0 20px'">
                     {{
                     index == 0 ? null : "+"
                     }}
@@ -237,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;
@@ -352,7 +350,7 @@
                 font-size: 20px;
               "
             >
-              <span>本园幼儿综合体质评估综合得分(女)</span>
+              <span>本园幼儿综合体质评估平均得分(女)</span>
             </div>
             <div
               class="el-table--enable-row-hover el-table--medium"
@@ -368,13 +366,12 @@
                   style="
                     position: relative;
                     display: inline-block;
-                    width: 200px;
                     text-align: center;
                   "
                   v-for="(item, index) in firstCategoryScoreListFEMALE"
                   :key="index"
                 >
-                  <span :style="index == 0 ? '' : 'margin-right:40px'">
+                  <span :style="index == 0 ? '' : 'margin:0 20px'">
                     {{
                     index == 0 ? null : "+"
                     }}
@@ -384,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="
@@ -517,18 +514,18 @@
                 <el-table-column label="男孩" align="center">
                   <el-table-column prop="maleAvgScore" label="平均值" align="center"></el-table-column>
                   <el-table-column prop="maleCityAvgScore" label="全市平均值" align="center"></el-table-column>
-                  <el-table-column prop="malePassCount" label="合格人数" align="center"></el-table-column>
+                  <!-- <el-table-column prop="malePassCount" label="合格人数" align="center"></el-table-column>
                   <el-table-column prop="malePassRate" label="合格率" align="center">
                     <template slot-scope="scope">{{ scope.row.malePassRate }}%</template>
-                  </el-table-column>
+                  </el-table-column>-->
                 </el-table-column>
                 <el-table-column label="女孩" align="center">
                   <el-table-column prop="feMaleAvgScore" label="平均值" align="center"></el-table-column>
                   <el-table-column prop="feMaleCityAvgScore" label="全市平均值" align="center"></el-table-column>
-                  <el-table-column prop="feMalePassCount" label="合格人数" align="center"></el-table-column>
+                  <!-- <el-table-column prop="feMalePassCount" label="合格人数" align="center"></el-table-column>
                   <el-table-column prop="feMalePassRate" label="合格率" align="center">
                     <template slot-scope="scope">{{ scope.row.feMalePassRate }}%</template>
-                  </el-table-column>
+                  </el-table-column>-->
                 </el-table-column>
               </el-table-column>
             </el-table>
@@ -536,7 +533,6 @@
         </el-card>
       </el-col>
     </el-row>
-
     <!--  -->
     <el-row>
       <el-col class="card-box" :span="24" :offset="0">
@@ -622,7 +618,7 @@
                       width: 100%;
                     "
                     v-for="item in ilist.categoryScoreList"
-                    :key="item.prentId"
+                    :key="item.categoryId"
                   >
                     <div style="border: 1px solid #f0f0f0">
                       <div style="width: 70px">{{ item.className }}</div>
@@ -630,8 +626,7 @@
                     <div style="border: 1px solid #f0f0f0">
                       <div style="width: 70px">{{ item.totalAvScore }}</div>
                     </div>
-
-                    <div style>
+                    <div>
                       <div style="display: flex; height: 62px">
                         <div
                           v-for="uitem in item.list"
@@ -708,7 +703,7 @@ export default {
       categoryAgeFractionListMALE: [],
       categoryScoreListMALE: [],
       firstCategoryScoreListMALE: [],
-      totalAvgFraction: "",
+      totalAvgFractionMALE: "",
       totalAvgFractionFEMALE: "",
       categoryTableNameListFEMALE: [],
       categoryAgeFractionListFEMALE: [],
@@ -778,20 +773,20 @@ export default {
     // <!-- classconstitution 班级体质分析 -->
     ClassListinfo() {
       this.classconstitutionlist = [];
-      for (let i = 0; i < this.classList.length; i++) {
-        this.echartslist.classId = this.classList[i].id;
+      this.classList.forEach(e => {
+        this.echartslist.classId = e.id;
         ClassList(this.echartslist).then(res => {
           if (res.code == 500) {
           } 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 = [];
@@ -989,7 +984,7 @@ export default {
           };
           myChart.setOption(option, true);
         }
-      }, 600);
+      });
     },
     //  <!-- development 动作发展分析 -->
     developmentinfo() {
@@ -1046,19 +1041,13 @@ export default {
               let seriesData = [];
               let yindicator = [];
               this.categoryScoreListFEMALE.forEach(el => {
-                seriesData.push(el.itemFraction);
+                seriesData.push(el.avgItemFraction);
                 if (el.avgCategoryName == null) {
                   el.avgCategoryName = "暂无";
                 }
                 if (this.categoryScoreListFEMALE.length == 1) {
                   yindicator.push({
-                    name:
-                      el.categoryName +
-                      " " +
-                      "(" +
-                      el.avgCategoryName +
-                      "" +
-                      ")",
+                    name: el.categoryName,
                     max: el.maxFraction
                   });
                   yindicator.push({
@@ -1071,13 +1060,7 @@ export default {
                   });
                 } else if (this.categoryScoreListFEMALE.length == 2) {
                   yindicator.push({
-                    name:
-                      el.categoryName +
-                      " " +
-                      "(" +
-                      el.avgCategoryName +
-                      "" +
-                      ")",
+                    name: el.categoryName,
                     max: el.maxFraction
                   });
                   yindicator.push({
@@ -1086,13 +1069,7 @@ export default {
                   });
                 } else {
                   yindicator.push({
-                    name:
-                      el.categoryName +
-                      " " +
-                      "(" +
-                      el.avgCategoryName +
-                      "" +
-                      ")",
+                    name: el.categoryName,
                     max: el.maxFraction
                   });
                 }
@@ -1157,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;
@@ -1187,19 +1164,13 @@ export default {
               let seriesData = [];
               let yindicator = [];
               this.categoryScoreListMALE.forEach(el => {
-                seriesData.push(el.itemFraction);
+                seriesData.push(el.avgItemFraction);
                 if (el.avgCategoryName == null) {
                   el.avgCategoryName = "暂无";
                 }
                 if (this.categoryScoreListMALE.length == 1) {
                   yindicator.push({
-                    name:
-                      el.categoryName +
-                      " " +
-                      "(" +
-                      el.avgCategoryName +
-                      "" +
-                      ")",
+                    name: el.categoryName,
                     max: el.maxFraction
                   });
                   yindicator.push({
@@ -1212,13 +1183,7 @@ export default {
                   });
                 } else if (this.categoryScoreListMALE.length == 2) {
                   yindicator.push({
-                    name:
-                      el.categoryName +
-                      " " +
-                      "(" +
-                      el.avgCategoryName +
-                      "" +
-                      ")",
+                    name: el.categoryName,
                     max: el.maxFraction
                   });
                   yindicator.push({
@@ -1227,13 +1192,7 @@ export default {
                   });
                 } else {
                   yindicator.push({
-                    name:
-                      el.categoryName +
-                      " " +
-                      "(" +
-                      el.avgCategoryName +
-                      "" +
-                      ")",
+                    name: el.categoryName,
                     max: el.maxFraction
                   });
                 }
@@ -1435,7 +1394,7 @@ export default {
               verticalAlign: app.config.verticalAlign,
               rotate: app.config.rotate,
               formatter: "{c}",
-              fontSize: 16,
+              fontSize: 14,
               rich: {
                 name: {}
               }
@@ -1467,7 +1426,6 @@ export default {
                   name: "男",
                   type: "bar",
                   barWidth: 35,
-                  barGap: 0,
                   color: "#00B050",
                   label: labelOption,
                   emphasis: {
@@ -1515,7 +1473,6 @@ export default {
                   name: "男",
                   barWidth: 35,
                   type: "bar",
-                  barGap: 0,
                   color: "#00B050",
                   label: labelOption,
                   emphasis: {
@@ -1710,6 +1667,16 @@ export default {
                 legend: {},
                 xAxis: [
                   {
+                    axisLabel: {
+                      inside: false,
+                      textStyle: {
+                        color: "#000",
+                        fontSize: "10",
+                        itemSize: ""
+                      },
+                      interval: 0,
+                      rotate: -30 //倾斜的程度
+                    },
                     type: "category",
                     axisTick: { show: false },
                     data: this.yclassname1
@@ -1747,6 +1714,16 @@ export default {
                 legend: {},
                 xAxis: [
                   {
+                    axisLabel: {
+                      inside: false,
+                      textStyle: {
+                        color: "#000",
+                        fontSize: "10",
+                        itemSize: ""
+                      },
+                      interval: 0,
+                      rotate: -30 //倾斜的程度
+                    },
                     type: "category",
                     axisTick: { show: false },
                     data: this.yclassname2
@@ -1782,6 +1759,16 @@ export default {
                 legend: {},
                 xAxis: [
                   {
+                    axisLabel: {
+                      inside: false,
+                      textStyle: {
+                        color: "#000",
+                        fontSize: "10",
+                        itemSize: ""
+                      },
+                      interval: 0,
+                      rotate: -30 //倾斜的程度
+                    },
                     type: "category",
                     axisTick: { show: false },
                     data: this.yclassname3
@@ -2007,7 +1994,10 @@ export default {
 
       option2 = {
         tooltip: {
-          trigger: "item"
+          trigger: "item",
+          formatter: function(params) {
+            return params.name + ":" + params.data.value + "人";
+          }
         },
         legend: {
           top: "5%",
@@ -2057,16 +2047,20 @@ export default {
             },
             data: [
               {
-                value: this.KindergartenPhysicalTestlist.excellentRate,
-                name: ">80优秀"
+                value: this.KindergartenPhysicalTestlist.thirtyOneScoreCount,
+                name: ">31(优秀)"
               },
               {
-                value: this.KindergartenPhysicalTestlist.qualifyRate,
-                name: "60-80合格"
+                value: this.KindergartenPhysicalTestlist.twentySevenScoreCount,
+                name: "28-31(良好)"
               },
               {
-                value: this.KindergartenPhysicalTestlist.unQualifyRate,
-                name: "<60不合格"
+                value: this.KindergartenPhysicalTestlist.twentyScoreCount,
+                name: "20-27(合格)"
+              },
+              {
+                value: this.KindergartenPhysicalTestlist.twentyCount,
+                name: "<20(不合格)"
               }
             ]
           }
diff --git a/src/views/system/motionPrescriptionLibrary/index.vue b/src/views/system/motionPrescriptionLibrary/index.vue
index a72ee4b..a23490b 100644
--- a/src/views/system/motionPrescriptionLibrary/index.vue
+++ b/src/views/system/motionPrescriptionLibrary/index.vue
@@ -274,12 +274,11 @@ import {
   prescriptionVideoUpload
 } from "@/api/system/motionPrescriptionLibrary";
 import { getToken } from "@/utils/auth";
-import baseurl from "@/api/baseurl";
 export default {
   name: "MotionPrescriptionLibrary",
   data() {
     return {
-      baseurl: null,
+      baseurl: process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -420,7 +419,6 @@ export default {
     };
   },
   created() {
-    this.baseurl = baseurl;
     this.getList();
   },
   methods: {
@@ -540,7 +538,7 @@ export default {
       this.lookvideolist = [];
       getPrescriptionVideoInfo(e.id).then(res => {
         res.data.forEach(e => {
-          e.prescriptionVideoUrl = baseurl + e.prescriptionVideoUrl;
+          e.prescriptionVideoUrl = this.baseurl + e.prescriptionVideoUrl;
           this.lookvideolist.push(e.prescriptionVideoUrl);
         });
         this.lookvideoshow = true;
diff --git a/src/views/system/personalecharts/index.vue b/src/views/system/personalecharts/index.vue
index 578518d..fc90691 100644
--- a/src/views/system/personalecharts/index.vue
+++ b/src/views/system/personalecharts/index.vue
@@ -1,12 +1,7 @@
 <template>
   <div class="app-container">
-    <img src="@/icons/pernoal.jpg" alt="" style="width: 100%" />
-    <div
-      style="font-size: 40px; margin: 80px auto; font-weight: 600"
-      class="title"
-    >
-      幼儿体质检测报告书
-    </div>
+    <img src="@/icons/pernoal.jpg" alt style="width: 100%" />
+    <div style="font-size: 40px; margin: 80px auto; font-weight: 600" class="title">幼儿体质检测报告书</div>
     <!-- //comprehensive 个人综合分析-->
     <div class="title" style="margin: 40px auto">个人综合分析</div>
     <el-row>
@@ -25,33 +20,22 @@
             "
           >
             <div style="display: flex; justify-content: space-around">
-              <div class="cell" style="width: 20%">
-                姓名:{{ sythesizestudent.studentName }}
-              </div>
-              <div class="cell" style="width: 20%">
-                性别:{{ sythesizestudent.studentSex == "MALE" ? "男" : "女" }}
-              </div>
-              <div class="cell" style="width: 20%">
-                年龄:{{ sythesizestudent.studentAge }}岁
-              </div>
-              <div class="cell" style="width: 20%">
-                民族:{{ sythesizestudent.nationName }}
-              </div>
-              <div class="cell" style="width: 20%">
-                ID:{{ sythesizestudent.studentNumber }}
-              </div>
+              <div class="cell" style="width: 20%">姓名:{{ sythesizestudent.studentName }}</div>
+              <div
+                class="cell"
+                style="width: 20%"
+              >性别:{{ sythesizestudent.studentSex == "MALE" ? "男" : "女" }}</div>
+              <div class="cell" style="width: 20%">年龄:{{ sythesizestudent.studentAge }}岁</div>
+              <div class="cell" style="width: 20%">民族:{{ sythesizestudent.nationName }}</div>
+              <div class="cell" style="width: 20%">ID:{{ sythesizestudent.studentNumber }}</div>
             </div>
 
             <div style="display: flex; margin-top: 20px">
-              <div class="cell" style="width: 60%">
-                所属幼儿园:{{ sythesizestudent.kindergartenName }}
-              </div>
+              <div class="cell" style="width: 60%">所属幼儿园:{{ sythesizestudent.kindergartenName }}</div>
               <div class="cell">班级:{{ sythesizestudent.className }}</div>
             </div>
             <div style="width: 60%; margin-top: 20px">
-              <div class="cell">
-                地址:{{ sythesizestudent.kindergartenAddress }}
-              </div>
+              <div class="cell">地址:{{ sythesizestudent.kindergartenAddress }}</div>
             </div>
           </div>
         </el-card>
@@ -68,35 +52,28 @@
               line-height: 40px;
             "
           >
-            <div
-              style="text-align: center; font-size: 18px; margin-bottom: 10px"
-            >
-              幼儿综合得分
-            </div>
+            <div style="text-align: center; font-size: 18px; margin-bottom: 10px">幼儿综合得分</div>
             <div style="display: inline-block">
               <span
                 style="
                   position: relative;
                   display: inline-block;
-                  width: 160px;
                   text-align: center;
                 "
                 v-for="(item, index) in sythesizestudent.firstItemCategoryList"
                 :key="index"
               >
-                <span :style="index == 0 ? '' : 'margin-right:20px'">{{
+                <span :style="index == 0 ? '' : 'margin:0 20px'">
+                  {{
                   index == 0 ? null : "+"
-                }}</span>
-
-                <span>
-                  {{ item.categoryName }}( {{ item.categoryScore }})
+                  }}
                 </span>
+                <span>{{ item.categoryName }}( {{ item.categoryScore }})</span>
               </span>
             </div>
             <div style="display: inline-block; position: relative">
-              <span style="margin: 0 20px">= </span>
+              <span style="margin: 0 20px">=</span>
               <span>综合得分({{ sythesizestudent.totalCategoryScore }})</span>
-
               <span
                 style="
                   display: inline-block;
@@ -108,9 +85,7 @@
               ></span>
             </div>
           </div>
-          <div style="text-align: center; font-size: 18px; margin-top: 20px">
-            获取徽章
-          </div>
+          <div style="text-align: center; font-size: 18px; margin-top: 20px">获取徽章</div>
           <div
             style="
               width: 70%;
@@ -120,15 +95,8 @@
               margin: 20px auto 10px;
             "
           >
-            <span
-              v-for="(item, index) in sythesizestudent.categoryNameList"
-              :key="index"
-            >
-              <img
-                style="width: 60px; height: 60px"
-                src="@/icons/金牌2.png"
-                alt=""
-              />
+            <span v-for="(item, index) in sythesizestudent.categoryNameList" :key="index">
+              <img style="width: 60px; height: 60px" src="@/icons/金牌2.png" alt />
               <div style="margin-top: 10px; font-size: 14px">{{ item }}</div>
             </span>
           </div>
@@ -151,19 +119,15 @@
       </el-col>
     </el-row>
     <!-- //shape 身体形态分析-->
-    <div class="title" style="margin: 40px auto" v-show="shapeshow">
-      身体形态分析
-    </div>
-    <el-row style="" v-show="shapeshow">
-      <el-col :span="12" class="card-box" style="">
+    <div class="title" style="margin: 40px auto" v-show="shapeshow">身体形态分析</div>
+    <el-row style v-show="shapeshow">
+      <el-col :span="12" class="card-box" style>
         <el-card>
           <div slot="header" style="text-align: center">
             <span>{{ shapelist.shapeTitle }}</span>
           </div>
           <div class="el-table el-table--enable-row-hover el-table--medium">
-            <div ref="commandstats" style="height: 120px">
-              {{ shapelist.shapeDescription }}
-            </div>
+            <div ref="commandstats" style="height: 120px">{{ shapelist.shapeDescription }}</div>
           </div>
         </el-card>
       </el-col>
@@ -179,43 +143,31 @@
               <table cellspacing="0" style="width: 100%; height: 120px">
                 <tbody>
                   <tr>
-                    <td
-                      class="el-table__cell is-leaf"
-                      style="text-align: center"
-                    >
+                    <td class="el-table__cell is-leaf" style="text-align: center">
                       <div class="cell">
                         姓名:
                         {{ shapelist.studentName }}
                       </div>
                     </td>
-                    <td
-                      class="el-table__cell is-leaf"
-                      style="text-align: center"
-                    >
+                    <td class="el-table__cell is-leaf" style="text-align: center">
                       <div class="cell">
                         {{
-                          shapelist.heightName ? shapelist.heightName : "身高"
+                        shapelist.heightName ? shapelist.heightName : "身高"
                         }}: {{ shapelist.heightScore
                         }}{{ shapelist.heightMeasureUnit }}
                       </div>
                     </td>
                   </tr>
                   <tr>
-                    <td
-                      class="el-table__cell is-leaf"
-                      style="text-align: center"
-                    >
+                    <td class="el-table__cell is-leaf" style="text-align: center">
                       <div class="cell">
                         {{
-                          shapelist.weightName ? shapelist.weightName : "体重"
+                        shapelist.weightName ? shapelist.weightName : "体重"
                         }}: {{ shapelist.weightScore
                         }}{{ shapelist.weightMeasureUnit }}
                       </div>
                     </td>
-                    <td
-                      class="el-table__cell is-leaf"
-                      style="text-align: center"
-                    >
+                    <td class="el-table__cell is-leaf" style="text-align: center">
                       <div class="cell">
                         <div class="cell">BMI值: {{ shapelist.bmi }}</div>
                       </div>
@@ -229,16 +181,12 @@
       </el-col>
     </el-row>
     <el-row style="margin-top: 50px" v-show="shapeshow">
-      <el-col :span="12" class="card-box" style="height: 370px">
+      <!-- <el-col :span="12" class="card-box" style="height: 370px">
         <el-card>
           <div slot="header" style="text-align: center">
             <span>年龄身高体重比图</span>
           </div>
-
-          <div
-            class="el-table el-table--enable-row-hover el-table--medium"
-            style="height: 310px"
-          >
+          <div class="el-table el-table--enable-row-hover el-table--medium" style="height: 310px">
             <div
               v-show="heightshow"
               slot="header"
@@ -264,9 +212,9 @@
                   "
                 >
                   {{
-                    ((((heightMax - heightMin) / heightMin) * heightMin) / 5) *
-                      4 +
-                    heightMin
+                  ((((heightMax - heightMin) / heightMin) * heightMin) / 5) *
+                  4 +
+                  heightMin
                   }}
                 </div>
                 <div
@@ -288,9 +236,9 @@
                   "
                 >
                   {{
-                    ((((heightMax - heightMin) / heightMin) * heightMin) / 5) *
-                      3 +
-                    heightMin
+                  ((((heightMax - heightMin) / heightMin) * heightMin) / 5) *
+                  3 +
+                  heightMin
                   }}
                 </div>
                 <div
@@ -312,9 +260,9 @@
                   "
                 >
                   {{
-                    ((((heightMax - heightMin) / heightMin) * heightMin) / 5) *
-                      2 +
-                    heightMin
+                  ((((heightMax - heightMin) / heightMin) * heightMin) / 5) *
+                  2 +
+                  heightMin
                   }}
                 </div>
                 <div
@@ -337,9 +285,9 @@
                   "
                 >
                   {{
-                    ((((heightMax - heightMin) / heightMin) * heightMin) / 5) *
-                      1 +
-                    heightMin
+                  ((((heightMax - heightMin) / heightMin) * heightMin) / 5) *
+                  1 +
+                  heightMin
                   }}
                 </div>
                 <div
@@ -359,9 +307,7 @@
                     left: -1%;
                     line-height: 20px;
                   "
-                >
-                  {{ heightMin }}
-                </div>
+                >{{ heightMin }}</div>
                 <div
                   style="
                     position: absolute;
@@ -380,9 +326,7 @@
                     right: -1%;
                     line-height: 20px;
                   "
-                >
-                  {{ heightMax }}
-                </div>
+                >{{ heightMax }}</div>
                 <div
                   style="
                     position: absolute;
@@ -405,7 +349,6 @@
                 ></div>
               </div>
 
-              <!-- <div style="color: red">达标</div> -->
               <div>{{ shapelist.ageHeightDescription }}</div>
               <div>
                 标准:{{ shapelist.ageHeightMin }}-{{ shapelist.ageHeightMax
@@ -443,9 +386,9 @@
                   "
                 >
                   {{
-                    ((((weightMax - weightMin) / weightMin) * weightMin) / 5) *
-                      4 +
-                    weightMin
+                  ((((weightMax - weightMin) / weightMin) * weightMin) / 5) *
+                  4 +
+                  weightMin
                   }}
                 </div>
                 <div
@@ -467,9 +410,9 @@
                   "
                 >
                   {{
-                    ((((weightMax - weightMin) / weightMin) * weightMin) / 5) *
-                      3 +
-                    weightMin
+                  ((((weightMax - weightMin) / weightMin) * weightMin) / 5) *
+                  3 +
+                  weightMin
                   }}
                 </div>
                 <div
@@ -491,9 +434,9 @@
                   "
                 >
                   {{
-                    ((((weightMax - weightMin) / weightMin) * weightMin) / 5) *
-                      2 +
-                    weightMin
+                  ((((weightMax - weightMin) / weightMin) * weightMin) / 5) *
+                  2 +
+                  weightMin
                   }}
                 </div>
                 <div
@@ -516,9 +459,9 @@
                   "
                 >
                   {{
-                    ((((weightMax - weightMin) / weightMin) * weightMin) / 5) *
-                      1 +
-                    weightMin
+                  ((((weightMax - weightMin) / weightMin) * weightMin) / 5) *
+                  1 +
+                  weightMin
                   }}
                 </div>
                 <div
@@ -538,9 +481,7 @@
                     left: -1%;
                     line-height: 20px;
                   "
-                >
-                  {{ weightMin }}
-                </div>
+                >{{ weightMin }}</div>
                 <div
                   style="
                     position: absolute;
@@ -559,9 +500,7 @@
                     right: -1%;
                     line-height: 20px;
                   "
-                >
-                  {{ weightMax }}
-                </div>
+                >{{ weightMax }}</div>
                 <div
                   style="
                     position: absolute;
@@ -584,7 +523,6 @@
                 ></div>
               </div>
 
-              <!-- <div style="color: red">达标</div> -->
               <div>{{ shapelist.ageWeightDescription }}</div>
               <div>
                 标准:{{ shapelist.ageWeightMin }}-{{ shapelist.ageWeightMax
@@ -593,7 +531,7 @@
             </div>
           </div>
         </el-card>
-      </el-col>
+      </el-col>-->
       <el-col :span="12" class="card-box" style="height: 370px">
         <el-card>
           <div slot="header" style="text-align: center">
@@ -617,7 +555,8 @@
                 transform: translate(-50%);
               "
             >
-              得分: <span style="color: red">{{ shapelist.bmi }}</span>
+              得分:
+              <span style="color: red">{{ shapelist.bmi }}</span>
             </div>
             <div
               style="
@@ -626,9 +565,7 @@
                 top: 55%;
                 transform: translate(-50%);
               "
-            >
-              {{ shapelist.bmiDescription }}
-            </div>
+            >{{ shapelist.bmiDescription }}</div>
             <!-- <div
               class="texts"
               style="
@@ -721,21 +658,15 @@
                   {{ item.levelMinScore }}~{{ item.levelMaxScore }}
                 </div>
               </span>
-            </div> -->
+            </div>-->
             <div></div>
           </div>
         </el-card>
       </el-col>
     </el-row>
     <!-- //quality 身体素质分析-->
-    <div class="title" style="margin: 40px auto" v-show="qualityshow">
-      身体素质分析
-    </div>
-    <el-card
-      class="box-card"
-      style="width: 95%; margin: 0 auto"
-      v-show="qualityshow"
-    >
+    <div class="title" style="margin: 40px auto" v-show="qualityshow">身体素质分析</div>
+    <el-card class="box-card" style="width: 95%; margin: 0 auto" v-show="qualityshow">
       <div slot="header" style="text-align: center">身体素质测试</div>
       <el-row style="text-align: center">
         <el-col
@@ -745,8 +676,7 @@
             border-right: 1px solid #ededed;
             border-bottom: 1px solid #ededed;
           "
-          >身体素质测试</el-col
-        >
+        >身体素质测试</el-col>
         <el-col
           :span="5"
           class="toptitle"
@@ -754,8 +684,7 @@
             border-right: 1px solid #ededed;
             border-bottom: 1px solid #ededed;
           "
-          >测量值</el-col
-        >
+        >测量值</el-col>
         <el-col
           :span="9"
           class="toptitle"
@@ -763,20 +692,10 @@
             border-right: 1px solid #ededed;
             border-bottom: 1px solid #ededed;
           "
-          >成绩</el-col
-        >
-        <el-col
-          :span="5"
-          class="toptitle"
-          style="border-bottom: 1px solid #ededed"
-          >综合评价</el-col
-        >
+        >成绩</el-col>
+        <el-col :span="5" class="toptitle" style="border-bottom: 1px solid #ededed">备注</el-col>
       </el-row>
-      <el-row
-        style="text-align: center"
-        v-for="(item, index) in studentscorelist"
-        :key="index"
-      >
+      <el-row style="text-align: center" v-for="(item, index) in studentscorelist" :key="index">
         <el-col
           :span="5"
           class="text"
@@ -786,9 +705,7 @@
             border-right: 1px solid #ededed;
             border-bottom: 1px solid #ededed;
           "
-        >
-          {{ item.itemName }}
-        </el-col>
+        >{{ item.itemName }}</el-col>
         <el-col
           class="text"
           :span="5"
@@ -799,8 +716,7 @@
             border-bottom: 1px solid #ededed;
           "
         >
-          {{ item.itemScore ? item.itemScore : "" }}
-          {{ item.scoreDictValue ? item.scoreDictValue : "" }}
+          {{ item.itemScore>=0 ? item.itemScore :item.scoreDictValue ? item.scoreDictValue : ""}}
           {{ item.measureUnit }}
         </el-col>
 
@@ -816,17 +732,18 @@
             overflow: hidden;
           "
         >
-          <span style="position: absolute; left: 5%; top: 10px"
-            >{{
-              item.measureUnit == "s" || item.measureUnit == "h" ? "时间" : ""
+          <span style="position: absolute; left: 5%; top: 10px">
+            {{
+            item.measureUnit == "s" || item.measureUnit == "h" ? "时间" : ""
             }}{{
-              item.measureUnit == "cm" || item.measureUnit == "m" ? "距离" : ""
+            item.measureUnit == "cm" || item.measureUnit == "m" ? "距离" : ""
             }}
             {{ item.measureUnit == "kg" ? "千克" : "" }}
-            {{ item.measureUnit == "g" ? "克" : "" }}({{ item.measureUnit }})
+            {{ item.measureUnit == "g" ? "克" : "" }}
+            {{ item.measureUnit == "分" ? "成绩" : "" }}({{ item.measureUnit }})
           </span>
 
-          <span style="position: absolute; left: 6%; top: 70%">评价</span>
+          <!-- <span style="position: absolute; left: 6%; top: 70%">评价</span> -->
           <div
             style="
               width: 65%;
@@ -847,10 +764,10 @@
               "
             >
               {{
-                (
-                  ((item.maxScore - item.minScore) / 5) * 4 +
-                  item.minScore
-                ).toFixed(1)
+              (
+              ((item.maxScore - item.minScore) / 5) * 4 +
+              item.minScore
+              ).toFixed(1)
               }}
             </div>
             <div
@@ -874,10 +791,10 @@
               "
             >
               {{
-                (
-                  ((item.maxScore - item.minScore) / 5) * 3 +
-                  item.minScore
-                ).toFixed(1)
+              (
+              ((item.maxScore - item.minScore) / 5) * 3 +
+              item.minScore
+              ).toFixed(1)
               }}
             </div>
             <div
@@ -901,10 +818,10 @@
               "
             >
               {{
-                (
-                  ((item.maxScore - item.minScore) / 5) * 2 +
-                  item.minScore
-                ).toFixed(1)
+              (
+              ((item.maxScore - item.minScore) / 5) * 2 +
+              item.minScore
+              ).toFixed(1)
               }}
             </div>
             <div
@@ -929,10 +846,10 @@
               "
             >
               {{
-                (
-                  ((item.maxScore - item.minScore) / 5) * 1 +
-                  item.minScore
-                ).toFixed(1)
+              (
+              ((item.maxScore - item.minScore) / 5) * 1 +
+              item.minScore
+              ).toFixed(1)
               }}
             </div>
             <div
@@ -954,9 +871,7 @@
                 overflow: hidden;
                 width: 32px;
               "
-            >
-              {{ item.minScore == null ? 0 : item.minScore }}
-            </div>
+            >{{ item.minScore == null ? 0 : item.minScore }}</div>
             <div
               style="
                 position: absolute;
@@ -977,9 +892,7 @@
                 overflow: hidden;
                 width: 32px;
               "
-            >
-              {{ item.maxScore == null ? 100 : item.maxScore }}
-            </div>
+            >{{ item.maxScore == null ? 100 : item.maxScore }}</div>
             <div
               style="
                 position: absolute;
@@ -1003,9 +916,7 @@
             ></div>
           </div>
 
-          <div style="position: absolute; left: 30%; top: 72%">
-            {{ item.leveName }}
-          </div>
+          <!-- <div style="position: absolute; left: 30%; top: 72%">{{ item.leveName }}</div> -->
         </el-col>
         <el-col
           class="text"
@@ -1018,18 +929,15 @@
             position: relative;
           "
         >
-          <span
+          <!-- <span
             style="
               margin-top: 20px;
               float: left;
               margin-left: 5%;
               margin-top: 7%;
             "
-            >成绩评价</span
-          >
-          <div style="position: absolute; left: 25%; top: 40%">
-            {{ item.scoreDictValue }}
-          </div>
+          >成绩评价</span>-->
+          <div style="position: absolute; left: 25%; top: 40%">{{ item.scoreDictValue }}</div>
         </el-col>
         <el-col
           class="text"
@@ -1039,8 +947,7 @@
             line-height: 100px;
             border-bottom: 1px solid #ededed;
           "
-          >{{ item.syntheticalAssess }}</el-col
-        >
+        >{{ item.syntheticalAssess }}</el-col>
       </el-row>
     </el-card>
     <!-- //action动作发展分析 -->
@@ -1053,23 +960,11 @@
           :span-method="arraySpanMethod"
           style="width: 100%; margin: 0 auto"
         >
-          <el-table-column prop="categoryName" label="测试分类" align="center">
-          </el-table-column>
-          <el-table-column prop="itemName" label="测试项目" align="center">
-          </el-table-column>
-          <el-table-column
-            prop="itemFraction"
-            label="动作技能总分"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="unifiedStandardScore"
-            label="统一最高得分"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
+          <el-table-column prop="categoryName" label="测试分类" align="center"></el-table-column>
+          <el-table-column prop="itemName" label="测试项目" align="center"></el-table-column>
+          <el-table-column prop="itemFraction" label="动作技能总分" align="center"></el-table-column>
+          <el-table-column prop="unifiedStandardScore" label="统一最高得分" align="center"></el-table-column>
+          <!-- <el-table-column
             prop="smallStandardScore"
             label="小班最高得分"
             align="center"
@@ -1086,52 +981,39 @@
             label="大班最高得分"
             align="center"
           >
-          </el-table-column>
-          <el-table-column prop="itemScoreAll" label="综合得分" align="center">
-          </el-table-column>
-          <el-table-column
-            prop="rootCategoryScoreAll"
-            label="国民体质测定总得分"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="nationalPhysiqueRank"
-            label="国民体质测定等级"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="syntheticalAssess"
-            label="综合评价"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column prop="remark" label="测试目的" align="center">
-          </el-table-column>
+          </el-table-column>-->
+          <el-table-column prop="itemScoreAll" label="综合得分" align="center"></el-table-column>
+          <el-table-column prop="rootCategoryScoreAll" label="国民体质测定总得分" align="center"></el-table-column>
+          <el-table-column prop="nationalPhysiqueRank" label="国民体质测定等级" align="center"></el-table-column>
+          <el-table-column prop="remark" label="测试目的" align="center"></el-table-column>
+          <el-table-column prop="syntheticalAssess" label="备注" align="center"></el-table-column>
         </el-table>
       </div>
     </el-row>
     <!-- //constitution -->
-    <div class="title" style="margin: 40px auto" v-show="constitutionshow">
-      综合体质分析
-    </div>
+    <div class="title" style="margin: 40px auto" v-show="constitutionshow">综合体质分析</div>
     <el-row v-if="constitutionshow">
-      <el-col :span="24" class="card-box" style="">
+      <el-col :span="24" class="card-box" style>
         <el-card>
           <div style="margin-left: 50px">
-            <span>学校排名:</span
-            ><span style="margin-left: 20px; margin-right: 20px">{{
+            <span>学校排名:</span>
+            <span style="margin-left: 20px; margin-right: 20px">
+              {{
               constitutionlist.schoolRank
-            }}</span
-            >名 <span style="margin-left: 50px">区域排名:</span
-            ><span style="margin-left: 20px; margin-right: 20px">{{
+              }}
+            </span>名
+            <span style="margin-left: 50px">区域排名:</span>
+            <span style="margin-left: 20px; margin-right: 20px">
+              {{
               constitutionlist.areaRank
-            }}</span
-            >名 <span style="margin-left: 50px">区域成绩占比:</span
-            ><span style="margin-left: 20px; margin-right: 20px">{{
+              }}
+            </span>名
+            <span style="margin-left: 50px">区域成绩占比:</span>
+            <span style="margin-left: 20px; margin-right: 20px">
+              {{
               constitutionlist.areaProportion
-            }}</span>
+              }}
+            </span>
           </div>
 
           <div slot="header" style="text-align: center; font-size: 20px">
@@ -1148,10 +1030,7 @@
                 margin-top: 20px;
               "
             >
-              <div
-                class="constitutionchart"
-                style="width: 100%; height: 300px; margin: 0 auto"
-              ></div>
+              <div class="constitutionchart" style="width: 100%; height: 300px; margin: 0 auto"></div>
             </div>
           </div>
         </el-card>
@@ -1167,44 +1046,15 @@
           style="width: 100%; margin: 0 auto"
           :span-method="selectlistMethod"
         >
-          <el-table-column prop="physicalQualityName" label="" align="center">
-          </el-table-column>
-          <el-table-column
-            prop="degreeMovement"
-            label="运动程度"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column prop="motionType" label="运动类型" align="center">
-          </el-table-column>
-          <el-table-column
-            prop="motionFrequency"
-            label="运动频率"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="motionStrength"
-            label="运动强度"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column prop="motionTime" label="运动时间" align="center">
-          </el-table-column>
-          <el-table-column prop="motionCapacity" label="运动量" align="center">
-          </el-table-column>
-          <el-table-column
-            prop="advancedTime"
-            label="进阶时间(可选择)"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="advancedScheme"
-            label="进阶方案"
-            align="center"
-          >
-          </el-table-column>
+          <el-table-column prop="physicalQualityName" label align="center"></el-table-column>
+          <el-table-column prop="degreeMovement" label="运动程度" align="center"></el-table-column>
+          <el-table-column prop="motionType" label="运动类型" align="center"></el-table-column>
+          <el-table-column prop="motionFrequency" label="运动频率" align="center"></el-table-column>
+          <el-table-column prop="motionStrength" label="运动强度" align="center"></el-table-column>
+          <el-table-column prop="motionTime" label="运动时间" align="center"></el-table-column>
+          <el-table-column prop="motionCapacity" label="运动量" align="center"></el-table-column>
+          <el-table-column prop="advancedTime" label="进阶时间(可选择)" align="center"></el-table-column>
+          <el-table-column prop="advancedScheme" label="进阶方案" align="center"></el-table-column>
         </el-table>
       </div>
     </el-row>
@@ -1228,7 +1078,7 @@ export default {
         batchCode: "",
         pageNum: 1,
         pageSize: 999,
-        studentId: "",
+        studentId: ""
       },
       //学生基本信息 comprehensive
       sythesizestudent: [],
@@ -1270,7 +1120,7 @@ export default {
       selectspanArr3: [],
       selectposition3: 0, // 标记位置
       selectspanArr4: [],
-      selectposition4: 0, // 标记位置
+      selectposition4: 0 // 标记位置
     };
   },
   mounted() {
@@ -1306,7 +1156,7 @@ export default {
       studentId: this.itemlists.studentId,
       batchCode: this.itemlists.batchCode,
       pageNum: 1,
-      pageSize: 999,
+      pageSize: 999
     };
   },
   methods: {
@@ -1320,7 +1170,7 @@ export default {
       this.selectposition3 = 0;
       this.selectspanArr4 = [];
       this.selectposition4 = 0;
-      selectThisActionDevelopmentVO(this.echartslist).then((res) => {
+      selectThisActionDevelopmentVO(this.echartslist).then(res => {
         this.selectlist = res.data;
         this.selectlistforeach();
       });
@@ -1394,7 +1244,7 @@ export default {
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
-          colspan: _col,
+          colspan: _col
         };
       }
       if (columnIndex == 1) {
@@ -1402,7 +1252,7 @@ export default {
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
-          colspan: _col,
+          colspan: _col
         };
       }
       if (columnIndex == 6) {
@@ -1410,7 +1260,7 @@ export default {
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
-          colspan: _col,
+          colspan: _col
         };
       }
       if (columnIndex == 8) {
@@ -1418,13 +1268,13 @@ export default {
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
-          colspan: _col,
+          colspan: _col
         };
       }
     },
     //综合体质分析素质 comprehensive
     comprehensive() {
-      synthesize(this.echartslist).then((res) => {
+      synthesize(this.echartslist).then(res => {
         if (res.data == [] || !res.data) {
         } else {
           this.sythesizestudent = res.data;
@@ -1436,7 +1286,7 @@ export default {
               categoryNameAbbreviate: "暂无",
               categoryScore: null,
               levelName: "暂无",
-              maxScore: null,
+              maxScore: null
             };
             res.data.physiqueCategoryList.push(obj);
             res.data.physiqueCategoryList.push(obj);
@@ -1448,20 +1298,20 @@ export default {
               categoryNameAbbreviate: "暂无",
               categoryScore: null,
               levelName: "暂无",
-              maxScore: null,
+              maxScore: null
             };
             res.data.physiqueCategoryList.push(obj);
             res.data.physiqueCategoryList.push(obj);
           }
 
-          res.data.physiqueCategoryList.forEach((el) => {
+          res.data.physiqueCategoryList.forEach(el => {
             seriesData.push(el.categoryScore);
             if (el.levelName == null) {
               el.levelName = "暂无";
             }
             yindicator.push({
-              name: el.categoryName + " " + "(" + el.levelName + "" + ")",
-              max: el.maxScore,
+              name: el.categoryName,
+              max: el.maxScore
             });
           });
           let comprehensiveChart = echarts.init(
@@ -1473,41 +1323,41 @@ export default {
             radar: {
               name: {
                 show: true,
-                color: "black",
+                color: "black"
               },
               center: ["50%", "50%"],
               //   雷达图的指示器，用来指定雷达图中的多个变量（维度）
               indicator: yindicator,
-              shape: "polygon", //对雷达图形设置成一个圆形,可选 circle:圆形,polygon:多角形(默认)
+              shape: "polygon" //对雷达图形设置成一个圆形,可选 circle:圆形,polygon:多角形(默认)
             },
             series: [
               {
                 type: "radar",
                 label: {
                   show: true,
-                  color: "blue", //显示数值
+                  color: "blue" //显示数值
                 },
                 areaStyle: {}, //每个雷达图形成一个阴影的面积
                 data: [
                   {
                     name: "成绩区域",
-                    value: seriesData,
-                  },
+                    value: seriesData
+                  }
                 ],
                 areaStyle: {
                   color: new echarts.graphic.RadialGradient(0.1, 0.6, 1, [
                     {
                       color: "rgba(50, 50, 255, 0.1)",
-                      offset: 0,
+                      offset: 0
                     },
                     {
                       color: "rgba(50, 50, 200, 0.9)",
-                      offset: 1,
-                    },
-                  ]),
-                },
-              },
-            ],
+                      offset: 1
+                    }
+                  ])
+                }
+              }
+            ]
           };
           // 绘制图表
           comprehensiveChart.setOption(option);
@@ -1517,7 +1367,7 @@ export default {
     //学生身体形态 shape
     shape() {
       setTimeout(() => {
-        analysis(this.echartslist).then((res) => {
+        analysis(this.echartslist).then(res => {
           if (!res.data || res.data == "") {
             this.shapeshow = false;
           } else if (
@@ -1549,7 +1399,7 @@ export default {
             this.bmiItemLevel = res.data.bmiItemLevel;
             this.itemweight = res.data.weightScore;
             let seriesData = [];
-            res.data.bmiItemLevel.forEach((el) => {
+            res.data.bmiItemLevel.forEach(el => {
               seriesData.push({
                 value: el.levelMaxScore,
                 name:
@@ -1559,7 +1409,7 @@ export default {
                   el.levelMinScore +
                   "~" +
                   el.levelMaxScore +
-                  ")",
+                  ")"
               });
             });
             let shapechart = echarts.init(
@@ -1573,29 +1423,29 @@ export default {
                   // center: ["37%", "50%"],
                   itemStyle: {
                     normal: {
-                      color: function (colors) {
+                      color: function(colors) {
                         let colorList = [
                           "#91cd77",
                           "#5470c6",
                           "#fc8251",
                           "#ef6567",
                           "#f9c956",
-                          "#75bedc",
+                          "#75bedc"
                         ];
                         return colorList[colors.dataIndex];
-                      },
-                    },
+                      }
+                    }
                   },
                   data: seriesData,
                   emphasis: {
                     itemStyle: {
                       shadowBlur: 10,
                       shadowOffsetX: 0,
-                      shadowColor: "rgba(0, 0, 0, 1)",
-                    },
-                  },
-                },
-              ],
+                      shadowColor: "rgba(0, 0, 0, 1)"
+                    }
+                  }
+                }
+              ]
             };
             option && shapechart.setOption(option);
           }
@@ -1606,7 +1456,7 @@ export default {
     //学生身体素质
     quality() {
       setTimeout(() => {
-        testBodyScoreInfo(this.echartslist).then((res) => {
+        testBodyScoreInfo(this.echartslist).then(res => {
           if (!res.rows || res.rows == "" || res.rows == []) {
             this.qualityshow = false;
           } else {
@@ -1619,7 +1469,7 @@ export default {
     //constitution
     constitutioninfo() {
       setTimeout(() => {
-        constitution(this.echartslist).then((res) => {
+        constitution(this.echartslist).then(res => {
           this.constitutionlist = res.data;
           if (!res.data || res.data == "") {
             this.constitutionshow = false;
@@ -1633,13 +1483,14 @@ export default {
       }, 400);
     },
     constitutionoptions() {
-      let constitutionEchart =
-        document.getElementsByClassName("constitutionchart");
+      let constitutionEchart = document.getElementsByClassName(
+        "constitutionchart"
+      );
       for (let i = 0; i < this.constitutionlist.itemScoreList.length; i++) {
         let ydata = [
           this.constitutionlist.itemScoreList[i].itemScore,
           this.constitutionlist.itemScoreList[i].schoolAvgScore,
-          this.constitutionlist.itemScoreList[i].cityAvgScore,
+          this.constitutionlist.itemScoreList[i].cityAvgScore
         ];
         let textname = this.constitutionlist.itemScoreList[i].itemName;
         let myChart = echarts.init(constitutionEchart[i]);
@@ -1647,31 +1498,31 @@ export default {
           title: {
             text: textname,
             subtext: "",
-            left: "50%",
+            left: "50%"
           },
           tooltip: {
             trigger: "axis",
             axisPointer: {
-              type: "shadow",
+              type: "shadow"
             },
-            formatter: function (params) {
+            formatter: function(params) {
               let tar = params[1];
               return tar.name + "<br/>" + tar.seriesName + " : " + tar.value;
-            },
+            }
           },
           grid: {
             left: "3%",
             right: "4%",
             bottom: "3%",
-            containLabel: true,
+            containLabel: true
           },
           xAxis: {
             type: "category",
             splitLine: { show: false },
-            data: this.constitutionlist.itemStudentList,
+            data: this.constitutionlist.itemStudentList
           },
           yAxis: {
-            type: "value",
+            type: "value"
           },
           series: [
             {
@@ -1680,15 +1531,15 @@ export default {
               stack: "Total",
               itemStyle: {
                 borderColor: "blue",
-                color: "blue",
+                color: "blue"
               },
               emphasis: {
                 itemStyle: {
                   borderColor: "transparent",
-                  color: "transparent",
-                },
+                  color: "transparent"
+                }
               },
-              data: [0, 0, 0],
+              data: [0, 0, 0]
             },
             {
               name: "分数",
@@ -1698,11 +1549,11 @@ export default {
               barWidth: 35,
               label: {
                 show: true,
-                position: "inside",
+                position: "inside"
               },
               itemStyle: {
                 normal: {
-                  color: function (colors) {
+                  color: function(colors) {
                     let colorList = [
                       "#91cd77",
                       "#5470c6",
@@ -1727,20 +1578,20 @@ export default {
                       "#fc8251",
                       "#ef6567",
                       "#f9c956",
-                      "#75bedc",
+                      "#75bedc"
                     ];
                     return colorList[i];
-                  },
-                },
+                  }
+                }
               },
 
               // itemStyle: {
               //   borderColor: "#94D8F6",
               //   color: "#94D8F6",
               // },
-              data: ydata,
-            },
-          ],
+              data: ydata
+            }
+          ]
         };
 
         myChart.setOption(option);
@@ -1817,7 +1668,7 @@ export default {
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
-          colspan: _col,
+          colspan: _col
         };
       }
       if (columnIndex == 7) {
@@ -1825,7 +1676,7 @@ export default {
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
-          colspan: _col,
+          colspan: _col
         };
       }
       if (columnIndex == 8) {
@@ -1833,7 +1684,7 @@ export default {
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
-          colspan: _col,
+          colspan: _col
         };
       }
       if (columnIndex == 9) {
@@ -1841,14 +1692,14 @@ export default {
         const _col = _row > 0 ? 1 : 0;
         return {
           rowspan: _row,
-          colspan: _col,
+          colspan: _col
         };
       }
     },
     //动作发展检测
     listActioninfo() {
       setTimeout(() => {
-        listAction(this.echartslist).then((res) => {
+        listAction(this.echartslist).then(res => {
           this.spanArr = [];
           this.position = 0;
           this.spanArr2 = [];
@@ -1867,8 +1718,8 @@ export default {
           }
         });
       }, 300);
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped='scss'>
diff --git a/src/views/system/physique/index.vue b/src/views/system/physique/index.vue
index 2be2078..b827c22 100644
--- a/src/views/system/physique/index.vue
+++ b/src/views/system/physique/index.vue
@@ -1,47 +1,19 @@
 <template>
   <div class="app-container">
-    <el-form
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-    >
-      <kindergarten
-        @kinbatlist="kinbatlist"
-        style="width: 500px; display: inline"
-      ></kindergarten>
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <kindergarten @kinbatlist="kinbatlist" style="width: 500px; display: inline"></kindergarten>
 
       <el-form-item label="学生性别" prop="studentSex" label-width="70px">
-        <el-select
-          v-model="analysisqueryParams.studentSex"
-          clearable
-          placeholder="请选择"
-        >
-          <el-option
-            v-for="item in sexs"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
+        <el-select v-model="analysisqueryParams.studentSex" clearable placeholder="请选择">
+          <el-option v-for="item in sexs" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >查看</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-row v-show="itemshow">
@@ -56,7 +28,7 @@
       >
         <div class="test" style="height: 90px">
           <div style="text-align: center; line-height: 40px">
-            <span>本园幼儿综合体质评估综合得分</span>
+            <span>本园幼儿综合体质评估平均得分</span>
           </div>
           <div
             class="el-table--enable-row-hover el-table--medium"
@@ -67,25 +39,22 @@
                 style="
                   position: relative;
                   display: inline-block;
-                  width: 200px;
                   text-align: center;
                 "
                 v-for="(item, index) in firstCategoryScoreList"
                 :key="index"
               >
-                <span :style="index == 0 ? '' : 'margin-right:40px'">{{
+                <span :style="index == 0 ? '' : 'margin: 0 20px'">
+                  {{
                   index == 0 ? null : "+"
-                }}</span>
-                <span>
-                  {{ item.categoryName }} ({{ item.avgCategoryFraction }})
+                  }}
                 </span>
+                <span>{{ item.categoryName }} ({{ item.avgCategoryFraction }})</span>
               </span>
             </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="margin: 0 20px">=</span>
+              <span style="display: inline-block; width: 120px">综合得分({{ totalAvgFraction }})</span>
 
               <span
                 style="
@@ -105,19 +74,13 @@
         <div style="text-align: center">
           <span>幼儿园综合体质分析图</span>
         </div>
-        <div class="">
-          <div
-            ref="chart"
-            id="chart"
-            style="width: 1000px; height: 600px; margin: 0 auto"
-          ></div>
+        <div class>
+          <div ref="chart" id="chart" style="width: 1000px; height: 600px; margin: 0 auto"></div>
         </div>
       </el-col>
       <el-col :span="24" :offset="0">
         <div style="margin: 0 auto; width: 100%; line-height: 60px">
-          <div
-            style="font-size: 12px; width: 100%; overflow: auto; height: 400px"
-          >
+          <div style="font-size: 12px; width: 100%; overflow: auto; height: 400px">
             <div
               style="
                 display: flex;
@@ -143,9 +106,7 @@
                     background: #f5f7fa;
                     color: black;
                   "
-                >
-                  {{ item.parentName }}
-                </div>
+                >{{ item.parentName }}</div>
                 <div
                   style="
                     display: flex;
@@ -159,9 +120,7 @@
                     v-for="uitem in item.childrenTableNameList"
                     :key="uitem.categoryId"
                     style="width: 90px"
-                  >
-                    {{ uitem.categoryName }}
-                  </div>
+                  >{{ uitem.categoryName }}</div>
                 </div>
               </div>
             </div>
@@ -177,14 +136,12 @@
                 :key="item.prentId"
               >
                 <div style="border: 1px solid #f0f0f0">
-                  <div style="width: 90px; line-height: 50px">
-                    {{ item.studentAge }}
-                  </div>
+                  <div style="width: 90px; line-height: 50px">{{ item.studentAge }}</div>
                 </div>
                 <div style="border: 1px solid #f0f0f0">
-                  <div style="width: 90px; line-height: 50px; height: 50px">
-                    {{ item.totalAvgFraction }}
-                  </div>
+                  <div
+                    style="width: 90px; line-height: 50px; height: 50px"
+                  >{{ item.totalAvgFraction }}</div>
                 </div>
                 <div>
                   <div style="display: flex; line-height: 50px">
@@ -197,10 +154,7 @@
                         line-height: 52px;
                         height: 52px;
                       "
-                    >
-                      {{ uitem }}
-                    </div>
-                    
+                    >{{ uitem }}</div>
                   </div>
                 </div>
               </div>
@@ -215,9 +169,12 @@
       <el-col :span="24" :offset="0">
         <el-card>
           <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>
           <!-- card body -->
         </el-card>
@@ -239,12 +196,12 @@ export default {
       sexs: [
         {
           value: "MALE",
-          label: "男",
+          label: "男"
         },
         {
           value: "FEMALE",
-          label: "女",
-        },
+          label: "女"
+        }
       ],
       itemshow: false,
       itemshow2: false,
@@ -257,13 +214,13 @@ export default {
         // studentSex: "FEMALE",
         kindergartenId: "",
         batchCode: "",
-        studentSex: "",
+        studentSex: ""
       },
       categoryTableNameList: [],
       categoryAgeFractionList: [],
       categoryScoreList: [],
       firstCategoryScoreList: [],
-      totalAvgFraction: "",
+      totalAvgFraction: ""
     };
   },
   mounted() {},
@@ -282,7 +239,7 @@ export default {
     },
 
     analysisinfo() {
-      physiqueanalysis(this.analysisqueryParams).then((res) => {
+      physiqueanalysis(this.analysisqueryParams).then(res => {
         if (res.data == [] || !res.data) {
           this.itemshow2 = true;
           this.itemshow = false;
@@ -297,16 +254,16 @@ export default {
             this.itemshow = false;
           } else {
             var list = [];
-            this.categoryTableNameList.forEach((e) => {
-              e.childrenTableNameList.forEach((el) => {
+            this.categoryTableNameList.forEach(e => {
+              e.childrenTableNameList.forEach(el => {
                 list.push(el.categoryId);
               });
             });
-            this.categoryAgeFractionList.forEach((el) => {
-              var list1 = list.map((e) => {
+            this.categoryAgeFractionList.forEach(el => {
+              var list1 = list.map(e => {
                 var num = 0;
                 var number = el.categoryAvgFractionList.findIndex(
-                  (o) => o.categoryId == e
+                  o => o.categoryId == e
                 );
                 if (number != -1) {
                   num = el.categoryAvgFractionList[number].avgCategoryFraction;
@@ -317,40 +274,37 @@ export default {
             });
             let seriesData = [];
             let yindicator = [];
-            this.categoryScoreList.forEach((el) => {
-              seriesData.push(el.itemFraction);
+            this.categoryScoreList.forEach(el => {
+              seriesData.push(el.avgItemFraction);
               if (el.avgCategoryName == null) {
                 el.avgCategoryName = "暂无";
               }
               if (this.categoryScoreList.length == 1) {
                 yindicator.push({
-                  name:
-                    el.categoryName + " " + "(" + el.avgCategoryName + "" + ")",
-                  max: el.maxFraction,
+                  name: el.categoryName,
+                  max: el.maxFraction
                 });
                 yindicator.push({
                   name: "暂无数据",
-                  max: 100,
+                  max: 100
                 });
                 yindicator.push({
                   name: "暂无数据",
-                  max: 100,
+                  max: 100
                 });
               } else if (this.categoryScoreList.length == 2) {
                 yindicator.push({
-                  name:
-                    el.categoryName + " " + "(" + el.avgCategoryName + "" + ")",
-                  max: el.maxFraction,
+                  name: el.categoryName,
+                  max: el.maxFraction
                 });
                 yindicator.push({
                   name: "暂无数据",
-                  max: 100,
+                  max: 100
                 });
               } else {
                 yindicator.push({
-                  name:
-                    el.categoryName + " " + "(" + el.avgCategoryName + "" + ")",
-                  max: el.maxFraction,
+                  name: el.categoryName,
+                  max: el.maxFraction
                 });
               }
             });
@@ -361,41 +315,41 @@ export default {
               radar: {
                 name: {
                   show: true,
-                  color: "black",
+                  color: "black"
                 },
                 center: ["50%", "50%"],
                 //   雷达图的指示器，用来指定雷达图中的多个变量（维度）
                 indicator: yindicator,
-                shape: "polygon", //对雷达图形设置成一个圆形,可选 circle:圆形,polygon:多角形(默认)
+                shape: "polygon" //对雷达图形设置成一个圆形,可选 circle:圆形,polygon:多角形(默认)
               },
               series: [
                 {
                   type: "radar",
                   label: {
                     show: true,
-                    color: "#D9A508", //显示数值
+                    color: "#D9A508" //显示数值
                   },
                   areaStyle: {}, //每个雷达图形成一个阴影的面积
                   data: [
                     {
                       name: "成绩区域",
-                      value: seriesData,
-                    },
+                      value: seriesData
+                    }
                   ],
                   areaStyle: {
                     color: new echarts.graphic.RadialGradient(0.1, 0.6, 1, [
                       {
                         color: "rgba(255,192,0, 0.8)",
-                        offset: 0,
+                        offset: 0
                       },
                       {
                         color: "rgba(255,192,0, 0.9)",
-                        offset: 1,
-                      },
-                    ]),
-                  },
-                },
-              ],
+                        offset: 1
+                      }
+                    ])
+                  }
+                }
+              ]
             };
             // 绘制图表
             myChart.setOption(option);
@@ -407,7 +361,7 @@ export default {
     },
     getList() {
       //用户权限
-      getRoleInfo().then((res) => {
+      getRoleInfo().then(res => {
         var user = res.data.roleKeys;
         if (user.includes("enchou")) {
           return;
@@ -422,8 +376,8 @@ export default {
     reset() {
       this.form = {};
       this.resetForm("form");
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped='scss'>
diff --git a/src/views/system/quality/index.vue b/src/views/system/quality/index.vue
index eda6041..98c652b 100644
--- a/src/views/system/quality/index.vue
+++ b/src/views/system/quality/index.vue
@@ -1,37 +1,15 @@
 <template>
   <div class="app-container">
-    <el-form
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-    >
-      <student
-        style="width: 500px; display: inline"
-        @itemlist="itemlists"
-      ></student>
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <student style="width: 500px; display: inline" @itemlist="itemlists"></student>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >查看</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-card
-      v-show="itemshow"
-      class="box-card"
-      style="width: 95%; margin: 0 auto"
-    >
+    <el-card v-show="itemshow" class="box-card" style="width: 95%; margin: 0 auto">
       <div slot="header" style="text-align: center">身体素质测试</div>
       <el-row style="text-align: center">
         <el-col
@@ -41,8 +19,7 @@
             border-right: 1px solid #ededed;
             border-bottom: 1px solid #ededed;
           "
-          >身体素质测试</el-col
-        >
+        >身体素质测试</el-col>
         <el-col
           :span="5"
           class="toptitle"
@@ -50,8 +27,7 @@
             border-right: 1px solid #ededed;
             border-bottom: 1px solid #ededed;
           "
-          >测量值</el-col
-        >
+        >测量值</el-col>
         <el-col
           :span="9"
           class="toptitle"
@@ -59,20 +35,10 @@
             border-right: 1px solid #ededed;
             border-bottom: 1px solid #ededed;
           "
-          >成绩</el-col
-        >
-        <el-col
-          :span="5"
-          class="toptitle"
-          style="border-bottom: 1px solid #ededed"
-          >综合评价</el-col
-        >
+        >成绩</el-col>
+        <el-col :span="5" class="toptitle" style="border-bottom: 1px solid #ededed">备注</el-col>
       </el-row>
-      <el-row
-        style="text-align: center"
-        v-for="(item, index) in studentscorelist"
-        :key="index"
-      >
+      <el-row style="text-align: center" v-for="(item, index) in studentscorelist" :key="index">
         <el-col
           :span="5"
           class="text"
@@ -82,9 +48,7 @@
             border-right: 1px solid #ededed;
             border-bottom: 1px solid #ededed;
           "
-        >
-          {{ item.itemName }}
-        </el-col>
+        >{{ item.itemName }}</el-col>
         <el-col
           class="text"
           :span="5"
@@ -95,8 +59,7 @@
             border-bottom: 1px solid #ededed;
           "
         >
-          {{ item.itemScore ? item.itemScore : "" }}
-          {{ item.scoreDictValue ? item.scoreDictValue : "" }}
+          {{ item.itemScore>=0 ? item.itemScore :item.scoreDictValue ? item.scoreDictValue : ""}}
           {{ item.measureUnit }}
         </el-col>
 
@@ -112,17 +75,18 @@
             overflow: hidden;
           "
         >
-          <span style="position: absolute; left: 5%; top: 10px"
-            >{{
-              item.measureUnit == "s" || item.measureUnit == "h" ? "时间" : ""
+          <span style="position: absolute; left: 5%; top: 10px">
+            {{
+            item.measureUnit == "s" || item.measureUnit == "h" ? "时间" : ""
             }}{{
-              item.measureUnit == "cm" || item.measureUnit == "m" ? "距离" : ""
+            item.measureUnit == "cm" || item.measureUnit == "m" ? "距离" : ""
             }}
             {{ item.measureUnit == "kg" ? "千克" : "" }}
-            {{ item.measureUnit == "g" ? "克" : "" }}({{ item.measureUnit }})
+            {{ item.measureUnit == "g" ? "克" : "" }}
+            {{ item.measureUnit == "分" ? "成绩" : "" }}({{ item.measureUnit }})
           </span>
 
-          <span style="position: absolute; left: 6%; top: 70%">评价</span>
+          <!-- <span style="position: absolute; left: 6%; top: 70%">评价</span> -->
           <div
             style="
               width: 65%;
@@ -143,10 +107,10 @@
               "
             >
               {{
-                (
-                  ((item.maxScore - item.minScore) / 5) * 4 +
-                  item.minScore
-                ).toFixed(1)
+              (
+              ((item.maxScore - item.minScore) / 5) * 4 +
+              item.minScore
+              ).toFixed(1)
               }}
             </div>
             <div
@@ -170,10 +134,10 @@
               "
             >
               {{
-                (
-                  ((item.maxScore - item.minScore) / 5) * 3 +
-                  item.minScore
-                ).toFixed(1)
+              (
+              ((item.maxScore - item.minScore) / 5) * 3 +
+              item.minScore
+              ).toFixed(1)
               }}
             </div>
             <div
@@ -197,10 +161,10 @@
               "
             >
               {{
-                (
-                  ((item.maxScore - item.minScore) / 5) * 2 +
-                  item.minScore
-                ).toFixed(1)
+              (
+              ((item.maxScore - item.minScore) / 5) * 2 +
+              item.minScore
+              ).toFixed(1)
               }}
             </div>
             <div
@@ -225,10 +189,10 @@
               "
             >
               {{
-                (
-                  ((item.maxScore - item.minScore) / 5) * 1 +
-                  item.minScore
-                ).toFixed(1)
+              (
+              ((item.maxScore - item.minScore) / 5) * 1 +
+              item.minScore
+              ).toFixed(1)
               }}
             </div>
             <div
@@ -250,9 +214,7 @@
                 overflow: hidden;
                 width: 32px;
               "
-            >
-              {{ item.minScore == null ? 0 : item.minScore }}
-            </div>
+            >{{ item.minScore == null ? 0 : item.minScore }}</div>
             <div
               style="
                 position: absolute;
@@ -273,9 +235,7 @@
                 overflow: hidden;
                 width: 32px;
               "
-            >
-              {{ item.maxScore == null ? 100 : item.maxScore }}
-            </div>
+            >{{ item.maxScore == null ? 100 : item.maxScore }}</div>
             <div
               style="
                 position: absolute;
@@ -298,10 +258,9 @@
               }"
             ></div>
           </div>
-
-          <div style="position: absolute; left: 30%; top: 72%">
+          <!-- <div style="position: absolute; left: 30%; top: 72%">
             {{ item.leveName }}
-          </div>
+          </div>-->
         </el-col>
         <el-col
           class="text"
@@ -314,18 +273,15 @@
             position: relative;
           "
         >
-          <span
+          <!-- <span
             style="
               margin-top: 20px;
               float: left;
               margin-left: 5%;
               margin-top: 7%;
             "
-            >成绩评价</span
-          >
-          <div style="position: absolute; left: 25%; top: 40%">
-            {{ item.scoreDictValue }}
-          </div>
+          >成绩评价</span>-->
+          <div style="position: absolute; left: 25%; top: 40%">{{ item.scoreDictValue }}</div>
         </el-col>
         <el-col
           class="text"
@@ -335,17 +291,19 @@
             line-height: 100px;
             border-bottom: 1px solid #ededed;
           "
-          >{{ item.syntheticalAssess }}</el-col
-        >
+        >{{ item.syntheticalAssess }}</el-col>
       </el-row>
     </el-card>
     <el-row :gutter="20" v-if="itemshow2">
       <el-col :span="24" :offset="0">
         <el-card>
           <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>
           <!-- card body -->
         </el-card>
@@ -360,7 +318,7 @@ import { getRoleInfo, testBodyScoreInfo } from "@/api/system/quality";
 export default {
   name: "quality",
   components: {
-    student,
+    student
   },
   data() {
     return {
@@ -375,14 +333,14 @@ export default {
         pageNum: 1,
         pageSize: 999,
         studentId: "",
-        batchCode: "",
+        batchCode: ""
         // studentId: "27",
         // batchCode: "PC202208230011",
         // studentId: "14",
         // batchCode: "PC202208030005",
         // studentId: "9",
         // batchCode: "PC202208030004",
-      },
+      }
     };
   },
 
@@ -398,7 +356,7 @@ export default {
     },
     //学生身体素质
     studenttext() {
-      testBodyScoreInfo(this.studentscore).then((res) => {
+      testBodyScoreInfo(this.studentscore).then(res => {
         // res.rows[3].levelMaxScore = 19.5;
         // res.rows[3].levelMinScore = 4.5;
         // res.rows[3].itemScore = 7.5;
@@ -414,7 +372,7 @@ export default {
     },
     getList() {
       //用户权限
-      getRoleInfo().then((res) => {
+      getRoleInfo().then(res => {
         this.classqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
         if (user.includes("enchou")) {
@@ -430,8 +388,8 @@ export default {
     reset() {
       this.form = {};
       this.resetForm("form");
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped='scss'>
diff --git a/src/views/system/shape/index.vue b/src/views/system/shape/index.vue
index 7a0bb78..ad3f39e 100644
--- a/src/views/system/shape/index.vue
+++ b/src/views/system/shape/index.vue
@@ -1,47 +1,23 @@
 <template>
   <div class="app-container">
-    <el-form
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-    >
-      <student
-        style="width: 500px; display: inline"
-        @itemlist="itemlists"
-      ></student>
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <student style="width: 500px; display: inline" @itemlist="itemlists"></student>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >查看</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-row v-show="itemshow">
-      <el-col
-        :span="11"
-        class="card-box"
-        style="margin-left: 30px; margin-right: 50px"
-      >
+      <el-col :span="11" class="card-box" style="margin-left: 30px; margin-right: 50px">
         <el-card>
           <div slot="header" style="text-align: center">
             <span>{{ analysislist.shapeTitle }}</span>
           </div>
           <div class="el-table el-table--enable-row-hover el-table--medium">
-            <div ref="commandstats" style="height: 100px">
-              {{ analysislist.shapeDescription }}
-            </div>
+            <div ref="commandstats" style="height: 100px">{{ analysislist.shapeDescription }}</div>
           </div>
         </el-card>
       </el-col>
@@ -57,45 +33,33 @@
               <table cellspacing="0" style="width: 100%; height: 100px">
                 <tbody>
                   <tr>
-                    <td
-                      class="el-table__cell is-leaf"
-                      style="text-align: center"
-                    >
+                    <td class="el-table__cell is-leaf" style="text-align: center">
                       <div class="cell">
                         姓名:
                         {{ analysislist.studentName }}
                       </div>
                     </td>
-                    <td
-                      class="el-table__cell is-leaf"
-                      style="text-align: center"
-                    >
+                    <td class="el-table__cell is-leaf" style="text-align: center">
                       <div class="cell">
                         {{
-                          analysislist.heightName
-                            ? analysislist.heightName
-                            : "身高"
+                        analysislist.heightName
+                        ? analysislist.heightName
+                        : "身高"
                         }}: {{ analysislist.heightScore
                         }}{{ analysislist.heightMeasureUnit }}
                       </div>
                     </td>
-                    <td
-                      class="el-table__cell is-leaf"
-                      style="text-align: center"
-                    >
+                    <td class="el-table__cell is-leaf" style="text-align: center">
                       <div class="cell">
                         {{
-                          analysislist.weightName
-                            ? analysislist.weightName
-                            : "体重"
+                        analysislist.weightName
+                        ? analysislist.weightName
+                        : "体重"
                         }}: {{ analysislist.weightScore
                         }}{{ analysislist.weightMeasureUnit }}
                       </div>
                     </td>
-                    <td
-                      class="el-table__cell is-leaf"
-                      style="text-align: center"
-                    >
+                    <td class="el-table__cell is-leaf" style="text-align: center">
                       <div class="cell">
                         <div class="cell">BMI值: {{ analysislist.bmi }}</div>
                       </div>
@@ -110,7 +74,7 @@
     </el-row>
 
     <el-row style="margin-top: 50px" v-show="itemshow">
-      <el-col
+      <!-- <el-col
         :span="11"
         class="card-box"
         style="margin-left: 30px; margin-right: 50px; height: 370px"
@@ -290,7 +254,6 @@
                 ></div>
               </div>
 
-              <!-- <div style="color: red">达标</div> -->
               <div>{{ analysislist.ageHeightDescription }}</div>
               <div>
                 标准:{{ analysislist.ageHeightMin }}-{{
@@ -469,8 +432,6 @@
                   }"
                 ></div>
               </div>
-
-              <!-- <div style="color: red">达标</div> -->
               <div>{{ analysislist.ageWeightDescription }}</div>
               <div>
                 标准:{{ analysislist.ageWeightMin }}-{{
@@ -480,13 +441,13 @@
             </div>
           </div>
         </el-card>
-      </el-col>
+      </el-col>-->
 
       <el-col
         :span="11"
         class="card-box"
-        style="height: 370px"
         v-show="itemshow3"
+        style="margin-left: 30px; margin-right: 50px; height: 370px"
       >
         <el-card>
           <div slot="header" style="text-align: center">
@@ -497,11 +458,7 @@
             class="el-table el-table--enable-row-hover el-table--medium"
             style="height: 310px; position: relative"
           >
-            <div
-              ref="chart"
-              id="chart"
-              style="width: 450px; height: 320px; margin: 0 auto"
-            ></div>
+            <div ref="chart" id="chart" style="width: 450px; height: 320px; margin: 0 auto"></div>
 
             <div
               style="
@@ -511,7 +468,8 @@
                 transform: translate(-50%);
               "
             >
-              得分: <span style="color: red">{{ analysislist.bmi }}</span>
+              得分:
+              <span style="color: red">{{ analysislist.bmi }}</span>
             </div>
             <div
               style="
@@ -520,9 +478,7 @@
                 top: 55%;
                 transform: translate(-50%);
               "
-            >
-              {{ analysislist.bmiDescription }}
-            </div>
+            >{{ analysislist.bmiDescription }}</div>
             <!-- <div
               class="texts"
               style="
@@ -615,7 +571,7 @@
                   {{ item.levelMinScore }}~{{ item.levelMaxScore }}
                 </div>
               </span>
-            </div> -->
+            </div>-->
             <div></div>
           </div>
         </el-card>
@@ -626,9 +582,12 @@
       <el-col :span="24" :offset="0">
         <el-card>
           <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>
           <!-- card body -->
         </el-card>
@@ -668,8 +627,8 @@ export default {
         // studentId: "10",
         // batchCode: "PC202208030005",
         studentId: "",
-        batchCode: "",
-      },
+        batchCode: ""
+      }
     };
   },
   mounted() {},
@@ -687,7 +646,7 @@ export default {
     },
     //学生身体形态
     studentanalysis() {
-      analysis(this.analysisstudent).then((res) => {
+      analysis(this.analysisstudent).then(res => {
         if (!res.data || res.data == "") {
           this.itemshow2 = true;
           this.itemshow3 = false;
@@ -724,7 +683,7 @@ export default {
           this.bmiItemLevel = res.data.bmiItemLevel;
           this.itemweight = res.data.weightScore;
           let seriesData = [];
-          res.data.bmiItemLevel.forEach((el) => {
+          res.data.bmiItemLevel.forEach(el => {
             seriesData.push({
               value: el.levelMaxScore,
               name:
@@ -734,7 +693,7 @@ export default {
                 el.levelMinScore +
                 "~" +
                 el.levelMaxScore +
-                ")",
+                ")"
             });
           });
           var myChart = echarts.init(document.getElementById("chart"));
@@ -746,29 +705,29 @@ export default {
                 // center: ["37%", "50%"],
                 itemStyle: {
                   normal: {
-                    color: function (colors) {
+                    color: function(colors) {
                       var colorList = [
                         "#91cd77",
                         "#5470c6",
                         "#fc8251",
                         "#ef6567",
                         "#f9c956",
-                        "#75bedc",
+                        "#75bedc"
                       ];
                       return colorList[colors.dataIndex];
-                    },
-                  },
+                    }
+                  }
                 },
                 data: seriesData,
                 emphasis: {
                   itemStyle: {
                     shadowBlur: 10,
                     shadowOffsetX: 0,
-                    shadowColor: "rgba(0, 0, 0, 1)",
-                  },
-                },
-              },
-            ],
+                    shadowColor: "rgba(0, 0, 0, 1)"
+                  }
+                }
+              }
+            ]
           };
           option && myChart.setOption(option);
           this.itemshow2 = false;
@@ -779,7 +738,7 @@ export default {
     },
     getList() {
       //用户权限
-      getRoleInfo().then((res) => {
+      getRoleInfo().then(res => {
         this.classqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
         if (user.includes("enchou")) {
@@ -795,8 +754,8 @@ export default {
     reset() {
       this.form = {};
       this.resetForm("form");
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped='scss'>
diff --git a/src/views/system/studentInfo/index.vue b/src/views/system/studentInfo/index.vue
index f7a2a57..26f609b 100644
--- a/src/views/system/studentInfo/index.vue
+++ b/src/views/system/studentInfo/index.vue
@@ -963,9 +963,9 @@ export default {
         kindergartenId: [
           { required: true, message: "所属幼儿园不能为空", trigger: "blur" }
         ],
-        studentNumber: [
-          { required: true, message: "请输入学生编号", trigger: "blur" }
-        ],
+        // studentNumber: [
+        //   { required: true, message: "请输入学生编号", trigger: "blur" }
+        // ],
         phone: [
           {
             required: true,
diff --git a/src/views/system/survey/index.vue b/src/views/system/survey/index.vue
index 79c5e77..31fa12a 100644
--- a/src/views/system/survey/index.vue
+++ b/src/views/system/survey/index.vue
@@ -14,19 +14,19 @@
         <div style="display: flex; margin-top: 20px">
           <div style="width: 50%">
             <div slot="header" class="header">
-              <span>班级综合体测成绩排名</span>
+              <span>班级体测总成绩统计图</span>
             </div>
             <div v-if="yclassname1.length != 0" style="position: relative">
               <div class="title">大班</div>
-              <div id="main" style="width: 500px; height: 350px; margin: 0 auto"></div>
+              <div id="main" style="width: 550px; height: 400px; margin: 0 auto"></div>
             </div>
             <div v-if="yclassname2.length != 0" style="position: relative">
               <div class="title">中班</div>
-              <div id="main2" style="width: 500px; height: 350px; margin: 0 auto"></div>
+              <div id="main2" style="width: 550px; height: 400px; margin: 0 auto"></div>
             </div>
             <div v-if="yclassname3.length != 0" style="position: relative">
               <div class="title">小班</div>
-              <div id="main3" style="width: 500px; height: 350px; margin: 0 auto"></div>
+              <div id="main3" style="width: 550px; height: 400px; margin: 0 auto"></div>
             </div>
           </div>
           <div style="width: 50%">
@@ -304,7 +304,7 @@ export default {
               verticalAlign: app.config.verticalAlign,
               rotate: app.config.rotate,
               formatter: "{c}",
-              fontSize: 16,
+              fontSize: 12,
               rich: {
                 name: {}
               }
@@ -319,6 +319,16 @@ export default {
               legend: {},
               xAxis: [
                 {
+                  axisLabel: {
+                    inside: false,
+                    textStyle: {
+                      color: "#000",
+                      fontSize: "10",
+                      itemSize: ""
+                    },
+                    interval: 0,
+                    rotate: -30 //倾斜的程度
+                  },
                   type: "category",
                   axisTick: { show: false },
                   data: this.yclassname1
@@ -356,6 +366,16 @@ export default {
               legend: {},
               xAxis: [
                 {
+                  axisLabel: {
+                    inside: false,
+                    textStyle: {
+                      color: "#000",
+                      fontSize: "10",
+                      itemSize: ""
+                    },
+                    interval: 0,
+                    rotate: -30 //倾斜的程度
+                  },
                   type: "category",
                   axisTick: { show: false },
                   data: this.yclassname2
@@ -391,6 +411,16 @@ export default {
               legend: {},
               xAxis: [
                 {
+                  axisLabel: {
+                    inside: false,
+                    textStyle: {
+                      color: "#000",
+                      fontSize: "10",
+                      itemSize: ""
+                    },
+                    interval: 0,
+                    rotate: -30 //倾斜的程度
+                  },
                   type: "category",
                   axisTick: { show: false },
                   data: this.yclassname3
@@ -497,7 +527,7 @@ export default {
   border-radius: 15px;
   position: absolute;
   left: 7%;
-  top: 8%;
+  top: 6%;
 }
 ::v-deep .el-card__header {
   border: none;
diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue
index 2faf1a7..53c5b12 100644
--- a/src/views/system/testItemScore/index.vue
+++ b/src/views/system/testItemScore/index.vue
@@ -333,7 +333,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column property="syntheticalAssess" label="综合评价" width="230" align="center">
+        <el-table-column property="syntheticalAssess" label="备注" width="230" align="center">
           <template slot-scope="scope">
             <el-input v-model="scope.row.syntheticalAssess"></el-input>
           </template>
@@ -427,7 +427,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column property="syntheticalAssess" label="综合评价" width="180" align="center">
+        <el-table-column property="syntheticalAssess" label="备注" width="180" align="center">
           <template slot-scope="scope">
             <el-input v-model="scope.row.syntheticalAssess"></el-input>
           </template>
@@ -763,7 +763,7 @@
           </template>-->
         </el-table-column>
 
-        <el-table-column property="syntheticalAssess" label="综合评价" width="180" align="center">
+        <el-table-column property="syntheticalAssess" label="备注" width="180" align="center">
           <!-- <template slot-scope="scope">
             <el-input v-model="scope.row.syntheticalAssess" readonly></el-input>
           </template>-->
@@ -932,35 +932,73 @@ export default {
     this.getList();
   },
   methods: {
-    oninputscore2(item) {
-      if (item.itemCode == "H001") {
-        this.Height = item.itemScore;
-        if (item.itemScore == "") {
-          this.form.itemScoreList.forEach(e => {
-            if (e.itemCode == "W001") {
-              e.itemFraction = "";
-              e.itemScore = "";
-            }
-          });
-        }
-      }
-      if (item.itemScore == "") {
+    oninputitemFractionedit(item) {
+      if (item.itemCode.split("-")[0] == "T") {
         this.form.itemScoreList.forEach(e => {
           if (e.testItemId == item.testItemId) {
-            e.itemFraction = "";
+            e.itemScore = e.itemFraction;
+          }
+        });
+      }
+    },
+    oninputitemFractionadd(item) {
+      if (item.itemCode.split("-")[0] == "T") {
+        this.form.itemScoreList.forEach(e => {
+          if (e.itemId == item.itemId) {
+            e.itemScore = e.itemFraction;
+          }
+        });
+      }
+    },
+    oninputscore2(item) {
+      if (item.itemCode.split("-")[0] == "T") {
+        this.form.itemScoreList.forEach(e => {
+          if (e.testItemId == item.testItemId) {
+            e.itemFraction = e.itemScore;
           }
         });
       } else {
-        if (item.itemCode == "W001") {
-          if (this.Height == "") {
-            this.$message.error("请先添加身高成绩！");
-            item.itemScore = "";
-            item.itemFraction = "";
+        if (item.itemCode == "H001") {
+          this.Height = item.itemScore;
+          if (item.itemScore == "") {
+            this.form.itemScoreList.forEach(e => {
+              if (e.itemCode == "W001") {
+                e.itemFraction = "";
+                e.itemScore = "";
+              }
+            });
+          }
+        }
+        if (item.itemScore == "") {
+          this.form.itemScoreList.forEach(e => {
+            if (e.testItemId == item.testItemId) {
+              e.itemFraction = "";
+            }
+          });
+        } else {
+          if (item.itemCode == "W001") {
+            if (this.Height == "") {
+              this.$message.error("请先添加身高成绩！");
+              item.itemScore = "";
+              item.itemFraction = "";
+            } else {
+              WgetStudentFraction(
+                this.addqueryParams.studentId,
+                item.testItemId,
+                this.Height,
+                item.itemScore
+              ).then(res => {
+                this.form.itemScoreList.forEach(e => {
+                  if (e.testItemId == res.data.itemId) {
+                    e.itemFraction = res.data.fraction;
+                  }
+                });
+              });
+            }
           } else {
-            WgetStudentFraction(
+            getStudentFraction(
               this.addqueryParams.studentId,
               item.testItemId,
-              this.Height,
               item.itemScore
             ).then(res => {
               this.form.itemScoreList.forEach(e => {
@@ -970,50 +1008,58 @@ export default {
               });
             });
           }
-        } else {
-          getStudentFraction(
-            this.addqueryParams.studentId,
-            item.testItemId,
-            item.itemScore
-          ).then(res => {
-            this.form.itemScoreList.forEach(e => {
-              if (e.testItemId == res.data.itemId) {
-                e.itemFraction = res.data.fraction;
-              }
-            });
-          });
         }
       }
     },
     oninputscore(item) {
-      if (item.itemCode == "H001") {
-        this.Height = item.itemScore;
-        if (item.itemScore == "") {
-          this.form.itemScoreList.forEach(e => {
-            if (e.itemCode == "W001") {
-              e.itemFraction = "";
-              e.itemScore = "";
-            }
-          });
-        }
-      }
-      if (item.itemScore == "") {
+      if (item.itemCode.split("-")[0] == "T") {
         this.form.itemScoreList.forEach(e => {
           if (e.itemId == item.itemId) {
-            e.itemFraction = "";
+            e.itemFraction = e.itemScore;
           }
         });
       } else {
-        if (item.itemCode == "W001") {
-          if (this.Height == "") {
-            this.$message.error("请先添加身高成绩！");
-            item.itemScore = "";
-            item.itemFraction = "";
+        if (item.itemCode == "H001") {
+          this.Height = item.itemScore;
+          if (item.itemScore == "") {
+            this.form.itemScoreList.forEach(e => {
+              if (e.itemCode == "W001") {
+                e.itemFraction = "";
+                e.itemScore = "";
+              }
+            });
+          }
+        }
+        if (item.itemScore == "") {
+          this.form.itemScoreList.forEach(e => {
+            if (e.itemId == item.itemId) {
+              e.itemFraction = "";
+            }
+          });
+        } else {
+          if (item.itemCode == "W001") {
+            if (this.Height == "") {
+              this.$message.error("请先添加身高成绩！");
+              item.itemScore = "";
+              item.itemFraction = "";
+            } else {
+              WgetStudentFraction(
+                this.addqueryParams.studentId,
+                item.itemId,
+                this.Height,
+                item.itemScore
+              ).then(res => {
+                this.form.itemScoreList.forEach(e => {
+                  if (e.itemId == res.data.itemId) {
+                    e.itemFraction = res.data.fraction;
+                  }
+                });
+              });
+            }
           } else {
-            WgetStudentFraction(
+            getStudentFraction(
               this.addqueryParams.studentId,
               item.itemId,
-              this.Height,
               item.itemScore
             ).then(res => {
               this.form.itemScoreList.forEach(e => {
@@ -1023,18 +1069,6 @@ export default {
               });
             });
           }
-        } else {
-          getStudentFraction(
-            this.addqueryParams.studentId,
-            item.itemId,
-            item.itemScore
-          ).then(res => {
-            this.form.itemScoreList.forEach(e => {
-              if (e.itemId == res.data.itemId) {
-                e.itemFraction = res.data.fraction;
-              }
-            });
-          });
         }
       }
     },
diff --git a/src/views/system/testItems/index.vue b/src/views/system/testItems/index.vue
index 8efc9d3..4882b63 100644
--- a/src/views/system/testItems/index.vue
+++ b/src/views/system/testItems/index.vue
@@ -863,13 +863,13 @@ export default {
             trigger: "blur",
           },
         ],
-        itemLevelList: [
-          {
-            required: true,
-            validator: itemLevelList,
-            trigger: "blur",
-          },
-        ],
+        // itemLevelList: [
+        //   {
+        //     required: true,
+        //     validator: itemLevelList,
+        //     trigger: "blur",
+        //   },
+        // ],
         minScore: [
           {
             required: true,