diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 8be99f2..4e2edaa 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -35,7 +35,7 @@ export default { }, data() { return { - title: '幼儿园体质检测管理系统', + title: '智慧幼儿体质评估与促进系统', logo: logoImg } } @@ -66,10 +66,11 @@ export default { width: 100%; & .sidebar-logo { - width: 32px; + width: 18px; height: 32px; vertical-align: middle; - margin-right: 12px; + + } & .sidebar-title { @@ -81,6 +82,7 @@ export default { font-size: 14px; font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif; vertical-align: middle; + } } diff --git a/src/views/system/classinfo/index.vue b/src/views/system/classinfo/index.vue index e88b6ba..5c997ef 100644 --- a/src/views/system/classinfo/index.vue +++ b/src/views/system/classinfo/index.vue @@ -33,6 +33,7 @@ @keyup.enter.native="handleQuery" /> + + + + + + + + + + + { - console.log(value); - console.log(value.length); + // console.log(value); + // console.log(value.length); // 验证手机号的正则表达式 const regMobile = /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/; @@ -415,6 +441,7 @@ export default { kindergartenId: null, className: null, classType: null, + entranceDate: null, }, queryParams2: { pageNum: 1, @@ -427,14 +454,6 @@ export default { form: {}, // 表单校验 rules: { - kindergartenId: [{ required: true, message: "请选择所属幼儿园" }], - className: [ - { required: true, message: "请输入班级名称", trigger: "blur" }, - ], - classType: [{ required: true, message: "请选择幼儿园类型" }], - classTeacher: [ - { required: true, message: "请输入班主任姓名", trigger: "blur" }, - ], phone: [ { required: true, @@ -443,6 +462,16 @@ export default { message: "", }, ], + kindergartenId: [{ required: true, message: "请选择所属幼儿园" }], + className: [ + { required: true, message: "请输入班级名称", trigger: "blur" }, + ], + classType: [{ required: true, message: "请选择幼儿园类型" }], + + classTeacher: [ + { required: true, message: "请输入班主任姓名", trigger: "blur" }], + entranceDate: [ + { required: true, message: "请选择日期", trigger: "change" }], }, }; }, @@ -477,6 +506,7 @@ export default { this.total2 = response.total; }); listClassinfo(this.queryParams).then((response) => { + console.log(response) this.classinfoList = response.rows; this.total = response.total; this.loading = false; @@ -502,6 +532,7 @@ export default { className: null, classType: null, classTeacher: null, + entranceDate:null, phone: undefined, kindergartenName: null, }; @@ -554,6 +585,7 @@ export default { this.kindergartenid2 = ""; this.title = "添加班级信息"; this.kindergartenName = "请选择所在幼儿园"; + }, /** 修改按钮操作 */ handleUpdate(row) { @@ -566,6 +598,7 @@ export default { this.kindergartenName = this.form.kindergartenName; this.open = true; this.title = "修改班级信息"; + }); }, /** 提交按钮 */ @@ -588,6 +621,7 @@ export default { } }); this.kindergartenid2 = ""; + }, /** 删除按钮操作 */ handleDelete(row) {