xinyilu/KindergartenUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
曹辉 2022-08-26 17:06:09 +08:00
commit 374a893bef
14 changed files with 95 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/system/KindergartenPhysicalTest/index.vue
View File

@ -46,7 +46,7 @@
<!-- //批次 --> <!-- //批次 -->
<el-dialog <el-dialog
width="500px" width="590px"
title="选择批次" title="选择批次"
:visible.sync="batchCodeshow" :visible.sync="batchCodeshow"
append-to-body append-to-body
@ -54,7 +54,7 @@
:before-close="batchCodecancel" :before-close="batchCodecancel"
> >
<el-table :data="testScorelist" align="center" style="margin-top: 0px"> <el-table :data="testScorelist" align="center" style="margin-top: 0px">
<el-table-column label="请选择" width="70" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -74,13 +74,13 @@
<el-table-column <el-table-column
property="batchCode" property="batchCode"
label="批次编号" label="批次编号"
width="190" width="200"
align="center" align="center"
/> />
<el-table-column <el-table-column
property="batchName" property="batchName"
label="批次名称" label="批次名称"
width="190" width="200"
align="center" align="center"
/> />
</el-table> </el-table>

8
src/views/system/action/index.vue
View File

@ -82,7 +82,7 @@
<!-- //批次 --> <!-- //批次 -->
<el-dialog <el-dialog
width="500px" width="590px"
title="选择批次" title="选择批次"
:visible.sync="batchCodeshow" :visible.sync="batchCodeshow"
append-to-body append-to-body
@ -90,7 +90,7 @@
:before-close="batchCodecancel" :before-close="batchCodecancel"
> >
<el-table :data="testScorelist" align="center" style="margin-top: 0px"> <el-table :data="testScorelist" align="center" style="margin-top: 0px">
<el-table-column label="请选择" width="70" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -110,13 +110,13 @@
<el-table-column <el-table-column
property="batchCode" property="batchCode"
label="批次编号" label="批次编号"
width="190" width="200"
align="center" align="center"
/> />
<el-table-column <el-table-column
property="batchName" property="batchName"
label="批次名称" label="批次名称"
width="190" width="200"
align="center" align="center"
/> />
</el-table> </el-table>

8
src/views/system/classconstitution/index.vue
View File

@ -67,7 +67,7 @@
<!-- //批次 --> <!-- //批次 -->
<el-dialog <el-dialog
width="500px" width="590px"
title="选择批次" title="选择批次"
:visible.sync="batchCodeshow" :visible.sync="batchCodeshow"
append-to-body append-to-body
@ -75,7 +75,7 @@
:before-close="batchCodecancel" :before-close="batchCodecancel"
> >
<el-table :data="testScorelist" align="center" style="margin-top: 0px"> <el-table :data="testScorelist" align="center" style="margin-top: 0px">
<el-table-column label="请选择" width="70" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -95,13 +95,13 @@
<el-table-column <el-table-column
property="batchCode" property="batchCode"
label="批次编号" label="批次编号"
width="190" width="200"
align="center" align="center"
/> />
<el-table-column <el-table-column
property="batchName" property="batchName"
label="批次名称" label="批次名称"
width="190" width="200"
align="center" align="center"
/> />
</el-table> </el-table>

4
src/views/system/classinfo/index.vue
View File

@ -238,7 +238,7 @@
<el-input <el-input
v-model="form.phone" v-model="form.phone"
placeholder="请输入联系电话" placeholder="请输入联系电话"
maxlength="13" maxlength="11"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -388,7 +388,7 @@ export default {
console.log(str); console.log(str);
// 验证手机号的正则表达式 // 验证手机号的正则表达式
const regMobile = const regMobile =
/^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/; /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/;
const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/; const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
const isTel = reg.test(str); const isTel = reg.test(str);

8
src/views/system/comprehensive/index.vue
View File

@ -82,7 +82,7 @@
<!-- //批次 --> <!-- //批次 -->
<el-dialog <el-dialog
width="500px" width="590px"
title="选择批次" title="选择批次"
:visible.sync="batchCodeshow" :visible.sync="batchCodeshow"
append-to-body append-to-body
@ -90,7 +90,7 @@
:before-close="batchCodecancel" :before-close="batchCodecancel"
> >
<el-table :data="testScorelist" align="center" style="margin-top: 0px"> <el-table :data="testScorelist" align="center" style="margin-top: 0px">
<el-table-column label="请选择" width="70" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -110,13 +110,13 @@
<el-table-column <el-table-column
property="batchCode" property="batchCode"
label="批次编号" label="批次编号"
width="190" width="200"
align="center" align="center"
/> />
<el-table-column <el-table-column
property="batchName" property="batchName"
label="批次名称" label="批次名称"
width="190" width="200"
align="center" align="center"
/> />
</el-table> </el-table>

8
src/views/system/constitution/index.vue
View File

@ -82,7 +82,7 @@
<!-- //批次 --> <!-- //批次 -->
<el-dialog <el-dialog
width="500px" width="590px"
title="选择批次" title="选择批次"
:visible.sync="batchCodeshow" :visible.sync="batchCodeshow"
append-to-body append-to-body
@ -90,7 +90,7 @@
:before-close="batchCodecancel" :before-close="batchCodecancel"
> >
<el-table :data="testScorelist" align="center" style="margin-top: 0px"> <el-table :data="testScorelist" align="center" style="margin-top: 0px">
<el-table-column label="请选择" width="70" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -110,13 +110,13 @@
<el-table-column <el-table-column
property="batchCode" property="batchCode"
label="批次编号" label="批次编号"
width="190" width="200"
align="center" align="center"
/> />
<el-table-column <el-table-column
property="batchName" property="batchName"
label="批次名称" label="批次名称"
width="190" width="200"
align="center" align="center"
/> />
</el-table> </el-table>

8
src/views/system/development/index.vue
View File

@ -73,7 +73,7 @@
<!-- //批次 --> <!-- //批次 -->
<el-dialog <el-dialog
width="500px" width="590px"
title="选择批次" title="选择批次"
:visible.sync="batchCodeshow" :visible.sync="batchCodeshow"
append-to-body append-to-body
@ -81,7 +81,7 @@
:before-close="batchCodecancel" :before-close="batchCodecancel"
> >
<el-table :data="testScorelist" align="center" style="margin-top: 0px"> <el-table :data="testScorelist" align="center" style="margin-top: 0px">
<el-table-column label="请选择" width="70" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -101,13 +101,13 @@
<el-table-column <el-table-column
property="batchCode" property="batchCode"
label="批次编号" label="批次编号"
width="190" width="200"
align="center" align="center"
/> />
<el-table-column <el-table-column
property="batchName" property="batchName"
label="批次名称" label="批次名称"
width="190" width="200"
align="center" align="center"
/> />
</el-table> </el-table>

8
src/views/system/heightAndWeight/index.vue
View File

@ -46,7 +46,7 @@
<!-- //批次 --> <!-- //批次 -->
<el-dialog <el-dialog
width="500px" width="590px"
title="选择批次" title="选择批次"
:visible.sync="batchCodeshow" :visible.sync="batchCodeshow"
append-to-body append-to-body
@ -54,7 +54,7 @@
:before-close="batchCodecancel" :before-close="batchCodecancel"
> >
<el-table :data="testScorelist" align="center" style="margin-top: 0px"> <el-table :data="testScorelist" align="center" style="margin-top: 0px">
<el-table-column label="请选择" width="70" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -74,13 +74,13 @@
<el-table-column <el-table-column
property="batchCode" property="batchCode"
label="批次编号" label="批次编号"
width="190" width="200"
align="center" align="center"
/> />
<el-table-column <el-table-column
property="batchName" property="batchName"
label="批次名称" label="批次名称"
width="190" width="200"
align="center" align="center"
/> />
</el-table> </el-table>

8
src/views/system/physique/index.vue
View File

@ -61,7 +61,7 @@
<!-- //批次 --> <!-- //批次 -->
<el-dialog <el-dialog
width="500px" width="590px"
title="选择批次" title="选择批次"
:visible.sync="batchCodeshow" :visible.sync="batchCodeshow"
append-to-body append-to-body
@ -69,7 +69,7 @@
:before-close="batchCodecancel" :before-close="batchCodecancel"
> >
<el-table :data="testScorelist" align="center" style="margin-top: 0px"> <el-table :data="testScorelist" align="center" style="margin-top: 0px">
<el-table-column label="请选择" width="70" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -89,13 +89,13 @@
<el-table-column <el-table-column
property="batchCode" property="batchCode"
label="批次编号" label="批次编号"
width="190" width="200"
align="center" align="center"
/> />
<el-table-column <el-table-column
property="batchName" property="batchName"
label="批次名称" label="批次名称"
width="190" width="200"
align="center" align="center"
/> />
</el-table> </el-table>

8
src/views/system/quality/index.vue
View File

@ -82,7 +82,7 @@
<!-- //批次 --> <!-- //批次 -->
<el-dialog <el-dialog
width="500px" width="590px"
title="选择批次" title="选择批次"
:visible.sync="batchCodeshow" :visible.sync="batchCodeshow"
append-to-body append-to-body
@ -90,7 +90,7 @@
:before-close="batchCodecancel" :before-close="batchCodecancel"
> >
<el-table :data="testScorelist" align="center" style="margin-top: 0px"> <el-table :data="testScorelist" align="center" style="margin-top: 0px">
<el-table-column label="请选择" width="70" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -110,13 +110,13 @@
<el-table-column <el-table-column
property="batchCode" property="batchCode"
label="批次编号" label="批次编号"
width="190" width="200"
align="center" align="center"
/> />
<el-table-column <el-table-column
property="batchName" property="batchName"
label="批次名称" label="批次名称"
width="190" width="200"
align="center" align="center"
/> />
</el-table> </el-table>

8
src/views/system/shape/index.vue
View File

@ -82,7 +82,7 @@
<!-- //批次 --> <!-- //批次 -->
<el-dialog <el-dialog
width="500px" width="590px"
title="选择批次" title="选择批次"
:visible.sync="batchCodeshow" :visible.sync="batchCodeshow"
append-to-body append-to-body
@ -90,7 +90,7 @@
:before-close="batchCodecancel" :before-close="batchCodecancel"
> >
<el-table :data="testScorelist" align="center" style="margin-top: 0px"> <el-table :data="testScorelist" align="center" style="margin-top: 0px">
<el-table-column label="请选择" width="70" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -110,13 +110,13 @@
<el-table-column <el-table-column
property="batchCode" property="batchCode"
label="批次编号" label="批次编号"
width="190" width="200"
align="center" align="center"
/> />
<el-table-column <el-table-column
property="batchName" property="batchName"
label="批次名称" label="批次名称"
width="190" width="200"
align="center" align="center"
/> />
</el-table> </el-table>

10
src/views/system/survey/index.vue
View File

@ -46,7 +46,7 @@
<!-- //批次 --> <!-- //批次 -->
<el-dialog <el-dialog
width="500px" width="590px"
title="选择批次" title="选择批次"
:visible.sync="batchCodeshow" :visible.sync="batchCodeshow"
append-to-body append-to-body
@ -54,7 +54,7 @@
:before-close="batchCodecancel" :before-close="batchCodecancel"
> >
<el-table :data="testScorelist" align="center" style="margin-top: 0px"> <el-table :data="testScorelist" align="center" style="margin-top: 0px">
<el-table-column label="请选择" width="70" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -74,13 +74,13 @@
<el-table-column <el-table-column
property="batchCode" property="batchCode"
label="批次编号" label="批次编号"
width="190" width="200"
align="center" align="center"
/> />
<el-table-column <el-table-column
property="batchName" property="batchName"
label="批次名称" label="批次名称"
width="190" width="200"
align="center" align="center"
/> />
</el-table> </el-table>
@ -227,7 +227,7 @@
<div slot="header" style="text-align: center"> <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> </div>
<!-- card body --> <!-- card body -->
</el-card> </el-card>

5
src/views/system/teacherInfo/index.vue
View File

@ -247,7 +247,7 @@
<el-input <el-input
v-model="form.teacherPhone" v-model="form.teacherPhone"
placeholder="请输入联系电话" placeholder="请输入联系电话"
maxlength="13" maxlength="11"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -581,6 +581,7 @@ import {
export default { export default {
name: "TeacherInfo", name: "TeacherInfo",
data() { data() {
// const checkMobile =/^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/;
// 验证手机号的规则 // 验证手机号的规则
var checkMobile = (rule, value, cb) => { var checkMobile = (rule, value, cb) => {
// 验证手机号的正则表达式 // 验证手机号的正则表达式
@ -590,7 +591,7 @@ export default {
cb(); cb();
} else { } else {
const regMobile = const regMobile =
/^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/; /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/;
const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/; 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(value);

48
src/views/system/testItemCityScore/index.vue
View File

@ -212,7 +212,11 @@
:required="true" :required="true"
v-if="form.resultDictType == ''" v-if="form.resultDictType == ''"
> >
<el-input v-model="value" placeholder="请输入平均得分" /> <el-input
v-model="value"
placeholder="请输入平均得分"
/>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -230,7 +234,8 @@
key="itemAvgText" key="itemAvgText"
prop="itemAvgText" prop="itemAvgText"
> >
<el-input v-model="form.itemAvgText" placeholder="请输入平均得分" /> <el-input v-model="form.itemAvgText" placeholder="请输入平均得分"
@input="change($event)" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -533,6 +538,40 @@ export default {
callback(); callback();
} }
} }
};
var roleMoeny1 = (rule, value, callback) => {
var str = String(this.form.itemAvgText);
console.log(str);
var str_ = "";
var str2 = "";
if (str.includes(".")) {
str_ = str.substr(str.indexOf(".")).length;
str2 = str.substr(0, str.indexOf(".")).length;
console.log(str2);
if (!this.form.itemAvgText) {
callback(new Error("不能为空"));
} else if (this.form.itemAvgText * 1 > 99999999) {
callback(new Error("最大99999999")); // 限制最大额度
} else if (this.form.itemAvgText == "0") {
callback(new Error("请输入成绩")); // 限制最大额度
} else if (str_ > 3) {
callback(new Error("小数点后两位")); // 限制最大额度
} else {
callback();
}
} else {
str2 = str.length;
console.log(str2);
if (!this.form.itemAvgText) {
callback(new Error("不能为空"));
} else if (this.form.itemAvgText * 1 > 99999999) {
callback(new Error("最大99999999")); // 限制最大额度
} else if (this.form.itemAvgText == "0") {
callback(new Error("请输入成绩")); // 限制最大额度
} else {
callback();
}
}
}; };
return { return {
//男女选择 //男女选择
@ -616,7 +655,7 @@ export default {
sex: [{ required: true, message: "请选择性别", trigger: "blur" }], sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
itemAvgScore: [{ required: true, validator: roleMoeny, message: "" }], itemAvgScore: [{ required: true, validator: roleMoeny, message: "" }],
itemAvgText: [ itemAvgText: [
{ required: true, message: "请输入全市平均成绩", trigger: "blur" }, { required: true, validator: roleMoeny1,message: "", trigger: "blur" },
], ],
areaId: [ areaId: [
{ required: true, message: "请选择所属区域", trigger: "blur" }, { required: true, message: "请选择所属区域", trigger: "blur" },
@ -631,6 +670,9 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
change (e) {
this.$forceUpdate()
},
inputChange() { inputChange() {
this.getItemCityScorelist.areaId = this.form.areaId; this.getItemCityScorelist.areaId = this.form.areaId;
if ( if (