From ce1d4373486ff0a0373a3525124ec53593fafcf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 25 Aug 2022 09:50:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=85=A5?=
=?UTF-8?q?=E5=AD=A6=E6=97=A5=E6=9C=9F=EF=BC=8C=E6=9B=B4=E6=94=B9=E9=A2=98?=
=?UTF-8?q?=E7=9B=AE=E5=92=8Clogo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/layout/components/Sidebar/Logo.vue | 8 ++--
src/views/system/classinfo/index.vue | 54 +++++++++++++++++++++-----
2 files changed, 49 insertions(+), 13 deletions(-)
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"
/>
+
+
+
+
+ {{ scope.row.entranceYear }}年
+
+
+
+
+
+
+
+
{
- 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) {
From 6a82030986ce00c9b69a921d5a911619e1c074a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 25 Aug 2022 10:19:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/classinfo/index.vue | 34 +++++++++++++---------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/views/system/classinfo/index.vue b/src/views/system/classinfo/index.vue
index 5c997ef..ff2bbcd 100644
--- a/src/views/system/classinfo/index.vue
+++ b/src/views/system/classinfo/index.vue
@@ -131,7 +131,7 @@
-
+
-
{
- // console.log(value);
- // console.log(value.length);
+ console.log(value);
+ var str = String(value);
+ console.log(str);
// 验证手机号的正则表达式
const regMobile =
/^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
- const isTel = reg.test(value);
+ const isTel = reg.test(str);
- if (value.length == 11) {
- if (regMobile.test(value)) {
+ if (str.length == 11) {
+ if (regMobile.test(str)) {
return cb();
}
- } else if (11 < value.length <= 13) {
+ } else if (11 < str.length <= 13) {
if (isTel) {
return cb();
}
@@ -467,11 +466,13 @@ export default {
{ required: true, message: "请输入班级名称", trigger: "blur" },
],
classType: [{ required: true, message: "请选择幼儿园类型" }],
-
+
classTeacher: [
- { required: true, message: "请输入班主任姓名", trigger: "blur" }],
+ { required: true, message: "请输入班主任姓名", trigger: "blur" },
+ ],
entranceDate: [
- { required: true, message: "请选择日期", trigger: "change" }],
+ { required: true, message: "请选择日期", trigger: "change" },
+ ],
},
};
},
@@ -506,7 +507,7 @@ export default {
this.total2 = response.total;
});
listClassinfo(this.queryParams).then((response) => {
- console.log(response)
+ console.log(response);
this.classinfoList = response.rows;
this.total = response.total;
this.loading = false;
@@ -532,7 +533,7 @@ export default {
className: null,
classType: null,
classTeacher: null,
- entranceDate:null,
+ entranceDate: null,
phone: undefined,
kindergartenName: null,
};
@@ -585,7 +586,6 @@ export default {
this.kindergartenid2 = "";
this.title = "添加班级信息";
this.kindergartenName = "请选择所在幼儿园";
-
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -598,7 +598,6 @@ export default {
this.kindergartenName = this.form.kindergartenName;
this.open = true;
this.title = "修改班级信息";
-
});
},
/** 提交按钮 */
@@ -621,7 +620,6 @@ export default {
}
});
this.kindergartenid2 = "";
-
},
/** 删除按钮操作 */
handleDelete(row) {