diff --git a/.env.development b/.env.development
index 6a5988e..dd5ac82 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 幼儿园体质检测管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.16.64:8080'
+VUE_APP_BASE_API = 'http://192.168.16.81:8080'
 #'/dev-api'
 
 # 路由懒加载
diff --git a/src/api/system/testItemScore.js b/src/api/system/testItemScore.js
index 39e1041..dcb0b3a 100644
--- a/src/api/system/testItemScore.js
+++ b/src/api/system/testItemScore.js
@@ -26,14 +26,6 @@ export function studentInfo(query) {
     })
 }
 
-//查询测试项目列表
-export function testItems(query) {
-    return request({
-        url: '/system/testItems/list',
-        method: 'get',
-        params: query
-    })
-}
 
 //查询成绩批次编号列表
 export function testScoreBatch(query) {
diff --git a/src/views/system/KindergartenPhysicalTest/index.vue b/src/views/system/KindergartenPhysicalTest/index.vue
index 7f21b13..289f44a 100644
--- a/src/views/system/KindergartenPhysicalTest/index.vue
+++ b/src/views/system/KindergartenPhysicalTest/index.vue
@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName">
+      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
         <el-button
           @click="kindergartenshow = true"
           v-if="kindergartenName == '请选择幼儿园'"
@@ -284,6 +284,7 @@ export default {
     return {
       itemshow: false,
       itemshow2: false,
+      showyey: true,
       total1: 0,
       total4: 0,
       //遮罩层
@@ -584,10 +585,13 @@ export default {
     },
     //点击批次
     batchCodeshowclick() {
-      if (this.analysisqueryParams.kindergartenId == "") {
+      if (
+        this.analysisqueryParams.kindergartenId == "" ||
+        this.analysisqueryParams.kindergartenId == null
+      ) {
         this.$message.error("请先选择幼儿园");
       } else {
-        this.testScore();
+        this.testScore(); 
         this.batchCodeshow = true;
       }
     },
@@ -625,6 +629,22 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
+
+        this.analysisqueryParams.kindergartenId = res.data.kindergartenId;
+        console.log(this.analysisqueryParams);
+
+        var user = res.data.roleKeys;
+        console.log(user);
+        if (user.includes("enchou")) {
+          this.showyey = false;
+          return;
+        } else if (user.includes("teacher")) {
+          this.showyey = false;
+          return;
+        } else if (user.includes("parent")) {
+          this.showyey = false;
+          return;
+        }
       });
       //获取幼儿园list
       listKindergartenInfo(this.kqueryParams).then((response) => {
diff --git a/src/views/system/action/index.vue b/src/views/system/action/index.vue
index 4422a0d..9a11029 100644
--- a/src/views/system/action/index.vue
+++ b/src/views/system/action/index.vue
@@ -700,7 +700,10 @@ export default {
     },
     //点击所属班级
     classshowclick() {
-      if (this.classqueryParams.kindergartenId == "") {
+      if (
+        this.classqueryParams.kindergartenId == "" ||
+        this.classqueryParams.kindergartenId == null
+      ) {
         this.$message.error("请先选择幼儿园");
       } else {
         this.classshow = true;
diff --git a/src/views/system/classconstitution/index.vue b/src/views/system/classconstitution/index.vue
index 605a681..534869a 100644
--- a/src/views/system/classconstitution/index.vue
+++ b/src/views/system/classconstitution/index.vue
@@ -712,7 +712,10 @@ export default {
     },
     //点击所属班级
     classshowclick() {
-      if (this.classqueryParams.kindergartenId == "") {
+      if (
+        this.classqueryParams.kindergartenId == "" ||
+        this.classqueryParams.kindergartenId == null
+      ) {
         this.$message.error("请先选择幼儿园");
       } else {
         this.classshow = true;
diff --git a/src/views/system/comprehensive/index.vue b/src/views/system/comprehensive/index.vue
index f564746..0cd6265 100644
--- a/src/views/system/comprehensive/index.vue
+++ b/src/views/system/comprehensive/index.vue
@@ -830,7 +830,8 @@ export default {
     },
     //点击所属班级
     classshowclick() {
-      if (this.classqueryParams.kindergartenId == "") {
+      console.log(this.classqueryParams)
+      if (this.classqueryParams.kindergartenId == ""||this.classqueryParams.kindergartenId ==null) {
         this.$message.error("请先选择幼儿园");
       } else {
         this.classshow = true;
@@ -899,9 +900,9 @@ export default {
     getList() {
       //用户权限
       getRoleInfo().then((res) => {
+        console.log(res);
         this.classqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
-        console.log(user);
         if (user.includes("enchou")) {
           this.showyey = false;
           return;
diff --git a/src/views/system/constitution/index.vue b/src/views/system/constitution/index.vue
index 704bf63..d4ea718 100644
--- a/src/views/system/constitution/index.vue
+++ b/src/views/system/constitution/index.vue
@@ -616,8 +616,8 @@ export default {
         if (!res.data || res.data == "") {
           this.itemshow2 = true;
           this.itemshow = false;
-          this.batchCodeName = "请选择批次";
-          this.batchCodeId = "";
+          // this.batchCodeName = "请选择批次";
+          // this.batchCodeId = "";
         } else {
           this.analysislist = res.data;
           this.$nextTick(() => {
@@ -670,7 +670,10 @@ export default {
     },
     //点击所属班级
     classshowclick() {
-      if (this.classqueryParams.kindergartenId == "") {
+      if (
+        this.classqueryParams.kindergartenId == "" ||
+        this.classqueryParams.kindergartenId == null
+      ) {
         this.$message.error("请先选择幼儿园");
       } else {
         this.classshow = true;
diff --git a/src/views/system/development/index.vue b/src/views/system/development/index.vue
index 29308ee..d38e8d4 100644
--- a/src/views/system/development/index.vue
+++ b/src/views/system/development/index.vue
@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName">
+      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
         <el-button
           @click="kindergartenshow = true"
           v-if="kindergartenName == '请选择幼儿园'"
@@ -24,7 +24,10 @@
 
       <el-form-item label="班级类型" prop="categoryName" label-width="70px">
         <el-select
-          v-if="analysislist.kindergartenId == ''"
+          v-if="
+            analysislist.kindergartenId == '' ||
+            this.analysislist.kindergartenId == null
+          "
           placeholder="请选择"
           disabled
           @click.native="selecetclick"
@@ -306,6 +309,7 @@ export default {
     return {
       itemshow: false,
       itemshow2: false,
+      showyey: true,
       total1: 0,
       total4: 0,
       //遮罩层
@@ -367,7 +371,10 @@ export default {
   },
   methods: {
     selecetclick() {
-      if (this.analysislist.kindergartenId == "") {
+      if (
+        this.analysislist.kindergartenId == "" ||
+        this.analysislist.kindergartenId == null
+      ) {
         this.$message.error("请先选择幼儿园");
       } else {
       }
@@ -450,6 +457,21 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
+        this.analysislist.kindergartenId = res.data.kindergartenId;
+        console.log(this.analysislist);
+
+        var user = res.data.roleKeys;
+        console.log(user);
+        if (user.includes("enchou")) {
+          this.showyey = false;
+          return;
+        } else if (user.includes("teacher")) {
+          this.showyey = false;
+          return;
+        } else if (user.includes("parent")) {
+          this.showyey = false;
+          return;
+        }
       });
       //获取幼儿园list
       listKindergartenInfo(this.kqueryParams).then((response) => {
diff --git a/src/views/system/heightAndWeight/index.vue b/src/views/system/heightAndWeight/index.vue
index be0cbde..a237648 100644
--- a/src/views/system/heightAndWeight/index.vue
+++ b/src/views/system/heightAndWeight/index.vue
@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName">
+      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
         <el-button
           @click="kindergartenshow = true"
           v-if="kindergartenName == '请选择幼儿园'"
@@ -235,6 +235,7 @@ export default {
     return {
       itemshow: false,
       itemshow2: false,
+      showyey: true,
       total1: 0,
       total4: 0,
       //遮罩层
@@ -569,7 +570,10 @@ export default {
     },
     //点击批次
     batchCodeshowclick() {
-      if (this.analysisqueryParams.kindergartenId == "") {
+      if (
+        this.analysisqueryParams.kindergartenId == "" ||
+        this.analysisqueryParams.kindergartenId == null
+      ) {
         this.$message.error("请先选择幼儿园");
       } else {
         this.testScore();
@@ -610,6 +614,21 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
+        this.analysisqueryParams.kindergartenId = res.data.kindergartenId;
+        console.log(this.analysisqueryParams);
+
+        var user = res.data.roleKeys;
+        console.log(user);
+        if (user.includes("enchou")) {
+          this.showyey = false;
+          return;
+        } else if (user.includes("teacher")) {
+          this.showyey = false;
+          return;
+        } else if (user.includes("parent")) {
+          this.showyey = false;
+          return;
+        }
       });
       //获取幼儿园list
       listKindergartenInfo(this.kqueryParams).then((response) => {
diff --git a/src/views/system/info/index.vue b/src/views/system/info/index.vue
index 316d024..facc3df 100644
--- a/src/views/system/info/index.vue
+++ b/src/views/system/info/index.vue
@@ -220,7 +220,8 @@ export default {
     var checkMobile = (rule, value, cb) => {
       // 验证手机号的正则表达式
       const regMobile =
-        /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
+      /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/;
+        // /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
       const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
       const isTel = reg.test(value);
 
diff --git a/src/views/system/physique/index.vue b/src/views/system/physique/index.vue
index f6b29ec..3b95472 100644
--- a/src/views/system/physique/index.vue
+++ b/src/views/system/physique/index.vue
@@ -579,7 +579,6 @@ export default {
       ) {
         this.$message.error("请先选择幼儿园");
       } else {
-        console.log(1);
         this.testScore();
         this.batchCodeshow = true;
       }
@@ -603,7 +602,7 @@ export default {
     sexclick() {
       console.log(this.analysisqueryParams);
       if (
-        this.analysisqueryParams.kindergartenId != "" &&
+        this.analysisqueryParams.kindergartenId != null &&
         this.analysisqueryParams.batchCode != ""
       ) {
         this.analysisinfo();
diff --git a/src/views/system/quality/index.vue b/src/views/system/quality/index.vue
index 94d9f21..c860454 100644
--- a/src/views/system/quality/index.vue
+++ b/src/views/system/quality/index.vue
@@ -851,7 +851,10 @@ export default {
     },
     //点击所属班级
     classshowclick() {
-      if (this.classqueryParams.kindergartenId == "") {
+      if (
+        this.classqueryParams.kindergartenId == "" ||
+        this.classqueryParams.kindergartenId == null
+      ) {
         this.$message.error("请先选择幼儿园");
       } else {
         this.classshow = true;
diff --git a/src/views/system/shape/index.vue b/src/views/system/shape/index.vue
index fec0a6c..a4a33f3 100644
--- a/src/views/system/shape/index.vue
+++ b/src/views/system/shape/index.vue
@@ -1231,7 +1231,7 @@ export default {
     },
     //点击所属班级
     classshowclick() {
-      if (this.classqueryParams.kindergartenId == "") {
+      if (this.classqueryParams.kindergartenId == ""||this.classqueryParams.kindergartenId == null) {
         this.$message.error("请先选择幼儿园");
       } else {
         this.classshow = true;
diff --git a/src/views/system/studentInfo/index.vue b/src/views/system/studentInfo/index.vue
index 25a9c88..454e80b 100644
--- a/src/views/system/studentInfo/index.vue
+++ b/src/views/system/studentInfo/index.vue
@@ -284,7 +284,11 @@
           <el-input v-model="form.studentName" placeholder="请输入学生姓名" />
         </el-form-item>
         <el-form-item label="学生编号" prop="studentNumber">
-          <el-input v-model="form.studentNumber" placeholder="请输入学生编号" maxlength="20" />
+          <el-input
+            v-model="form.studentNumber"
+            placeholder="请输入学生编号"
+            maxlength="20"
+          />
         </el-form-item>
         <el-form-item label="学生性别" prop="studentSex">
           <el-radio-group v-model="form.studentSex">
@@ -1006,15 +1010,16 @@ export default {
         this.form = response.data;
         this.classinfoName = this.form.className;
         this.classinfoId = this.form.classId;
+        console.log(this.form);
 
-        if (this.form.parentStudentInfoList.length == 0) {
+        if (this.form.parentStudentInfoList == null) {
+        } else if (this.form.parentStudentInfoList.length == 0) {
         } else if (this.form.parentStudentInfoList.length == 1) {
           this.parentlist.push(this.form.parentStudentInfoList[0]);
         } else if (this.form.parentStudentInfoList.length == 2) {
           this.parentlist.push(this.form.parentStudentInfoList[0]);
           this.parentlist.push(this.form.parentStudentInfoList[1]);
         }
-        console.log(this.parentlist);
 
         if (this.parentlist.length == 0) {
           this.parentInfoName = "请选择学生家长";
@@ -1069,7 +1074,8 @@ export default {
         // }
         this.form2.id = this.form.id;
         this.form2.classId = this.form.classId;
-        if (this.form.parentStudentInfoList.length == 0) {
+        if (this.form.parentStudentInfoList == null) {
+        } else if (this.form.parentStudentInfoList.length == 0) {
         } else if (this.form.parentStudentInfoList.length == 1) {
           this.form2.parentIdList.push(this.form.parentStudentInfoList[0].id);
         } else if (this.form.parentStudentInfoList.length == 2) {
diff --git a/src/views/system/survey/index.vue b/src/views/system/survey/index.vue
index 18cb883..67b658b 100644
--- a/src/views/system/survey/index.vue
+++ b/src/views/system/survey/index.vue
@@ -332,19 +332,9 @@ export default {
   methods: {
     ClassListinfo() {
       ClassList(this.classqueryParams).then((res) => {
-        console.log(res.rows.length);
         if (res.rows.length == 0) {
           this.itemshow2 = true;
           this.itemshow = false;
-          console.log(
-            this.yclassname1,
-            this.yclassname2,
-            this.yclassname3,
-            this.classscore1,
-            this.classscore2,
-            this.classscore3
-          );
-          console.log(this.itemshow2);
         } else {
           this.$nextTick((e) => {
             this.yclassname1 = [];
@@ -353,8 +343,6 @@ export default {
             this.classscore1 = [];
             this.classscore2 = [];
             this.classscore3 = [];
-
-            console.log(2);
             res.rows.forEach((e) => {
               if (e.classType == this.LARGECLASS) {
                 this.yclassname1.push(e.className);
@@ -643,6 +631,7 @@ export default {
     },
     //点击批次
     batchCodeshowclick() {
+      console.log(this.classqueryParams);
       if (
         this.classqueryParams.kindergartenId == "" ||
         this.classqueryParams.kindergartenId == null
@@ -691,9 +680,9 @@ export default {
       });
       //用户权限
       getRoleInfo().then((res) => {
-        console.log(res);
         this.studentlistqueryParams.kindergartenId = res.data.kindergartenId;
         this.classqueryParams.kindergartenId = res.data.kindergartenId;
+        console.log(this.classqueryParams);
 
         var user = res.data.roleKeys;
         console.log(user);
diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue
index c644c7a..29ce9a5 100644
--- a/src/views/system/testItemScore/index.vue
+++ b/src/views/system/testItemScore/index.vue
@@ -183,7 +183,7 @@
             @click="yryinnerVisible = true"
             v-if="kindergartenName == '请选择幼儿园'"
             style="
-              width: 200px;
+              width: 240px;
               text-align: left;
               height: 36px;
               color: #c0c4cc;
@@ -197,7 +197,7 @@
             @click="yryinnerVisible = true"
             v-else
             style="
-              width: 200px;
+              width: 240px;
               text-align: left;
               height: 36px;
               padding-left: -10px;
@@ -902,7 +902,6 @@ import {
   updateTestItemScore,
   classInfo,
   studentInfo,
-  testItems,
   testScoreBatch,
   getAllTestItemScoreInfo,
 } from "@/api/system/testItemScore";
@@ -1257,6 +1256,7 @@ export default {
         studentId: row.studentId,
         batchCode: row.batchCode,
       };
+      this.form.itemScoreList = [];
       getTestItemScore(list).then((response) => {
         console.log();
         this.form = response.data;