diff --git a/src/views/assembly/kindergarten.vue b/src/views/assembly/kindergarten.vue index 2042326..607545a 100644 --- a/src/views/assembly/kindergarten.vue +++ b/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); diff --git a/src/views/assembly/student.vue b/src/views/assembly/student.vue index a89c59a..1ac6efa 100644 --- a/src/views/assembly/student.vue +++ b/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 { diff --git a/src/views/system/KindergartenPhysicalTest/index.vue b/src/views/system/KindergartenPhysicalTest/index.vue index fed375f..a8bf966 100644 --- a/src/views/system/KindergartenPhysicalTest/index.vue +++ b/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")) { diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index 5eb7cb8..8099702 100644 --- a/src/views/system/area/index.vue +++ b/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; } diff --git a/src/views/system/classconstitution/index.vue b/src/views/system/classconstitution/index.vue index e3d18a7..241be04 100644 --- a/src/views/system/classconstitution/index.vue +++ b/src/views/system/classconstitution/index.vue @@ -51,7 +51,12 @@ append-to-body :before-close="classcancel" > - +