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

Merge remote-tracking branch 'origin/dev'

Browse Source
This commit is contained in:
纪寒 2022-08-29 14:29:45 +08:00
commit 49a83fb1ec
16 changed files with 110 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = 幼儿园体质检测管理系统
ENV = 'development'
# 若依管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.16.64:8080'
VUE_APP_BASE_API = 'http://192.168.16.81:8080'
#'/dev-api'
# 路由懒加载

8
src/api/system/testItemScore.js
View File

@ -26,14 +26,6 @@ export function studentInfo(query) {
})
}
//查询测试项目列表
export function testItems(query) {
return request({
url: '/system/testItems/list',
method: 'get',
params: query
})
}
//查询成绩批次编号列表
export function testScoreBatch(query) {

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

@ -7,7 +7,7 @@
v-show="showSearch"
label-width="90px"
>
<el-form-item label="所属幼儿园" prop="categoryName">
<el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
<el-button
@click="kindergartenshow = true"
v-if="kindergartenName == '请选择幼儿园'"
@ -284,6 +284,7 @@ export default {
return {
itemshow: false,
itemshow2: false,
showyey: true,
total1: 0,
total4: 0,
//遮罩层
@ -584,7 +585,10 @@ export default {
},
//点击批次
batchCodeshowclick() {
if (this.analysisqueryParams.kindergartenId == "") {
if (
this.analysisqueryParams.kindergartenId == "" ||
this.analysisqueryParams.kindergartenId == null
) {
this.$message.error("请先选择幼儿园");
} else {
this.testScore();
@ -625,6 +629,22 @@ export default {
//用户权限
getRoleInfo().then((res) => {
console.log(res);
this.analysisqueryParams.kindergartenId = res.data.kindergartenId;
console.log(this.analysisqueryParams);
var user = res.data.roleKeys;
console.log(user);
if (user.includes("enchou")) {
this.showyey = false;
return;
} else if (user.includes("teacher")) {
this.showyey = false;
return;
} else if (user.includes("parent")) {
this.showyey = false;
return;
}
});
//获取幼儿园list
listKindergartenInfo(this.kqueryParams).then((response) => {

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

@ -700,7 +700,10 @@ export default {
},
//点击所属班级
classshowclick() {
if (this.classqueryParams.kindergartenId == "") {
if (
this.classqueryParams.kindergartenId == "" ||
this.classqueryParams.kindergartenId == null
) {
this.$message.error("请先选择幼儿园");
} else {
this.classshow = true;

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

@ -712,7 +712,10 @@ export default {
},
//点击所属班级
classshowclick() {
if (this.classqueryParams.kindergartenId == "") {
if (
this.classqueryParams.kindergartenId == "" ||
this.classqueryParams.kindergartenId == null
) {
this.$message.error("请先选择幼儿园");
} else {
this.classshow = true;

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

@ -830,7 +830,8 @@ export default {
},
//点击所属班级
classshowclick() {
if (this.classqueryParams.kindergartenId == "") {
console.log(this.classqueryParams)
if (this.classqueryParams.kindergartenId == ""||this.classqueryParams.kindergartenId ==null) {
this.$message.error("请先选择幼儿园");
} else {
this.classshow = true;
@ -899,9 +900,9 @@ export default {
getList() {
//用户权限
getRoleInfo().then((res) => {
console.log(res);
this.classqueryParams.kindergartenId = res.data.kindergartenId;
var user = res.data.roleKeys;
console.log(user);
if (user.includes("enchou")) {
this.showyey = false;
return;

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

@ -616,8 +616,8 @@ export default {
if (!res.data || res.data == "") {
this.itemshow2 = true;
this.itemshow = false;
this.batchCodeName = "请选择批次";
this.batchCodeId = "";
// this.batchCodeName = "请选择批次";
// this.batchCodeId = "";
} else {
this.analysislist = res.data;
this.$nextTick(() => {
@ -670,7 +670,10 @@ export default {
},
//点击所属班级
classshowclick() {
if (this.classqueryParams.kindergartenId == "") {
if (
this.classqueryParams.kindergartenId == "" ||
this.classqueryParams.kindergartenId == null
) {
this.$message.error("请先选择幼儿园");
} else {
this.classshow = true;

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

@ -7,7 +7,7 @@
v-show="showSearch"
label-width="90px"
>
<el-form-item label="所属幼儿园" prop="categoryName">
<el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
<el-button
@click="kindergartenshow = true"
v-if="kindergartenName == '请选择幼儿园'"
@ -24,7 +24,10 @@
<el-form-item label="班级类型" prop="categoryName" label-width="70px">
<el-select
v-if="analysislist.kindergartenId == ''"
v-if="
analysislist.kindergartenId == '' ||
this.analysislist.kindergartenId == null
"
placeholder="请选择"
disabled
@click.native="selecetclick"
@ -306,6 +309,7 @@ export default {
return {
itemshow: false,
itemshow2: false,
showyey: true,
total1: 0,
total4: 0,
//遮罩层
@ -367,7 +371,10 @@ export default {
},
methods: {
selecetclick() {
if (this.analysislist.kindergartenId == "") {
if (
this.analysislist.kindergartenId == "" ||
this.analysislist.kindergartenId == null
) {
this.$message.error("请先选择幼儿园");
} else {
}
@ -450,6 +457,21 @@ export default {
//用户权限
getRoleInfo().then((res) => {
console.log(res);
this.analysislist.kindergartenId = res.data.kindergartenId;
console.log(this.analysislist);
var user = res.data.roleKeys;
console.log(user);
if (user.includes("enchou")) {
this.showyey = false;
return;
} else if (user.includes("teacher")) {
this.showyey = false;
return;
} else if (user.includes("parent")) {
this.showyey = false;
return;
}
});
//获取幼儿园list
listKindergartenInfo(this.kqueryParams).then((response) => {

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

@ -7,7 +7,7 @@
v-show="showSearch"
label-width="90px"
>
<el-form-item label="所属幼儿园" prop="categoryName">
<el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
<el-button
@click="kindergartenshow = true"
v-if="kindergartenName == '请选择幼儿园'"
@ -235,6 +235,7 @@ export default {
return {
itemshow: false,
itemshow2: false,
showyey: true,
total1: 0,
total4: 0,
//遮罩层
@ -569,7 +570,10 @@ export default {
},
//点击批次
batchCodeshowclick() {
if (this.analysisqueryParams.kindergartenId == "") {
if (
this.analysisqueryParams.kindergartenId == "" ||
this.analysisqueryParams.kindergartenId == null
) {
this.$message.error("请先选择幼儿园");
} else {
this.testScore();
@ -610,6 +614,21 @@ export default {
//用户权限
getRoleInfo().then((res) => {
console.log(res);
this.analysisqueryParams.kindergartenId = res.data.kindergartenId;
console.log(this.analysisqueryParams);
var user = res.data.roleKeys;
console.log(user);
if (user.includes("enchou")) {
this.showyey = false;
return;
} else if (user.includes("teacher")) {
this.showyey = false;
return;
} else if (user.includes("parent")) {
this.showyey = false;
return;
}
});
//获取幼儿园list
listKindergartenInfo(this.kqueryParams).then((response) => {

3
src/views/system/info/index.vue
View File

@ -220,7 +220,8 @@ export default {
var checkMobile = (rule, value, cb) => {
// 验证手机号的正则表达式
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}$/;
// /^(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);

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

@ -579,7 +579,6 @@ export default {
) {
this.$message.error("请先选择幼儿园");
} else {
console.log(1);
this.testScore();
this.batchCodeshow = true;
}
@ -603,7 +602,7 @@ export default {
sexclick() {
console.log(this.analysisqueryParams);
if (
this.analysisqueryParams.kindergartenId != "" &&
this.analysisqueryParams.kindergartenId != null &&
this.analysisqueryParams.batchCode != ""
) {
this.analysisinfo();

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

@ -851,7 +851,10 @@ export default {
},
//点击所属班级
classshowclick() {
if (this.classqueryParams.kindergartenId == "") {
if (
this.classqueryParams.kindergartenId == "" ||
this.classqueryParams.kindergartenId == null
) {
this.$message.error("请先选择幼儿园");
} else {
this.classshow = true;

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

@ -1231,7 +1231,7 @@ export default {
},
//点击所属班级
classshowclick() {
if (this.classqueryParams.kindergartenId == "") {
if (this.classqueryParams.kindergartenId == ""||this.classqueryParams.kindergartenId == null) {
this.$message.error("请先选择幼儿园");
} else {
this.classshow = true;

14
src/views/system/studentInfo/index.vue
View File

@ -284,7 +284,11 @@
<el-input v-model="form.studentName" placeholder="请输入学生姓名" />
</el-form-item>
<el-form-item label="学生编号" prop="studentNumber">
<el-input v-model="form.studentNumber" placeholder="请输入学生编号" maxlength="20" />
<el-input
v-model="form.studentNumber"
placeholder="请输入学生编号"
maxlength="20"
/>
</el-form-item>
<el-form-item label="学生性别" prop="studentSex">
<el-radio-group v-model="form.studentSex">
@ -1006,15 +1010,16 @@ export default {
this.form = response.data;
this.classinfoName = this.form.className;
this.classinfoId = this.form.classId;
console.log(this.form);
if (this.form.parentStudentInfoList.length == 0) {
if (this.form.parentStudentInfoList == null) {
} else if (this.form.parentStudentInfoList.length == 0) {
} else if (this.form.parentStudentInfoList.length == 1) {
this.parentlist.push(this.form.parentStudentInfoList[0]);
} else if (this.form.parentStudentInfoList.length == 2) {
this.parentlist.push(this.form.parentStudentInfoList[0]);
this.parentlist.push(this.form.parentStudentInfoList[1]);
}
console.log(this.parentlist);
if (this.parentlist.length == 0) {
this.parentInfoName = "请选择学生家长";
@ -1069,7 +1074,8 @@ export default {
// }
this.form2.id = this.form.id;
this.form2.classId = this.form.classId;
if (this.form.parentStudentInfoList.length == 0) {
if (this.form.parentStudentInfoList == null) {
} else if (this.form.parentStudentInfoList.length == 0) {
} else if (this.form.parentStudentInfoList.length == 1) {
this.form2.parentIdList.push(this.form.parentStudentInfoList[0].id);
} else if (this.form.parentStudentInfoList.length == 2) {

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

@ -332,19 +332,9 @@ export default {
methods: {
ClassListinfo() {
ClassList(this.classqueryParams).then((res) => {
console.log(res.rows.length);
if (res.rows.length == 0) {
this.itemshow2 = true;
this.itemshow = false;
console.log(
this.yclassname1,
this.yclassname2,
this.yclassname3,
this.classscore1,
this.classscore2,
this.classscore3
);
console.log(this.itemshow2);
} else {
this.$nextTick((e) => {
this.yclassname1 = [];
@ -353,8 +343,6 @@ export default {
this.classscore1 = [];
this.classscore2 = [];
this.classscore3 = [];
console.log(2);
res.rows.forEach((e) => {
if (e.classType == this.LARGECLASS) {
this.yclassname1.push(e.className);
@ -643,6 +631,7 @@ export default {
},
//点击批次
batchCodeshowclick() {
console.log(this.classqueryParams);
if (
this.classqueryParams.kindergartenId == "" ||
this.classqueryParams.kindergartenId == null
@ -691,9 +680,9 @@ export default {
});
//用户权限
getRoleInfo().then((res) => {
console.log(res);
this.studentlistqueryParams.kindergartenId = res.data.kindergartenId;
this.classqueryParams.kindergartenId = res.data.kindergartenId;
console.log(this.classqueryParams);
var user = res.data.roleKeys;
console.log(user);

6
src/views/system/testItemScore/index.vue
View File

@ -183,7 +183,7 @@
@click="yryinnerVisible = true"
v-if="kindergartenName == '请选择幼儿园'"
style="
width: 200px;
width: 240px;
text-align: left;
height: 36px;
color: #c0c4cc;
@ -197,7 +197,7 @@
@click="yryinnerVisible = true"
v-else
style="
width: 200px;
width: 240px;
text-align: left;
height: 36px;
padding-left: -10px;
@ -902,7 +902,6 @@ import {
updateTestItemScore,
classInfo,
studentInfo,
testItems,
testScoreBatch,
getAllTestItemScoreInfo,
} from "@/api/system/testItemScore";
@ -1257,6 +1256,7 @@ export default {
studentId: row.studentId,
batchCode: row.batchCode,
};
this.form.itemScoreList = [];
getTestItemScore(list).then((response) => {
console.log();
this.form = response.data;