diff --git a/package.json b/package.json
index 52dd699..16b7c0f 100644
--- a/package.json
+++ b/package.json
@@ -46,9 +46,11 @@
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
+    "html2canvas": "^1.4.1",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
+    "jspdf": "^2.5.1",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
diff --git a/src/api/system/KindergartenPhysicalTest.js b/src/api/system/KindergartenPhysicalTest.js
index fb203e6..0262e31 100644
--- a/src/api/system/KindergartenPhysicalTest.js
+++ b/src/api/system/KindergartenPhysicalTest.js
@@ -1,10 +1,10 @@
 import request from '@/utils/request'
 
 // 查询
-export function analysis(query) {
+export function KindergartenPhysicalTestanalysis(query) {
     return request({
         url: '/kindergarten/side/analysis',
         method: 'get',
         params: query
     })
-}
+}
\ No newline at end of file
diff --git a/src/api/system/constitution.js b/src/api/system/constitution.js
index 8a9f365..265c846 100644
--- a/src/api/system/constitution.js
+++ b/src/api/system/constitution.js
@@ -1,10 +1,10 @@
 import request from '@/utils/request'
 
 // 查询
-export function analysis(query) {
+export function constitution(query) {
     return request({
         url: '/children/ranking/analysis',
         method: 'get',
         params: query
     })
-}
+}
\ No newline at end of file
diff --git a/src/api/system/development.js b/src/api/system/development.js
index a04293c..da3c965 100644
--- a/src/api/system/development.js
+++ b/src/api/system/development.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 查询
-export function analysis(query) {
+export function developmentanalysis(query) {
     return request({
         url: '/physical/action/analysis',
         method: 'get',
diff --git a/src/api/system/heightAndWeight.js b/src/api/system/heightAndWeight.js
index c7b847b..757fead 100644
--- a/src/api/system/heightAndWeight.js
+++ b/src/api/system/heightAndWeight.js
@@ -1,10 +1,10 @@
 import request from '@/utils/request'
 
 // 查询
-export function analysis(query) {
+export function heightAndWeightanalysis(query) {
     return request({
         url: '/average/heightAndWeight/analysis',
         method: 'get',
         params: query
     })
-}
+}
\ No newline at end of file
diff --git a/src/api/system/kindergartenCheckReport.js b/src/api/system/kindergartenCheckReport.js
index dbe2cc3..cc6e606 100644
--- a/src/api/system/kindergartenCheckReport.js
+++ b/src/api/system/kindergartenCheckReport.js
@@ -35,4 +35,14 @@ export function report(kindergartenId, batchCode) {
         url: `/system/checkReport/kindergarten/constitution?kindergartenId=${kindergartenId}&batchCode=${batchCode}`,
         method: 'POST'
     })
+}
+
+// 幼儿园报告上传接口
+
+export function uploadKindergartenCheckReport(data) {
+    return request({
+        url: `/system/kindergartenCheckReport/uploadKindergartenCheckReport`,
+        method: 'POST',
+        data
+    })
 }
\ No newline at end of file
diff --git a/src/api/system/personalCheckReport.js b/src/api/system/personalCheckReport.js
index 3fb9ab6..a885137 100644
--- a/src/api/system/personalCheckReport.js
+++ b/src/api/system/personalCheckReport.js
@@ -52,4 +52,15 @@ export function report(id) {
         method: 'POST',
         responseType: 'blob'
     })
+}
+
+
+
+// 幼儿个人报告上传接口
+export function uploadPersonalCheckReport(data) {
+    return request({
+        url: `/system/personalCheckReport/uploadPersonalCheckReport `,
+        method: 'POST',
+        data
+    })
 }
\ No newline at end of file
diff --git a/src/api/system/physique.js b/src/api/system/physique.js
index 19f78e4..3ea62a2 100644
--- a/src/api/system/physique.js
+++ b/src/api/system/physique.js
@@ -1,10 +1,10 @@
 import request from '@/utils/request'
 
 // 查询
-export function analysis(query) {
+export function physiqueanalysis(query) {
     return request({
         url: '/kindergarten/physique/analysis',
         method: 'get',
         params: query
     })
-}
+}
\ No newline at end of file
diff --git a/src/icons/kind.jpg b/src/icons/kind.jpg
new file mode 100644
index 0000000..387f7b9
Binary files /dev/null and b/src/icons/kind.jpg differ
diff --git a/src/icons/pernoal.jpg b/src/icons/pernoal.jpg
new file mode 100644
index 0000000..8e5bf4b
Binary files /dev/null and b/src/icons/pernoal.jpg differ
diff --git a/src/layout/index.vue b/src/layout/index.vue
index fea38a6..8715220 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -77,7 +77,6 @@ export default {
   },
   watch: {
     $route(to, from) {
-      console.log(to.path, from.path);
       if (to.path != "/index") {
         this.show = false;
       } else {
@@ -87,8 +86,6 @@ export default {
   },
   methods: {
     info() {
-      console.log(this.$router.path);
-      console.log(this.$route.path);
       if (this.$route.path != "/index") {
         this.show = false;
       } else {
diff --git a/src/utils/request.js b/src/utils/request.js
index 6484b43..d59d440 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -18,7 +18,7 @@ const service = axios.create({
     // axios中请求配置有baseURL选项，表示请求URL公共部分
     baseURL: process.env.VUE_APP_BASE_API, //'http://192.168.16.64:8080',
     // 超时
-    timeout: 10000
+    timeout: 20000
 })
 
 // request拦截器
diff --git a/src/views/system/KindergartenPhysicalTest/index.vue b/src/views/system/KindergartenPhysicalTest/index.vue
index a8bf966..cec6c25 100644
--- a/src/views/system/KindergartenPhysicalTest/index.vue
+++ b/src/views/system/KindergartenPhysicalTest/index.vue
@@ -133,7 +133,7 @@
 import * as echarts from "echarts";
 import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
 import { getRoleInfo } from "@/api/system/quality";
-import { analysis } from "@/api/system/KindergartenPhysicalTest";
+import { KindergartenPhysicalTestanalysis } from "@/api/system/KindergartenPhysicalTest";
 import Kindergarten from "../../assembly/kindergarten.vue";
 
 export default {
@@ -176,7 +176,7 @@ export default {
     },
 
     analysisinfo() {
-      analysis(this.analysisqueryParams).then((res) => {
+      KindergartenPhysicalTestanalysis(this.analysisqueryParams).then((res) => {
         if (res.data == [] || !res.data) {
           this.itemshow2 = true;
           this.itemshow = false;
diff --git a/src/views/system/classconstitution/index.vue b/src/views/system/classconstitution/index.vue
index a5ffb25..7ef4729 100644
--- a/src/views/system/classconstitution/index.vue
+++ b/src/views/system/classconstitution/index.vue
@@ -127,96 +127,108 @@
 
     <el-row v-show="itemshow">
       <el-col :span="24" :offset="0">
-        <div style="margin: 0 autu; font-size: 14px">
-          <div
-            style="
-              line-height: 60px;
-              display: flex;
-              text-align: center;
-              justify-content: center;
-              color: black;
-              font-weight: 550;
-            "
-          >
+        <div style="margin: 0 auto; width: 1000px">
+          <div style="font-size: 12px; width: 100%; overflow: auto">
             <div
               style="
-                width: 120px;
-                border: 1px solid #f0f0f0;
-                background: #f5f7fa;
+                line-height: 60px;
+                display: flex;
+                text-align: center;
+                justify-content: flex-start;
+                color: black;
+                font-weight: 550;
               "
             >
-              年龄
-            </div>
-            <div
-              style="
-                width: 120px;
-                border: 1px solid #f0f0f0;
-                background: #f5f7fa;
-              "
-            >
-              平均总分
-            </div>
-            <div v-for="item in categoryTableNameList" :key="item.prentId">
-              <div
-                style="
-                  text-align: center;
-                  line-height: 30px;
-                  border: 1px solid #f0f0f0;
-                  background: #f5f7fa;
-                "
-              >
-                {{ item.parentName }}
-              </div>
-              <div
-                style="
-                  display: flex;
-                  line-height: 30px;
-                  border: 1px solid #f0f0f0;
-                  background: #f5f7fa;
-                  font-size: 12px;
-                "
-              >
+              <div>
                 <div
-                  v-for="uitem in item.childrenTableNameList"
-                  :key="uitem.categoryId"
-                  style="width: 120px"
+                  style="
+                    width: 120px;
+                    border: 1px solid #f0f0f0;
+                    background: #f5f7fa;
+                  "
                 >
-                  {{ uitem.categoryName }}
+                  年龄
                 </div>
               </div>
-            </div>
-          </div>
-          <div style="font-size: 14px">
-            <div
-              style="
-                text-align: center;
-                display: flex;
-                justify-content: center;
-                line-height: 50px;
-              "
-              v-for="item in categoryScoreList"
-              :key="item.prentId"
-            >
-              <div style="width: 120px; border: 1px solid #f0f0f0">
-                {{ item.className }}
-              </div>
-              <div style="width: 120px; border: 1px solid #f0f0f0">
-                {{ item.totalAvScore }}
-              </div>
+
               <div>
-                <div style="display: flex; line-height: 60px">
+                <div
+                  style="
+                    width: 120px;
+                    border: 1px solid #f0f0f0;
+                    background: #f5f7fa;
+                  "
+                >
+                  平均总分
+                </div>
+              </div>
+
+              <div v-for="item in categoryTableNameList" :key="item.prentId">
+                <div
+                  style="
+                    text-align: center;
+                    line-height: 30px;
+                    border: 1px solid #f0f0f0;
+                    background: #f5f7fa;
+                  "
+                >
+                  {{ item.parentName }}
+                </div>
+                <div
+                  style="
+                    display: flex;
+                    line-height: 30px;
+                    border: 1px solid #f0f0f0;
+                    background: #f5f7fa;
+                    font-size: 12px;
+                  "
+                >
                   <div
-                    v-for="uitem in item.list"
+                    v-for="uitem in item.childrenTableNameList"
                     :key="uitem.categoryId"
-                    style="width: 120px; border: 0.5px solid #f0f0f0"
+                    style="width: 120px"
                   >
-                    {{ uitem }}
+                    {{ uitem.categoryName }}
                   </div>
                 </div>
               </div>
             </div>
+            <div style="font-size: 14px">
+              <div
+                style="
+                  text-align: center;
+                  display: flex;
+                  justify-content: flex-start;
+                  line-height: 50px;
+                "
+                v-for="item in categoryScoreList"
+                :key="item.prentId"
+              >
+                <div style="border: 1px solid #f0f0f0">
+                  <div style="width: 120px">
+                    {{ item.className }}
+                  </div>
+                </div>
+                <div style="border: 1px solid #f0f0f0">
+                  <div style="width: 120px">
+                    {{ item.totalAvScore }}
+                  </div>
+                </div>
+                <div>
+                  <div style="display: flex; line-height: 60px">
+                    <div
+                      v-for="uitem in item.list"
+                      :key="uitem.categoryId"
+                      style="width: 120px; border: 0.5px solid #f0f0f0"
+                    >
+                      {{ uitem }}
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div></div>
           </div>
-          <div></div>
         </div>
       </el-col>
       <el-col :span="24" :offset="0">
diff --git a/src/views/system/constitution/index.vue b/src/views/system/constitution/index.vue
index fe7426e..582e6e1 100644
--- a/src/views/system/constitution/index.vue
+++ b/src/views/system/constitution/index.vue
@@ -89,7 +89,7 @@
 import * as echarts from "echarts";
 import student from "@/views/assembly/student.vue";
 import { getRoleInfo } from "@/api/system/quality";
-import { analysis } from "@/api/system/constitution";
+import { constitution } from "@/api/system/constitution";
 export default {
   name: "constitution",
   components: {
@@ -131,7 +131,6 @@ export default {
           this.analysislist.itemScoreList[i].schoolAvgScore,
           this.analysislist.itemScoreList[i].cityAvgScore,
         ];
-
         var textname = this.analysislist.itemScoreList[i].itemName;
         //   console.log(ydata);
         var myChart = echarts.init(myEchart[i]);
@@ -224,7 +223,7 @@ export default {
     },
     //综合体质分析
     analysislists() {
-      analysis(this.analysisqueryParams).then((res) => {
+      constitution(this.analysisqueryParams).then((res) => {
         console.log(res);
         if (!res.data || res.data == "") {
           this.itemshow2 = true;
diff --git a/src/views/system/development/index.vue b/src/views/system/development/index.vue
index ddb9c37..81d7999 100644
--- a/src/views/system/development/index.vue
+++ b/src/views/system/development/index.vue
@@ -144,7 +144,7 @@
 <script>
 import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
 import { getRoleInfo } from "@/api/system/quality";
-import { analysis } from "@/api/system/development";
+import { developmentanalysis } from "@/api/system/development";
 import kindergarten from "../../assembly/kindergarten.vue";
 export default {
   components: { kindergarten },
@@ -191,7 +191,7 @@ export default {
     },
     //动作发展状况
     analysisinfo() {
-      analysis(this.analysislist).then((res) => {
+      developmentanalysis(this.analysislist).then((res) => {
         if (res.data) {
           var obj = res.data;
           this.physicalActionList = obj.physicalActionList;
diff --git a/src/views/system/heightAndWeight/index.vue b/src/views/system/heightAndWeight/index.vue
index c0a1e35..1767588 100644
--- a/src/views/system/heightAndWeight/index.vue
+++ b/src/views/system/heightAndWeight/index.vue
@@ -84,7 +84,7 @@
 <script>
 import * as echarts from "echarts";
 import { getRoleInfo } from "@/api/system/quality";
-import { analysis } from "@/api/system/heightAndWeight";
+import { heightAndWeightanalysis } from "@/api/system/heightAndWeight";
 import Kindergarten from "../../assembly/kindergarten.vue";
 
 export default {
@@ -124,7 +124,7 @@ export default {
     },
 
     analysisinfo() {
-      analysis(this.analysisqueryParams).then((res) => {
+      heightAndWeightanalysis(this.analysisqueryParams).then((res) => {
         if (!res.data) {
           this.itemshow2 = true;
           this.itemshow = false;
diff --git a/src/views/system/kindergartenCheckReport/index.vue b/src/views/system/kindergartenCheckReport/index.vue
index 962c3e7..cbacc32 100644
--- a/src/views/system/kindergartenCheckReport/index.vue
+++ b/src/views/system/kindergartenCheckReport/index.vue
@@ -176,7 +176,7 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1200px"
+      width="1600px"
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -186,14 +186,13 @@
             <el-radio :label="1">已审核</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="报告内容" prop="reportName">
-          <iframe
-            ref="pdfCotainer"
-            :src="pdfurl + '#toolbar=0'"
-            width="1000px"
-            height="550px"
-          ></iframe>
-        </el-form-item>
+        <div style="height: 600px; overflow: auto">
+          <kindergartenEcharts
+            v-if="open"
+            :itemlists="itemlist"
+            class="personal"
+          ></kindergartenEcharts>
+        </div>
         <!-- <el-form-item label="幼儿园名称" prop="kindergartenName">
           <el-input v-model="form.kindergartenName" />
         </el-form-item>
@@ -213,20 +212,13 @@
       </div>
     </el-dialog>
 
-    <el-dialog
-      title="预览"
-      :visible.sync="openiframe"
-      width="1050px"
-      append-to-body
-    >
-      <div style="height: 600px">
-        <iframe
-          ref="pdfCotainer"
-          :src="pdfurl + '#toolbar=0'"
-          width="1000px"
-          height="600px"
-          frameborder="0"
-        ></iframe>
+    <el-dialog :visible.sync="openiframe" width="1600px" append-to-body>
+      <div style="height: 680px; overflow: auto">
+        <kindergartenEcharts
+          :itemlists="itemlist"
+          class="personal"
+          v-if="openiframe"
+        ></kindergartenEcharts>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="openiframe = false">关闭</el-button>
@@ -429,23 +421,25 @@
 <script>
 import {
   listKindergartenCheckReport,
-  existKindergartenCheckReport,
-  updateKindergartenCheckReport,
-  report,
+  uploadKindergartenCheckReport,
 } from "@/api/system/kindergartenCheckReport";
 import kindergarten from "../../assembly/kindergarten.vue";
-import baseurl from "@/api/baseurl.js";
-import {
-  listKindergartenInfo,
-  tKindergartenInfo,
-} from "@/api/system/kindergartenInfo";
-import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
-
+import { listKindergartenInfo } from "@/api/system/kindergartenInfo";
+import { testScoreBatch } from "@/api/system/quality";
+import kindergartenEcharts from "../kindergartenEcharts/index.vue";
+import html2canvas from "html2canvas";
+import JsPDF from "jspdf";
 export default {
-  components: { kindergarten },
+  components: { kindergarten, kindergartenEcharts },
   name: "KindergartenCheckReport",
   data() {
     return {
+      //itemlist
+      itemlist: {
+        kindergartenId: "",
+        batchCode: "",
+        number: 1,
+      },
       checkStatuslist: [
         {
           value: 0,
@@ -612,56 +606,125 @@ export default {
       this.handleQuery();
     },
     /** 审核按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.form = JSON.parse(JSON.stringify(row));
-      existKindergartenCheckReport(row.kindergartenId, row.batchCode).then(
-        (response) => {
-          if (response.data.existFlag) {
-            this.title = "修改幼儿园检测报告审批状态";
-            this.pdfurl = baseurl + response.data.downloadAddress;
-            this.open = true;
-          } else {
-            report(row.kindergartenId, row.batchCode).then((res) => {
-              this.pdfurl = baseurl + res.data.downloadAddress;
-              this.form.id = res.data.id;
-              // this.pdfurl = window.URL.createObjectURL(res);
-              // window.open(this.pdfurl);
-              this.info();
-              this.open = true;
-            });
-          }
-        }
-      );
+    handleUpdate(item) {
+      this.itemlist.kindergartenId = item.kindergartenId;
+      this.itemlist.batchCode = item.batchCode;
+      this.itemlist.number++;
+      this.loading = true;
+      setTimeout(() => {
+        this.form = JSON.parse(JSON.stringify(item));
+        this.title = "修改幼儿园检测报告审批状态";
+        this.open = true;
+        this.loading = false;
+      }, 300);
     },
     /** 提交按钮 */
     submitForm() {
-      var obj = {
-        id: this.form.id,
-        checkStatus: this.form.checkStatus,
+      //转pdf
+      this.open = false;
+      let shareContent = document.querySelector(".personal"), //需要截图的包裹的（原生的）DOM 对象
+        width = shareContent.clientWidth * 1.1, //获取dom 宽度
+        height = shareContent.clientHeight * 1.1, //获取dom 高度
+        canvas = document.createElement("canvas"), //创建一个canvas节点
+        scale = 1.1; //定义任意放大倍数 支持小数
+      // width = 2000;
+      canvas.width = width * scale; //定义canvas 宽度 * 缩放
+      canvas.height = height * scale; //定义canvas高度 *缩放
+      canvas.style.width = shareContent.clientWidth * scale + "px";
+      canvas.style.height = shareContent.clientHeight * scale + "px";
+      canvas.style.backgroundColor = "#ffffff";
+      canvas.getContext("2d").scale(scale, scale); //获取context,设置scale
+      let opts = {
+        scale: scale, // 添加的scale 参数
+        canvas: canvas, //自定义 canvas
+        logging: false, //日志开关，便于查看html2canvas的内部执行流程
+        width: width, //dom 原始宽度
+        height: height,
+        useCORS: true, // 【重要】开启跨域配置
       };
-      updateKindergartenCheckReport(obj).then((response) => {
-        this.$modal.msgSuccess("修改成功");
-        this.open = false;
-        this.queryParams = {
-          pageNum: 1,
-          pageSize: 10,
-          kindergartenId: null,
-          batchCode: null,
-        };
-        this.info();
+      html2canvas(shareContent, opts).then(() => {
+        var contentWidth = canvas.width;
+        var contentHeight = canvas.height; //一页pdf显示html页面生成的canvas高度;
+        var pageHeight = (contentWidth / 592.28) * 841.89; //未生成pdf的html页面高度
+        var leftHeight = contentHeight; //页面偏移
+        var position = 0; //a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的宽高
+        var imgWidth = 595.28;
+        var imgHeight = (592.28 / contentWidth) * contentHeight;
+        var pageData = canvas.toDataURL("image/jpeg", 1.0);
+        var PDF = new JsPDF("", "pt", "a4");
+        if (leftHeight < pageHeight) {
+          PDF.addImage(pageData, "JPEG", 0, 0, imgWidth, imgHeight);
+          console.log(PDF);
+        } else {
+          while (leftHeight > 0) {
+            PDF.addImage(pageData, "JPEG", 0, position, imgWidth, imgHeight);
+            leftHeight -= pageHeight;
+            position -= 841.89;
+            if (leftHeight > 0) {
+              PDF.addPage();
+            }
+          }
+        }
+        // PDF.save("体质检测报告.pdf"); // 这里是导出的文件名
+        console.log(this.form);
+
+        var basepdf = PDF.output("datauristring"); // 转base64
+        // basepdf = basepdf.split("filename=generated.pdf;");
+        // base64 转 二进制流(blob)
+        let blob = this.dataURLtoBlob(basepdf);
+        // console.log(blob, "blob");
+        let formData = new FormData();
+        formData.append("kindergartenFile", blob);
+        formData.append("kindergartenId", this.form.kindergartenId);
+        formData.append("kindergartenName", this.form.kindergartenName);
+        formData.append("batchCode", this.form.batchCode);
+        formData.append("checkStatus", this.form.checkStatus);
+        console.log(this.form);
+        uploadKindergartenCheckReport(formData).then((res) => {
+          console.log(res);
+          if (res.code == 200) {
+            this.$message({
+              message: "审核成功",
+              type: "success",
+            });
+            this.info();
+          }
+        });
       });
+
+      // updateKindergartenCheckReport(obj).then((response) => {
+      //   this.$modal.msgSuccess("修改成功");
+      //   this.open = false;
+      //   this.queryParams = {
+      //     pageNum: 1,
+      //     pageSize: 10,
+      //     kindergartenId: null,
+      //     batchCode: null,
+      //   };
+      //   this.info();
+      // });
     },
     //预览
     lookhand(item) {
-      report(item.kindergartenId, item.batchCode).then((res) => {
-        // this.pdfurl = window.URL.createObjectURL(res);
-        this.pdfurl = baseurl + res.data.downloadAddress;
-        this.info();
+      this.itemlist.kindergartenId = item.kindergartenId;
+      this.itemlist.batchCode = item.batchCode;
+      this.itemlist.number++;
+      console.log(item);
+      this.loading = true;
+
+      setTimeout(() => {
         this.openiframe = true;
-        console.log(this.pdfurl);
-        // window.open(this.pdfurl);
-      });
+        this.loading = false;
+      }, 300);
+
+      // report(item.kindergartenId, item.batchCode).then((res) => {
+      //   // this.pdfurl = window.URL.createObjectURL(res);
+      //   this.pdfurl = baseurl + res.data.downloadAddress;
+      //   this.info();
+      //   this.openiframe = true;
+      //   console.log(this.pdfurl);
+      //   // window.open(this.pdfurl);
+      // });
     },
     /** 导出按钮操作 */
     handleExport(row) {
@@ -674,7 +737,7 @@ export default {
         this.download(
           `/system/kindergartenCheckReport/download?id=${row.id}`,
           {},
-          `幼儿园检测报告.pdf`
+          row.reportName + `.pdf`
         );
       }
     },
@@ -747,6 +810,21 @@ export default {
       };
       this.kinhandleQuery();
     },
+    // /base64转二进制
+    dataURLtoBlob(dataurl) {
+      // console.log(dataurl);
+      var arr = dataurl.split(","),
+        mime = arr[0].match(/:(.*?);/)[1],
+        bstr = atob(arr[1]),
+        n = bstr.length,
+        u8arr = new Uint8Array(n);
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new Blob([u8arr], {
+        type: mime,
+      });
+    },
   },
 };
 </script>
diff --git a/src/views/system/kindergartenEcharts/index.vue b/src/views/system/kindergartenEcharts/index.vue
new file mode 100644
index 0000000..7e371a9
--- /dev/null
+++ b/src/views/system/kindergartenEcharts/index.vue
@@ -0,0 +1,2342 @@
+<template>
+  <div class="app-container">
+    <img src="@/icons/kind.jpg" alt="" style="width: 100%" />
+    <div
+      style="
+        font-size: 40px;
+        margin: 60px auto;
+        font-weight: 600;
+        text-align: center;
+      "
+    >
+      幼儿园综合体质分析报告书
+    </div>
+    <!-- //KindergartenPhysicalTest 体测达标分析-->
+    <el-row v-show="KindergartenPhysicalTestshow">
+      <el-col :span="24" class="card-box">
+        <el-card>
+          <div slot="header" style="text-align: center; font-size: 26px">
+            <span>体测达标分析</span>
+          </div>
+          <div style="margin-left: 50px; text-align: center; margin-top: 20px">
+            <span>幼儿园名称:</span
+            ><span style="margin-left: 20px; margin-right: 10px">{{
+              KindergartenPhysicalTestlist.kindergartenName
+            }}</span>
+
+            <span style="margin-left: 50px">幼儿园性质:</span
+            ><span style="margin-left: 20px; margin-right: 20px">{{
+              KindergartenPhysicalTestlist.kindergartenType == type.dictValue
+                ? type.dictLabel
+                : type2.dictLabel
+            }}</span>
+
+            <span style="margin-left: 50px">参与体测人数:</span
+            ><span style="margin-left: 20px">{{
+              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>
+                <div
+                  id="KindergartenPhysicalTest1"
+                  style="
+                    width: 500px;
+                    height: 300px;
+                    margin: 0 auto;
+                    padding-top: 40px;
+                  "
+                ></div>
+              </div>
+
+              <div
+                slot="header"
+                style="
+                  width: 50%;
+                  text-align: center;
+                  font-size: 18px;
+                  position: relative;
+                "
+              >
+                <span class="title">本园体测成绩达标率(%)</span>
+                <span>
+                  <span
+                    style="
+                      position: absolute;
+                      top: 58%;
+                      left: 47.5%;
+                      font-size: 25px;
+                    "
+                    >{{ KindergartenPhysicalTestlist.standardRate }}%</span
+                  >
+                  <span
+                    style="
+                      position: absolute;
+                      top: 67%;
+                      left: 46.5%;
+                      font-size: 16px;
+                    "
+                    >达标率</span
+                  >
+                </span>
+                <div
+                  id="KindergartenPhysicalTest2"
+                  style="
+                    width: 500px;
+                    height: 300px;
+                    margin: 0 auto;
+                    padding-top: 20px;
+                  "
+                ></div>
+              </div>
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+    <!-- survey体测概况分析 -->
+    <el-row v-show="surveyshow">
+      <el-col :span="24" class="card-box">
+        <el-card>
+          <div slot="header" style="text-align: center; font-size: 26px">
+            <span>体测概况分析</span>
+          </div>
+          <div>
+            <div style="display: flex; margin-top: 20px">
+              <div style="width: 50%">
+                <div slot="header" class="header">
+                  <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>
+                <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>
+                <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>
+              </div>
+              <div style="width: 50%">
+                <div slot="header" class="header" style="margin-bottom: 20px">
+                  <span>全园优秀幼儿榜(TOP10)</span>
+                </div>
+                <el-table
+                  ref="studentlist"
+                  :data="studentlist"
+                  highlight-current-row
+                  style="margin: 0 auto; width: 530px"
+                >
+                  <el-table-column
+                    type="index"
+                    width="130"
+                    label="排名"
+                    align="center"
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    property="studentName"
+                    label="姓名"
+                    width="130"
+                    align="center"
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    property="className"
+                    label="班级"
+                    width="130"
+                    align="center"
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    property="itemFraction"
+                    label="分数"
+                    width="140"
+                    align="center"
+                  >
+                  </el-table-column>
+                </el-table>
+
+                <div
+                  slot="header"
+                  class="header"
+                  style="margin-bottom: 20px; margin-top: 20px"
+                >
+                  <span>班级优秀幼儿榜</span>
+                </div>
+                <el-table
+                  ref="selectAllClassBylist"
+                  :data="selectAllClassBylist"
+                  highlight-current-row
+                  style="margin: 0 auto; width: 530px"
+                >
+                  <el-table-column
+                    type="index"
+                    width="130"
+                    label="排名"
+                    align="center"
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    property="studentName"
+                    label="姓名"
+                    width="130"
+                    align="center"
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    property="className"
+                    label="班级"
+                    width="130"
+                    align="center"
+                  >
+                  </el-table-column>
+                  <el-table-column
+                    property="itemFraction"
+                    label="分数"
+                    width="140"
+                    align="center"
+                  >
+                  </el-table-column>
+                </el-table>
+              </div>
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+    <!--heightAndWeight 平均身高体重 -->
+    <el-row v-show="heightAndWeightshow">
+      <el-col :span="24" class="card-box" style="">
+        <el-card >
+          <div slot="header" style="text-align: center; font-size: 26px">
+            <span>平均身高体重</span>
+          </div>
+          <div style="display: flex; margin-top: 40px">
+            <div
+              slot="header"
+              style="width: 50%; text-align: center; font-size: 18px"
+            >
+              <span>各年级男/女平均身高(cm)</span>
+              <div
+                id="heightAndWeight1"
+                style="
+                  width: 500px;
+                  height: 300px;
+                  margin: 0 auto;
+                  padding-top: 40px;
+                "
+              ></div>
+            </div>
+            <div
+              slot="header"
+              style="width: 50%; text-align: center; font-size: 18px"
+            >
+              <span>各年级男/女平均体重(kg)</span>
+              <div
+                id="heightAndWeight2"
+                style="
+                  width: 500px;
+                  height: 300px;
+                  margin: 0 auto;
+                  padding-top: 40px;
+                "
+              ></div>
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+    <!-- physique综合体制分析 -->
+    <el-row>
+      <el-col :span="24" :offset="0" class="card-box" style="font-size: 15px">
+        <div slot="header" style="text-align: center; font-size: 26px">
+          <span>综合体质分析</span>
+        </div>
+        <el-card v-show="MALE">
+          <div class="test" style="height: 90px">
+            <div style="text-align: center; line-height: 40px; font-size: 20px">
+              <span>本园幼儿综合体质评估综合得分(男)</span>
+            </div>
+            <div
+              class="el-table--enable-row-hover el-table--medium"
+              style="
+                margin: 0 auto;
+                line-height: 40px;
+                text-align: center;
+                border-bottom: 1px solid #8fd6d9;
+              "
+            >
+              <div style="display: inline-block">
+                <span
+                  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'">{{
+                    index == 0 ? null : "+"
+                  }}</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="
+                    display: inline-block;
+                    position: absolute;
+                    top: 20px;
+                    width: 100px;
+                    left: 40px;
+                    margin: 0 20px;
+                  "
+                ></span>
+              </div>
+            </div>
+          </div>
+          <div style="text-align: center; margin-top: 20px">
+            <span>幼儿园综合体质分析图</span>
+          </div>
+          <div class="">
+            <div
+              ref="MALEchart"
+              id="MALEchart"
+              style="width: 1000px; height: 600px; margin: 0 auto"
+            ></div>
+          </div>
+          <div
+            style="margin: 0 auto; width: 100%; line-height: 60px"
+            v-show="MALE"
+          >
+            <div style="font-size: 12px; width: 100%; height: 400px">
+              <div
+                style="
+                  display: flex;
+                  text-align: center;
+                  justify-content: center;
+                  color: black;
+                "
+              >
+                <div style="border: 1px solid #f0f0f0; background: #f5f7fa">
+                  <div style="width: 80px; line-height: 60px">年龄</div>
+                </div>
+                <div style="border: 1px solid #f0f0f0; background: #f5f7fa">
+                  <div style="width: 80px; line-height: 60px">平均总分</div>
+                </div>
+
+                <div
+                  v-for="item in categoryTableNameListMALE"
+                  :key="item.prentId"
+                >
+                  <div
+                    style="
+                      text-align: center;
+                      line-height: 30px;
+                      border: 1px solid #f0f0f0;
+                      background: #f5f7fa;
+                    "
+                  >
+                    {{ item.parentName }}
+                  </div>
+                  <div
+                    style="
+                      display: flex;
+                      line-height: 30px;
+                      border: 1px solid #f0f0f0;
+                      background: #f5f7fa;
+                    "
+                  >
+                    <div
+                      v-for="uitem in item.childrenTableNameList"
+                      :key="uitem.categoryId"
+                      style="
+                        width: 90px;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                      "
+                    >
+                      {{ uitem.categoryName }}
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div>
+                <div
+                  style="
+                    text-align: center;
+                    display: flex;
+                    justify-content: center;
+                    font-size: 14px;
+                  "
+                  v-for="item in categoryAgeFractionListMALE"
+                  :key="item.prentId"
+                >
+                  <div style="border: 0.5px solid #f0f0f0">
+                    <div style="width: 80px; line-height: 50px">
+                      {{ item.studentAge }}
+                    </div>
+                  </div>
+                  <div style="border: 0.5px solid #f0f0f0">
+                    <div style="width: 80px; line-height: 50px">
+                      {{ item.totalAvgFraction }}
+                    </div>
+                  </div>
+                  <div>
+                    <div style="display: flex; line-height: 50px">
+                      <div
+                        v-for="uitem in item.list"
+                        :key="uitem.categoryId"
+                        style="width: 90px; border: 0.5px solid #f0f0f0"
+                      >
+                        {{ uitem }}
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div></div>
+            </div>
+          </div>
+        </el-card>
+        <el-card  v-show="FEMALE">
+          <!-- //FAMALE -->
+          <div class="test" style="height: 90px">
+            <div
+              style="
+                text-align: center;
+                line-height: 40px;
+                margin-top: 50px;
+                font-size: 20px;
+              "
+            >
+              <span>本园幼儿综合体质评估综合得分(女)</span>
+            </div>
+            <div
+              class="el-table--enable-row-hover el-table--medium"
+              style="
+                margin: 0 auto;
+                line-height: 40px;
+                text-align: center;
+                border-bottom: 1px solid #8fd6d9;
+              "
+            >
+              <div style="display: inline-block">
+                <span
+                  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'">{{
+                    index == 0 ? null : "+"
+                  }}</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="
+                    display: inline-block;
+                    position: absolute;
+                    top: 20px;
+                    width: 100px;
+                    left: 40px;
+                    margin: 0 20px;
+                  "
+                ></span>
+              </div>
+            </div>
+          </div>
+          <div style="text-align: center; margin-top: 20px">
+            <span>幼儿园综合体质分析图</span>
+          </div>
+          <div class="">
+            <div
+              ref="FEMALEchart"
+              id="FEMALEchart"
+              style="width: 1000px; height: 600px; margin: 0 auto"
+            ></div>
+          </div>
+          <div style="width: 100%; margin: 0 auto; line-height: 60px">
+            <div
+              style="
+                font-size: 12px;
+                width: 100%;
+                overflow: auto;
+                height: 400px;
+              "
+            >
+              <div
+                style="
+                  display: flex;
+                  text-align: center;
+                  justify-content: center;
+                  color: black;
+                "
+              >
+                <div style="border: 1px solid #f0f0f0; background: #f5f7fa">
+                  <div style="width: 80px; line-height: 60px">年龄</div>
+                </div>
+
+                <div style="border: 1px solid #f0f0f0; background: #f5f7fa">
+                  <div style="width: 80px; line-height: 60px">平均总分</div>
+                </div>
+                <div
+                  v-for="item in categoryTableNameListFEMALE"
+                  :key="item.prentId"
+                >
+                  <div
+                    style="
+                      text-align: center;
+                      line-height: 30px;
+                      border: 1px solid #f0f0f0;
+                      background: #f5f7fa;
+                      color: black;
+                    "
+                  >
+                    {{ item.parentName }}
+                  </div>
+                  <div
+                    style="
+                      display: flex;
+                      line-height: 30px;
+                      border: 1px solid #f0f0f0;
+                      background: #f5f7fa;
+                      color: black;
+                    "
+                  >
+                    <div
+                      v-for="uitem in item.childrenTableNameList"
+                      :key="uitem.categoryId"
+                      style="
+                        width: 90px;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                      "
+                    >
+                      {{ uitem.categoryName }}
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div>
+                <div
+                  style="
+                    text-align: center;
+                    display: flex;
+                    justify-content: center;
+                    font-size: 14px;
+                  "
+                  v-for="item in categoryAgeFractionListFEMALE"
+                  :key="item.prentId"
+                >
+                  <div style="line-height: 50px; border: 0.5px solid #f0f0f0">
+                    <div style="width: 80px">
+                      {{ item.studentAge }}
+                    </div>
+                  </div>
+                  <div style="line-height: 50px; border: 0.5px solid #f0f0f0">
+                    <div style="width: 80px">
+                      {{ item.totalAvgFraction }}
+                    </div>
+                  </div>
+                  <div>
+                    <div style="display: flex; line-height: 50px">
+                      <div
+                        v-for="uitem in item.list"
+                        :key="uitem.categoryId"
+                        style="
+                          width: 90px;
+                          border: 0.5px solid #f0f0f0;
+                          height: 54px;
+                        "
+                      >
+                        {{ uitem }}
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div></div>
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+    <!-- development 动作发展分析 -->
+    <el-row>
+      <el-col :span="24" :offset="0" class="card-box" style="font-size: 15px">
+        <el-card>
+          <div slot="header" style="text-align: center; font-size: 26px">
+            <span>动作发展分析</span>
+          </div>
+          <div
+            v-for="(item, index) in developmentList"
+            :key="index"
+            v-show="developmentshow"
+          >
+            <el-table :data="item.physicalActionList" style="margin: 20px auto">
+              <el-table-column :label="item.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="平均值"
+                    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="malePassRate"
+                    label="合格率"
+                    align="center"
+                  >
+                    <template slot-scope="scope"
+                      >{{ scope.row.malePassRate }}%</template
+                    >
+                  </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="feMalePassRate"
+                    label="合格率"
+                    align="center"
+                  >
+                    <template slot-scope="scope"
+                      >{{ scope.row.feMalePassRate }}%</template
+                    >
+                  </el-table-column>
+                </el-table-column>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!--  -->
+    <el-row>
+      <el-col class="card-box" :span="24" :offset="0">
+        <el-card>
+          <div
+            slot="header"
+            style="text-align: center; font-size: 26px; margin-bottom: 20px"
+          >
+            <span>班级体质分析</span>
+          </div>
+          <div
+            v-for="(ilist, index) in classconstitutionlist"
+            :key="index"
+          >
+            <div
+              slot="header"
+              style="text-align: center; font-size: 22px; margin-bottom: 20px"
+            >
+              <span
+                >班级体质分析({{ ilist.categoryScoreList[0].className }})</span
+              >
+            </div>
+            <div style="margin: 0 auto; width: 1400px; line-height: 60px">
+              <div style="font-size: 12px; width: 100%; overflow: auto">
+                <div
+                  style="
+                    display: flex;
+                    text-align: center;
+                    justify-content: center;
+                    color: black;
+                    font-weight: 550;
+                    height: 92px;
+                  "
+                >
+                  <div
+                    style="background: #f5f7fa; height: 92px; line-height: 92px"
+                  >
+                    <div
+                      style="
+                        width: 70px;
+                        border: 1px solid #f0f0f0;
+                        background: #f5f7fa;
+                      "
+                    >
+                      班级
+                    </div>
+                  </div>
+                  <div
+                    style="background: #f5f7fa; height: 92px; line-height: 92px"
+                  >
+                    <div
+                      style="
+                        width: 70px;
+                        border: 1px solid #f0f0f0;
+                        background: #f5f7fa;
+                      "
+                    >
+                      平均总分
+                    </div>
+                  </div>
+
+                  <div
+                    v-for="item in ilist.categoryTableNameList"
+                    :key="item.prentId"
+                  >
+                    <div
+                      style="
+                        text-align: center;
+                        border: 1px solid #f0f0f0;
+                        background: #f5f7fa;
+                        height: 30px;
+                        line-height: 30px;
+                      "
+                    >
+                      {{ item.parentName }}
+                    </div>
+                    <div
+                      style="
+                        display: flex;
+                        border: 1px solid #f0f0f0;
+                        background: #f5f7fa;
+                        font-size: 10px;
+                        width: 100%;
+                      "
+                    >
+                      <div
+                        v-for="uitem in item.childrenTableNameList"
+                        :key="uitem.categoryId"
+                        style="
+                          width: 90px;
+                          height: 60px;
+                          overflow: hidden;
+                          text-overflow: ellipsis;
+                          white-space: nowrap;
+                        "
+                      >
+                        {{ uitem.categoryName }}
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div style="font-size: 12px; width: 100%">
+                  <div
+                    style="
+                      text-align: center;
+                      display: flex;
+                      justify-content: center;
+                      line-height: 30px;
+                      width: 100%;
+                    "
+                    v-for="item in ilist.categoryScoreList"
+                    :key="item.prentId"
+                  >
+                    <div style="border: 1px solid #f0f0f0">
+                      <div style="width: 70px">
+                        {{ item.className }}
+                      </div>
+                    </div>
+                    <div style="border: 1px solid #f0f0f0">
+                      <div style="width: 70px">
+                        {{ item.totalAvScore }}
+                      </div>
+                    </div>
+
+                    <div style="">
+                      <div style="display: flex; height: 62px">
+                        <div
+                          v-for="uitem in item.list"
+                          :key="uitem.categoryId"
+                          style="width: 90px; border: 0.5px solid #f0f0f0"
+                        >
+                          {{ uitem }}
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="">
+                <div
+                  class="chart"
+                  ref="chart"
+                  id="chart"
+                  style="width: 800px; height: 350px; margin: 50px auto"
+                ></div>
+              </div>
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import { listClassinfo } from "@/api/system/classinfo";
+import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
+import { KindergartenPhysicalTestanalysis } from "@/api/system/KindergartenPhysicalTest";
+import { StudentList } from "@/api/system/survey";
+import { heightAndWeightanalysis } from "@/api/system/heightAndWeight";
+import { physiqueanalysis } from "@/api/system/physique";
+import { developmentanalysis } from "@/api/system/development";
+import { ClassList } from "@/api/system/classconstitution";
+export default {
+  name: "KindergartenEcharts",
+  props: ["itemlists"],
+  data() {
+    return {
+      echartslist: {
+        pageNum: 1,
+        pageSize: 999,
+        kindergartenId: "",
+        batchCode: "",
+      },
+      //KindergartenPhysicalTest体测达标分析
+      KindergartenPhysicalTestshow: true,
+      kindergartenType: "kindergarten_type",
+      type: {},
+      type2: {},
+      KindergartenPhysicalTestlist: {},
+      //survey体测概况分析
+      surveyshow: true,
+      studentlist: [],
+      selectAllClassBylist: [],
+      LARGECLASS: "LARGE_CLASS",
+      MIDDLECLASS: "MIDDLE_CLASS",
+      SMALLCLASS: "SMALL_CLASS",
+      yclassname1: [],
+      yclassname2: [],
+      yclassname3: [],
+      classscore1: [],
+      classscore2: [],
+      classscore3: [],
+      //heightAndWeight平均身高体重
+      heightAndWeightlist: [],
+      heightAndWeightshow: true,
+      //physique 综合体质分析
+      FEMALE: false,
+      MALE: false,
+      categoryTableNameListMALE: [],
+      categoryAgeFractionListMALE: [],
+      categoryScoreListMALE: [],
+      firstCategoryScoreListMALE: [],
+      totalAvgFraction: "",
+      totalAvgFractionFEMALE: "",
+      categoryTableNameListFEMALE: [],
+      categoryAgeFractionListFEMALE: [],
+      categoryScoreListFEMALE: [],
+      firstCategoryScoreListFEMALE: [],
+      //    <!-- development 动作发展分析 -->
+      //班级类型
+      ClassType: "class_type",
+      classtypelist: [],
+      developmentList: [],
+      developmentshow: false,
+      //<!-- classconstitution 班级体质分析 -->
+      classList: [],
+      classconstitutionlist: [],
+      categoryTableNameList: [],
+      categoryAgeFractionList: [],
+      categoryScoreList: [],
+      totalAvgFraction: "",
+      listname: [],
+    };
+  },
+  mounted() {
+    this.classinfo();
+    this.getList();
+    this.classtype();
+    this.KindergartenPhysicalTestinfo();
+    this.StudentListinfo();
+    this.heightAndWeightinfo();
+    this.physiqueinfoFEMALE();
+    this.physiqueinfoMALE();
+    console.log(this.KindergartenPhysicalTestlist);
+  },
+  //   watch: {
+  //     itemlists: {
+  //       handler(newName, oldName) {
+  //         console.log(newName,oldName)
+  //         this.echartslist = {
+  //           kindergartenId: newName.kindergartenId,
+  //           batchCode: newName.batchCode,
+  //           pageNum: 1,
+  //           pageSize: 999,
+  //           studentSex: null,
+  //         };
+  //         console.log(this.echartslist);
+  //         this.developmentList = [];
+  //         this.getList();
+  //         this.classtype();
+  //         this.classinfo();
+  //         this.KindergartenPhysicalTestinfo();
+  //         this.StudentListinfo();
+  //         this.heightAndWeightinfo();
+  //         this.physiqueinfoMALE();
+  //         this.physiqueinfoFEMALE();
+  //       },
+  //       deep: true,
+  //     },
+  //   },
+
+  created() {
+    this.echartslist = {
+      kindergartenId: this.itemlists.kindergartenId,
+      batchCode: this.itemlists.batchCode,
+      pageNum: 1,
+      pageSize: 999,
+      classId: null,
+    };
+    console.log(this.echartslist);
+    this.developmentList = [];
+  },
+  methods: {
+    // <!-- classconstitution 班级体质分析 -->
+    ClassListinfo() {
+      this.classconstitutionlist = [];
+      for (let i = 0; i < this.classList.length; i++) {
+        this.echartslist.classId = this.classList[i].id;
+        ClassList(this.echartslist).then((res) => {
+          if (res.code == 500) {
+          } else if (!res.data) {
+          } else {
+            this.classconstitutionlist.push(res.data);
+          }
+        });
+      }
+      this.info();
+    },
+    info() {
+      setTimeout(() => {
+        console.log(this.classconstitutionlist);
+        var myEhart = document.getElementsByClassName("chart");
+        for (let k = 0; k < this.classconstitutionlist.length; k++) {
+          var yseries = [];
+          var name = "";
+          var names = [];
+          var ydata = [];
+          this.categoryTableNameList = [];
+          this.categoryAgeFractionList = [];
+          this.categoryScoreList = [];
+          this.totalAvgFraction = [];
+          this.listname = [];
+          var myChart = echarts.init(myEhart[k]);
+          this.totalAvgFraction =
+            this.classconstitutionlist[k].totalAvgFraction;
+          this.categoryAgeFractionList =
+            this.classconstitutionlist[k].categoryAgeFractionList;
+          var list = [];
+          this.categoryTableNameList =
+            this.classconstitutionlist[k].categoryTableNameList;
+          this.categoryTableNameList.forEach((e) => {
+            e.childrenTableNameList.forEach((el) => {
+              list.push(el.categoryId);
+            });
+          });
+          this.categoryScoreList =
+            this.classconstitutionlist[k].categoryScoreList;
+          let yname = [];
+          this.categoryScoreList.forEach((el) => {
+            yname.push(el.className);
+            var listname = list.map((e) => {
+              var num = 0;
+              var number = el.categoryScoreList.findIndex(
+                (o) => o.categoryId == e
+              );
+              if (number != -1) {
+                num = el.categoryScoreList[number].categoryName;
+              }
+              return num;
+            });
+            this.listname = listname;
+            var list1 = list.map((e) => {
+              var num = 0;
+              var number = el.categoryScoreList.findIndex(
+                (o) => o.categoryId == e
+              );
+              if (number != -1) {
+                num = el.categoryScoreList[number].avgScore;
+              }
+              if (num == null) {
+                num = 0;
+                return num;
+              }
+              return num;
+            });
+            el.list = list1;
+          });
+          for (let i = 0; i < this.listname.length; i++) {
+            name = this.categoryScoreList[0].categoryScoreList[i].categoryName;
+            ydata = [
+              this.categoryScoreList[0].list[i],
+              this.categoryScoreList[1].list[i],
+              this.categoryScoreList[2].list[i],
+            ];
+            var obj = {
+              name: name,
+              type: "bar",
+              label: labelOption,
+              emphasis: {
+                focus: "series",
+              },
+              data: ydata,
+            };
+            yseries.push(obj);
+            names.push(name);
+          }
+          this.listname = [];
+          var option;
+          const posList = [
+            "left",
+            "right",
+            "top",
+            "bottom",
+            "inside",
+            "insideTop",
+            "insideLeft",
+            "insideRight",
+            "insideBottom",
+            "insideTopLeft",
+            "insideTopRight",
+            "insideBottomLeft",
+            "insideBottomRight",
+          ];
+          app.configParameters = {
+            rotate: {
+              min: 0,
+              max: 90,
+            },
+            align: {
+              options: {
+                left: "left",
+                center: "center",
+                right: "right",
+              },
+            },
+            verticalAlign: {
+              options: {
+                top: "top",
+                middle: "middle",
+                bottom: "bottom",
+              },
+            },
+            position: {
+              options: posList.reduce(function (map, pos) {
+                map[pos] = pos;
+                return map;
+              }, {}),
+            },
+            distance: {
+              min: 0,
+              max: 100,
+            },
+          };
+          app.config = {
+            rotate: 0,
+            align: "center",
+            verticalAlign: "middle",
+            position: "top",
+            distance: 15,
+            onChange: function () {
+              const labelOption = {
+                rotate: app.config.rotate,
+                align: app.config.align,
+                verticalAlign: app.config.verticalAlign,
+                position: app.config.position,
+                distance: app.config.distance,
+              };
+              myChart.setOption({
+                series: [
+                  {
+                    label: labelOption,
+                  },
+                  {
+                    label: labelOption,
+                  },
+                  {
+                    label: labelOption,
+                  },
+                  {
+                    label: labelOption,
+                  },
+                ],
+              });
+            },
+          };
+          const labelOption = {
+            show: true,
+            position: app.config.position,
+            distance: app.config.distance,
+            align: app.config.align,
+            verticalAlign: app.config.verticalAlign,
+            rotate: app.config.rotate,
+            formatter: "{c}",
+            fontSize: 16,
+            rich: {
+              name: {},
+            },
+          };
+          option = {
+            tooltip: {
+              trigger: "axis",
+              axisPointer: {
+                type: "",
+              },
+            },
+            legend: {
+              data: names,
+            },
+            xAxis: [
+              {
+                type: "category",
+                axisTick: { show: false },
+                data: yname,
+              },
+            ],
+            yAxis: [
+              {
+                type: "value",
+              },
+            ],
+            series: yseries,
+          };
+          myChart.setOption(option, true);
+        }
+      }, 600);
+    },
+    //  <!-- development 动作发展分析 -->
+    developmentinfo() {
+      setTimeout(() => {
+        this.developmentList = [];
+        for (let i = 0; i < this.classtypelist.length; i++) {
+          this.echartslist.classType = this.classtypelist[i].type;
+          developmentanalysis(this.echartslist).then((res) => {
+            if (res.data) {
+              this.developmentList.push(res.data);
+            } else {
+            }
+          });
+        }
+        this.developmentshow = true;
+      }, 500);
+    },
+    //physique 综合体质分析
+    physiqueinfoFEMALE() {
+      setTimeout(() => {
+        this.echartslist.studentSex = "FEMALE";
+        physiqueanalysis(this.echartslist).then((res) => {
+          if (res.data == [] || !res.data) {
+            this.FEMALE = false;
+          } else {
+            this.totalAvgFractionFEMALE = res.data.totalAvgFraction;
+            this.categoryTableNameListFEMALE = res.data.categoryTableNameList;
+            this.categoryAgeFractionListFEMALE =
+              res.data.categoryAgeFractionList;
+            this.categoryScoreListFEMALE = res.data.categoryScoreList;
+            this.firstCategoryScoreListFEMALE = res.data.firstCategoryScoreList;
+            if (res.data == [] || !res.data) {
+            } else {
+              var list = [];
+              this.categoryTableNameListFEMALE.forEach((e) => {
+                e.childrenTableNameList.forEach((el) => {
+                  list.push(el.categoryId);
+                });
+              });
+              this.categoryAgeFractionListFEMALE.forEach((el) => {
+                var list1 = list.map((e) => {
+                  var num = 0;
+                  var number = el.categoryAvgFractionList.findIndex(
+                    (o) => o.categoryId == e
+                  );
+                  if (number != -1) {
+                    num =
+                      el.categoryAvgFractionList[number].avgCategoryFraction;
+                  }
+                  return num;
+                });
+                el.list = list1;
+              });
+              let seriesData = [];
+              let yindicator = [];
+              this.categoryScoreListFEMALE.forEach((el) => {
+                seriesData.push(el.itemFraction);
+                if (el.avgCategoryName == null) {
+                  el.avgCategoryName = "暂无";
+                }
+                if (this.categoryScoreListFEMALE.length == 1) {
+                  yindicator.push({
+                    name:
+                      el.categoryName +
+                      " " +
+                      "(" +
+                      el.avgCategoryName +
+                      "" +
+                      ")",
+                    max: el.maxFraction,
+                  });
+                  yindicator.push({
+                    name: "暂无数据",
+                    max: 100,
+                  });
+                  yindicator.push({
+                    name: "暂无数据",
+                    max: 100,
+                  });
+                } else if (this.categoryScoreListFEMALE.length == 2) {
+                  yindicator.push({
+                    name:
+                      el.categoryName +
+                      " " +
+                      "(" +
+                      el.avgCategoryName +
+                      "" +
+                      ")",
+                    max: el.maxFraction,
+                  });
+                  yindicator.push({
+                    name: "暂无数据",
+                    max: 100,
+                  });
+                } else {
+                  yindicator.push({
+                    name:
+                      el.categoryName +
+                      " " +
+                      "(" +
+                      el.avgCategoryName +
+                      "" +
+                      ")",
+                    max: el.maxFraction,
+                  });
+                }
+              });
+              var myChart = echarts.init(
+                document.getElementById("FEMALEchart")
+              );
+              let option = {
+                //配置维度的最大值
+                color: "#D9A508",
+                radar: {
+                  name: {
+                    show: true,
+                    color: "black",
+                  },
+                  center: ["50%", "50%"],
+                  //   雷达图的指示器，用来指定雷达图中的多个变量（维度）
+                  indicator: yindicator,
+                  shape: "polygon", //对雷达图形设置成一个圆形,可选 circle:圆形,polygon:多角形(默认)
+                },
+                series: [
+                  {
+                    type: "radar",
+                    label: {
+                      show: true,
+                      color: "#D9A508", //显示数值
+                    },
+                    areaStyle: {}, //每个雷达图形成一个阴影的面积
+                    data: [
+                      {
+                        name: "成绩区域",
+                        value: seriesData,
+                      },
+                    ],
+                    areaStyle: {
+                      color: new echarts.graphic.RadialGradient(0.1, 0.6, 1, [
+                        {
+                          color: "rgba(255,192,0, 0.8)",
+                          offset: 0,
+                        },
+                        {
+                          color: "rgba(255,192,0, 0.9)",
+                          offset: 1,
+                        },
+                      ]),
+                    },
+                  },
+                ],
+              };
+              // 绘制图表
+              myChart.setOption(option);
+              this.FEMALE = true;
+            }
+          }
+        });
+      }, 400);
+    },
+    physiqueinfoMALE() {
+      setTimeout(() => {
+        this.echartslist.studentSex = "MALE";
+        physiqueanalysis(this.echartslist).then((res) => {
+          if (res.data == [] || !res.data) {
+            this.MALE = false;
+          } else {
+            this.totalAvgFraction = res.data.totalAvgFraction;
+            this.categoryTableNameListMALE = res.data.categoryTableNameList;
+            this.categoryAgeFractionListMALE = res.data.categoryAgeFractionList;
+            this.categoryScoreListMALE = res.data.categoryScoreList;
+            this.firstCategoryScoreListMALE = res.data.firstCategoryScoreList;
+            if (res.data == [] || !res.data) {
+            } else {
+              var list = [];
+              this.categoryTableNameListMALE.forEach((e) => {
+                e.childrenTableNameList.forEach((el) => {
+                  list.push(el.categoryId);
+                });
+              });
+              this.categoryAgeFractionListMALE.forEach((el) => {
+                var list1 = list.map((e) => {
+                  var num = 0;
+                  var number = el.categoryAvgFractionList.findIndex(
+                    (o) => o.categoryId == e
+                  );
+                  if (number != -1) {
+                    num =
+                      el.categoryAvgFractionList[number].avgCategoryFraction;
+                  }
+                  return num;
+                });
+                el.list = list1;
+              });
+              let seriesData = [];
+              let yindicator = [];
+              this.categoryScoreListMALE.forEach((el) => {
+                seriesData.push(el.itemFraction);
+                if (el.avgCategoryName == null) {
+                  el.avgCategoryName = "暂无";
+                }
+                if (this.categoryScoreListMALE.length == 1) {
+                  yindicator.push({
+                    name:
+                      el.categoryName +
+                      " " +
+                      "(" +
+                      el.avgCategoryName +
+                      "" +
+                      ")",
+                    max: el.maxFraction,
+                  });
+                  yindicator.push({
+                    name: "暂无数据",
+                    max: 100,
+                  });
+                  yindicator.push({
+                    name: "暂无数据",
+                    max: 100,
+                  });
+                } else if (this.categoryScoreListMALE.length == 2) {
+                  yindicator.push({
+                    name:
+                      el.categoryName +
+                      " " +
+                      "(" +
+                      el.avgCategoryName +
+                      "" +
+                      ")",
+                    max: el.maxFraction,
+                  });
+                  yindicator.push({
+                    name: "暂无数据",
+                    max: 100,
+                  });
+                } else {
+                  yindicator.push({
+                    name:
+                      el.categoryName +
+                      " " +
+                      "(" +
+                      el.avgCategoryName +
+                      "" +
+                      ")",
+                    max: el.maxFraction,
+                  });
+                }
+              });
+              var myChart = echarts.init(document.getElementById("MALEchart"));
+              let option = {
+                //配置维度的最大值
+                color: "#D9A508",
+                radar: {
+                  name: {
+                    show: true,
+                    color: "black",
+                  },
+                  center: ["50%", "50%"],
+                  //   雷达图的指示器，用来指定雷达图中的多个变量（维度）
+                  indicator: yindicator,
+                  shape: "polygon", //对雷达图形设置成一个圆形,可选 circle:圆形,polygon:多角形(默认)
+                },
+                series: [
+                  {
+                    type: "radar",
+                    label: {
+                      show: true,
+                      color: "#D9A508", //显示数值
+                    },
+                    areaStyle: {}, //每个雷达图形成一个阴影的面积
+                    data: [
+                      {
+                        name: "成绩区域",
+                        value: seriesData,
+                      },
+                    ],
+                    areaStyle: {
+                      color: new echarts.graphic.RadialGradient(0.1, 0.6, 1, [
+                        {
+                          color: "rgba(255,192,0, 0.8)",
+                          offset: 0,
+                        },
+                        {
+                          color: "rgba(255,192,0, 0.9)",
+                          offset: 1,
+                        },
+                      ]),
+                    },
+                  },
+                ],
+              };
+              // 绘制图表
+              myChart.setOption(option);
+              this.MALE = true;
+            }
+          }
+        });
+      }, 350);
+    },
+    //平均身高体重
+    heightAndWeightinfo() {
+      setTimeout(() => {
+        heightAndWeightanalysis(this.echartslist).then((res) => {
+          if (!res.data) {
+            this.heightAndWeightshow = false;
+          } else {
+            this.heightAndWeightlist = res.data;
+            var yclassname = [];
+            var grilsheight = [];
+            var boyheight = [];
+            var boyweight = [];
+            var grilsweight = [];
+
+            for (let i = 0; i < this.heightAndWeightlist.length; i++) {
+              this.heightAndWeightlist[i].weightAndHeightAvgScoreList.forEach(
+                (el) => {
+                  if (el.itemCode == "H001" && el.studentSex == "MALE") {
+                    boyheight.push(el.averageScore);
+                  } else if (
+                    el.itemCode == "H001" &&
+                    el.studentSex == "FEMALE"
+                  ) {
+                    grilsheight.push(el.averageScore);
+                  } else if (
+                    el.itemCode == "W001" &&
+                    el.studentSex == "FEMALE"
+                  ) {
+                    grilsweight.push(el.averageScore);
+                  } else if (el.itemCode == "W001" && el.studentSex == "MALE") {
+                    boyweight.push(el.averageScore);
+                  }
+                }
+              );
+              if (grilsheight.length == i) {
+                grilsheight.push(0);
+              }
+              if (boyheight.length == i) {
+                boyheight.push(0);
+              }
+              if (boyweight.length == i) {
+                boyweight.push(0);
+              }
+              if (grilsweight.length == i) {
+                grilsweight.push(0);
+              }
+            }
+
+            this.heightAndWeightlist.forEach((e) => {
+              yclassname.push(e.className);
+            });
+            var app = {};
+
+            var myChart = echarts.init(
+              document.getElementById("heightAndWeight1")
+            );
+            var myChart2 = echarts.init(
+              document.getElementById("heightAndWeight2")
+            );
+            var option;
+            var option2;
+            const posList = [
+              "left",
+              "right",
+              "top",
+              "bottom",
+              "inside",
+              "insideTop",
+              "insideLeft",
+              "insideRight",
+              "insideBottom",
+              "insideTopLeft",
+              "insideTopRight",
+              "insideBottomLeft",
+              "insideBottomRight",
+            ];
+            app.configParameters = {
+              rotate: {
+                min: 0,
+                max: 90,
+              },
+              align: {
+                options: {
+                  left: "left",
+                  center: "center",
+                  right: "right",
+                },
+              },
+              verticalAlign: {
+                options: {
+                  top: "top",
+                  middle: "middle",
+                  bottom: "bottom",
+                },
+              },
+              position: {
+                options: posList.reduce(function (map, pos) {
+                  map[pos] = pos;
+                  return map;
+                }, {}),
+              },
+              distance: {
+                min: 0,
+                max: 100,
+              },
+            };
+            app.config = {
+              rotate: 0,
+              align: "center",
+              verticalAlign: "middle",
+              position: "top",
+              distance: 15,
+              onChange: function () {
+                const labelOption = {
+                  rotate: app.config.rotate,
+                  align: app.config.align,
+                  verticalAlign: app.config.verticalAlign,
+                  position: app.config.position,
+                  distance: app.config.distance,
+                };
+                myChart.setOption({
+                  series: [
+                    {
+                      label: labelOption,
+                    },
+                    {
+                      label: labelOption,
+                    },
+                    {
+                      label: labelOption,
+                    },
+                    {
+                      label: labelOption,
+                    },
+                  ],
+                });
+              },
+            };
+            const labelOption = {
+              show: true,
+              position: app.config.position,
+              distance: app.config.distance,
+              align: app.config.align,
+              verticalAlign: app.config.verticalAlign,
+              rotate: app.config.rotate,
+              formatter: "{c}",
+              fontSize: 16,
+              rich: {
+                name: {},
+              },
+            };
+            option = {
+              tooltip: {
+                trigger: "axis",
+                axisPointer: {
+                  type: "shadow",
+                },
+              },
+              legend: {
+                data: ["男", "女"],
+              },
+              xAxis: [
+                {
+                  type: "category",
+                  axisTick: { show: false },
+                  data: yclassname,
+                },
+              ],
+              yAxis: [
+                {
+                  type: "value",
+                },
+              ],
+              series: [
+                {
+                  name: "男",
+                  type: "bar",
+                  barWidth: 35,
+                  barGap: 0,
+                  color: "#00B050",
+                  label: labelOption,
+                  emphasis: {
+                    focus: "series",
+                  },
+                  data: boyheight,
+                },
+                {
+                  name: "女",
+                  type: "bar",
+                  barWidth: 35,
+                  color: "red",
+                  label: labelOption,
+                  emphasis: {
+                    focus: "series",
+                  },
+                  data: grilsheight,
+                },
+              ],
+            };
+            option2 = {
+              tooltip: {
+                trigger: "axis",
+                axisPointer: {
+                  type: "shadow",
+                },
+              },
+              legend: {
+                data: ["男", "女"],
+              },
+              xAxis: [
+                {
+                  type: "category",
+                  axisTick: { show: false },
+                  data: yclassname,
+                },
+              ],
+              yAxis: [
+                {
+                  type: "value",
+                },
+              ],
+              series: [
+                {
+                  name: "男",
+                  barWidth: 35,
+                  type: "bar",
+                  barGap: 0,
+                  color: "#00B050",
+                  label: labelOption,
+                  emphasis: {
+                    focus: "series",
+                  },
+                  data: boyweight,
+                },
+                {
+                  barWidth: 35,
+                  name: "女",
+                  type: "bar",
+                  color: "red",
+                  label: labelOption,
+                  emphasis: {
+                    focus: "series",
+                  },
+                  data: grilsweight,
+                },
+              ],
+            };
+            option && myChart.setOption(option);
+            option2 && myChart2.setOption(option2);
+            this.heightAndWeightshow = true;
+          }
+        });
+      }, 300);
+    },
+    //survey体测概况分析
+    StudentListinfo() {
+      setTimeout(() => {
+        StudentList(this.echartslist).then((res) => {
+          if (res.data.testAllStudentScoreVOList != null) {
+            this.studentlist = res.data.testAllStudentScoreVOList;
+          }
+          if (res.data.allStudentScoreVOList != null) {
+            this.yclassname1 = [];
+            this.yclassname2 = [];
+            this.yclassname3 = [];
+            this.classscore1 = [];
+            this.classscore2 = [];
+            this.classscore3 = [];
+            res.data.allStudentScoreVOList.forEach((e) => {
+              if (e.classType == this.LARGECLASS) {
+                this.yclassname1.push(e.className);
+                if (
+                  e.itemScoreAll == "" ||
+                  !e.itemScoreAll ||
+                  e.itemScoreAll == null
+                ) {
+                  this.classscore1.push(0);
+                } else {
+                  this.classscore1.push(e.itemScoreAll);
+                }
+              } else if (e.classType == this.MIDDLECLASS) {
+                this.yclassname2.push(e.className);
+                if (
+                  e.itemScoreAll == "" ||
+                  !e.itemScoreAll ||
+                  e.itemScoreAll == null
+                ) {
+                  this.classscore2.push(0);
+                } else {
+                  this.classscore2.push(e.itemScoreAll);
+                }
+              } else if (e.classType == this.SMALLCLASS) {
+                this.yclassname3.push(e.className);
+                if (
+                  e.itemScoreAll == "" ||
+                  !e.itemScoreAll ||
+                  e.itemScoreAll == null
+                ) {
+                  this.classscore3.push(0);
+                } else {
+                  this.classscore3.push(e.itemScoreAll);
+                }
+              }
+            });
+            this.$nextTick((e) => {
+              if (this.yclassname1.length != 0) {
+                var myChart = echarts.init(document.getElementById("survey1"));
+              }
+              if (this.yclassname2.length != 0) {
+                var myChart2 = echarts.init(document.getElementById("survey2"));
+              }
+              if (this.yclassname3.length != 0) {
+                var myChart3 = echarts.init(document.getElementById("survey3"));
+              }
+              // var myChart = echarts.init(document.getElementById("main"));
+              // var myChart2 = echarts.init(document.getElementById("main2"));
+              // var myChart3 = echarts.init(document.getElementById("main3"));
+              var app = {};
+              var option;
+              var option2;
+              var option3;
+              const posList = [
+                "left",
+                "right",
+                "top",
+                "bottom",
+                "inside",
+                "insideTop",
+                "insideLeft",
+                "insideRight",
+                "insideBottom",
+                "insideTopLeft",
+                "insideTopRight",
+                "insideBottomLeft",
+                "insideBottomRight",
+              ];
+              app.configParameters = {
+                rotate: {
+                  min: 0,
+                  max: 90,
+                },
+                align: {
+                  options: {
+                    left: "left",
+                    center: "center",
+                    right: "right",
+                  },
+                },
+                verticalAlign: {
+                  options: {
+                    top: "top",
+                    middle: "middle",
+                    bottom: "bottom",
+                  },
+                },
+                position: {
+                  options: posList.reduce(function (map, pos) {
+                    map[pos] = pos;
+                    return map;
+                  }, {}),
+                },
+                distance: {
+                  min: 0,
+                  max: 100,
+                },
+              };
+              app.config = {
+                rotate: 0,
+                align: "center",
+                verticalAlign: "middle",
+                position: "top",
+                distance: 15,
+                onChange: function () {
+                  const labelOption = {
+                    rotate: app.config.rotate,
+                    align: app.config.align,
+                    verticalAlign: app.config.verticalAlign,
+                    position: app.config.position,
+                    distance: app.config.distance,
+                  };
+                  myChart.setOption({
+                    series: [
+                      {
+                        label: labelOption,
+                      },
+                      {
+                        label: labelOption,
+                      },
+                      {
+                        label: labelOption,
+                      },
+                      {
+                        label: labelOption,
+                      },
+                    ],
+                  });
+                },
+              };
+              const labelOption = {
+                show: true,
+                position: app.config.position,
+                distance: app.config.distance,
+                align: app.config.align,
+                verticalAlign: app.config.verticalAlign,
+                rotate: app.config.rotate,
+                formatter: "{c}",
+                fontSize: 16,
+                rich: {
+                  name: {},
+                },
+              };
+              option = {
+                tooltip: {
+                  trigger: "axis",
+                  axisPointer: {
+                    type: "shadow",
+                  },
+                },
+                legend: {},
+                xAxis: [
+                  {
+                    type: "category",
+                    axisTick: { show: false },
+                    data: this.yclassname1,
+                  },
+                ],
+                yAxis: [
+                  {
+                    type: "value",
+                    // max: (value) => {
+                    //   return Math.ceil(value.max / 100) * 100;
+                    // },
+                  },
+                ],
+                series: [
+                  {
+                    type: "bar",
+                    barWidth: 35,
+                    barGap: 0,
+                    color: "#00B050",
+                    label: labelOption,
+                    emphasis: {
+                      focus: "series",
+                    },
+                    data: this.classscore1,
+                  },
+                ],
+              };
+              option2 = {
+                tooltip: {
+                  trigger: "axis",
+                  axisPointer: {
+                    type: "shadow",
+                  },
+                },
+                legend: {},
+                xAxis: [
+                  {
+                    type: "category",
+                    axisTick: { show: false },
+                    data: this.yclassname2,
+                  },
+                ],
+                yAxis: [
+                  {
+                    type: "value",
+                  },
+                ],
+                series: [
+                  {
+                    type: "bar",
+                    barGap: 0,
+                    barWidth: 35,
+
+                    color: "#00B050",
+                    label: labelOption,
+                    emphasis: {
+                      focus: "series",
+                    },
+                    data: this.classscore2,
+                  },
+                ],
+              };
+              option3 = {
+                tooltip: {
+                  trigger: "axis",
+                  axisPointer: {
+                    type: "shadow",
+                  },
+                },
+                legend: {},
+                xAxis: [
+                  {
+                    type: "category",
+                    axisTick: { show: false },
+                    data: this.yclassname3,
+                  },
+                ],
+                yAxis: [
+                  {
+                    type: "value",
+                  },
+                ],
+                series: [
+                  {
+                    type: "bar",
+                    barGap: 0,
+                    barWidth: 35,
+                    color: "#00B050",
+                    label: labelOption,
+                    emphasis: {
+                      focus: "series",
+                    },
+                    data: this.classscore3,
+                  },
+                ],
+              };
+
+              if (this.yclassname1.length != 0) {
+                option && myChart.setOption(option);
+              }
+              if (this.yclassname2.length != 0) {
+                option2 && myChart2.setOption(option2);
+              }
+              if (this.yclassname3.length != 0) {
+                option3 && myChart3.setOption(option3);
+              }
+              // option && myChart.setOption(option);
+              // option2 && myChart2.setOption(option2);
+              // option3 && myChart3.setOption(option3);
+            });
+          }
+          if (res.data.allClassByVOList != null) {
+            this.selectAllClassBylist = res.data.allClassByVOList;
+          }
+          if (
+            res.data.allStudentScoreVOList == null &&
+            res.data.testAllStudentScoreVOList == null &&
+            res.data.allClassByVOList == null
+          ) {
+          }
+        });
+      }, 200);
+    },
+    //KindergartenPhysicalTest 体测达标分析
+    KindergartenPhysicalTestinfo() {
+      this.KindergartenPhysicalTestlist = {};
+      KindergartenPhysicalTestanalysis(this.echartslist).then((res) => {
+        if (res.data == [] || !res.data) {
+          this.KindergartenPhysicalTestshow = false;
+        } else {
+          this.KindergartenPhysicalTestlist = res.data;
+          var app = {};
+          var myChart = echarts.init(
+            document.getElementById("KindergartenPhysicalTest1")
+          );
+          var option;
+
+          const posList = [
+            "left",
+            "right",
+            "top",
+            "bottom",
+            "inside",
+            "insideTop",
+            "insideLeft",
+            "insideRight",
+            "insideBottom",
+            "insideTopLeft",
+            "insideTopRight",
+            "insideBottomLeft",
+            "insideBottomRight",
+          ];
+          app.configParameters = {
+            rotate: {
+              min: 0,
+              max: 90,
+            },
+            align: {
+              options: {
+                left: "left",
+                center: "center",
+                right: "right",
+              },
+            },
+            verticalAlign: {
+              options: {
+                top: "top",
+                middle: "middle",
+                bottom: "bottom",
+              },
+            },
+            position: {
+              options: posList.reduce(function (map, pos) {
+                map[pos] = pos;
+                return map;
+              }, {}),
+            },
+            distance: {
+              min: 0,
+              max: 100,
+            },
+          };
+          app.config = {
+            rotate: 0,
+            align: "center",
+            verticalAlign: "middle",
+            position: "top",
+            distance: 15,
+            onChange: function () {
+              const labelOption = {
+                rotate: app.config.rotate,
+                align: app.config.align,
+                verticalAlign: app.config.verticalAlign,
+                position: app.config.position,
+                distance: app.config.distance,
+              };
+              myChart.setOption({
+                series: [
+                  {
+                    label: labelOption,
+                  },
+                  {
+                    label: labelOption,
+                  },
+                  {
+                    label: labelOption,
+                  },
+                  {
+                    label: labelOption,
+                  },
+                ],
+              });
+            },
+          };
+          const labelOption = {
+            show: true,
+            position: app.config.position,
+            distance: app.config.distance,
+            align: app.config.align,
+            verticalAlign: app.config.verticalAlign,
+            rotate: app.config.rotate,
+            formatter: "{c}",
+            fontSize: 16,
+            rich: {
+              name: {},
+            },
+          };
+          option = {
+            tooltip: {
+              trigger: "axis",
+              axisPointer: {
+                type: "shadow",
+              },
+            },
+            legend: {
+              data: ["男", "女"],
+            },
+            xAxis: [
+              {
+                type: "category",
+                axisTick: { show: false },
+                data: ["3-4岁", "4-5岁", "5-6岁", "6岁以上"],
+              },
+            ],
+            yAxis: [
+              {
+                type: "value",
+              },
+            ],
+            series: [
+              {
+                name: "男",
+                type: "bar",
+                barGap: 0,
+                color: "#60C5F1",
+                label: labelOption,
+                emphasis: {
+                  focus: "series",
+                },
+                data: [
+                  this.KindergartenPhysicalTestlist.threeAndFourMaleCount,
+                  this.KindergartenPhysicalTestlist.fourAndFiveMaleCount,
+                  this.KindergartenPhysicalTestlist.fiveAndSixMaleCount,
+                  this.KindergartenPhysicalTestlist.sixAndMoreMaleCount,
+                ],
+              },
+              {
+                name: "女",
+                type: "bar",
+                color: "#98E0AD",
+                label: labelOption,
+                emphasis: {
+                  focus: "series",
+                },
+                data: [
+                  this.KindergartenPhysicalTestlist.threeAndFourFeMaleCount,
+                  this.KindergartenPhysicalTestlist.fourAndFiveFeMaleCount,
+                  this.KindergartenPhysicalTestlist.fiveAndSixFeMaleCount,
+                  this.KindergartenPhysicalTestlist.sixAndMoreFeMaleCount,
+                ],
+              },
+            ],
+          };
+
+          option && myChart.setOption(option);
+          this.KindergartenPhysicalTestoptions();
+          this.KindergartenPhysicalTestshow = true;
+        }
+      });
+    },
+    KindergartenPhysicalTestoptions() {
+      var chartDom = document.getElementById("KindergartenPhysicalTest2");
+      var myChart = echarts.init(chartDom);
+      var option2;
+
+      option2 = {
+        tooltip: {
+          trigger: "item",
+        },
+        legend: {
+          top: "5%",
+          left: "center",
+        },
+        series: [
+          {
+            center: ["50%", "60%"],
+            itemStyle: {
+              normal: {
+                label: {
+                  show: true,
+                  formatter: "{d}%", //只要百分比
+                  position: "inside",
+                },
+                labelLine: { show: true },
+                color: function (colors) {
+                  var colorList = [
+                    "#5470c6",
+                    "#fc8251",
+                    "#91cd77",
+                    "#ef6567",
+                    "#f9c956",
+                    "#75bedc",
+                  ];
+                  return colorList[colors.dataIndex];
+                },
+              },
+            },
+            name: "",
+            type: "pie",
+            radius: ["40%", "70%"],
+            avoidLabelOverlap: false,
+            label: {
+              show: false,
+              position: "center",
+            },
+            emphasis: {
+              label: {
+                show: false,
+                fontSize: "20",
+                fontWeight: "bold",
+              },
+            },
+            labelLine: {
+              show: false,
+            },
+            data: [
+              {
+                value: this.KindergartenPhysicalTestlist.excellentRate,
+                name: ">80优秀",
+              },
+              {
+                value: this.KindergartenPhysicalTestlist.qualifyRate,
+                name: "60-80合格",
+              },
+              {
+                value: this.KindergartenPhysicalTestlist.unQualifyRate,
+                name: "<60不合格",
+              },
+            ],
+          },
+        ],
+      };
+
+      option2 && myChart.setOption(option2);
+    },
+    //班级type
+    getList() {
+      tKindergartenInfo(this.kindergartenType).then((res) => {
+        this.type = res.data[0];
+        this.type2 = res.data[1];
+      });
+    },
+    //班级类型
+    classtype() {
+      this.classtypelist = [];
+      tKindergartenInfo(this.ClassType).then((res) => {
+        res.data.forEach((e) => {
+          var obj = {
+            name: e.dictLabel,
+            type: e.dictValue,
+          };
+          this.classtypelist.push(obj);
+        });
+        this.developmentinfo();
+      });
+    },
+    //班级list
+    classinfo() {
+      listClassinfo(this.echartslist).then((response) => {
+        this.classList = response.rows;
+        this.ClassListinfo();
+      });
+    },
+  },
+};
+</script>
+<style scoped='scss'>
+::v-deep .el-card__header {
+  border: none;
+}
+::v-deep .el-form {
+  display: inline;
+}
+.title {
+  display: block;
+  width: 350px;
+  margin: 0 auto;
+  line-height: 35px;
+  background-color: #60c5f1;
+  color: #fff;
+  font-size: 15px;
+  border-radius: 20px;
+}
+.text {
+  font-size: 12px;
+  position: absolute;
+  left: 19%;
+  top: 10%;
+}
+.header {
+  text-align: center;
+  font-size: 18px;
+  width: 380px;
+  height: 45px;
+  line-height: 45px;
+  margin: 0 auto;
+  background-color: #f0f0f0;
+  border-radius: 25px;
+}
+.surveytitle {
+  width: 70px;
+  background-color: #00d1da;
+  color: #fff;
+  line-height: 25px;
+  height: 25px;
+  font-size: 14px;
+  text-align: center;
+  border-radius: 15px;
+  position: absolute;
+  left: 7%;
+  top: 8%;
+}
+::v-deep .el-card__header {
+  border: none;
+}
+::v-deep .el-form {
+  display: inline;
+}
+</style>
diff --git a/src/views/system/personalCheckReport/index.vue b/src/views/system/personalCheckReport/index.vue
index ba749d9..b4f71df 100644
--- a/src/views/system/personalCheckReport/index.vue
+++ b/src/views/system/personalCheckReport/index.vue
@@ -149,7 +149,6 @@
         </template>
       </el-table-column>
     </el-table>
-
     <pagination
       v-show="total > 0"
       :total="total"
@@ -302,7 +301,6 @@
         @pagination="studentlist"
       />
     </el-dialog>
-
     <!-- //幼儿园 -->
     <el-dialog
       width="860px"
@@ -403,7 +401,6 @@
         @pagination="listKindergartenInfoetList"
       />
     </el-dialog>
-
     <!-- //班级 -->
     <el-dialog
       width="1050px"
@@ -513,7 +510,6 @@
         @pagination="classinfo"
       />
     </el-dialog>
-
     <!-- //批次 -->
     <el-dialog
       width="700px"
@@ -617,14 +613,19 @@
             <el-radio :label="1">已审核</el-radio>
           </el-radio-group>
         </el-form-item>
-        <iframe
-          ref="pdfCotainer"
-          :src="pdfurl + '#toolbar=0'"
-          width="1150px"
-          height="550px"
-        ></iframe>
-
-        <!-- <el-form-item label="学生姓名" prop="studentId">
+      </el-form>
+      <div style="height: 650px; overflow: auto">
+        <personalecharts
+          v-if="open"
+          :itemlists="itemlist"
+          class="personal"
+        ></personalecharts>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+      <!-- <el-form-item label="学生姓名" prop="studentId">
           <el-input v-model="form.studentId" placeholder="请输入学生姓名" />
         </el-form-item>
         <el-form-item label="批次编号" prop="batchCode">
@@ -636,26 +637,20 @@
         <el-form-item label="报告名称" prop="reportName">
           <el-input v-model="form.reportName" placeholder="请输入报告名称" />
         </el-form-item> -->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
     </el-dialog>
-
+    <!-- //预览 -->
     <el-dialog
-      title="预览"
-      :visible.sync="openiframe"
-      width="1050px"
+      width="1200px"
+      style="height: 95%"
       append-to-body
+      :visible.sync="openiframe"
     >
-      <div>
-        <iframe
-          ref="pdfCotainer"
-          :src="pdfurl + '#toolbar=0'"
-          width="1000px"
-          height="600px"
-        ></iframe>
+      <div style="height: 700px; overflow: auto">
+        <personalecharts
+          v-if="openiframe"
+          :itemlists="itemlist"
+          class="personal"
+        ></personalecharts>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="openiframe = false">关闭</el-button>
@@ -671,23 +666,19 @@ import {
 } from "@/api/system/kindergartenInfo";
 import { listStudentInfo } from "@/api/system/studentInfo";
 import { listClassinfo } from "@/api/system/classinfo";
-import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
+import { testScoreBatch } from "@/api/system/quality";
 import {
   listPersonalCheckReport,
-  updatePersonalCheckReport,
-  checkReportreport,
-  existCheckReport,
+  uploadPersonalCheckReport,
 } from "@/api/system/personalCheckReport";
-import student from "../../assembly/student.vue";
-import baseurl from "@/api/baseurl.js";
-
+import personalecharts from "../personalecharts/index.vue";
+import html2canvas from "html2canvas";
+import JsPDF from "jspdf";
 export default {
-  components: { student },
+  components: { personalecharts },
   name: "PersonalCheckReport",
   data() {
     return {
-      itemshow: false,
-      itemshow2: false,
       total1: 0,
       total2: 0,
       total3: 0,
@@ -823,6 +814,13 @@ export default {
           name: "已审核",
         },
       ],
+      itemlist: {
+        pageNum: 1,
+        pageSize: 999,
+        studentId: "",
+        batchCode: "",
+        number: 1,
+      },
     };
   },
   created() {
@@ -830,6 +828,26 @@ export default {
     this.listKindergartenInfoetList();
   },
   methods: {
+    //预览
+    lookhand(item) {
+      this.itemlist.studentId = item.studentId;
+      this.itemlist.batchCode = item.batchCode;
+      this.itemlist.number++;
+      this.loading = true;
+      setTimeout(() => {
+        this.form = JSON.parse(JSON.stringify(item));
+        this.openiframe = true;
+        this.loading = false;
+      }, 300);
+
+      // checkReportreport(item.studentId, item.batchCode).then((res) => {
+      //   // this.pdfurl = window.URL.createObjectURL(res);
+      //   this.pdfurl = baseurl + res.data.downloadAddress;
+      //   this.getList();
+      //   this.openiframe = true;
+      //   // window.open(this.pdfurl);
+      // });
+    },
     /** 查询个人体质检测报告列表 */
     getList() {
       this.loading = true;
@@ -875,30 +893,39 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-    /** 修改按钮操作 */
+    /** 审核按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids;
-      this.form = JSON.parse(JSON.stringify(row));
-      console.log(this.form);
-      // this.form = row;
-      this.title = "修改个人体质检测报告";
-      existCheckReport(row.studentId, row.batchCode).then((res) => {
-        if (res.data.existFlag) {
-          this.pdfurl = baseurl + res.data.downloadAddress;
-          this.open = true;
-        } else {
-          checkReportreport(row.studentId, row.batchCode).then((res) => {
-            // this.pdfurl = window.URL.createObjectURL(res);
-            this.pdfurl = baseurl + res.data.downloadAddress;
-            this.form.id = res.data.id;
-            this.getList();
-            this.open = true;
-            // window.open(this.pdfurl);
-          });
-        }
-      });
-      console.log(this.form);
+      this.itemlist.studentId = row.studentId;
+      this.itemlist.batchCode = row.batchCode;
+      this.itemlist.number++;
+      this.loading = true;
+      setTimeout(() => {
+        this.form = JSON.parse(JSON.stringify(row));
+        // this.form = row;
+        this.title = "审核个人体质检测报告";
+        this.open = true;
+        this.loading = false;
+      }, 300);
+      // existCheckReport(row.studentId, row.batchCode).then((res) => {
+      //   if (res.code == 200) {
+      //     if (res.data.existFlag) {
+      //       this.loading = false;
+      //       this.open = true;
+      //     } else {
+      //       checkReportreport(row.studentId, row.batchCode).then((res) => {
+      //         // this.pdfurl = window.URL.createObjectURL(res);
+      //         this.form.id = res.data.id;
+      //         this.getList();
+      //         this.loading = false;
+      //         this.open = true;
+      //         // window.open(this.pdfurl);
+      //       });
+      //     }
+      //   } else if (res.code == 500) {
+      //     this.loading = false;
+      //     this.$message.error("获取审核信息失败");
+      //   }
+      // });
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -930,33 +957,100 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    /** 提交按钮 */
-    submitForm() {
-      var obj = {
-        id: this.form.id,
-        checkStatus: this.form.checkStatus,
-      };
-      updatePersonalCheckReport(obj).then((response) => {
-        this.$modal.msgSuccess("修改成功");
-        this.queryParams = {
-          pageNum: 1,
-          pageSize: 10,
-          studentId: null,
-          batchCode: null,
-        };
-        this.getList();
-        this.open = false;
+    // /base64转二进制
+    dataURLtoBlob(dataurl) {
+      console.log(dataurl);
+      var arr = dataurl.split(","),
+        mime = arr[0].match(/:(.*?);/)[1],
+        bstr = atob(arr[1]),
+        n = bstr.length,
+        u8arr = new Uint8Array(n);
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new Blob([u8arr], {
+        type: mime,
       });
     },
-    //预览
-    lookhand(item) {
-      console.log(item);
-      checkReportreport(item.studentId, item.batchCode).then((res) => {
-        // this.pdfurl = window.URL.createObjectURL(res);
-        this.pdfurl = baseurl + res.data.downloadAddress;
-        this.getList();
-        this.openiframe = true;
-        // window.open(this.pdfurl);
+    /** 提交按钮 */
+    submitForm() {
+      // updatePersonalCheckReport(obj).then((res) => {
+      //   if (res.code == 200) {
+      //     this.$modal.msgSuccess("修改成功");
+      //     this.queryParams = {
+      //       pageNum: 1,
+      //       pageSize: 10,
+      //       studentId: null,
+      //       batchCode: null,
+      //     };
+      //     this.getList();
+      //     this.open = false;
+      //   } else {
+      //     this.$modal.msgSuccess("修改失败");
+      //   }
+      // });
+      //转pdf
+      this.open = false;
+      let shareContent = document.querySelector(".personal"), //需要截图的包裹的（原生的）DOM 对象
+        width = shareContent.clientWidth * 1.1, //获取dom 宽度
+        height = shareContent.clientHeight * 1.1, //获取dom 高度
+        canvas = document.createElement("canvas"), //创建一个canvas节点
+        scale = 1.1; //定义任意放大倍数 支持小数
+      // width = 2000;
+      canvas.width = width * scale; //定义canvas 宽度 * 缩放
+      canvas.height = height * scale; //定义canvas高度 *缩放
+      canvas.style.width = shareContent.clientWidth * scale + "px";
+      canvas.style.height = shareContent.clientHeight * scale + "px";
+      canvas.style.backgroundColor = "#ffffff";
+      canvas.getContext("2d").scale(scale, scale); //获取context,设置scale
+      let opts = {
+        scale: scale, // 添加的scale 参数
+        canvas: canvas, //自定义 canvas
+        logging: false, //日志开关，便于查看html2canvas的内部执行流程
+        width: width, //dom 原始宽度
+        height: height,
+        useCORS: true, // 【重要】开启跨域配置
+      };
+      html2canvas(shareContent, opts).then(() => {
+        var contentWidth = canvas.width;
+        var contentHeight = canvas.height; //一页pdf显示html页面生成的canvas高度;
+        var pageHeight = (contentWidth / 592.28) * 841.89; //未生成pdf的html页面高度
+        var leftHeight = contentHeight; //页面偏移
+        var position = 0; //a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的宽高
+        var imgWidth = 595.28;
+        var imgHeight = (592.28 / contentWidth) * contentHeight;
+        var pageData = canvas.toDataURL("image/jpeg", 1.0);
+        var PDF = new JsPDF("", "pt", "a4");
+        if (leftHeight < pageHeight) {
+          PDF.addImage(pageData, "JPEG", 0, 0, imgWidth, imgHeight);
+          console.log(PDF);
+        } else {
+          while (leftHeight > 0) {
+            PDF.addImage(pageData, "JPEG", 0, position, imgWidth, imgHeight);
+            leftHeight -= pageHeight;
+            position -= 841.89;
+            if (leftHeight > 0) {
+              PDF.addPage();
+            }
+          }
+        }
+        var basepdf = PDF.output("datauristring"); // 转base64
+        // basepdf = basepdf.split("filename=generated.pdf;");
+        // base64 转 二进制流(blob)
+        let blob = this.dataURLtoBlob(basepdf);
+        console.log(blob, "blob");
+
+        let formData = new FormData();
+        formData.append("personalFile", blob);
+        formData.append("studentId", this.form.studentId);
+        formData.append("studentName", this.form.studentName);
+        formData.append("batchCode", this.form.batchCode);
+        formData.append("checkStatus", this.form.checkStatus);
+        uploadPersonalCheckReport(formData).then((res) => {
+          console.log(res);
+          this.getList();
+        });
+        // PDF.save("幼儿体质检测报告.pdf"); // 这里是导出的文件名
       });
     },
     /** 导出按钮操作 */
@@ -967,11 +1061,11 @@ export default {
         this.download(
           `/system/personalCheckReport/download?id=${row.id}`,
           {},
-          `个人体质检测报告.pdf`
+          row.reportName + `.pdf`
         );
       }
     },
-
+    // },
     //班级
     classresetQuery() {
       this.classqueryParams.className = "";
@@ -1173,4 +1267,7 @@ export default {
 ::v-deep .el-form {
   display: inline;
 }
+.personal {
+  background-color: #fff;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/system/personalecharts/index.vue b/src/views/system/personalecharts/index.vue
new file mode 100644
index 0000000..0e3477c
--- /dev/null
+++ b/src/views/system/personalecharts/index.vue
@@ -0,0 +1,1709 @@
+<template>
+  <div class="app-container">
+    <ul class="infinite-list" v-infinite-scroll="load" style="overflow: auto">
+      <img src="@/icons/pernoal.jpg" alt="" style="width: 100%" />
+      <div
+        style="font-size: 40px; margin: 40px auto; font-weight: 600"
+        class="title"
+      >
+        幼儿体质检测报告书
+      </div>
+      <!-- //comprehensive 个人综合分析-->
+      <div class="title" style="margin: 40px auto">个人综合分析</div>
+      <el-row>
+        <el-col :span="24" class="card-box">
+          <el-card>
+            <div slot="header" style="text-align: center; margin-bottom: 10px">
+              <span>学生基本信息</span>
+            </div>
+            <div
+              class="el-table--enable-row-hover el-table--medium"
+              style="
+                margin-top: 10px;
+                padding-bottom: 20px;
+                border-bottom: 1px solid #f0f0f0;
+                padding-left: 20px;
+              "
+            >
+              <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>
+
+              <div style="display: flex; margin-top: 20px">
+                <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>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="24" class="card-box">
+          <el-card style="margin-top: 10px">
+            <div
+              class="el-table--enable-row-hover el-table--medium"
+              style="
+                margin: 20px auto;
+                height: 110px;
+                text-align: center;
+                border-bottom: 1px solid #f0f0f0;
+                line-height: 40px;
+              "
+            >
+              <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'">{{
+                    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;
+                    position: absolute;
+                    top: 20px;
+                    width: 80px;
+                    left: 29px;
+                  "
+                ></span>
+              </div>
+            </div>
+            <div style="text-align: center; font-size: 18px; margin-top: 20px">
+              获取徽章
+            </div>
+            <div
+              style="
+                width: 70%;
+                display: flex;
+                text-align: center;
+                justify-content: space-around;
+                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=""
+                />
+                <div style="margin-top: 10px; font-size: 14px">{{ item }}</div>
+              </span>
+            </div>
+          </el-card>
+        </el-col>
+
+        <el-col :span="24" class="card-box" style="margin-top: 10px">
+          <el-card>
+            <div slot="header" style="text-align: center">
+              <span>综合体质分析图</span>
+            </div>
+            <div class="el-table el-table--enable-row-hover el-table--medium">
+              <div
+                ref="comprehensivechart"
+                id="comprehensivechart"
+                style="width: 800px; height: 500px; margin: 0 auto"
+              ></div>
+            </div>
+          </el-card>
+        </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="">
+          <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>
+          </el-card>
+        </el-col>
+
+        <el-col :span="12" class="card-box">
+          <el-card>
+            <div slot="header" style="text-align: center">
+              <span>身高体重信息</span>
+            </div>
+
+            <div class="el-table el-table--enable-row-hover el-table--medium">
+              <div ref="commandstats" style="height: 120px">
+                <table cellspacing="0" style="width: 100%; height: 120px">
+                  <tbody>
+                    <tr>
+                      <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"
+                      >
+                        <div class="cell">
+                          {{
+                            shapelist.heightName
+                              ? shapelist.heightName
+                              : "身高"
+                          }}: {{ shapelist.heightScore
+                          }}{{ shapelist.heightMeasureUnit }}
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td
+                        class="el-table__cell is-leaf"
+                        style="text-align: center"
+                      >
+                        <div class="cell">
+                          {{
+                            shapelist.weightName
+                              ? shapelist.weightName
+                              : "体重"
+                          }}: {{ shapelist.weightScore
+                          }}{{ shapelist.weightMeasureUnit }}
+                        </div>
+                      </td>
+                      <td
+                        class="el-table__cell is-leaf"
+                        style="text-align: center"
+                      >
+                        <div class="cell">
+                          <div class="cell">BMI值: {{ shapelist.bmi }}</div>
+                        </div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+      <el-row style="margin-top: 50px" v-show="shapeshow">
+        <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
+                v-show="heightshow"
+                slot="header"
+                style="text-align: center; font-size: 12px; padding-top: 20px"
+              >
+                <span>年龄身高比</span>
+
+                <div
+                  style="
+                    width: 300px;
+                    margin: 0 auto;
+                    height: 70px;
+                    margin-top: 10px;
+                    position: relative;
+                  "
+                >
+                  <div
+                    style="
+                      position: absolute;
+                      top: 1px;
+                      left: 79%;
+                      line-height: 20px;
+                    "
+                  >
+                    {{
+                      ((((heightMax - heightMin) / heightMin) * heightMin) /
+                        5) *
+                        4 +
+                      heightMin
+                    }}
+                  </div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 20px;
+                      left: 80%;
+                      width: 1px;
+                      height: 15px;
+                      background: #a2a4a1;
+                    "
+                  ></div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 1px;
+                      left: 59%;
+                      line-height: 20px;
+                    "
+                  >
+                    {{
+                      ((((heightMax - heightMin) / heightMin) * heightMin) /
+                        5) *
+                        3 +
+                      heightMin
+                    }}
+                  </div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 20px;
+                      left: 60%;
+                      width: 1px;
+                      height: 15px;
+                      background: #a2a4a1;
+                    "
+                  ></div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 1px;
+                      left: 39%;
+                      line-height: 20px;
+                    "
+                  >
+                    {{
+                      ((((heightMax - heightMin) / heightMin) * heightMin) /
+                        5) *
+                        2 +
+                      heightMin
+                    }}
+                  </div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 20px;
+                      left: 40%;
+                      width: 1px;
+                      height: 15px;
+                      background: #a2a4a1;
+                    "
+                  ></div>
+
+                  <div
+                    style="
+                      position: absolute;
+                      top: 1px;
+                      left: 19%;
+                      line-height: 20px;
+                    "
+                  >
+                    {{
+                      ((((heightMax - heightMin) / heightMin) * heightMin) /
+                        5) *
+                        1 +
+                      heightMin
+                    }}
+                  </div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 20px;
+                      left: 20%;
+                      width: 1px;
+                      height: 15px;
+                      background: #a2a4a1;
+                    "
+                  ></div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 1px;
+                      left: -1%;
+                      line-height: 20px;
+                    "
+                  >
+                    {{ heightMin }}
+                  </div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 20px;
+                      left: 0%;
+                      width: 1px;
+                      height: 15px;
+                      background: #a2a4a1;
+                    "
+                  ></div>
+
+                  <div
+                    style="
+                      position: absolute;
+                      top: 1px;
+                      right: -1%;
+                      line-height: 20px;
+                    "
+                  >
+                    {{ heightMax }}
+                  </div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 20px;
+                      right: 0%;
+                      width: 2px;
+                      height: 15px;
+                      background: #a2a4a1;
+                    "
+                  ></div>
+
+                  <div
+                    class="cz2"
+                    :style="{
+                      width:
+                        ((itemheight - heightMin) / (heightMax - heightMin)) *
+                          100 +
+                        '%',
+                    }"
+                  ></div>
+                </div>
+
+                <!-- <div style="color: red">达标</div> -->
+                <div>{{ shapelist.ageHeightDescription }}</div>
+                <div>
+                  标准:{{ shapelist.ageHeightMin }}-{{ shapelist.ageHeightMax
+                  }}{{ shapelist.heightMeasureUnit }}
+                </div>
+              </div>
+
+              <div
+                slot="header"
+                v-show="weightshow"
+                style="
+                  text-align: center;
+                  margin-top: 20px;
+                  font-size: 12px;
+                  padding-top: 20px;
+                "
+              >
+                <span>年龄体重比</span>
+
+                <div
+                  style="
+                    width: 300px;
+                    margin: 0 auto;
+                    height: 70px;
+                    margin-top: 10px;
+                    position: relative;
+                  "
+                >
+                  <div
+                    style="
+                      position: absolute;
+                      top: 1px;
+                      left: 79%;
+                      line-height: 20px;
+                    "
+                  >
+                    {{
+                      ((((weightMax - weightMin) / weightMin) * weightMin) /
+                        5) *
+                        4 +
+                      weightMin
+                    }}
+                  </div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 20px;
+                      left: 80%;
+                      width: 1px;
+                      height: 15px;
+                      background: #a2a4a1;
+                    "
+                  ></div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 1px;
+                      left: 59%;
+                      line-height: 20px;
+                    "
+                  >
+                    {{
+                      ((((weightMax - weightMin) / weightMin) * weightMin) /
+                        5) *
+                        3 +
+                      weightMin
+                    }}
+                  </div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 20px;
+                      left: 60%;
+                      width: 1px;
+                      height: 15px;
+                      background: #a2a4a1;
+                    "
+                  ></div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 1px;
+                      left: 39%;
+                      line-height: 20px;
+                    "
+                  >
+                    {{
+                      ((((weightMax - weightMin) / weightMin) * weightMin) /
+                        5) *
+                        2 +
+                      weightMin
+                    }}
+                  </div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 20px;
+                      left: 40%;
+                      width: 1px;
+                      height: 15px;
+                      background: #a2a4a1;
+                    "
+                  ></div>
+
+                  <div
+                    style="
+                      position: absolute;
+                      top: 1px;
+                      left: 19%;
+                      line-height: 20px;
+                    "
+                  >
+                    {{
+                      ((((weightMax - weightMin) / weightMin) * weightMin) /
+                        5) *
+                        1 +
+                      weightMin
+                    }}
+                  </div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 20px;
+                      left: 20%;
+                      width: 1px;
+                      height: 15px;
+                      background: #a2a4a1;
+                    "
+                  ></div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 1px;
+                      left: -1%;
+                      line-height: 20px;
+                    "
+                  >
+                    {{ weightMin }}
+                  </div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 20px;
+                      left: 0%;
+                      width: 1px;
+                      height: 15px;
+                      background: #a2a4a1;
+                    "
+                  ></div>
+
+                  <div
+                    style="
+                      position: absolute;
+                      top: 1px;
+                      right: -1%;
+                      line-height: 20px;
+                    "
+                  >
+                    {{ weightMax }}
+                  </div>
+                  <div
+                    style="
+                      position: absolute;
+                      top: 20px;
+                      right: 0%;
+                      width: 2px;
+                      height: 15px;
+                      background: #a2a4a1;
+                    "
+                  ></div>
+
+                  <div
+                    class="cz2"
+                    :style="{
+                      width:
+                        ((itemweight - weightMin) / (weightMax - weightMin)) *
+                          100 +
+                        '%',
+                    }"
+                  ></div>
+                </div>
+
+                <!-- <div style="color: red">达标</div> -->
+                <div>{{ shapelist.ageWeightDescription }}</div>
+                <div>
+                  标准:{{ shapelist.ageWeightMin }}-{{ shapelist.ageWeightMax
+                  }}{{ shapelist.weightMeasureUnit }}
+                </div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="12" class="card-box" style="height: 370px">
+          <el-card>
+            <div slot="header" style="text-align: center">
+              <span>BMI</span>
+            </div>
+            <div
+              class="el-table el-table--enable-row-hover el-table--medium"
+              style="height: 310px; position: relative"
+            >
+              <div
+                ref="shapechart"
+                id="shapechart"
+                style="width: 400px; height: 250px; margin: 0 auto"
+              ></div>
+
+              <div
+                style="
+                  position: absolute;
+                  left: 52%;
+                  top: 38%;
+                  transform: translate(-50%);
+                "
+              >
+                得分: <span style="color: red">{{ shapelist.bmi }}</span>
+              </div>
+              <div
+                style="
+                  position: absolute;
+                  left: 50%;
+                  top: 55%;
+                  transform: translate(-50%);
+                "
+              >
+                {{ shapelist.bmiDescription }}
+              </div>
+              <!-- <div
+              class="texts"
+              style="
+                width: 285px;
+                height: 60px;
+                line-height: 20px;
+                margin: 0 auto;
+                font-size: 12px;
+              "
+            >
+              <span
+                class="text"
+                style="display: inline-block; margin-right: 10px"
+                v-for="(item, index) in bmiItemLevel"
+                :key="index"
+              >
+                <span
+                  style="
+                    vertical-align: middle;
+                    width: 30px;
+                    height: 14px;
+                    background: #91cd77;
+                    display: inline-block;
+                    margin-right: 5px;
+                    border-radius: 2px;
+                  "
+                ></span>
+                <span>{{ item.levelName }}</span>
+                <div style="text-align: center">
+                  {{ item.levelMinScore }}~{{ item.levelMaxScore }}
+                </div>
+              </span>
+
+               <span
+                class="text"
+                style="display: inline-block; margin-right: 10px"
+              >
+                <span
+                  style="
+                    vertical-align: middle;
+                    width: 30px;
+                    height: 14px;
+                    background: #5470c6;
+                    display: inline-block;
+                    margin-right: 5px;
+                    border-radius: 2px;
+                  "
+                ></span>
+                <span>健康</span>
+                <div style="text-align: center">
+                  {{ item.levelMinScore }}~{{ item.levelMaxScore }}
+                </div>
+              </span>
+
+              <span
+                class="text"
+                style="display: inline-block; margin-right: 10px"
+              >
+                <span
+                  style="
+                    vertical-align: middle;
+                    width: 30px;
+                    height: 14px;
+                    background: #fc8251;
+                    display: inline-block;
+                    margin-right: 5px;
+                    border-radius: 2px;
+                  "
+                ></span>
+                <span>过重</span>
+                <div style="text-align: center">
+                  {{ item.levelMinScore }}~{{ item.levelMaxScore }}
+                </div>
+              </span>
+
+              <span class="text" style="display: inline-block">
+                <span
+                  style="
+                    vertical-align: middle;
+                    width: 30px;
+                    height: 14px;
+                    background: #ef6567;
+                    display: inline-block;
+                    margin-right: 5px;
+                    border-radius: 2px;
+                  "
+                ></span>
+                <span>肥胖</span>
+                <div style="text-align: center">
+                  {{ item.levelMinScore }}~{{ item.levelMaxScore }}
+                </div>
+              </span>
+            </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 slot="header" style="text-align: center">身体素质测试</div>
+        <el-row style="text-align: center">
+          <el-col
+            :span="5"
+            class="toptitle"
+            style="
+              border-right: 1px solid #ededed;
+              border-bottom: 1px solid #ededed;
+            "
+            >身体素质测试</el-col
+          >
+          <el-col
+            :span="5"
+            class="toptitle"
+            style="
+              border-right: 1px solid #ededed;
+              border-bottom: 1px solid #ededed;
+            "
+            >测量值</el-col
+          >
+          <el-col
+            :span="9"
+            class="toptitle"
+            style="
+              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-row>
+        <el-row
+          style="text-align: center"
+          v-for="(item, index) in studentscorelist"
+          :key="index"
+        >
+          <el-col
+            :span="5"
+            class="text"
+            style="
+              height: 100px;
+              line-height: 100px;
+              border-right: 1px solid #ededed;
+              border-bottom: 1px solid #ededed;
+            "
+          >
+            {{ item.itemName }}
+          </el-col>
+          <el-col
+            class="text"
+            :span="5"
+            style="
+              height: 100px;
+              line-height: 100px;
+              border-right: 1px solid #ededed;
+              border-bottom: 1px solid #ededed;
+            "
+          >
+            {{ item.itemScore ? item.itemScore : "" }}
+            {{ item.scoreDictValue ? item.scoreDictValue : "" }}
+            {{ item.measureUnit }}
+          </el-col>
+
+          <el-col
+            class="text"
+            v-if="item.itemScore"
+            :span="9"
+            style="
+              height: 100px;
+              border-right: 1px solid #ededed;
+              border-bottom: 1px solid #ededed;
+              position: relative;
+              overflow: hidden;
+            "
+          >
+            <span style="position: absolute; left: 5%; top: 10px"
+              >{{
+                item.measureUnit == "s" || item.measureUnit == "h"
+                  ? "时间"
+                  : ""
+              }}{{
+                item.measureUnit == "cm" || item.measureUnit == "m"
+                  ? "距离"
+                  : ""
+              }}
+              {{ item.measureUnit == "kg" ? "千克" : "" }}
+              {{ item.measureUnit == "g" ? "克" : "" }}({{ item.measureUnit }})
+            </span>
+
+            <span style="position: absolute; left: 6%; top: 70%">评价</span>
+            <div
+              style="
+                width: 65%;
+                margin: 0 auto;
+                margin-top: 10px;
+                margin-left: 25%;
+                position: relative;
+              "
+            >
+              <div
+                style="
+                  position: absolute;
+                  top: 1px;
+                  left: 75%;
+                  line-height: 20px;
+                  overflow: hidden;
+                  width: 40px;
+                "
+              >
+                {{
+                  (
+                    ((item.maxScore - item.minScore) / 5) * 4 +
+                    item.minScore
+                  ).toFixed(1)
+                }}
+              </div>
+              <div
+                style="
+                  position: absolute;
+                  top: 20px;
+                  left: 80%;
+                  width: 1px;
+                  height: 15px;
+                  background: #a2a4a1;
+                "
+              ></div>
+              <div
+                style="
+                  position: absolute;
+                  top: 1px;
+                  left: 55%;
+                  overflow: hidden;
+                  line-height: 20px;
+                  width: 40px;
+                "
+              >
+                {{
+                  (
+                    ((item.maxScore - item.minScore) / 5) * 3 +
+                    item.minScore
+                  ).toFixed(1)
+                }}
+              </div>
+              <div
+                style="
+                  position: absolute;
+                  top: 20px;
+                  left: 60%;
+                  width: 1px;
+                  height: 15px;
+                  background: #a2a4a1;
+                "
+              ></div>
+              <div
+                style="
+                  position: absolute;
+                  top: 1px;
+                  left: 35%;
+                  line-height: 20px;
+                  overflow: hidden;
+                  width: 40px;
+                "
+              >
+                {{
+                  (
+                    ((item.maxScore - item.minScore) / 5) * 2 +
+                    item.minScore
+                  ).toFixed(1)
+                }}
+              </div>
+              <div
+                style="
+                  position: absolute;
+                  top: 20px;
+                  left: 40%;
+                  width: 1px;
+                  height: 15px;
+                  background: #a2a4a1;
+                "
+              ></div>
+
+              <div
+                style="
+                  position: absolute;
+                  top: 1px;
+                  left: 15%;
+                  line-height: 20px;
+                  overflow: hidden;
+                  width: 40px;
+                "
+              >
+                {{
+                  (
+                    ((item.maxScore - item.minScore) / 5) * 1 +
+                    item.minScore
+                  ).toFixed(1)
+                }}
+              </div>
+              <div
+                style="
+                  position: absolute;
+                  top: 20px;
+                  left: 20%;
+                  width: 1px;
+                  height: 15px;
+                  background: #a2a4a1;
+                "
+              ></div>
+              <div
+                style="
+                  position: absolute;
+                  top: 1px;
+                  left: -5%;
+                  line-height: 20px;
+                  overflow: hidden;
+                  width: 32px;
+                "
+              >
+                {{ item.minScore == null ? 0 : item.minScore }}
+              </div>
+              <div
+                style="
+                  position: absolute;
+                  top: 20px;
+                  left: 0%;
+                  width: 1px;
+                  height: 15px;
+                  background: #a2a4a1;
+                "
+              ></div>
+
+              <div
+                style="
+                  position: absolute;
+                  top: 1px;
+                  right: -3%;
+                  line-height: 20px;
+                  overflow: hidden;
+                  width: 32px;
+                "
+              >
+                {{ item.maxScore == null ? 100 : item.maxScore }}
+              </div>
+              <div
+                style="
+                  position: absolute;
+                  top: 20px;
+                  right: 0%;
+                  width: 2px;
+                  height: 15px;
+                  background: #a2a4a1;
+                "
+              ></div>
+
+              <div
+                class="cz2"
+                :style="{
+                  width:
+                    ((item.itemScore - item.minScore) /
+                      (item.maxScore - item.minScore)) *
+                      100 +
+                    '%',
+                }"
+              ></div>
+            </div>
+
+            <div style="position: absolute; left: 30%; top: 72%">
+              {{ item.leveName }}
+            </div>
+          </el-col>
+          <el-col
+            class="text"
+            v-else
+            :span="9"
+            style="
+              height: 100px;
+              border-right: 1px solid #ededed;
+              border-bottom: 1px solid #ededed;
+              position: relative;
+            "
+          >
+            <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>
+          </el-col>
+          <el-col
+            class="text"
+            :span="5"
+            style="
+              height: 100px;
+              line-height: 100px;
+              border-bottom: 1px solid #ededed;
+            "
+            >{{ item.syntheticalAssess }}</el-col
+          >
+        </el-row>
+      </el-card>
+      <!-- //action动作发展分析 -->
+      <div class="title" style="margin: 40px auto">动作发展分析</div>
+      <el-row :gutter="24">
+        <div style="margin: 10px auto; width: 100%">
+          <el-table
+            :data="actionlist"
+            border
+            :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
+              prop="smallStandardScore"
+              label="小班最高得分"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="middleStandardScore"
+              label="中班最高得分"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="largeStandardScore"
+              label="大班最高得分"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="itemScoreAll"
+              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>
+        </div>
+      </el-row>
+      <!-- //constitution -->
+      <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-card>
+            <div style="margin-left: 50px">
+              <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">{{
+                constitutionlist.areaRank
+              }}</span
+              >名 <span style="margin-left: 50px">区域成绩占比:</span
+              ><span style="margin-left: 20px; margin-right: 20px">{{
+                constitutionlist.areaProportion
+              }}</span>
+            </div>
+
+            <div slot="header" style="text-align: center; font-size: 20px">
+              <span>体测项目分值与全校、全市对比</span>
+            </div>
+            <div style="width: 100%; display: flex; flex-wrap: wrap">
+              <div
+                v-for="(item, index) in constitutionlist.itemScoreList"
+                :key="index"
+                style="
+                  width: 45%;
+                  height: 300px;
+                  margin-left: 3%;
+                  margin-top: 20px;
+                "
+              >
+                <div
+                  class="constitutionchart"
+                  style="width: 100%; height: 300px; margin: 0 auto"
+                ></div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </ul>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import { analysis } from "@/api/system/shape";
+import { synthesize } from "@/api/system/comprehensive";
+import { testBodyScoreInfo } from "@/api/system/quality";
+import { constitution } from "@/api/system/constitution";
+import { listAction } from "@/api/system/action";
+
+export default {
+  name: "personalecharts",
+  props: ["itemlists"],
+  data() {
+    return {
+      constitutionshow: true,
+      echartslist: {
+        batchCode: "",
+        pageNum: 1,
+        pageSize: 999,
+        studentId: "",
+      },
+      //学生基本信息 comprehensive
+      sythesizestudent: [],
+      //shape
+      shapeshow: true,
+      weightshow: true,
+      heightshow: true,
+      itemweight: "",
+      weightMax: 70,
+      weightMin: 10,
+      itemheight: "",
+      heightMax: 150,
+      heightMin: 30,
+      shapelist: [], //身体形态list
+      bmiItemLevel: [], //bmi
+      //quality
+      studentscorelist: [], //学生成绩
+      qualityshow: true,
+      //constitution
+      constitutionlist: [],
+      //action
+      actionlist: [],
+      spanArr: [],
+      position: 0, // 标记位置
+      spanArr2: [],
+      position2: 0, // 标记位置
+      count: 0, //滑动位置
+    };
+  },
+  mounted() {
+    this.constitutionlist = [];
+    this.comprehensive();
+    this.shape();
+    this.quality();
+    this.constitutioninfo();
+    this.listActioninfo();
+  },
+  // watch: {
+  //   itemlists: {
+  //     handler(newName, oldName) {
+  //       console.log(newName, oldName);
+  //       this.echartslist = {
+  //         studentId: newName.studentId,
+  //         batchCode: newName.batchCode,
+  //         pageNum: 1,
+  //         pageSize: 999,
+  //       };
+  //       this.constitutionlist = [];
+  //       this.comprehensive();
+  //       this.shape();
+  //       this.quality();
+  //       this.listActioninfo();
+  //       this.constitutioninfo();
+  //     },
+  //     deep: true,
+  //   },
+  // },
+  created() {
+    console.log(this.itemlists);
+    this.echartslist = {
+      studentId: this.itemlists.studentId,
+      batchCode: this.itemlists.batchCode,
+      pageNum: 1,
+      pageSize: 999,
+    };
+  },
+  methods: {
+    load() {},
+    //综合体质分析素质 comprehensive
+    comprehensive() {
+      synthesize(this.echartslist).then((res) => {
+        if (res.data == [] || !res.data) {
+        } else {
+          this.sythesizestudent = res.data;
+          let seriesData = [];
+          let yindicator = [];
+          if (res.data.physiqueCategoryList.length == 1) {
+            let obj = {
+              categoryName: "暂无",
+              categoryNameAbbreviate: "暂无",
+              categoryScore: null,
+              levelName: "暂无",
+              maxScore: null,
+            };
+            res.data.physiqueCategoryList.push(obj);
+            res.data.physiqueCategoryList.push(obj);
+            res.data.physiqueCategoryList.push(obj);
+          }
+          if (res.data.physiqueCategoryList.length == 2) {
+            let obj = {
+              categoryName: "暂无",
+              categoryNameAbbreviate: "暂无",
+              categoryScore: null,
+              levelName: "暂无",
+              maxScore: null,
+            };
+            res.data.physiqueCategoryList.push(obj);
+            res.data.physiqueCategoryList.push(obj);
+          }
+
+          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,
+            });
+          });
+          let comprehensiveChart = echarts.init(
+            document.getElementById("comprehensivechart")
+          );
+          let option = {
+            //配置维度的最大值
+            color: "blue",
+            radar: {
+              name: {
+                show: true,
+                color: "black",
+              },
+              center: ["50%", "50%"],
+              //   雷达图的指示器，用来指定雷达图中的多个变量（维度）
+              indicator: yindicator,
+              shape: "polygon", //对雷达图形设置成一个圆形,可选 circle:圆形,polygon:多角形(默认)
+            },
+            series: [
+              {
+                type: "radar",
+                label: {
+                  show: true,
+                  color: "blue", //显示数值
+                },
+                areaStyle: {}, //每个雷达图形成一个阴影的面积
+                data: [
+                  {
+                    name: "成绩区域",
+                    value: seriesData,
+                  },
+                ],
+                areaStyle: {
+                  color: new echarts.graphic.RadialGradient(0.1, 0.6, 1, [
+                    {
+                      color: "rgba(50, 50, 255, 0.1)",
+                      offset: 0,
+                    },
+                    {
+                      color: "rgba(50, 50, 200, 0.9)",
+                      offset: 1,
+                    },
+                  ]),
+                },
+              },
+            ],
+          };
+          // 绘制图表
+          comprehensiveChart.setOption(option);
+        }
+      });
+    },
+    //学生身体形态 shape
+    shape() {
+      setTimeout(() => {
+        analysis(this.echartslist).then((res) => {
+          if (!res.data || res.data == "") {
+            this.shapeshow = false;
+          } else if (
+            res.data.weightScore == 0 ||
+            res.data.weightScore == null
+          ) {
+            this.weightshow = false;
+            this.shapelist = res.data;
+            this.itemheight = res.data.heightScore;
+            this.bmiItemLevel = res.data.bmiItemLevel;
+            this.itemweight = res.data.weightScore;
+          } else if (
+            res.data.heightScore == 0 ||
+            res.data.heightScore == null
+          ) {
+            this.heightshow = false;
+            this.shapelist = res.data;
+            this.itemheight = res.data.heightScore;
+            this.bmiItemLevel = res.data.bmiItemLevel;
+            this.itemweight = res.data.weightScore;
+          } else if (res.data.bmiItemLevel == null) {
+            this.shapelist = res.data;
+            this.itemheight = res.data.heightScore;
+            this.bmiItemLevel = res.data.bmiItemLevel;
+            this.itemweight = res.data.weightScore;
+          } else {
+            this.shapelist = res.data;
+            this.itemheight = res.data.heightScore;
+            this.bmiItemLevel = res.data.bmiItemLevel;
+            this.itemweight = res.data.weightScore;
+            // console.log(this.shapelist);
+            console.log(this.bmiItemLevel);
+            let seriesData = [];
+            res.data.bmiItemLevel.forEach((el) => {
+              seriesData.push({
+                value: el.levelMaxScore,
+                name:
+                  el.levelName +
+                  " " +
+                  "(" +
+                  el.levelMinScore +
+                  "~" +
+                  el.levelMaxScore +
+                  ")",
+              });
+            });
+            console.log(seriesData);
+            let shapechart = echarts.init(
+              document.getElementById("shapechart")
+            );
+            let option = {
+              series: [
+                {
+                  type: "pie",
+                  radius: ["40%", "70%"],
+                  // center: ["37%", "50%"],
+                  itemStyle: {
+                    normal: {
+                      color: function (colors) {
+                        let colorList = [
+                          "#91cd77",
+                          "#5470c6",
+                          "#fc8251",
+                          "#ef6567",
+                          "#f9c956",
+                          "#75bedc",
+                        ];
+                        return colorList[colors.dataIndex];
+                      },
+                    },
+                  },
+                  data: seriesData,
+                  emphasis: {
+                    itemStyle: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: "rgba(0, 0, 0, 1)",
+                    },
+                  },
+                },
+              ],
+            };
+            option && shapechart.setOption(option);
+          }
+        });
+      }, 100);
+    },
+    //quality
+    //学生身体素质
+    quality() {
+      setTimeout(() => {
+        testBodyScoreInfo(this.echartslist).then((res) => {
+          if (!res.rows || res.rows == "" || res.rows == []) {
+            this.qualityshow = false;
+          } else {
+            this.studentscorelist = res.rows;
+            this.qualityshow = true;
+          }
+        });
+      }, 200);
+    },
+    //constitution
+    constitutioninfo() {
+      setTimeout(() => {
+        constitution(this.echartslist).then((res) => {
+          console.log(res);
+          this.constitutionlist = res.data;
+          if (!res.data || res.data == "") {
+            this.constitutionshow = false;
+          } else {
+            this.constitutionshow = true;
+            this.$nextTick(() => {
+              this.constitutionoptions();
+            });
+          }
+        });
+      }, 400);
+    },
+    constitutionoptions() {
+      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,
+        ];
+        let textname = this.constitutionlist.itemScoreList[i].itemName;
+        //   console.log(ydata);
+        let myChart = echarts.init(constitutionEchart[i]);
+        let option = {
+          title: {
+            text: textname,
+            subtext: "",
+            left: "50%",
+          },
+          tooltip: {
+            trigger: "axis",
+            axisPointer: {
+              type: "shadow",
+            },
+            formatter: function (params) {
+              let tar = params[1];
+              return tar.name + "<br/>" + tar.seriesName + " : " + tar.value;
+            },
+          },
+          grid: {
+            left: "3%",
+            right: "4%",
+            bottom: "3%",
+            containLabel: true,
+          },
+          xAxis: {
+            type: "category",
+            splitLine: { show: false },
+            data: this.constitutionlist.itemStudentList,
+          },
+          yAxis: {
+            type: "value",
+          },
+          series: [
+            {
+              name: "Placeholder",
+              type: "bar",
+              stack: "Total",
+              itemStyle: {
+                borderColor: "blue",
+                color: "blue",
+              },
+              emphasis: {
+                itemStyle: {
+                  borderColor: "transparent",
+                  color: "transparent",
+                },
+              },
+              data: [0, 0, 0],
+            },
+            {
+              name: "分数",
+              type: "bar",
+              stack: "Total",
+              // center: ["50%", "50%"],
+              barWidth: 35,
+              label: {
+                show: true,
+                position: "inside",
+              },
+              itemStyle: {
+                normal: {
+                  color: function (colors) {
+                    let colorList = [
+                      "#91cd77",
+                      "#5470c6",
+                      "#fc8251",
+                      "#ef6567",
+                      "#f9c956",
+                      "#75bedc",
+                      "#91cd77",
+                      "#5470c6",
+                      "#fc8251",
+                      "#ef6567",
+                      "#f9c956",
+                      "#75bedc",
+                      "#91cd77",
+                      "#5470c6",
+                      "#fc8251",
+                      "#ef6567",
+                      "#f9c956",
+                      "#75bedc",
+                      "#91cd77",
+                      "#5470c6",
+                      "#fc8251",
+                      "#ef6567",
+                      "#f9c956",
+                      "#75bedc",
+                    ];
+                    return colorList[i];
+                  },
+                },
+              },
+
+              // itemStyle: {
+              //   borderColor: "#94D8F6",
+              //   color: "#94D8F6",
+              // },
+              data: ydata,
+            },
+          ],
+        };
+
+        myChart.setOption(option);
+      }
+    },
+    //action
+    actionforeach() {
+      this.spanArr = [];
+      this.position = 0; // 标记位置
+      this.spanArr2 = [];
+      this.position2 = 0; // 标记位置
+      this.actionlist.forEach((item, index) => {
+        if (index == 0) {
+          this.spanArr.push(1);
+          this.position = 0;
+          this.spanArr2.push(1);
+          this.position2 = 0;
+        } else {
+          // 判断当前元素与上一个元素是否相同  也就是判断 a 的值是否相同
+          if (
+            this.actionlist[index].categoryName ==
+            this.actionlist[index - 1].categoryName
+          ) {
+            // 如果相同 当前位置的 值 加1
+            this.spanArr[this.position] += 1;
+            this.spanArr.push(0); // 下一个位置 给 0
+          } else {
+            this.spanArr.push(1); // 不相等下一个位置给 1
+            this.position = index; // 标记位置 设置为当前位置
+          }
+
+          if (
+            this.actionlist[index].categoryName ==
+              this.actionlist[index - 1].categoryName &&
+            this.actionlist[index].itemScoreAll ==
+              this.actionlist[index - 1].itemScoreAll
+          ) {
+            this.spanArr2[this.position] += 1;
+            this.spanArr2.push(0); // 下一个位置 给 0
+          } else {
+            this.spanArr2.push(1); // 不相等下一个位置给 1
+            this.position2 = index; // 标记位置 设置为当前位置
+          }
+        }
+      });
+      //   console.log(this.spanArr);
+    },
+    // 合并单元格
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+      //   console.log(columnIndex);
+      // 对第一列 相对字段 a  进行合并
+      if (columnIndex == 0) {
+        // console.log(this.spanArr);
+        const _row = this.spanArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col,
+        };
+      }
+      if (columnIndex == 7) {
+        // console.log(this.spanArr2);
+        const _row = this.spanArr2[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col,
+        };
+      }
+    },
+    //动作发展检测
+    listActioninfo() {
+      setTimeout(() => {
+        listAction(this.echartslist).then((res) => {
+          if (!res.rows || res.rows == "") {
+          } else {
+            //   res.rows.itemCategoryList.forEach((e) => {
+            //     e.push(res.rows.categoryName);
+            //   });
+            this.actionlist = res.rows;
+            this.actionforeach();
+            console.log(this.actionlist);
+          }
+        });
+      }, 300);
+    },
+  },
+};
+</script>
+<style scoped='scss'>
+.title {
+  font-size: 28px;
+  margin: 0 auto;
+  text-align: center;
+  margin-bottom: 20px;
+}
+::v-deep .el-card__header {
+  border: none;
+}
+.cz2 {
+  background: #ffc000;
+  height: 5px;
+  align-items: center;
+  line-height: 30px;
+  position: absolute;
+  top: 40px;
+}
+::v-deep .el-form {
+  display: inline;
+}
+.text {
+  font-size: 14px;
+}
+.toptitle {
+  height: 50px;
+  line-height: 50px;
+  background-color: #f8f8f9;
+  font-size: 15px;
+  font-weight: 600;
+}
+</style>
diff --git a/src/views/system/physique/index.vue b/src/views/system/physique/index.vue
index 60346c0..2b68626 100644
--- a/src/views/system/physique/index.vue
+++ b/src/views/system/physique/index.vue
@@ -114,110 +114,99 @@
         </div>
       </el-col>
       <el-col :span="24" :offset="0">
-        <div style="margin: 0 auto">
+        <div style="margin: 0 auto; width: 100%; line-height: 60px">
           <div
-            style="
-              display: flex;
-              text-align: center;
-              justify-content: center;
-              color: black;
-            "
+            style="font-size: 12px; width: 100%; overflow: auto; height: 400px"
           >
             <div
               style="
-                width: 120px;
-                line-height: 60px;
-                border: 1px solid #f0f0f0;
-                background: #f5f7fa;
-              "
-            >
-              年龄
-            </div>
-            <div
-              style="
-                width: 120px;
-                line-height: 60px;
-                border: 1px solid #f0f0f0;
-                background: #f5f7fa;
+                display: flex;
+                text-align: center;
+                justify-content: center;
                 color: black;
               "
             >
-              平均总分
-            </div>
-            <div v-for="item in categoryTableNameList" :key="item.prentId">
-              <div
-                style="
-                  text-align: center;
-                  line-height: 30px;
-                  border: 1px solid #f0f0f0;
-                  background: #f5f7fa;
-                  color: black;
-                "
-              >
-                {{ item.parentName }}
+              <div style="border: 0.5px solid #f0f0f0; background: #f5f7fa">
+                <div style="width: 90px; line-height: 58px">年龄</div>
               </div>
-              <div
-                style="
-                  display: flex;
-                  line-height: 30px;
-                  border: 1px solid #f0f0f0;
-                  background: #f5f7fa;
-                  color: black;
-                "
-              >
+
+              <div style="border: 0.5px solid #f0f0f0; background: #f5f7fa">
+                <div style="width: 90px; line-height: 58px">平均总分</div>
+              </div>
+
+              <div v-for="item in categoryTableNameList" :key="item.prentId">
                 <div
-                  v-for="uitem in item.childrenTableNameList"
-                  :key="uitem.categoryId"
-                  style="width: 120px"
+                  style="
+                    text-align: center;
+                    line-height: 30px;
+                    border: 1px solid #f0f0f0;
+                    background: #f5f7fa;
+                    color: black;
+                  "
                 >
-                  {{ uitem.categoryName }}
+                  {{ item.parentName }}
                 </div>
-              </div>
-            </div>
-          </div>
-          <div>
-            <div
-              style="
-                text-align: center;
-                display: flex;
-                justify-content: center;
-                font-size: 14px;
-              "
-              v-for="item in categoryAgeFractionList"
-              :key="item.prentId"
-            >
-              <div
-                style="
-                  width: 120px;
-                  line-height: 50px;
-                  border: 1px solid #f0f0f0;
-                "
-              >
-                {{ item.studentAge }}
-              </div>
-              <div
-                style="
-                  width: 120px;
-                  line-height: 50px;
-                  border: 1px solid #f0f0f0;
-                "
-              >
-                {{ item.totalAvgFraction }}
-              </div>
-              <div>
-                <div style="display: flex; line-height: 50px">
+                <div
+                  style="
+                    display: flex;
+                    line-height: 32px;
+                    border: 1px solid #f0f0f0;
+                    background: #f5f7fa;
+                    color: black;
+                  "
+                >
                   <div
-                    v-for="uitem in item.list"
+                    v-for="uitem in item.childrenTableNameList"
                     :key="uitem.categoryId"
-                    style="width: 120px; border: 0.5px solid #f0f0f0"
+                    style="width: 90px"
                   >
-                    {{ uitem }}
+                    {{ uitem.categoryName }}
                   </div>
                 </div>
               </div>
             </div>
+            <div>
+              <div
+                style="
+                  text-align: center;
+                  display: flex;
+                  justify-content: center;
+                  font-size: 14px;
+                "
+                v-for="item in categoryAgeFractionList"
+                :key="item.prentId"
+              >
+                <div style="border: 1px solid #f0f0f0">
+                  <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>
+                <div>
+                  <div style="display: flex; line-height: 50px">
+                    <div
+                      v-for="uitem in item.list"
+                      :key="uitem.categoryId"
+                      style="
+                        width: 90px;
+                        border: 0.5px solid #f0f0f0;
+                        line-height: 52px;
+                        height: 52px;
+                      "
+                    >
+                      {{ uitem }}
+                    </div>
+                    
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div></div>
           </div>
-          <div></div>
         </div>
       </el-col>
     </el-row>
@@ -239,7 +228,7 @@
 <script>
 import * as echarts from "echarts";
 import { getRoleInfo } from "@/api/system/quality";
-import { analysis } from "@/api/system/physique";
+import { physiqueanalysis } from "@/api/system/physique";
 import Kindergarten from "../../assembly/kindergarten.vue";
 
 export default {
@@ -296,7 +285,7 @@ export default {
     },
 
     analysisinfo() {
-      analysis(this.analysisqueryParams).then((res) => {
+      physiqueanalysis(this.analysisqueryParams).then((res) => {
         if (res.data == [] || !res.data) {
           this.itemshow2 = true;
           this.itemshow = false;
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index 1615ba8..6278c7b 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -124,6 +124,7 @@ export default {
       this.$refs.cropper.getCropBlob(data => {
         let formData = new FormData();
         formData.append("avatarfile", data);
+        console.log(data)
         uploadAvatar(formData).then(response => {
           this.open = false;
           this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;