修改页面

src/views/assembly/kindergarten.vue

@@ -220,8 +220,35 @@ export default {
   mounted() {},
   created() {
     this.getList();
+    this.onshow();
   },
   methods: {
+    onshow() {
+      if (localStorage.getItem("kindergartenName") == null) {
+        this.kindergartenName = "请选择幼儿园";
+      } else {
+        this.kindergartenName = localStorage.getItem("kindergartenName");
+      }
+      if (localStorage.getItem("batchCode2") == null) {
+        this.batchCode = "请选择批次";
+      } else {
+        this.batchCode = localStorage.getItem("batchCode2");
+      }
+      this.batchCode = localStorage.getItem("batchCode2");
+      this.kindergartenId = localStorage.getItem("kindergartenId");
+      this.$emit("kinbatlist", this.kindergartenId, this.batchCode, 0);
+    },
+
+    //幼儿园左侧点击
+    kindergartenNameclick(row) {
+      this.kindergartenName = row.kindergartenName;
+      this.kindergartenId = row.id;
+      this.kindergartenshow = false;
+      localStorage.setItem("kindergartenName", this.kindergartenName);
+      localStorage.setItem("kindergartenId", this.kindergartenId);
+      this.$emit("kinbatlist", this.kindergartenId, this.batchCode, 1);
+    },
+
     //点击批次左边
     batchCodeclick(row) {
       this.batchCodeId = row.id;
@@ -229,7 +256,7 @@ export default {
       this.batchCodeshow = false;
       localStorage.setItem("batchCode2", this.batchCode);
       if (this.kindergartenId != "") {
-        this.$emit("kinbatlist", this.kindergartenId, this.batchCode);
+        this.$emit("kinbatlist", this.kindergartenId, this.batchCode, 2);
       }
     },
     //点击批次
@@ -252,13 +279,6 @@ export default {
     kindergartencancel() {
       this.kindergartenshow = false;
     },
-    //幼儿园左侧点击
-    kindergartenNameclick(row) {
-      this.kindergartenName = row.kindergartenName;
-      this.kindergartenId = row.id;
-      this.kindergartenshow = false;
-      this.$emit("kinbatlist", this.kindergartenId, this.batchCode);
-    },
 
     getList() {
       tKindergartenInfo(this.kindergartenType).then((res) => {
@@ -266,6 +286,7 @@ export default {
         this.type2 = res.data[1];
       });
       //用户权限
+      // this.analysisqueryParams.kindergartenId = res.data.kindergartenId;
       getRoleInfo().then((res) => {
         var user = res.data.roleKeys;
         console.log(user);

src/views/assembly/student.vue

@@ -461,6 +461,13 @@ export default {
       this.batchCode = localStorage.getItem("batchCode");
       this.studentId = localStorage.getItem("studentId");
       console.log(localStorage.getItem("studentname"));
+
+      if (localStorage.getItem("batchCode") == null) {
+        this.batchCode = "请选择批次";
+      } else {
+        this.batchCode = localStorage.getItem("batchCode");
+      }
+
       if (localStorage.getItem("studentname") == null) {
         this.studentname = "请选择学生";
       } else {

src/views/system/KindergartenPhysicalTest/index.vue

@@ -416,9 +416,7 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
-        this.analysisqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
-        console.log(user);
         if (user.includes("enchou")) {
           return;
         } else if (user.includes("teacher")) {

src/views/system/area/index.vue

@@ -329,10 +329,12 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      this.form.code = Number(this.form.code);
       this.form2.name = this.form.name;
       this.form2.code = this.form.code;
       this.form2.sort = this.form.sort;
       this.form2.parentId = this.form.parentId;
+      console.log(this.form);
       if (this.areaList.length == 0) {
         this.form.parentId = 0;
       }

src/views/system/classconstitution/index.vue

@@ -51,7 +51,12 @@
       append-to-body
       :before-close="classcancel"
     >
-      <el-table :data="classinfoList" align="center" style="margin-top: 10px" @cell-dblclick="classclick">
+      <el-table
+        :data="classinfoList"
+        align="center"
+        style="margin-top: 10px"
+        @cell-dblclick="classclick"
+      >
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -304,18 +309,21 @@ export default {
     handleQuery() {
       this.ClassListinfo();
     },
-    kinbatlist(kindergartenId, batchCode) {
+    kinbatlist(kindergartenId, batchCode, text) {
-      console.log(kindergartenId, batchCode);
+      console.log(kindergartenId, batchCode, text);
-      if (this.ClassListlist.kindergartenId != "") {
+      if (text == 1) {
-        this.classqueryParams.kindergartenId = "";
+        if (this.ClassListlist.kindergartenId != "") {
-        this.className = "请选择班级";
+          this.classqueryParams.kindergartenId = "";
-        this.classId = "";
+          this.className = "请选择班级";
-      }
+          this.classId = "";
-      if (this.classId != "") {
+        }
-        this.classqueryParams.kindergartenId = "";
+        if (this.classId != "") {
-        this.className = "请选择班级";
+          this.classqueryParams.kindergartenId = "";
-        this.classId = "";
+          this.className = "请选择班级";
+          this.classId = "";
+        }
       }
+
       this.ClassListlist.kindergartenId = kindergartenId;
       this.ClassListlist.batchCode = batchCode;
       this.classqueryParams.kindergartenId = kindergartenId;
@@ -558,10 +566,7 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
-        this.ClassListlist.kindergartenId = res.data.kindergartenId;
-        this.classqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
-        console.log(user);
         if (user.includes("enchou")) {
           return;
         } else if (user.includes("teacher")) {

src/views/system/development/index.vue

@@ -228,9 +228,7 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
-        this.analysislist.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
-        console.log(user);
         if (user.includes("enchou")) {
           return;
         } else if (user.includes("teacher")) {

src/views/system/heightAndWeight/index.vue

@@ -290,6 +290,7 @@ export default {
               {
                 name: "男",
                 type: "bar",
+                barWidth: 35,
                 barGap: 0,
                 color: "#00B050",
                 label: labelOption,
@@ -301,6 +302,7 @@ export default {
               {
                 name: "女",
                 type: "bar",
+                barWidth: 35,
                 color: "red",
                 label: labelOption,
                 emphasis: {
@@ -335,6 +337,7 @@ export default {
             series: [
               {
                 name: "男",
+                barWidth: 35,
                 type: "bar",
                 barGap: 0,
                 color: "#00B050",
@@ -345,6 +348,7 @@ export default {
                 data: boyweight,
               },
               {
+                barWidth: 35,
                 name: "女",
                 type: "bar",
                 color: "red",
@@ -368,9 +372,7 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
-        this.analysisqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
-        console.log(user);
         if (user.includes("enchou")) {
           return;
         } else if (user.includes("teacher")) {

src/views/system/physique/index.vue

@@ -67,13 +67,13 @@
                 style="
                   position: relative;
                   display: inline-block;
-                  width: 150px;
+                  width: 200px;
                   text-align: center;
                 "
                 v-for="(item, index) in firstCategoryScoreList"
                 :key="index"
               >
-                <span :style="index == 0 ? '' : 'margin-right:20px'">{{
+                <span :style="index == 0 ? '' : 'margin-right:40px'">{{
                   index == 0 ? null : "+"
                 }}</span>
                 <span>
@@ -277,10 +277,13 @@ export default {
     handleQuery() {
       this.analysisinfo();
     },
-    kinbatlist(kindergartenId, batchCode) {
+    kinbatlist(kin, batchCode) {
-      console.log(kindergartenId, batchCode);
+      console.log(kin);
-      this.analysisqueryParams.kindergartenId = kindergartenId;
+      var a = kin;
+      console.log(a)
+      this.analysisqueryParams.kindergartenId = a;
       this.analysisqueryParams.batchCode = batchCode;
+      console.log(this.analysisqueryParams)
     },
 
     analysisinfo() {
@@ -416,9 +419,7 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
-        this.analysisqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
-        console.log(user);
         if (user.includes("enchou")) {
           return;
         } else if (user.includes("teacher")) {

src/views/system/survey/index.vue

@@ -134,16 +134,16 @@ export default {
         batchCode: "",
         pageNum: 1,
         pageSize: 10,
-        // kindergartenId: "12",
+        // kindergartenId: "2",
-        // batchCode: "PC202208030005",
+        // batchCode: "PC202208260011",
       },
       studentlistqueryParams: {
         kindergartenId: "",
         batchCode: "",
         pageNum: 1,
         pageSize: 10,
-        // kindergartenId: "1",
+        // kindergartenId: "2",
-        // batchCode: "PC202208030005",
+        // batchCode: "PC202208260011",
       },
       LARGECLASS: "LARGE_CLASS",
       MIDDLECLASS: "MIDDLE_CLASS",
@@ -468,10 +468,7 @@ export default {
     getList() {
       //用户权限
       getRoleInfo().then((res) => {
-        this.studentlistqueryParams.kindergartenId = res.data.kindergartenId;
-        this.classqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
-        console.log(user);
         if (user.includes("enchou")) {
           return;
         } else if (user.includes("teacher")) {
@@ -490,6 +487,12 @@ export default {
 };
 </script>
 <style scoped='scss'>
+.text {
+  font-size: 12px;
+  position: absolute;
+  left: 19%;
+  top: 10%;
+}
 .header {
   text-align: center;
   font-size: 18px;
@@ -510,8 +513,8 @@ export default {
   text-align: center;
   border-radius: 15px;
   position: absolute;
-  left: 14%;
+  left: 7%;
-  top: 5%;
+  top: 8%;
 }
 ::v-deep .el-card__header {
   border: none;