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 
# Conflicts:
#	src/views/system/testItemScore/index.vue
This commit is contained in:
曹辉 2022-08-31 09:25:08 +08:00
commit a6be166b6b
5 changed files with 195 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,14 @@ export function getTestItemScore(query) {
})
}
// 查询个人成绩
// export function getAllTestItemScoreInfo(id) {
// return request({
// url: 'system/testItemScore/getAllTestItemScoreInfo' + id,
// method: 'get'
// })
// }
// 新增个人成绩录入管理
export function addTestItemScore(data) {
return request({
@ -86,6 +94,6 @@ export function getAllTestItemScoreInfo(query) {
return request({
url: '/system/testItemScore/getAllTestItemScoreInfo',
method: 'get',
params: query
params: query,
})
}

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

@ -389,9 +389,11 @@ export default {
console.log(str);
// 验证手机号的正则表达式
const regMobile =
/^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/;
/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
// /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
// /^(?:(?:\+|0086))?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[0-9]))\d{8}$/;
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(value);
if (str.length == 11) {
if (regMobile.test(str)) {

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

@ -49,7 +49,9 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="expireTimeOPtion"
unlink-panels
style="width: 240px"
>
</el-date-picker>
</el-form-item>
@ -219,8 +221,14 @@
/>
<!-- 添加或修改学生信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="85px">
<el-dialog
:title="title"
:visible.sync="open"
width="500px"
append-to-body
:before-close="cancel"
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="所属班级" prop="classId">
<el-button
type=""
@ -335,6 +343,7 @@
:inline="true"
v-show="showSearch"
label-width="70px"
style="margin-bottom: -30px"
>
<el-form-item label="家长姓名" prop="parentName">
<el-input
@ -377,21 +386,26 @@
</el-form-item>
</el-form>
<el-table ref="tags" :data="parentInfoList" align="center">
<el-table
ref="tags"
:data="parentInfoList"
align="center"
@cell-dblclick="handleSelectionChange2"
>
<!-- <el-table-column type="selection" label="请选择" width="100" align="center"> -->
<el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope">
<el-button
type="primary"
style="width: 15px; height: 15px"
circle
style="width: 20px; height: 20px; padding: 0px"
v-if="parent1 == scope.row.id || parent2 == scope.row.id"
@click="handleSelectionChange3(scope.row)"
></el-button>
<el-button
v-else
style="width: 15px; height: 15px"
circle
style="width: 20px; height: 20px; padding: 0px"
@click="handleSelectionChange2(scope.row)"
></el-button>
</template>
@ -423,22 +437,28 @@
</el-table-column>
</el-table>
<el-button
type="success"
plain
size="mini"
@click="prentclickok"
style="margin-top: 30px; margin-left: 20px"
>选择完成</el-button
>
<pagination
v-show="total3 > 0"
:total="total3"
:page.sync="parentInfoList2.pageNum"
:limit.sync="parentInfoList2.pageSize"
@pagination="getList"
style="margin-top: 40px"
/>
<el-button
type="primary"
size="mini"
@click="prentclickok"
style="
margin-top: 30px;
margin-left: 85%;
width: 100px;
height: 50px;
font-size: 15px;
"
>选择完成</el-button
>
</el-dialog>
<!-- //班级信息表格数据 -->
@ -504,7 +524,12 @@
</el-form-item>
</el-form>
<el-table :data="classinfoList" align="center" style="margin-top: 10px">
<el-table
:data="classinfoList"
align="center"
style="margin-top: 10px"
@cell-dblclick="classinfoclick"
>
<el-table-column label="请选择" width="80" align="center">
<template slot-scope="scope">
<el-button
@ -716,6 +741,12 @@ export default {
return time.getTime() > Date.now();
},
},
expireTimeOPtion: {
disabledDate(time) {
return time.getTime() > Date.now();
},
},
Data: "",
//查看家长
@ -809,7 +840,6 @@ export default {
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
@ -1352,7 +1382,7 @@ export default {
this.Data = [];
this.handleQuery();
// this.reload();
this.form.studentNumber = null;
},
/** 重置按钮操作 */
resetQuery3() {

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

@ -302,8 +302,8 @@
</el-form-item>
</el-form>
<el-table :data="kindergartenInfoList">
<el-table-column label="请选择" width="70" align="center">
<el-table :data="kindergartenInfoList" @cell-dblclick="kindergartenNameclick">
<el-table-column label="请选择" width="70" align="center" >
<template slot-scope="scope">
<el-button
type="primary"
@ -431,7 +431,7 @@
</el-form-item>
</el-form>
<el-table :data="classinfoList" align="center" style="margin-top: 10px">
<el-table :data="classinfoList" align="center" style="margin-top: 10px" @cell-dblclick="classinfoclick">
<!-- <el-table-column type="selection" width="50" align="center" /> -->
<el-table-column label="请选择" width="70" align="center">
<template slot-scope="scope">
@ -494,21 +494,20 @@
>
</el-table-column>
</el-table>
<el-button
type="success"
plain
size="mini"
@click="cancel3"
style="margin-top: 30px; margin-left: 20px"
>选择完成</el-button
>
<pagination
<pagination
v-show="total2 > 0"
:total="total2"
:page.sync="classinfoList2.pageNum"
:limit.sync="classinfoList2.pageSize"
@pagination="getList"
/>
<el-button
type="primary"
size="mini"
@click="cancel3"
style="margin-top: 30px; margin-left: 85%;width: 100px; height: 50px;font-size:15px"
>选择完成</el-button>
</el-dialog>
<el-dialog

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

@ -141,20 +141,19 @@
:data="testItemScoreList"
@selection-change="handleSelectionChange"
@row-dblclick="handledbClick"
ref="table"
ref="table"
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column
<el-table-column
width="150"
label="所属批次编号"
align="center"
prop="batchCode"
/>
<el-table-column label="批次名称" align="center" prop="batchName" />
<el-table-column label="批次名称" align="center" prop="batchName" />
<el-table-column label="班级名称" align="center" prop="className" />
<el-table-column label="学生姓名" align="center" prop="studentName" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<!-- <el-table-column label="修改人" align="center" prop="updateBy" />
@ -165,6 +164,14 @@
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-search"
@click="seepraent(scope.row)"
v-hasPermi="['system:testItemScore:edit']"
>查看</el-button
>
<el-button
size="mini"
type="text"
@ -456,6 +463,7 @@
</el-dialog>
<!--所属班级 弹窗 -->
<el-dialog
width="850px"
title="选择所属班级"
@ -805,7 +813,7 @@
:page.sync="queryParams3.pageNum"
:limit.sync="queryParams3.pageSize"
@pagination="studentinfoclick"
/>
</el-dialog>
<!-- 批次编号 -->
@ -924,6 +932,101 @@
@pagination="getList"
/>
</el-dialog>
<!-- //查看个人成绩 -->
<el-dialog
title="查看个人成绩"
:visible.sync="innerVisible5"
append-to-body
style="margin-top: 5%"
width="1000px"
>
<el-table
ref="singleTable"
:data="getAllTestItemScore"
style="width: 95%; margin: 20px auto"
>
<el-table-column
property="itemCode"
label="项目编号"
width="185"
align="center"
>
</el-table-column>
<el-table-column
property="itemName"
label="项目名称"
width="185"
align="center"
>
</el-table-column>
<!-- <el-table-column
property="scoreDictId"
label="字典类型"
align="center"
width="120"
>
<template slot-scope="scope">
{{
scope.row.scoreDictId == ResultType1.dictCode
? ResultType1.dictLabel
: ""
}}{{
scope.row.scoreDictId == ResultType2.dictCode
? ResultType2.dictLabel
: ""
}}</template
>
</el-table-column> -->
<el-table-column
property="itemScore"
label="个人成绩"
width="180"
align="center"
>
<!-- <template slot-scope="scope">
<el-input
readonly
type="number"
v-model="scope.row.itemScore"
v-if="
scope.row.itemScore != null ||
scope.row.scoreDictId == ResultType1.dictCode
"
></el-input>
<el-input
readonly
v-model="scope.row.scoreDictValue"
v-if="
scope.row.scoreDictValue != null ||
scope.row.scoreDictId == ResultType2.dictCode
"
></el-input>
</template> -->
</el-table-column>
<el-table-column
property="itemFraction"
label="个人成绩得分"
width="180"
align="center"
>
<!-- <template slot-scope="scope">
<el-input type="number" v-model="scope.row.itemFraction" readonly></el-input>
</template> -->
</el-table-column>
<el-table-column
property="syntheticalAssess"
label="综合评价"
width="180"
align="center"
>
<!-- <template slot-scope="scope">
<el-input v-model="scope.row.syntheticalAssess" readonly></el-input>
</template> -->
</el-table-column>
</el-table>
</el-dialog>
</div>
</template>
@ -974,6 +1077,7 @@ export default {
testItemss: [],
testScoreBatchs: [],
innerVisible4: false,
innerVisible5: false,
itemNumbername: "请选择批次编号",
//幼儿园查询参数
kqueryParams: {
@ -1011,6 +1115,8 @@ export default {
classInfos: [],
// 个人成绩录入管理表格数据
testItemScoreList: [],
//个人成绩查看
getAllTestItemScore: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@ -1081,6 +1187,16 @@ export default {
},
methods: {
// 查看个人信息
seepraent(row) {
this.reset();
// const row = row.id || this.ids;
getAllTestItemScoreInfo(row).then((res) => {
this.getAllTestItemScore = res.data;
// console.log(this.getAllTestItemScore);
this.innerVisible5 = true;
});
},
testclick() {
this.innerVisible4 = true;
},
@ -1164,8 +1280,6 @@ export default {
getList() {
//查询班级信息
this.loading = true;
console.log(this.queryParams);
//获取幼儿园list
listKindergartenInfo(this.kqueryParams).then((response) => {
this.kindergartenList = response.rows;
@ -1214,6 +1328,7 @@ export default {
studentId: null,
batchCode: null,
itemScoreList: [],
batchId:null,
};
this.resetForm("form");
},