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

修改bug

Browse Source
This commit is contained in:
曹辉 2022-09-16 09:51:35 +08:00
parent cc5d7bef99
commit 6ab475ffe4
8 changed files with 253 additions and 103 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.81:8081'
VUE_APP_BASE_API = 'http://192.168.16.81:8082'
#'/dev-api'
# 路由懒加载

107
src/views/assembly/kindergarten.vue
View File

@ -40,20 +40,56 @@
<!-- //批次 -->
<el-dialog
width="590px"
width="700px"
title="选择批次"
:visible.sync="batchCodeshow"
append-to-body
style="margin-top: 20px"
:before-close="batchCodecancel"
>
<el-form
:model="testqueryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<el-form-item label="批次编号" prop="batchCode">
<el-input
v-model="testqueryParams.batchCode"
placeholder="请输入批次编号"
clearable
/>
</el-form-item>
<el-form-item label="批次名称" prop="batchCode">
<el-input
v-model="testqueryParams.batchName"
placeholder="请输入批次名称"
clearable
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="testScore"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="testresetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table
:data="testScorelist"
align="center"
style="margin-top: 0px"
@cell-dblclick="batchCodeclick"
>
<el-table-column label="请选择" width="100" align="center">
<el-table-column label="请选择" width="200" align="center">
<template slot-scope="scope">
<el-button
type="primary"
@ -73,13 +109,13 @@
<el-table-column
property="batchCode"
label="批次编号"
width="200"
width="230"
align="center"
/>
<el-table-column
property="batchName"
label="批次名称"
width="200"
width="230"
align="center"
/>
</el-table>
@ -100,6 +136,34 @@
append-to-body
:before-close="kindergartencancel"
>
<el-form
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="110px"
>
<el-form-item label="幼儿园名称" prop="kindergartenName">
<el-input
style="width: 200px"
v-model="kqueryParams.kindergartenName"
placeholder="请输入幼儿园名称"
></el-input>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="kinhandleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="kinresetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick">
<el-table-column label="请选择" width="70" align="center">
<template slot-scope="scope">
@ -206,7 +270,7 @@ export default {
kindergartenId: "",
//批次名称
batchCode: "",
batchName:'请选择批次',
batchName: "请选择批次",
//批次list
testScorelist: [],
//批次编号
@ -273,15 +337,46 @@ export default {
this.total4 = res.total;
});
},
testresetQuery() {
this.testqueryParams = {
pageNum: 1,
pageSize: 10,
batchCode:'',
batchName:'',
};
this.testScore();
},
//批次关闭
batchCodecancel() {
this.batchCodeshow = false;
this.testresetQuery();
},
//幼儿园关闭
kindergartencancel() {
this.kindergartenshow = false;
this.kinresetQuery();
},
kinhandleQuery() {
//获取幼儿园list
listKindergartenInfo(this.kqueryParams).then((response) => {
this.kindergartenList = response.rows;
this.total1 = response.total;
// console.log(this.kindergartenList);
});
},
kinresetQuery() {
this.kqueryParams = {
pageNum: 1,
pageSize: 10,
organizeId: null,
kindergartenName: null,
kindergartenAddress: null,
kindergartenType: null,
phone: null,
contacts: null,
};
this.kinhandleQuery();
},
getList() {
//用户权限
getRoleInfo().then((res) => {

62
src/views/assembly/student.vue
View File

@ -378,20 +378,56 @@
<!-- //批次 -->
<el-dialog
width="590px"
width="700px"
title="选择批次"
:visible.sync="batchCodeshow"
append-to-body
style="margin-top: 20px"
:before-close="batchCodecancel"
>
<el-form
:model="testqueryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<el-form-item label="批次编号" prop="batchCode">
<el-input
v-model="testqueryParams.batchCode"
placeholder="请输入批次编号"
clearable
/>
</el-form-item>
<el-form-item label="批次名称" prop="batchCode">
<el-input
v-model="testqueryParams.batchName"
placeholder="请输入批次名称"
clearable
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="testScore"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="testresetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table
:data="testScorelist"
align="center"
style="margin-top: 0px"
@cell-dblclick="batchCodeclick"
>
<el-table-column label="请选择" width="100" align="center">
<el-table-column label="请选择" width="200" align="center">
<template slot-scope="scope">
<el-button
type="primary"
@ -411,13 +447,13 @@
<el-table-column
property="batchCode"
label="批次编号"
width="200"
width="230"
align="center"
/>
<el-table-column
property="batchName"
label="批次名称"
width="200"
width="230"
align="center"
/>
</el-table>
@ -644,6 +680,20 @@ export default {
this.total4 = res.total;
});
},
testresetQuery() {
this.testqueryParams = {
pageNum: 1,
pageSize: 10,
batchCode: "",
batchName: "",
};
this.testScore();
},
//批次关闭
batchCodecancel() {
this.batchCodeshow = false;
this.testresetQuery();
},
// 点击学生按钮
studentshowclick() {
this.studentshow = true;
@ -682,10 +732,6 @@ export default {
}
// console.log(this.classqueryParams);
},
//批次关闭
batchCodecancel() {
this.batchCodeshow = false;
},
//学生关闭
studentcancel() {
this.studentshow = false;

55
src/views/system/itemCategory/index.vue
View File

@ -195,7 +195,6 @@
v-model="form.parentId"
/>
</el-form-item>
<!-- <el-form-item label="所属上级" prop="parentId">
<el-input v-model="form.parentId" placeholder="请输入父级id" />
</el-form-item> -->
@ -213,7 +212,6 @@
maxlength="80"
/>
</el-form-item>
<el-form-item label="测试分类得分" prop="testItemLevelList">
<div
v-for="(item, index) in form.testItemLevelList"
@ -256,7 +254,6 @@
></el-button>
</div>
</el-form-item>
<el-form-item label="分类排序" prop="sorting">
<el-input
v-model="form.sorting"
@ -297,7 +294,6 @@ export default {
data() {
var roleMoeny = (rule, value, callback) => {
var str = this.form.sorting;
if (Number.isNaN(Number.parseFloat(str))) {
callback(new Error("请输入分类排序"));
} else if (str.length == 0) {
@ -306,39 +302,36 @@ export default {
callback();
}
};
let testItemLevelList = (rule, value, callback) => {
let min = value
.map((e) => {
return e.levelMinScore;
})
.toString();
let max = value
.map((e) => {
return e.levelMaxScore;
})
.toString();
console.log(min, max);
if (Number(max) < Number(min)) {
if (max && min && max < min) {
let ItemLevelList = (rule, value, callback) => {
for (let i = 0; i < value.length; i++) {
console.log(value[i].levelMinScore > value[i].levelMaxScore);
if (value[i].levelMinScore > value[i].levelMaxScore) {
callback(new Error("最高分必须大于最低分,请重新填写！"));
} else {
console.log(min, max);
}
}
if (
value.map((e) => {
return e.levelName;
}) == ""
) {
} else if (value[i].levelName == "") {
callback();
} else if (min == "") {
} else if (value[i].levelMinScore == "") {
callback();
} else if (max == "") {
} else if (value[i].levelMaxScore == "") {
callback();
} else {
callback();
}
}
// value.for((e) => {
// console.log(e.levelMinScore, e.levelMaxScore);
// console.log(e.levelMinScore > e.levelMaxScore);
// if (e.levelMinScore > e.levelMaxScore) {
// callback(new Error("最高分必须大于最低分,请重新填写！"));
// } else if (e.levelName == "") {
// callback();
// } else if (e.levelMinScore == "") {
// callback();
// } else if (e.levelMaxScore == "") {
// callback();
// } else {
// callback();
// }
// });
};
return {
// 重新渲染表格状态
@ -379,7 +372,7 @@ export default {
testItemLevelList: [
{
// required: true,
validator: testItemLevelList,
validator: ItemLevelList,
trigger: "blur",
},
],

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

@ -373,7 +373,7 @@ export default {
// 成绩查询参数
studentscore: {
pageNum: 1,
pageSize: 10,
pageSize: 999,
studentId: "",
batchCode: "",
// studentId: "27",

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

@ -1010,7 +1010,7 @@
<el-form-item label="批次名称" prop="batchCode">
<el-input
v-model="queryParams5.batchName"
placeholder="请输入批次编号"
placeholder="请输入批次名称"
clearable
@keyup.enter.native="handleQuery"
/>

33
src/views/system/testItems/index.vue
View File

@ -699,19 +699,17 @@ export default {
}
};
let itemLevelList = (rule, value, callback) => {
let min = value
.map((e) => {
let min = value.map((e) => {
return e.levelMinScore;
})
.toString();
let max = value
.map((e) => {
});
let max = value.map((e) => {
return e.levelMaxScore;
})
.toString();
console.log(min, max);
});
console.log(value.length);
if (max && min && max < min) {
for (var i = 0; i < value.length; i++) {
console.log(min[i], max[i]);
if (max[i] < min[i]) {
callback(new Error("最高分必须大于最低分,请重新填写！"));
} else {
console.log(min, max);
@ -719,24 +717,17 @@ export default {
if (
value.map((e) => {
return e.levelName;
}) == ""
})[i] == ""
) {
callback();
} else if (
value.map((e) => {
return e.levelMinScore;
}) == ""
) {
} else if (min[i] == "") {
callback();
} else if (
value.map((e) => {
return e.levelMaxScore;
}) == ""
) {
} else if (max[i] == "") {
callback();
} else {
callback();
}
}
};
let minScore = (rule, value, callback) => {

39
src/views/system/testScoreBatch/index.vue
View File

@ -99,7 +99,12 @@
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<el-table-column label="批次编号" align="center" prop="batchCode" />
<el-table-column label="批次名称" align="center" prop="batchName" />
<el-table-column label="备注信息" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column
label="备注信息"
align="center"
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<!-- <el-table-column label="修改人" align="center" prop="updateBy" />
@ -244,6 +249,13 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total2 > 0"
:total="total2"
:page.sync="temqueryParams.pageNum"
:limit.sync="temqueryParams.pageSize"
@pagination="lookitem"
/>
</div>
</el-dialog>
@ -283,7 +295,7 @@
>
</el-form-item>
</el-form>
<el-table :data="testItemss">
<el-table :data="testItemss" @cell-dblclick="addtestitem">
<el-table-column label="请选择" width="70" align="center">
<template slot-scope="scope">
<el-button
@ -431,7 +443,7 @@
margin-top: 30px;
margin-left: 85%;
width: 100px;
height: 50px;
height: 40px;
font-size: 15px;
"
>选择完成</el-button
@ -481,6 +493,13 @@
>
</el-table-column>
</el-table>
<pagination
v-show="total2 > 0"
:total="total2"
:page.sync="temqueryParams.pageNum"
:limit.sync="temqueryParams.pageSize"
@pagination="lookitem"
/>
</el-dialog>
</div>
</template>
@ -526,6 +545,7 @@ export default {
showSearch: true,
// 总条数
total: 0,
total2: 0,
testItemss: [],
total4: 0,
// 测试成绩批次表格数据
@ -541,6 +561,11 @@ export default {
batchCode: null,
batchName: null,
},
temqueryParams: {
pageNum: 1,
pageSize: 10,
id: "",
},
// 测试项目
queryParams4: {
pageNum: 1,
@ -603,13 +628,12 @@ export default {
lookitem(item) {
this.itemlist = [];
this.items = [];
var id = {
batchId: item.id,
};
temBatchInfoList(id).then((res) => {
this.temqueryParams.id = item.id;
temBatchInfoList(this.temqueryParams).then((res) => {
console.log(res);
if (res.rows.length != 0) {
this.itemlist = res.rows;
this.total2 = res.total;
this.items = res.rows;
this.items.forEach((e) => {
e.itemType = e.resultDictType;
@ -703,6 +727,7 @@ export default {
this.reset();
this.open = true;
this.items = [];
this.total2 = 0;
this.title = "添加测试成绩批次";
},
/** 修改按钮操作 */