xg

修改
2023-09-01 16:23:23 +08:00 · 2023-09-01 10:04:03 +08:00 · 2023-09-01 09:40:37 +08:00 · 2023-07-25 09:48:05 +08:00 · 2023-07-25 09:19:30 +08:00 · 2023-07-21 17:40:07 +08:00
22 changed files with 785 additions and 599 deletions
--- a/.env.development
+++ b/.env.development
@ -1,11 +1,11 @@
 # 页面标题
-VUE_APP_TITLE = 智慧幼儿体质评估与促进系统
+VUE_APP_TITLE = 幼儿体质健康促进系统

 # 开发环境配置
 ENV = 'development'

-# 智慧幼儿体质评估与促进系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.16.76:8090'
+# 幼儿体质健康促进系统/开发环境
+VUE_APP_BASE_API = 'https://kindergarten.xinelu.cn'
 #'/dev-api'

 # 路由懒加载
--- a/.env.production
+++ b/.env.production
@ -1,9 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 智慧幼儿体质评估与促进系统
+VUE_APP_TITLE = 幼儿体质健康促进系统

 # 生产环境配置
 ENV = 'production'

-# 智慧幼儿体质评估与促进系统/生产环境
-# VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://192.168.16.76:8090'
+# 幼儿体质健康促进系统/生产环境
+VUE_APP_BASE_API = 'https://kindergarten.xinelu.cn'
--- a/.env.staging
+++ b/.env.staging
@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 智慧幼儿体质评估与促进系统
+VUE_APP_TITLE = 幼儿体质健康促进系统

 NODE_ENV = production

 # 测试环境配置
 ENV = 'staging'

-# 智慧幼儿体质评估与促进系统/测试环境
+# 幼儿体质健康促进系统/测试环境
 VUE_APP_BASE_API = '/stage-api'
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/src/assets/images/bj.png
+++ b/src/assets/images/bj.png
--- a/src/assets/logo/logo.png
+++ b/src/assets/logo/logo.png
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@ -70,7 +70,7 @@ export default {
  },
  data() {
    return {
-      title: "智慧幼儿体质评估与促进系统",
+      title: "幼儿体质健康促进系统",
      logo: logoImg,
    };
  },
@ -103,7 +103,7 @@ export default {
    width: 100%;

    & .sidebar-logo {
-      width: 40px;
+      width: 45px;
      height: 40px;
      vertical-align: middle;
    }
--- a/src/views/assembly/classe.vue
+++ b/src/views/assembly/classe.vue
@ -4,11 +4,9 @@
      <el-form-item label="所属班级" prop="className">
        <el-button
          @click="classshow = true"
-          v-if="className == '请选择班级'"
          class="btn"
-          style="color: #c0c4cc;"
+          :style="className == '请选择班级'?'color: #c0c4cc;':''"
        >{{ className }}</el-button>
-        <el-button @click="classshow = true" class="btn" v-else>{{ className }}</el-button>
      </el-form-item>
    </el-form>
    <!-- //班级 -->
--- a/src/views/assembly/kindergarlog.vue
+++ b/src/views/assembly/kindergarlog.vue
@ -1,14 +1,13 @@
 <template>
  <div class="app-container">
-    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item :label="kindergartitle" prop="kindergartenName">
+        <i class="el-icon-circle-close" @click="kindergartenicon" v-if="nameicon && nameicons"></i>
        <el-button
          @click="kindergartenshow = true"
-          v-if="kindergartenName == '请选择幼儿园'"
          class="btn"
-          style="color: #c0c4cc;"
+          :style="kindergartenName == '请选择幼儿园'?'color: #c0c4cc;':''"
        >{{ kindergartenName }}</el-button>
-        <el-button @click="kindergartenshow = true" class="btn" v-else>{{ kindergartenName }}</el-button>
      </el-form-item>
    </el-form>
    <!-- //幼儿园 -->
@ -74,7 +73,7 @@ import {
 import { getRoleInfo } from "@/api/system/quality";
 export default {
  name: "kindergar",
-  props: ["iddnamelist"],
+  props: ["iddnamelist", "nameicon"],
  components: {},
  data() {
    return {
@ -102,32 +101,61 @@ export default {
      //幼儿园名字
      kindergartenName: "请选择幼儿园",
      //幼儿园ID
-      kindergartenId: ""
+      kindergartenId: "",
+      nameicons: false
    };
  },
  mounted() {},
  created() {
    this.getList();
    this.reset();
-    this.kindergartenId = this.iddnamelist.kindergartenId;
-    this.kindergartenName = this.iddnamelist.kindergartenName;
+    if (this.iddnamelist) {
+      this.kindergartenId = this.iddnamelist.kindergartenId;
+    }
+    if (this.iddnamelist.kindergartenId) {
+      this.nameicons = true;
+    }
+    if (this.iddnamelist.kindergartenName) {
+      this.kindergartenName = this.iddnamelist.kindergartenName;
+    }
  },
  watch: {
    iddnamelist: {
      handler(newlist, oldlist) {
-        console.log(newlist);
+        if (newlist.kindergartenId) {
+          this.nameicons = true;
+        }
        this.kindergartenId = newlist.kindergartenId;
        this.kindergartenName = newlist.kindergartenName;
      }
    }
  },
  methods: {
+    kindergartenicon() {
+      this.kindergartenName = "请选择幼儿园";
+      this.kindergartenId = "";
+      this.nameicons = false;
+      if (this.kindergartenName != "请选择幼儿园") {
+        this.$emit("kinbatlist", this.kindergartenId, this.kindergartenName);
+      } else {
+        this.$emit("kinbatlist", this.kindergartenId, "");
+      }
+    },
+    resetlist() {
+      this.kindergartenName = "请选择幼儿园";
+      this.kindergartenId = "";
+    },
    //幼儿园左侧点击
    kindergartenNameclick(row) {
+      this.nameicons = true;
      this.kindergartenName = row.kindergartenName;
      this.kindergartenId = row.id;
      this.kindergartenshow = false;
-      this.$emit("kinbatlist", this.kindergartenId);
+      if (this.kindergartenName != "请选择幼儿园") {
+        this.$emit("kinbatlist", this.kindergartenId, this.kindergartenName);
+      } else {
+        this.$emit("kinbatlist", this.kindergartenId, "");
+      }
    },
    //幼儿园关闭
    kindergartencancel() {
@ -183,4 +211,10 @@ export default {
  overflow: hidden;
  font-size: 13px;
 }
+::v-deep .el-icon-circle-close:before {
+  position: absolute;
+  left: 90%;
+  top: 33%;
+  color: #c0c8d3;
+}
 </style>
--- a/src/views/assembly/kindergarten.vue
+++ b/src/views/assembly/kindergarten.vue
@ -1,48 +1,32 @@
 <template>
  <div class="app-container">
-    <el-form
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-    >
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
      <el-form-item label="所属幼儿园" prop="categoryName">
+        <i class="el-icon-circle-close" @click="kindergartenicon" v-if="nameicon && nameicons"></i>
        <el-button
-          @click="kindergartenshow = true"
-          v-if="kindergartenName == '请选择幼儿园'"
+          @click.stop="kindergartenshow = true"
+          :style="kindergartenName == '请选择幼儿园'?'color: #c0c4cc;':''"
          style="
            width: 230px;
            text-align: left;
            height: 32px;
-            color: #c0c4cc;
            overflow: hidden;
            white-space: nowrap;
            text-overflow: ellipsis;
          "
-          >{{ kindergartenName }}</el-button
-        >
-        <el-button
-          @click="kindergartenshow = true"
-          style="width: 230px; text-align: left; height: 32px"
-          v-else
-          >{{ kindergartenName }}</el-button
-        >
+        >{{ kindergartenName }}</el-button>
      </el-form-item>
-
      <el-form-item label="所属批次" prop="categoryName">
+        <i
+          class="el-icon-circle-close"
+          @click="batchNameicon"
+          v-if="batchnameicon && batchnameicons"
+        ></i>
        <el-button
          @click="batchCodeshowclick"
-          style="width: 230px; text-align: left; height: 32px; color: #c0c4cc"
-          v-if="batchName == '请选择批次'"
-          >{{ batchName }}</el-button
-        >
-        <el-button
-          @click="batchCodeshowclick"
-          style="width: 230px; text-align: left; height: 32px"
-          v-else
-          >{{ batchName }}</el-button
-        >
+          :style="batchName == '请选择批次'?'color: #c0c4cc;':''"
+          style="width: 230px; text-align: left; height: 32px;"
+        >{{ batchName }}</el-button>
      </el-form-item>
    </el-form>

@ -64,30 +48,14 @@
        label-width="90px"
      >
        <el-form-item label="批次编号" prop="batchCode">
-          <el-input
-            v-model="testqueryParams.batchCode"
-            placeholder="请输入批次编号"
-            clearable
-          />
+          <el-input v-model="testqueryParams.batchCode" placeholder="请输入批次编号" clearable />
        </el-form-item>
        <el-form-item label="批次名称" prop="batchCode">
-          <el-input
-            v-model="testqueryParams.batchName"
-            placeholder="请输入批次名称"
-            clearable
-          />
+          <el-input v-model="testqueryParams.batchName" placeholder="请输入批次名称" clearable />
        </el-form-item>
        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="testScore"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="testresetQuery"
-            >重置</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="testScore">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="testresetQuery">重置</el-button>
        </el-form-item>
      </el-form>

@ -114,18 +82,8 @@
            ></el-button>
          </template>
        </el-table-column>
-        <el-table-column
-          property="batchCode"
-          label="批次编号"
-          width="230"
-          align="center"
-        />
-        <el-table-column
-          property="batchName"
-          label="批次名称"
-          width="230"
-          align="center"
-        />
+        <el-table-column property="batchCode" label="批次编号" width="230" align="center" />
+        <el-table-column property="batchName" label="批次名称" width="230" align="center" />
      </el-table>
      <pagination
        v-show="total4 > 0"
@ -144,13 +102,7 @@
      append-to-body
      :before-close="kindergartencancel"
    >
-      <el-form
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="110px"
-      >
+      <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
        <el-form-item label="幼儿园名称" prop="kindergartenName">
          <el-input
            style="width: 200px"
@ -160,16 +112,8 @@
        </el-form-item>

        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="kinhandleQuery"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="kinresetQuery"
-            >重置</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="kinhandleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="kinresetQuery">重置</el-button>
        </el-form-item>
      </el-form>
      <el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick">
@ -191,42 +135,11 @@
            ></el-button>
          </template>
        </el-table-column>
-
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名字"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="kindergartenAddress"
-          label="幼儿园地址"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          label="幼儿园所在组织"
-          align="center"
-          prop="organizeName"
-          width="150"
-        >
-        </el-table-column>
-        <el-table-column
-          property="contacts"
-          label="联系人"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
+        <el-table-column property="kindergartenName" label="幼儿园名字" width="150" align="center"></el-table-column>
+        <el-table-column property="kindergartenAddress" label="幼儿园地址" width="150" align="center"></el-table-column>
+        <el-table-column label="幼儿园所在组织" align="center" prop="organizeName" width="150"></el-table-column>
+        <el-table-column property="contacts" label="联系人" width="150" align="center"></el-table-column>
+        <el-table-column property="phone" label="联系电话" width="150" align="center"></el-table-column>
      </el-table>
      <pagination
        v-show="total1 > 0"
@ -241,13 +154,14 @@
 <script>
 import {
  listKindergartenInfo,
-  tKindergartenInfo,
+  tKindergartenInfo
 } from "@/api/system/kindergartenInfo";
 import { getRoleInfo, testScoreBatch } from "@/api/system/quality";

 export default {
  name: "",
  components: {},
+  props: ["nameicon", "batchnameicon"],
  data() {
    return {
      total1: 0,
@ -268,7 +182,7 @@ export default {
        kindergartenAddress: null,
        kindergartenType: null,
        phone: null,
-        contacts: null,
+        contacts: null
      },
      //幼儿园list
      kindergartenList: [],
@ -284,8 +198,10 @@ export default {
      //批次编号
      testqueryParams: {
        pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
      },
+      nameicons: "",
+      batchnameicons: ""
    };
  },
  mounted() {},
@ -294,22 +210,42 @@ export default {
    this.onshow();
  },
  methods: {
+    resetlist() {
+      this.kindergartenName = "请选择幼儿园";
+      this.kindergartenId = "";
+      this.batchCode = "";
+      this.batchName = "请选择批次";
+      this.nameicons = false;
+      this.batchnameicons = false;
+    },
+    kindergartenicon() {
+      this.kindergartenName = "请选择幼儿园";
+      this.kindergartenId = "";
+      this.nameicons = false;
+      this.$emit("kinbatlists", this.kindergartenId);
+    },
+    batchNameicon() {
+      this.batchCode = "";
+      this.batchName = "请选择批次";
+      this.$emit("kinbatlisticon", this.batchCode);
+      this.batchnameicons = false;
+    },
    onshow() {
-      this.batchCode = localStorage.getItem("batchCode2");
-      this.batchName = localStorage.getItem("batchName2");
-      this.kindergartenId = localStorage.getItem("kindergartenId");
-      if (localStorage.getItem("kindergartenName") == null) {
-        this.kindergartenName = "请选择幼儿园";
-        this.batchCode = "请选择批次";
-      } else {
-        this.kindergartenName = localStorage.getItem("kindergartenName");
-      }
-      if (localStorage.getItem("batchCode2") == null) {
-        this.batchCode = "请选择批次";
-      } else {
-        this.batchCode = localStorage.getItem("batchCode2");
-      }
-      this.$emit("kinbatlist", this.kindergartenId, this.batchCode);
+      // this.batchCode = localStorage.getItem("batchCode2");
+      // this.batchName = localStorage.getItem("batchName2");
+      // this.kindergartenId = localStorage.getItem("kindergartenId");
+      // if (localStorage.getItem("kindergartenName") == null) {
+      this.kindergartenName = "请选择幼儿园";
+      this.batchCode = "请选择批次";
+      // } else {
+      // this.kindergartenName = localStorage.getItem("kindergartenName");
+      // }
+      // if (localStorage.getItem("batchCode2") == null) {
+      //   this.batchCode = "请选择批次";
+      // } else {
+      //   this.batchCode = localStorage.getItem("batchCode2");
+      // }
+      // this.$emit("kinbatlist", this.kindergartenId, this.batchCode);
    },

    //幼儿园左侧点击
@ -317,8 +253,9 @@ export default {
      this.kindergartenName = row.kindergartenName;
      this.kindergartenId = row.id;
      this.kindergartenshow = false;
-      localStorage.setItem("kindergartenName", this.kindergartenName);
-      localStorage.setItem("kindergartenId", this.kindergartenId);
+      this.nameicons = true;
+      // localStorage.setItem("kindergartenName", this.kindergartenName);
+      // localStorage.setItem("kindergartenId", this.kindergartenId);
      this.$emit("kinbatlist", this.kindergartenId, this.batchCode, 1);
    },

@ -327,9 +264,10 @@ export default {
      this.batchCode = row.batchCode;
      this.batchName = row.batchName;
      this.batchCodeshow = false;
-      localStorage.setItem("batchCode2", this.batchCode);
-      localStorage.setItem("batchName2", this.batchName);
-      if (this.kindergartenId != "") {
+      this.batchnameicons = true;
+      // localStorage.setItem("batchCode2", this.batchCode);
+      // localStorage.setItem("batchName2", this.batchName);
+      if (this.kindergartenId != "" || !this.kindergartenId) {
        this.$emit("kinbatlist", this.kindergartenId, this.batchCode, 2);
      }
    },
@ -340,7 +278,7 @@ export default {
    },
    //批次
    testScore() {
-      testScoreBatch(this.testqueryParams).then((res) => {
+      testScoreBatch(this.testqueryParams).then(res => {
        this.testScorelist = res.rows;
        this.total4 = res.total;
      });
@ -350,7 +288,7 @@ export default {
        pageNum: 1,
        pageSize: 10,
        batchCode: "",
-        batchName: "",
+        batchName: ""
      };
      this.testScore();
    },
@ -366,7 +304,7 @@ export default {
    },
    kinhandleQuery() {
      //获取幼儿园list
-      listKindergartenInfo(this.kqueryParams).then((response) => {
+      listKindergartenInfo(this.kqueryParams).then(response => {
        this.kindergartenList = response.rows;
        this.total1 = response.total;
      });
@ -380,36 +318,35 @@ export default {
        kindergartenAddress: null,
        kindergartenType: null,
        phone: null,
-        contacts: null,
+        contacts: null
      };
      this.kinhandleQuery();
    },
    getList() {
      //用户权限
-      getRoleInfo().then((res) => {
+      getRoleInfo().then(res => {
        var user = res.data.roleKeys;
-        if (user.includes("enchou")) {
-          return;
-        } else if (user.includes("teacher")) {
-          if (res.data != 999999) {
-            this.kindergartenId = res.data.kindergartenId;
-            this.kindergartenName = res.data.kindergartenName;
-            this.$emit("kinbatlist", this.kindergartenId, this.batchCode, 0);
-            localStorage.setItem("kindergartenName", res.data.kindergartenName);
-            localStorage.setItem("kindergartenId", res.data.kindergartenId);
-          }
-          return;
-        } else if (user.includes("parent")) {
-          return;
+        if (user.includes("teacher")) {
+          // if (res.code != 999999) {
+          res.data.kindergartenId
+            ? (this.kindergartenId = res.data.kindergartenId)
+            : "";
+          res.data.kindergartenName
+            ? (this.kindergartenName = res.data.kindergartenName)
+            : "";
+          this.$emit("kinbatlist", this.kindergartenId, this.batchCode, 0);
+          // res.data.kindergartenName? localStorage.setItem("kindergartenName", res.data.kindergartenName):'';
+          // res.data.kindergartenId? localStorage.setItem("kindergartenId", res.data.kindergartenId):'';
+          // }
        }
      });
-      tKindergartenInfo(this.kindergartenType).then((res) => {
+      tKindergartenInfo(this.kindergartenType).then(res => {
        this.type = res.data[0];
        this.type2 = res.data[1];
      });

      //获取幼儿园list
-      listKindergartenInfo(this.kqueryParams).then((response) => {
+      listKindergartenInfo(this.kqueryParams).then(response => {
        this.kindergartenList = response.rows;
        this.total1 = response.total;
      });
@ -418,12 +355,18 @@ export default {
    reset() {
      this.form = {};
      this.resetForm("form");
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped='scss'>
 ::v-deep .el-card__header {
  border: none;
 }
+::v-deep .el-icon-circle-close:before {
+  position: absolute;
+  left: 90%;
+  top: 33%;
+  color: #c0c8d3;
+}
 </style>
--- a/src/views/assembly/parent.vue
+++ b/src/views/assembly/parent.vue
@ -4,11 +4,9 @@
      <el-form-item label="家长姓名" prop="parentName">
        <el-button
          @click="parentshow = true"
-          v-if="parentName == '请选择家长'"
          class="btn"
-          style="color: #c0c4cc;"
+          :style="parentName == '请选择家长'?'color: #c0c4cc;':''"
        >{{ parentName }}</el-button>
-        <el-button @click="parentshow = true" class="btn" v-else>{{ parentName }}</el-button>
      </el-form-item>
    </el-form>
    <!-- //家长 -->
@ -51,7 +49,12 @@
          </template>
        </el-table-column>
        <el-table-column property="parentName" label="家长姓名" align="center"></el-table-column>
-        <el-table-column property="parentSex" label="性别" align="center"></el-table-column>
+        <el-table-column property="parentSex" label="性别" align="center">
+          <template slot-scope="scope">
+            {{scope.row.studentSex=='MALE'?'男':''}}
+            {{scope.row.studentSex=='FEMALE'?'女':''}}
+          </template>
+        </el-table-column>
        <el-table-column property="phone" label="联系电话" align="center"></el-table-column>
      </el-table>
      <pagination
--- a/src/views/assembly/student.vue
+++ b/src/views/assembly/student.vue
@ -1,39 +1,19 @@
 <template>
  <div class="app-container">
-    <el-form
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-    >
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
      <el-form-item label="学生姓名" prop="categoryName">
        <el-button
          @click="studentshowclick"
-          v-if="studentname == '请选择学生'"
-          style="width: 230px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ studentname }}</el-button
-        >
-        <el-button
-          @click="studentshowclick"
-          style="width: 230px; text-align: left; height: 32px"
-          v-else
-          >{{ studentname }}</el-button
-        >
+          :style="studentname == '请选择学生'?'color: #c0c4cc;':''"
+          style="width: 230px; text-align: left; height: 32px; "
+        >{{ studentname }}</el-button>
      </el-form-item>
      <el-form-item label="所属批次" prop="categoryName">
        <el-button
          @click="batchCodeshowclick"
-          style="width: 230px; text-align: left; height: 32px; color: #c0c4cc"
-          v-if="batchName == '请选择批次'"
-          >{{ batchName }}</el-button
-        >
-        <el-button
-          @click="batchCodeshowclick"
-          style="width: 230px; text-align: left; height: 32px"
-          v-else
-          >{{ batchName }}</el-button
-        >
+          style="width: 230px; text-align: left; height: 32px;"
+          :style="batchName == '请选择批次'?'color: #c0c4cc;':''"
+        >{{ batchName }}</el-button>
      </el-form-item>
    </el-form>

@ -45,30 +25,11 @@
      append-to-body
      :before-close="studentcancel"
    >
-      <el-form
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="90px"
-      >
+      <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
        <el-form-item label="所属幼儿园" prop="categoryName">
          <el-button
            @click="kindergartenshow = true"
-            v-if="kindergartenName == '请选择幼儿园'"
-            style="
-              width: 200px;
-              text-align: left;
-              height: 32px;
-              color: #c0c4cc;
-              overflow: hidden;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-            "
-            >{{ kindergartenName }}</el-button
-          >
-          <el-button
-            @click="kindergartenshow = true"
+            :style="kindergartenName == '请选择幼儿园'?'color: #c0c4cc;':''"
            style="
              width: 200px;
              text-align: left;
@ -77,11 +38,8 @@
              white-space: nowrap;
              text-overflow: ellipsis;
            "
-            v-else
-            >{{ kindergartenName }}</el-button
-          >
+          >{{ kindergartenName }}</el-button>
        </el-form-item>
-
        <el-form-item label="所属班级" prop="categoryName" label-width="80px">
          <el-button
            @click="classshowclick"
@ -89,28 +47,12 @@
              width: 200px;
              text-align: left;
              height: 32px;
-              color: #c0c4cc;
              overflow: hidden;
              white-space: nowrap;
              text-overflow: ellipsis;
            "
-            v-if="className == '请选择班级'"
-            >{{ className }}</el-button
-          >
-
-          <el-button
-            @click="classshowclick"
-            style="
-              width: 200px;
-              text-align: left;
-              height: 32px;
-              overflow: hidden;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-            "
-            v-else
-            >{{ className }}</el-button
-          >
+            :style="className == '请选择班级'?'color: #c0c4cc;':''"
+          >{{ className }}</el-button>
        </el-form-item>

        <el-form-item label="学生姓名" prop="studentName" label-width="80px">
@ -122,16 +64,8 @@
        </el-form-item>

        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </el-form-item>
      </el-form>
      <el-table
@ -157,34 +91,12 @@
            ></el-button>
          </template>
        </el-table-column>
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="studentName"
-          label="学生姓名"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="studentName"
-          label="性别"
-          width="190"
-          align="center"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.studentSex == "MALE" ? "男" : "女" }}
-          </template>
+        <el-table-column property="className" label="班级名称" width="190" align="center" />
+        <el-table-column property="studentName" label="学生姓名" width="190" align="center" />
+        <el-table-column property="studentName" label="性别" width="190" align="center">
+          <template slot-scope="scope">{{ scope.row.studentSex == "MALE" ? "男" : "女" }}</template>
        </el-table-column>
-        <el-table-column
-          property="homeAddress"
-          label="住址"
-          width="190"
-          align="center"
-        />
+        <el-table-column property="homeAddress" label="住址" width="190" align="center" />
      </el-table>
      <pagination
        v-show="total3 > 0"
@ -203,13 +115,7 @@
      append-to-body
      :before-close="kindergartencancel"
    >
-      <el-form
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="110px"
-      >
+      <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
        <el-form-item label="幼儿园名称" prop="kindergartenName">
          <el-input
            style="width: 200px"
@ -219,16 +125,8 @@
        </el-form-item>

        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="kinhandleQuery"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="kinresetQuery"
-            >重置</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="kinhandleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="kinresetQuery">重置</el-button>
        </el-form-item>
      </el-form>
      <el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick">
@ -251,41 +149,11 @@
          </template>
        </el-table-column>

-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名字"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="kindergartenAddress"
-          label="幼儿园地址"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          label="幼儿园所在组织"
-          align="center"
-          prop="organizeName"
-          width="150"
-        >
-        </el-table-column>
-        <el-table-column
-          property="contacts"
-          label="联系人"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
+        <el-table-column property="kindergartenName" label="幼儿园名字" width="150" align="center"></el-table-column>
+        <el-table-column property="kindergartenAddress" label="幼儿园地址" width="150" align="center"></el-table-column>
+        <el-table-column label="幼儿园所在组织" align="center" prop="organizeName" width="150"></el-table-column>
+        <el-table-column property="contacts" label="联系人" width="150" align="center"></el-table-column>
+        <el-table-column property="phone" label="联系电话" width="150" align="center"></el-table-column>
      </el-table>
      <pagination
        v-show="total1 > 0"
@ -304,32 +172,14 @@
      append-to-body
      :before-close="classcancel"
    >
-      <el-form
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="110px"
-      >
+      <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
        <el-form-item label="班级名称" prop="className">
-          <el-input
-            style="width: 200px"
-            v-model="classqueryParams.className"
-            placeholder="请输入班级名称"
-          ></el-input>
+          <el-input style="width: 200px" v-model="classqueryParams.className" placeholder="请输入班级名称"></el-input>
        </el-form-item>

        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="classhandleQuery"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="classresetQuery"
-            >重置</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="classhandleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="classresetQuery">重置</el-button>
        </el-form-item>
      </el-form>
      <el-table
@ -355,25 +205,9 @@
            ></el-button>
          </template>
        </el-table-column>
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="classType"
-          label="班级类型"
-          width="160"
-          align="center"
-        >
+        <el-table-column property="kindergartenName" label="幼儿园名称" width="190" align="center" />
+        <el-table-column property="className" label="班级名称" width="180" align="center"></el-table-column>
+        <el-table-column property="classType" label="班级类型" width="160" align="center">
          <template slot-scope="scope">
            {{ scope.row.classType == dictValue1 ? "大班" : "" }}
            {{ scope.row.classType == dictValue2 ? "中班" : "" }}
@ -382,20 +216,8 @@
          </template>
        </el-table-column>

-        <el-table-column
-          property="classTeacher"
-          label="班主任姓名"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="190"
-          align="center"
-        >
-        </el-table-column>
+        <el-table-column property="classTeacher" label="班主任姓名" width="180" align="center"></el-table-column>
+        <el-table-column property="phone" label="联系电话" width="190" align="center"></el-table-column>
      </el-table>
      <pagination
        v-show="total2 > 0"
@ -424,30 +246,14 @@
        label-width="90px"
      >
        <el-form-item label="批次编号" prop="batchCode">
-          <el-input
-            v-model="testqueryParams.batchCode"
-            placeholder="请输入批次编号"
-            clearable
-          />
+          <el-input v-model="testqueryParams.batchCode" placeholder="请输入批次编号" clearable />
        </el-form-item>
        <el-form-item label="批次名称" prop="batchCode">
-          <el-input
-            v-model="testqueryParams.batchName"
-            placeholder="请输入批次名称"
-            clearable
-          />
+          <el-input v-model="testqueryParams.batchName" placeholder="请输入批次名称" clearable />
        </el-form-item>
        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="testScore"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="testresetQuery"
-            >重置</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="testScore">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="testresetQuery">重置</el-button>
        </el-form-item>
      </el-form>

@ -474,18 +280,8 @@
            ></el-button>
          </template>
        </el-table-column>
-        <el-table-column
-          property="batchCode"
-          label="批次编号"
-          width="230"
-          align="center"
-        />
-        <el-table-column
-          property="batchName"
-          label="批次名称"
-          width="230"
-          align="center"
-        />
+        <el-table-column property="batchCode" label="批次编号" width="230" align="center" />
+        <el-table-column property="batchName" label="批次名称" width="230" align="center" />
      </el-table>
      <pagination
        v-show="total4 > 0"
@ -501,7 +297,7 @@
 <script>
 import {
  listKindergartenInfo,
-  tKindergartenInfo,
+  tKindergartenInfo
 } from "@/api/system/kindergartenInfo";
 import { listStudentInfo } from "@/api/system/studentInfo";
 import { listClassinfo } from "@/api/system/classinfo";
@ -544,7 +340,7 @@ export default {
        cardNumber: null,
        onceName: null,
        homeAddress: null,
-        kindergartenId: null,
+        kindergartenId: null
      },
      //班级查询
      classqueryParams: {
@ -552,7 +348,7 @@ export default {
        pageSize: 10,
        kindergartenId: "",
        className: null,
-        classType: null,
+        classType: null
      },
      //幼儿园查询参数
      kqueryParams: {
@ -563,7 +359,7 @@ export default {
        kindergartenAddress: null,
        kindergartenType: null,
        phone: null,
-        contacts: null,
+        contacts: null
      },
      //幼儿园list
      kindergartenList: [],
@ -593,8 +389,8 @@ export default {
      //批次编号
      testqueryParams: {
        pageNum: 1,
-        pageSize: 10,
-      },
+        pageSize: 10
+      }
    };
  },
  created() {
@ -622,12 +418,12 @@ export default {
        kindergartenAddress: null,
        kindergartenType: null,
        phone: null,
-        contacts: null,
+        contacts: null
      };
      this.kinhandleQuery();
    },
    kinhandleQuery() {
-      listKindergartenInfo(this.kqueryParams).then((response) => {
+      listKindergartenInfo(this.kqueryParams).then(response => {
        this.kindergartenList = response.rows;
        this.total1 = response.total;
      });
@ -652,7 +448,7 @@ export default {
        cardNumber: null,
        onceName: null,
        homeAddress: null,
-        kindergartenId: null,
+        kindergartenId: null
      };
      this.studentlist();
    },
@ -661,27 +457,27 @@ export default {
      this.studentlist();
    },
    onshow() {
-      this.batchCode = localStorage.getItem("batchCode");
-      this.studentId = localStorage.getItem("studentId");
-      this.batchName = localStorage.getItem("batchName");
-      if (localStorage.getItem("batchCode") == null) {
-        this.batchName = "请选择批次";
-      } else {
-        this.batchCode = localStorage.getItem("batchCode");
-        this.$emit("itemlist", this.studentId, this.batchCode);
-      }
-      if (localStorage.getItem("studentname") == null) {
-        this.studentname = "请选择学生";
-      } else {
-        this.studentname = localStorage.getItem("studentname");
-        this.$emit("itemlist", this.studentId, this.batchCode);
-      }
-      if (
-        localStorage.getItem("batchCode") != null &&
-        localStorage.getItem("studentId") != null
-      ) {
-        this.$emit("itemlist", this.studentId, this.batchCode);
-      }
+      // this.batchCode = localStorage.getItem("batchCode");
+      // this.studentId = localStorage.getItem("studentId");
+      // this.batchName = localStorage.getItem("batchName");
+      // if (localStorage.getItem("batchCode") == null) {
+      this.batchName = "请选择批次";
+      // } else {
+      //   this.batchCode = localStorage.getItem("batchCode");
+      //   this.$emit("itemlist", this.studentId, this.batchCode);
+      // }
+      // if (localStorage.getItem("studentname") == null) {
+      this.studentname = "请选择学生";
+      // } else {
+      // this.studentname = localStorage.getItem("studentname");
+      // this.$emit("itemlist", this.studentId, this.batchCode);
+      // }
+      // if (
+      //   localStorage.getItem("batchCode") != null &&
+      //   localStorage.getItem("studentId") != null
+      // ) {
+      //   this.$emit("itemlist", this.studentId, this.batchCode);
+      // }
    },
    //点击批次
    batchCodeshowclick() {
@ -693,15 +489,15 @@ export default {
      this.batchCode = row.batchCode;
      this.batchName = row.batchName;
      this.batchCodeshow = false;
-      localStorage.setItem("batchCode", this.batchCode);
-      localStorage.setItem("batchName", this.batchName);
-      if (this.studentId != "") {
+      // localStorage.setItem("batchCode", this.batchCode);
+      // localStorage.setItem("batchName", this.batchName);
+      // if (this.studentId != "") {
        this.$emit("itemlist", this.studentId, this.batchCode);
-      }
+      // }
    },
    //批次
    testScore() {
-      testScoreBatch(this.testqueryParams).then((res) => {
+      testScoreBatch(this.testqueryParams).then(res => {
        this.testScorelist = res.rows;
        this.total4 = res.total;
      });
@ -711,7 +507,7 @@ export default {
        pageNum: 1,
        pageSize: 10,
        batchCode: "",
-        batchName: "",
+        batchName: ""
      };
      this.testScore();
    },
@ -730,15 +526,15 @@ export default {
      this.studentname = row.studentName;
      this.studentId = row.id;
      this.studentshow = false;
-      localStorage.setItem("studentId", this.studentId);
-      localStorage.setItem("studentname", this.studentname);
-      if (this.batchCode != "") {
+      // localStorage.setItem("studentId", this.studentId);
+      // localStorage.setItem("studentname", this.studentname);
+      // if (this.batchCode != "") {
        this.$emit("itemlist", this.studentId, this.batchCode);
-      }
+      // }
    },
    //获取学生
    studentlist() {
-      listStudentInfo(this.studentqueryParams).then((res) => {
+      listStudentInfo(this.studentqueryParams).then(res => {
        this.studentInfoList = res.rows;
        this.total3 = res.total;
      });
@ -758,6 +554,10 @@ export default {
    //学生关闭
    studentcancel() {
      this.studentshow = false;
+      this.studentqueryParams = {
+        pageNum: 1,
+        pageSize: 10
+      };
      this.kindergartenName = "请选择幼儿园";
      this.kindergartenId = "";
      this.className = "请选择班级";
@ -779,10 +579,12 @@ export default {
      this.classshow = false;
      this.studentname = "请选择学生";
      this.studentId = "";
+      this.handleQuery();
    },
    //幼儿园左侧点击
    kindergartenNameclick(row) {
      this.classqueryParams.kindergartenId = row.id;
+      this.studentqueryParams.kindergartenId = row.id;
      this.className = "请选择班级";
      this.classId = "";
      this.studentname = "请选择学生";
@ -793,7 +595,7 @@ export default {
    },
    //班级类型
    class() {
-      tKindergartenInfo(this.ClassType).then((res) => {
+      tKindergartenInfo(this.ClassType).then(res => {
        this.dictValue1 = res.data[0].dictValue;
        this.dictValue2 = res.data[1].dictValue;
        this.dictValue3 = res.data[2].dictValue;
@ -802,7 +604,7 @@ export default {
    },
    //班级list
    classinfo() {
-      listClassinfo(this.classqueryParams).then((response) => {
+      listClassinfo(this.classqueryParams).then(response => {
        this.classinfoList = response.rows;
        this.total2 = response.total;
      });
@ -810,36 +612,41 @@ export default {

    getList() {
      //用户权限
-      getRoleInfo().then((res) => {
+      getRoleInfo().then(res => {
        var user = res.data.roleKeys;
        if (user.includes("enchou")) {
-          this.classqueryParams.kindergartenId = res.data.kindergartenId;
-          this.studentqueryParams.kindergartenId = res.data.kindergartenId;
+          res.data.kindergartenId
+            ? (this.classqueryParams.kindergartenId = res.data.kindergartenId)
+            : "";
+          res.data.kindergartenId
+            ? (this.studentqueryParams.kindergartenId = res.data.kindergartenId)
+            : "";
          return;
-        } else if (user.includes("teacher")) {
-          this.kindergartenId = res.data.kindergartenId;
-          this.classqueryParams.kindergartenId = res.data.kindergartenId;
-          this.kindergartenName = String(res.data.kindergartenName);
-          return;
-        } else if (user.includes("parent")) {
+        }
+        if (user.includes("teacher")) {
+          res.data.kindergartenId
+            ? (this.kindergartenId = res.data.kindergartenId)
+            : "";
+          res.data.kindergartenId
+            ? (this.classqueryParams.kindergartenId = res.data.kindergartenId)
+            : "";
+          res.data.kindergartenName
+            ? (this.kindergartenName = String(res.data.kindergartenName))
+            : "";
          return;
        }
      });
      //获取幼儿园list
-      listKindergartenInfo(this.kqueryParams).then((response) => {
+      listKindergartenInfo(this.kqueryParams).then(response => {
        this.kindergartenList = response.rows;
        this.total1 = response.total;
      });
    },
-    //批次关闭
-    batchCodecancel() {
-      this.batchCodeshow = false;
-    },
    // 表单重置
    reset() {
      this.form = {};
      this.resetForm("form");
-    },
-  },
+    }
+  }
 };
 </script>
--- a/src/views/login.vue
+++ b/src/views/login.vue
@ -6,7 +6,7 @@
      :rules="loginRules"
      class="login-form"
    >
-      <h3 class="title">智慧幼儿体质评估与促进系统</h3>
+      <h3 class="title">幼儿体质健康促进系统</h3>
      <el-form-item prop="username">
        <el-input
          v-model="loginForm.username"
--- a/src/views/register.vue
+++ b/src/views/register.vue
@ -1,7 +1,7 @@
 <template>
  <div class="register">
    <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">智慧幼儿体质评估与促进系统</h3>
+      <h3 class="title">幼儿体质健康促进系统</h3>
      <el-form-item prop="username">
        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
--- a/src/views/system/constitution/index.vue
+++ b/src/views/system/constitution/index.vue
@ -1,50 +1,36 @@
 <template>
  <div class="app-container">
-    <el-form
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-    >
-      <student
-        style="width: 500px; display: inline"
-        @itemlist="itemlists"
-      ></student>
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+      <student style="width: 500px; display: inline" @itemlist="itemlists"></student>
      <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >查看</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
      </el-form-item>
    </el-form>
    <el-row :gutter="10" class="mb8">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-row v-show="itemshow">
-      <el-col :span="24" class="card-box" style="">
+      <el-col :span="24" class="card-box" style>
        <el-card>
          <div style="margin-left: 50px">
-            <span>学校排名:</span
+            <!-- <span>学校排名:</span
            ><span style="margin-left: 20px; margin-right: 20px">{{
              analysislist.schoolRank
            }}</span
-            >名 <span style="margin-left: 50px">区域排名:</span
-            ><span style="margin-left: 20px; margin-right: 20px">{{
+            >名-->
+            <span style="margin-left: 50px">区域排名:</span>
+            <span style="margin-left: 20px; margin-right: 20px">
+              {{
              analysislist.areaRank
-            }}</span
-            >名 <span style="margin-left: 50px">区域成绩占比:</span
-            ><span style="margin-left: 20px; margin-right: 20px">{{
+              }}
+            </span>名
+            <span style="margin-left: 50px">区域成绩占比:</span>
+            <span style="margin-left: 20px; margin-right: 20px">
+              {{
              analysislist.areaProportion
-            }}</span
-            >
+              }}
+            </span>
          </div>

          <div slot="header" style="text-align: center; font-size: 25px">
@ -61,10 +47,7 @@
                margin-top: 20px;
              "
            >
-              <div
-                class="bar"
-                style="width: 400px; height: 300px; margin: 0 auto"
-              ></div>
+              <div class="bar" style="width: 400px; height: 300px; margin: 0 auto"></div>
            </div>
          </div>
        </el-card>
@ -75,9 +58,12 @@
      <el-col :span="24" :offset="0">
        <el-card>
          <div slot="header" style="text-align: center">
-            <img style="width: 40px" src="@/icons/笑脸.png" alt="" />
+            <img style="width: 40px" src="@/icons/笑脸.png" alt />

-            <div><!-- card title -->该学生此批次暂没数据</div>
+            <div>
+              <!-- card title -->
+              该学生此批次暂没数据
+            </div>
          </div>
          <!-- card body -->
        </el-card>
@ -93,7 +79,7 @@ import { constitution } from "@/api/system/constitution";
 export default {
  name: "constitution",
  components: {
-    student,
+    student
  },
  data() {
    return {
@ -106,8 +92,8 @@ export default {
      //查询传值
      analysisqueryParams: {
        studentId: "",
-        batchCode: "",
-      },
+        batchCode: ""
+      }
    };
  },
  mounted() {},
@ -128,7 +114,7 @@ export default {
        var ydata = [
          this.analysislist.itemScoreList[i].itemScore,
          this.analysislist.itemScoreList[i].schoolAvgScore,
-          this.analysislist.itemScoreList[i].cityAvgScore,
+          this.analysislist.itemScoreList[i].cityAvgScore
        ];
        var textname = this.analysislist.itemScoreList[i].itemName;
        var myChart = echarts.init(myEchart[i]);
@ -136,31 +122,31 @@ export default {
          title: {
            text: textname,
            subtext: "",
-            left: "50%",
+            left: "50%"
          },
          tooltip: {
            trigger: "axis",
            axisPointer: {
-              type: "shadow",
+              type: "shadow"
            },
-            formatter: function (params) {
+            formatter: function(params) {
              var tar = params[1];
              return tar.name + "<br/>" + tar.seriesName + " : " + tar.value;
-            },
+            }
          },
          grid: {
            left: "3%",
            right: "4%",
            bottom: "3%",
-            containLabel: true,
+            containLabel: true
          },
          xAxis: {
            type: "category",
            splitLine: { show: false },
-            data: this.analysislist.itemStudentList,
+            data: this.analysislist.itemStudentList
          },
          yAxis: {
-            type: "value",
+            type: "value"
          },
          series: [
            {
@ -169,15 +155,15 @@ export default {
              stack: "Total",
              itemStyle: {
                borderColor: "blue",
-                color: "blue",
+                color: "blue"
              },
              emphasis: {
                itemStyle: {
                  borderColor: "transparent",
-                  color: "transparent",
-                },
+                  color: "transparent"
+                }
              },
-              data: [0, 0, 0],
+              data: [0, 0, 0]
            },
            {
              name: "分数",
@ -187,31 +173,31 @@ export default {
              barWidth: 35,
              label: {
                show: true,
-                position: "inside",
+                position: "inside"
              },
              itemStyle: {
                normal: {
-                  color: function (colors) {
+                  color: function(colors) {
                    var colorList = [
                      "#91cd77",
                      "#5470c6",
                      "#fc8251",
                      "#ef6567",
                      "#f9c956",
-                      "#75bedc",
+                      "#75bedc"
                    ];
                    return colorList[i];
-                  },
-                },
+                  }
+                }
              },

              // itemStyle: {
              //   borderColor: "#94D8F6",
              //   color: "#94D8F6",
              // },
-              data: ydata,
-            },
-          ],
+              data: ydata
+            }
+          ]
        };

        myChart.setOption(option);
@ -221,7 +207,7 @@ export default {
    },
    //综合体质分析
    analysislists() {
-      constitution(this.analysisqueryParams).then((res) => {
+      constitution(this.analysisqueryParams).then(res => {
        if (!res.data || res.data == "") {
          this.itemshow2 = true;
          this.itemshow = false;
@ -237,7 +223,7 @@ export default {
    },
    getList() {
      //用户权限
-      getRoleInfo().then((res) => {
+      getRoleInfo().then(res => {
        this.classqueryParams.kindergartenId = res.data.kindergartenId;
        var user = res.data.roleKeys;
        if (user.includes("enchou")) {
@ -253,8 +239,8 @@ export default {
    reset() {
      this.form = {};
      this.resetForm("form");
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped='scss'>
--- a/src/views/system/kindergartenCheckReport/index.vue
+++ b/src/views/system/kindergartenCheckReport/index.vue
@ -139,7 +139,13 @@
    />

    <!-- 修改幼儿园检测报告对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1350px" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1350px"
+      append-to-body
+      :before-close="cancel"
+    >
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="审核状态" prop="checkStatus">
          <el-radio-group v-model="form.checkStatus">
@ -148,7 +154,12 @@
          </el-radio-group>
        </el-form-item>
        <div style="height: 550px; overflow: auto">
-          <kindergartenEcharts v-if="open" :itemlists="itemlist" class="personal"></kindergartenEcharts>
+          <kindergartenEcharts
+            v-if="open"
+            :itemlists="itemlist"
+            class="personal"
+            @handtrue="handtrue"
+          ></kindergartenEcharts>
        </div>
        <!-- <el-form-item label="幼儿园名称" prop="kindergartenName">
          <el-input v-model="form.kindergartenName" />
@ -164,11 +175,13 @@
        </el-form-item>-->
      </el-form>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click.native.prevent="submitForm" :loading="handtrueloading">
+          <span v-if="!handtrueloading">确 定</span>
+          <span v-else>加 载 中...</span>
+        </el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
-
    <el-dialog :visible.sync="openiframe" width="1350px" append-to-body>
      <div style="height: 680px; overflow: auto">
        <kindergartenEcharts :itemlists="itemlist" class="personal" v-if="openiframe"></kindergartenEcharts>
@ -318,6 +331,7 @@ export default {
  data() {
    return {
      //itemlist
+      handtrueloading: true,
      itemlist: {
        kindergartenId: "",
        batchCode: "",
@ -413,6 +427,11 @@ export default {
    this.info();
  },
  methods: {
+    handtrue(e) {
+      setTimeout(() => {
+        this.handtrueloading = e;
+      }, 1000);
+    },
    /** 查询幼儿园检测报告列表 */
    info() {
      this.loading = true;
@ -489,6 +508,7 @@ export default {
    },
    /** 审核按钮操作 */
    handleUpdate(item) {
+      this.handtrueloading = true;
      this.itemlist.kindergartenId = item.kindergartenId;
      this.itemlist.batchCode = item.batchCode;
      this.itemlist.number++;
--- a/src/views/system/kindergartenEcharts/index.vue
+++ b/src/views/system/kindergartenEcharts/index.vue
@ -265,7 +265,7 @@
            ></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="font-size: 12px; width: 100%; height: 600px">
              <div
                style="
                  display: flex;
@ -416,7 +416,7 @@
                font-size: 12px;
                width: 100%;
                overflow: auto;
-                height: 400px;
+                height: 600px;
              "
            >
              <div
@ -731,13 +731,6 @@ export default {
  },
  mounted() {
    this.classinfo();
-    this.getList();
-    this.classtype();
-    this.KindergartenPhysicalTestinfo();
-    this.StudentListinfo();
-    this.heightAndWeightinfo();
-    this.physiqueinfoFEMALE();
-    this.physiqueinfoMALE();
  },
  //   watch: {
  //     itemlists: {
@ -1011,6 +1004,7 @@ export default {
      setTimeout(() => {
        this.echartslist.studentSex = "FEMALE";
        physiqueanalysis(this.echartslist).then(res => {
+          this.$emit("handtrue", false);
          if (res.data == [] || !res.data) {
            this.FEMALE = false;
          } else {
@ -1135,6 +1129,7 @@ export default {
      setTimeout(() => {
        this.echartslist.studentSex = "MALE";
        physiqueanalysis(this.echartslist).then(res => {
+          this.physiqueinfoMALE();
          if (res.data == [] || !res.data) {
            this.MALE = false;
          } else {
@ -1256,6 +1251,7 @@ export default {
    heightAndWeightinfo() {
      setTimeout(() => {
        heightAndWeightanalysis(this.echartslist).then(res => {
+          this.physiqueinfoFEMALE();
          if (!res.data) {
            this.heightAndWeightshow = false;
          } else {
@ -1508,6 +1504,7 @@ export default {
    StudentListinfo() {
      setTimeout(() => {
        StudentList(this.echartslist).then(res => {
+          this.heightAndWeightinfo();
          if (res.data.testAllStudentScoreVOList != null) {
            this.studentlist = res.data.testAllStudentScoreVOList;
          }
@ -1828,6 +1825,7 @@ export default {
    KindergartenPhysicalTestinfo() {
      this.KindergartenPhysicalTestlist = {};
      KindergartenPhysicalTestanalysis(this.echartslist).then(res => {
+        this.StudentListinfo();
        if (res.data == [] || !res.data) {
          this.KindergartenPhysicalTestshow = false;
        } else {
@ -2078,6 +2076,7 @@ export default {
      tKindergartenInfo(this.kindergartenType).then(res => {
        this.type = res.data[0];
        this.type2 = res.data[1];
+        this.classtype();
      });
    },
    //班级类型
@ -2092,6 +2091,7 @@ export default {
          this.classtypelist.push(obj);
        });
        this.developmentinfo();
+        this.KindergartenPhysicalTestinfo();
      });
    },
    //班级list
@ -2099,6 +2099,7 @@ export default {
      listClassinfo(this.echartslist).then(response => {
        this.classList = response.rows;
        this.ClassListinfo();
+        this.getList();
      });
    }
  }
--- a/src/views/system/personalCheckReport/index.vue
+++ b/src/views/system/personalCheckReport/index.vue
@ -421,10 +421,13 @@
        </el-form-item>
      </el-form>
      <div style="height: 550px; overflow: auto">
-        <personalecharts v-if="open" :itemlists="itemlist" class="personal"></personalecharts>
+        <personalecharts v-if="open" :itemlists="itemlist" class="personal" @handtrue="handtrue"></personalecharts>
      </div>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click.native.prevent="submitForm" :loading="handtrueloading">
+          <span v-if="!handtrueloading">确 定</span>
+          <span v-else>加 载 中...</span>
+        </el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
@ -460,6 +463,7 @@ export default {
  name: "PersonalCheckReport",
  data() {
    return {
+      handtrueloading: true,
      total1: 0,
      total2: 0,
      total3: 0,
@ -609,6 +613,11 @@ export default {
    this.listKindergartenInfoetList();
  },
  methods: {
+    handtrue(e) {
+      setTimeout(() => {
+        this.handtrueloading = e;
+      }, 1000);
+    },
    //预览
    lookhand(item) {
      this.itemlist.studentId = item.studentId;
@ -667,6 +676,7 @@ export default {
    },
    /** 审核按钮操作 */
    handleUpdate(row) {
+      this.handtrueloading = true;
      this.itemlist.studentId = row.studentId;
      this.itemlist.batchCode = row.batchCode;
      this.itemlist.number++;
--- a/src/views/system/personalecharts/index.vue
+++ b/src/views/system/personalecharts/index.vue
@ -996,12 +996,12 @@
      <el-col :span="24" class="card-box" style>
        <el-card>
          <div style="margin-left: 50px">
-            <span>学校排名:</span>
+            <!-- <span>学校排名:</span>
            <span style="margin-left: 20px; margin-right: 20px">
              {{
              constitutionlist.schoolRank
              }}
-            </span>名
+            </span>名-->
            <span style="margin-left: 50px">区域排名:</span>
            <span style="margin-left: 20px; margin-right: 20px">
              {{
@ -1126,11 +1126,6 @@ export default {
  mounted() {
    this.constitutionlist = [];
    this.comprehensive();
-    this.shape();
-    this.quality();
-    this.constitutioninfo();
-    this.listActioninfo();
-    this.select();
  },
  // watch: {
  //   itemlists: {
@ -1236,6 +1231,7 @@ export default {
            this.selectposition4 = index; // 标记位置 设置为当前位置
          }
        }
+        this.$emit("handtrue", false);
      });
    },
    selectlistMethod({ row, column, rowIndex, columnIndex }) {
@ -1275,6 +1271,7 @@ export default {
    //综合体质分析素质 comprehensive
    comprehensive() {
      synthesize(this.echartslist).then(res => {
+        this.shape();
        if (res.data == [] || !res.data) {
        } else {
          this.sythesizestudent = res.data;
@ -1368,6 +1365,7 @@ export default {
    shape() {
      setTimeout(() => {
        analysis(this.echartslist).then(res => {
+          this.quality();
          if (!res.data || res.data == "") {
            this.shapeshow = false;
          } else if (
@ -1457,6 +1455,7 @@ export default {
    quality() {
      setTimeout(() => {
        testBodyScoreInfo(this.echartslist).then(res => {
+          this.constitutioninfo();
          if (!res.rows || res.rows == "" || res.rows == []) {
            this.qualityshow = false;
          } else {
@ -1470,6 +1469,7 @@ export default {
    constitutioninfo() {
      setTimeout(() => {
        constitution(this.echartslist).then(res => {
+          this.listActioninfo();
          this.constitutionlist = res.data;
          if (!res.data || res.data == "") {
            this.constitutionshow = false;
@ -1700,6 +1700,7 @@ export default {
    listActioninfo() {
      setTimeout(() => {
        listAction(this.echartslist).then(res => {
+          this.select();
          this.spanArr = [];
          this.position = 0;
          this.spanArr2 = [];
--- a/src/views/system/physique/index.vue
+++ b/src/views/system/physique/index.vue
@ -80,7 +80,7 @@
      </el-col>
      <el-col :span="24" :offset="0">
        <div style="margin: 0 auto; width: 100%; line-height: 60px">
-          <div style="font-size: 12px; width: 100%; overflow: auto; height: 400px">
+          <div style="font-size: 12px; width: 100%; overflow: auto; height: 600px">
            <div
              style="
                display: flex;
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@ -384,6 +384,7 @@
                multiple
                placeholder="请选择角色"
                @change="changeroleIds"
+                @remove-tag="remove"
              >
                <el-option
                  v-for="item in roleOptions"
@ -398,12 +399,45 @@
          <el-col :span="12">
            <kindergarlog
              v-if="kinshow"
+              :nameicon="true"
              :iddnamelist="form"
              @kinbatlist="kinbatlist"
-              style="width: 500px; display: inline;"
+              style="width: 500px; display: inline"
              ref="kinresets"
            ></kindergarlog>
          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属班级" prop="classInfoList" class="is-required" v-if="statusitem">
+              <el-button
+                @click="innerVisibleclick"
+                style="
+                  width: 220px;
+                  text-align: left;
+                  height: 36px;
+                  color: #c0c4cc;
+                "
+                v-if="classinfoName.length == 0"
+              >请选择所属班级</el-button>
+              <el-tag
+                v-for="(tag, index) in classinfoName"
+                v-else
+                :key="index"
+                closable
+                type
+                :disable-transitions="true"
+                @close="handleClose(tag, index)"
+                style="margin-right: 10px"
+              >{{ tag.className }}</el-tag>
+              <el-tag
+                v-if="classinfoName.length != 0"
+                type="primary"
+                plain
+                :disable-transitions="true"
+                @click="innerVisibletrue2"
+                style="float: right; margin-top: 4px"
+              >选择所属班级</el-tag>
+            </el-form-item>
+          </el-col>
        </el-row>
        <el-row>
          <el-col :span="24">
@ -418,7 +452,98 @@
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
+    <!-- //班级 -->
+    <el-dialog
+      width="1000px"
+      title="选择所属班级"
+      :visible.sync="innerVisible"
+      append-to-body
+      :before-close="cancel3"
+    >
+      <el-form
+        :model="classinfoList2"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="90px"
+      >
+        <el-form-item label="班级名称" prop="className">
+          <el-input
+            style="width: 150px"
+            v-model="classinfoList2.className"
+            placeholder="请输入班级名称"
+            clearable
+            @keyup.enter.native="handleQuery2"
+          />
+        </el-form-item>
+        <el-form-item label="班级类型" prop="classType">
+          <el-select v-model="classinfoList2.classType" placeholder="请选择" style="width: 150px">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.classType"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="班主任姓名" prop="classTeacher">
+          <el-input
+            v-model="classinfoList2.classTeacher"
+            placeholder="请输入班主任姓名"
+            style="width: 150px"
+            clearable
+            @keyup.enter.native="handleQuery2"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery2">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery3">重置</el-button>
+        </el-form-item>
+      </el-form>

+      <el-table
+        :data="classinfoList"
+        align="center"
+        style="margin-top: 10px"
+        @cell-dblclick="classinfoclick"
+      >
+        <el-table-column label="请选择" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button
+              :type="containsclass(scope.row.id) ? 'primary' : ''"
+              style="width: 20px; height: 20px"
+              circle
+              @click="classinfoclick(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column property="kindergartenName" label="幼儿园名称" width="190" align="center" />
+        <el-table-column property="className" label="班级名称" width="180" align="center"></el-table-column>
+        <el-table-column property="classType" label="班级类型" width="160" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.classType == dictValue1 ? "大班" : "" }}
+            {{ scope.row.classType == dictValue2 ? "中班" : "" }}
+            {{ scope.row.classType == dictValue3 ? "小班" : "" }}
+            {{ scope.row.classType == dictValue4 ? "毕业" : "" }}
+          </template>
+        </el-table-column>
+
+        <el-table-column property="classTeacher" label="班主任姓名" width="180" align="center"></el-table-column>
+        <el-table-column property="phone" label="联系电话" width="190" align="center"></el-table-column>
+      </el-table>
+      <pagination
+        v-show="total2 > 0"
+        :total="total2"
+        :page.sync="classinfoList2.pageNum"
+        :limit.sync="classinfoList2.pageSize"
+        @pagination="getclassinfo"
+      />
+      <div slot="footer" class="dialog-footer" style="height: 50px;">
+        <el-button type="primary" @click="cancel3" style="float: left;">选择完成</el-button>
+        <el-button @click="innerVisiblecancel" style="float: left;">取消选择</el-button>
+      </div>
+    </el-dialog>
    <!-- 用户导入对话框 -->
    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
      <el-upload
@ -462,6 +587,8 @@
 <script>
 import { listArea } from "@/api/system/area.js";
 import kindergarlog from "../../assembly/kindergarlog.vue";
+import { listClassinfo } from "@/api/system/classinfo";
+import { getClassInfo } from "@/api/system/teacherInfo";
 import {
  listUser,
  getUser,
@ -485,6 +612,40 @@ export default {
    return {
      // 遮罩层
      loading: true,
+      dictValue1: "",
+      dictValue2: "",
+      dictValue3: "",
+      dictValue4: "",
+      classinfoList: [],
+      total2: 0,
+      innerVisible: false,
+      formkindergartenId: "",
+      classinfoList2: {
+        pageNum: 1,
+        pageSize: 10,
+        kindergartenId: null,
+        className: null,
+        classType: null
+      },
+      classinfoName: [],
+      options: [
+        {
+          classType: "",
+          label: "大班"
+        },
+        {
+          classType: "",
+          label: "中班"
+        },
+        {
+          classType: "",
+          label: "小班"
+        },
+        {
+          classType: "",
+          label: "毕业"
+        }
+      ],
      //用户类型
      memberGrades: [
        { memberGrade: "COMMON", name: "普通" },
@ -521,7 +682,10 @@ export default {
      //区域
      areaList: [],
      // 表单参数
-      form: {},
+      form: {
+        classInfoList: [],
+        kindergartenId: null
+      },
      defaultProps: {
        children: "children",
        label: "label"
@ -547,6 +711,8 @@ export default {
        name: "",
        code: ""
      },
+      ClassType: "class_type",
+      statusitem: false,
      queryParams: {
        pageNum: 1,
        pageSize: 10,
@ -579,6 +745,9 @@ export default {
            trigger: "blur"
          }
        ],
+        classInfoList: [
+          { required: true, message: "所属班级不能为空", trigger: "blur" }
+        ],
        nickName: [
          { required: true, message: "用户昵称不能为空", trigger: "blur" }
        ],
@ -615,7 +784,16 @@ export default {
      this.$refs.tree.filter(val);
    }
  },
+  computed: {
+    //传入的id  等于这个数组的id 的情况下为true  为蓝色按钮
+    containsclass() {
+      return function(id) {
+        return this.form.classInfoList.find(e => e == id);
+      };
+    }
+  },
  created() {
+    this.info();
    this.getList();
    this.getTreeselect();
    this.usermemberGrade();
@ -625,8 +803,148 @@ export default {
    });
  },
  methods: {
+    innerVisibletrue2() {
+      if (this.form.kindergartenId == "" || !this.form.kindergartenId) {
+        this.$message.error("请先选择幼儿园");
+      } else {
+        this.classinfoList2.kindergartenId = this.form.kindergartenId;
+        this.innerVisible = true;
+        this.getclassinfo();
+      }
+    },
+    //移除tage
+    handleClose(tag, index) {
+      this.form.classInfoList.splice(index, 1);
+      this.classinfoName.splice(index, 1);
+    },
+    resetQuery3() {
+      this.classinfoList2 = {
+        pageNum: 1,
+        pageSize: 10,
+        kindergartenId: this.form.kindergartenId,
+        className: null,
+        classType: null,
+        classTeacher: null
+      };
+      this.handleQuery2();
+    },
+    handleQuery2() {
+      listClassinfo(this.classinfoList2).then(response => {
+        this.classinfoList = response.rows;
+        this.total2 = response.total;
+      });
+    },
+
+    innerVisiblecancel() {
+      this.innerVisible = false;
+      this.classinfoName = [];
+    },
+    cancel3() {
+      // if (Array.isArray(this.classinfoName)) {
+      //   this.classinfoName = this.classinfoName.join(",");
+      // } else {
+      // }
+      this.innerVisible = false;
+      this.innerVisible2 = false;
+      this.classinfoList2 = {
+        pageNum: 1,
+        pageSize: 10,
+        kindergartenId: null,
+        className: null,
+        classType: null
+      };
+      // this.classinfoName = "请选择所属班级";
+      // this.classinfoid = "";
+      // if (this.classinfoName > 1) {
+
+      // } else if (this.classinfoName.length == 1) {
+      //   this.classinfoName = JSON.parse(this.classinfoName);
+      // }
+    },
+    innerVisibleclick() {
+      if (
+        this.form.kindergartenId == "" ||
+        !this.form.kindergartenId ||
+        this.form.kindergartenId == null
+      ) {
+        this.$message.error("请先选择幼儿园");
+      } else {
+        this.classinfoList2.kindergartenId = this.form.kindergartenId;
+        this.innerVisible = true;
+        this.getclassinfo();
+      }
+    },
+
+    info() {
+      tKindergartenInfo(this.ClassType).then(res => {
+        this.options[0].classType = res.data[0].dictValue;
+        this.options[1].classType = res.data[1].dictValue;
+        this.options[2].classType = res.data[2].dictValue;
+        this.options[3].classType = res.data[3].dictValue;
+        this.dictValue1 = res.data[0].dictValue;
+        this.dictValue2 = res.data[1].dictValue;
+        this.dictValue3 = res.data[2].dictValue;
+        this.dictValue4 = res.data[3].dictValue;
+      });
+    },
+    classinfoclick2(item) {},
+    classinfoclick(item) {
+      if (this.form.classInfoList.findIndex(e => e == item.id) != -1) {
+        this.form.classInfoList = this.form.classInfoList.filter(
+          e => e != item.id
+        );
+        this.classinfoName = this.classinfoName.filter(e => e.id != item.id);
+      } else {
+        this.form.classInfoList.push(item.id);
+        if (Array.isArray(this.classinfoName)) {
+          this.classinfoName.push(item);
+        } else {
+          this.classinfoName = this.classinfoName.split(",");
+          this.classinfoName.push(item);
+        }
+      }
+    },
+    //选择班级
+    getclassinfo() {
+      listClassinfo(this.classinfoList2).then(response => {
+        this.classinfoList = response.rows;
+        this.total2 = response.total;
+      });
+    },
    changeroleIds(row) {
-      this.kinshow = false;
+      var b = row.map(String);
+      if (b.length > 0) {
+        if (b.includes("6") == true) {
+          this.statusitem = true;
+          if (this.formkindergartenId) {
+            this.form.kindergartenId = this.formkindergartenId;
+          }
+          this.kinshow = true;
+        } else if (b.includes("10") == true) {
+          this.form.classInfoList = null;
+          // this.form.kindergartenId = null;
+          this.classinfoName = [];
+          this.form.kindergartenId;
+          this.kinshow = true;
+          this.statusitem = false;
+        } else if (b.includes("5") == true) {
+          this.form.classInfoList = null;
+          // this.form.kindergartenId = null;
+          this.classinfoName = [];
+          this.kinshow = true;
+          this.statusitem = false;
+        } else {
+          this.statusitem = false;
+          this.kinshow = false;
+        }
+      } else {
+        this.kinshow = false;
+        this.statusitem = false;
+        this.form.classInfoList = null;
+        this.form.kindergartenId = null;
+        this.classinfoName = [];
+      }
+      // this.kinshow = false;
      var obj = {};
      this.roleOptions.forEach(el => {
        if (el.roleKey == "enchou") {
@ -636,15 +954,33 @@ export default {
      row.forEach(e => {
        if (e == obj.roleId) {
          this.kinshow = true;
-          this.form.kindergartenId = "";
-          this.form.kindergartenName = "请选择幼儿园";
+          // this.form.kindergartenId = "";
+          // this.form.kindergartenName = "请选择幼儿园";
        }
      });
    },
+    remove(e) {
+      // if (e) {
+      // if (e == 6) {
+      //   this.form.classInfoList = null;
+      //   // this.form.kindergartenId = null;
+      //   this.classinfoName = [];
+      // }
+      // else if (e == 5 || e == 10) {
+      //   // this.classinfoName= [];
+      //   // this.form.classInfoList=null;
+      //   // this.form.kindergartenId = null;
+      // }
+      // }
+    },
    //幼儿园传值
-    kinbatlist(e) {
-      this.kindergartenId = e;
-      this.form.kindergartenId = e;
+    kinbatlist(id, name) {
+      console.log(id,name)
+      this.$set(this.form, "kindergartenId", id);
+      this.$set(this.form, "kindergartenName", name);
+      this.classinfoName = [];
+      this.form.classInfoList = [];
+      this.form.classinfoName = [];
    },
    //字典用户类型
    usermemberGrade() {
@ -721,7 +1057,7 @@ export default {
    // 表单重置
    reset() {
      this.form = {
-        kindergartenId: undefined,
+        kindergartenId: null,
        userId: undefined,
        areaId: undefined,
        deptId: undefined,
@ -735,7 +1071,8 @@ export default {
        status: "0",
        remark: undefined,
        postIds: [],
-        roleIds: []
+        roleIds: [],
+        classInfoList: []
      };
      this.resetForm("form");
    },
@ -772,6 +1109,7 @@ export default {
    /** 新增按钮操作 */
    handleAdd() {
      this.kinshow = false;
+      this.statusitem = false;
      this.reset();
      this.getTreeselect();
      getUser().then(response => {
@ -785,15 +1123,42 @@ export default {
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.kinshow = false;
+      this.classinfoName = [];
      this.reset();
      this.getTreeselect();
      const userId = row.userId || this.ids;
      getUser(userId).then(response => {
+        response.data.classinfoName = response.data.classInfoList;
+        response.data.classInfoList
+          ? (response.data.classInfoList = response.data.classInfoList.map(
+              e => e.id
+            ))
+          : (response.data.classInfoList = []);
        this.form = response.data;
+        if (response.data.kindergartenId) {
+          this.formkindergartenId = response.data.kindergartenId;
+        }
        this.postOptions = response.posts;
        this.roleOptions = response.roles;
        this.form.postIds = response.postIds;
        this.form.roleIds = response.roleIds;
+        var b = this.form.roleIds.map(String);
+        response.data.classinfoName
+          ? (this.classinfoName = response.data.classinfoName)
+          : (this.classinfoName = []);
+        if (b.includes("6") == true) {
+          this.statusitem = true;
+          this.kinshow = true;
+        } else if (b.includes("10") == true) {
+          this.kinshow = true;
+          this.statusitem = false;
+        } else if (b.includes("5") == true) {
+          this.kinshow = true;
+          this.statusitem = false;
+        } else {
+          this.statusitem = false;
+          this.kinshow = false;
+        }
        this.title = "修改用户";
        this.form.password = "";
        var obj = {};
@ -812,6 +1177,18 @@ export default {
        }
        this.open = true;
      });
+      // .then((el) => {
+      //   this.getclassinfo();
+      // })
+      // .then((val) => {
+      //   getClassInfo({
+      //     id: row.id,
+      //   }).then((res) => {
+      //     this.form.classInfoList = res.data.map((e) => e.id);
+      //     this.form.classInfoList.join(",");
+      //     res.data.map((e) => this.classinfoName.push(e));
+      //   });
+      // });
    },
    /** 重置密码按钮操作 */
    handleResetPwd(row) {
@ -824,7 +1201,9 @@ export default {
      })
        .then(({ value }) => {
          resetUserPwd(row.userId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
+            if (response.code == 200) {
+              this.$modal.msgSuccess("修改成功，新密码是：" + value);
+            }
          });
        })
        .catch(() => {});
@ -836,19 +1215,24 @@ export default {
    },
    /** 提交按钮 */
    submitForm: function() {
+      var b = this.form.roleIds.map(String);
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.userId != undefined) {
            updateUser(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
+              if (response.code == 200) {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
            });
          } else {
            addUser(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
+              if (response.code == 200) {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
            });
          }
        }
--- a/vue.config.js
+++ b/vue.config.js
@ -7,7 +7,7 @@ function resolve(dir) {

 const CompressionPlugin = require('compression-webpack-plugin')

-const name = process.env.VUE_APP_TITLE || '智慧幼儿体质评估与促进系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '幼儿体质健康促进系统' // 网页标题

 const port = process.env.port || process.env.npm_config_port || 80 // 端口
Author	SHA1	Message	Date
辉	8b398ec874	xg	2023-09-01 16:23:23 +08:00
辉	ef1600bd82	修改	2023-09-01 10:04:03 +08:00
辉	a9c620e3ec	修改	2023-09-01 09:40:37 +08:00
纪寒	fb1d79d026	Merge remote-tracking branch 'origin/dev'	2023-07-25 09:48:05 +08:00
辉	828fdd5a50	修改	2023-07-25 09:19:30 +08:00
辉	0bb93757ed	修改	2023-07-21 17:40:07 +08:00
纪寒	18dae08bff	Merge remote-tracking branch 'origin/dev'	2023-07-21 17:19:13 +08:00
辉	9322140854	修改	2023-07-21 17:09:33 +08:00
纪寒	6b663d22e2	Merge remote-tracking branch 'origin/dev' # Conflicts: # .env.development # .env.production	2023-07-21 17:00:45 +08:00
辉	b82aa6bf4f	修改	2023-07-21 16:43:30 +08:00
纪寒	a32a38462b	Merge remote-tracking branch 'origin/dev'	2023-07-21 16:11:02 +08:00
纪寒	3a2132db9b	Merge remote-tracking branch 'origin/dev' # Conflicts: # src/api/baseurl.js	2023-07-21 15:48:04 +08:00
纪寒	44f9c0c562	Merge remote-tracking branch 'origin/dev'	2023-07-13 18:02:23 +08:00
纪寒	12af524f36	Merge remote-tracking branch 'origin/dev'	2023-06-28 13:57:28 +08:00
纪寒	062c00ee9f	Merge remote-tracking branch 'origin/dev'	2023-04-20 10:34:03 +08:00
纪寒	e269e73e4f	Merge remote-tracking branch 'origin/dev'	2023-04-07 11:41:02 +08:00
纪寒	0a36a1b75c	修改生产环境地址	2023-04-06 15:23:43 +08:00