Skip to content

D
dd_school
Commit 0f2ada0e by wangjian
Options

Merge remote-tracking branch 'origin/master'

parents 23814581 6a701854
Showing with 370 additions and 43 deletions
ruoyi-ui/src/views/smartSchool/electronicArchives/assessmentView/index.vue
......@@ -349,7 +349,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
semester: null,
......@@ -526,6 +526,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
semester: null,
year: null,
......@@ -556,6 +558,24 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
semester: null,
year: null,
schoolYear: null,
grade: null,
className: null,
teacherName: null,
idCard: null,
moralEduCheckAchievement: null,
intellEduCheckAchievement: null,
totalCheckAchievement: null,
classType: null,
sub: null,
};
this.resetForm("queryParams");
this.handleQuery();
},
......
ruoyi-ui/src/views/smartSchool/electronicArchives/electronicRecords/index.vue
......@@ -2,7 +2,7 @@
<div class="app-container">
<el-dialog title="查询" :visible.sync="query" width="60%" append-to-body>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="130px">
label-width="130px" class="search">
<el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
......@@ -427,7 +427,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
schoolYear: null,
semester: null,
year: null,
......@@ -556,6 +556,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
schoolYear: null,
semester: null,
......@@ -605,6 +607,23 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
schoolYear: null,
semester: null,
year: null,
grade: null,
sub: null,
className: null,
name: null,
idCard: null,
incubationPeriod: null,
sameExamResults: null,
situation: null,
highQuality: null,
classCompetition: null,
}
this.resetForm("queryForm");
this.handleQuery();
},
......@@ -680,7 +699,7 @@ export default {
}
};
</script>
<style lang="scss" scoped>
<style scoped lang="scss">
.mask {
position: fixed;
top: 0;
......@@ -726,6 +745,10 @@ export default {
width: 200px
}
.add ::v-deep .el-textarea__inner {
margin-bottom: 10px;
}
::v-deep.el-table--border .el-table__cell .cell {
padding-left: 0px !important;
......
ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/index.vue
......@@ -443,7 +443,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: null,
......@@ -636,6 +636,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
sub: null,
teacherName: null,
......@@ -669,6 +671,24 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: null,
teacherName: null,
year: null,
teachingClassName: null,
classType: null,
gkAppraising: null,
topStudentsCulture: null,
incrementSituation: null,
effectiveNumSituation: null,
other: null,
auditState: null,
}
this.resetForm("queryParams");
this.handleQuery();
},
......@@ -805,9 +825,14 @@ export default {
margin-bottom: 0px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
height: 32px;
line-height: 32px;
}
::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/annualAssessment/index.vue
......@@ -188,7 +188,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
year: null,
name: null,
checkResult: null,
......@@ -262,6 +262,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
year: null,
name: null,
......@@ -279,6 +281,13 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
year: null,
name: null,
checkResult: null,
}
this.resetForm("queryForm");
this.handleQuery();
},
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/awardTutoringstu/index.vue
......@@ -455,7 +455,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: null,
......@@ -713,6 +713,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
sub: null,
awardType: null,
......@@ -746,6 +748,23 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
username: null,
org: null,
awardTime: null,
pictureName: null,
pictureurl: null,
}
this.resetForm("queryParams");
this.handleQuery();
},
......@@ -844,8 +863,13 @@ export default {
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
height: 32px;
line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/comprehensiveHonors/index.vue
......@@ -405,7 +405,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: "",
......@@ -597,6 +597,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
sub: null,
awardType: null,
......@@ -630,6 +632,19 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: "",
awardType: "",
awardRank: "",
awardLevel: "",
userName: "",
startTime: "",
endTime: "",
}
this.resetForm("queryParams");
this.handleQuery();
},
......@@ -785,8 +800,13 @@ export default {
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
height: 32px;
line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/essaysWritings/index.vue
......@@ -411,7 +411,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
sub: null,
awardType: null,
awardRank: null,
......@@ -629,6 +629,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
sub: null,
awardType: null,
......@@ -662,6 +664,23 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
endTime: null,
startTime: null,
}
this.queryParams.startTime = "";
this.queryParams.endTime = "";
this.resetForm("queryParams");
......@@ -762,8 +781,13 @@ export default {
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
height: 32px;
line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/lectureAwards/index.vue
......@@ -411,7 +411,20 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
endTime: null,
startTime: null,
sub: null,
awardType: null,
awardRank: null,
......@@ -627,6 +640,21 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
endTime: null,
startTime: null,
id: null,
sub: null,
awardType: null,
......@@ -660,6 +688,37 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
endTime: null,
startTime: null,
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
upateBy: null,
endTime: null,
startTime: null,
}
this.queryParams.startTime = "";
this.queryParams.endTime = "";
this.resetForm("queryParams");
......@@ -760,8 +819,13 @@ export default {
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
height: 32px;
line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/projectResearch/index.vue
......@@ -414,7 +414,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: null,
......@@ -651,6 +651,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
sub: null,
awardType: null,
......@@ -684,6 +686,25 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
endTime: null,
startTime: null,
}
this.queryParams.startTime = "";
this.queryParams.endTime = "";
this.resetForm("queryParams");
......@@ -784,8 +805,13 @@ export default {
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
height: 32px;
line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teacherAwards/index.vue
......@@ -412,7 +412,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
sub: null,
awardType: null,
awardRank: null,
......@@ -626,6 +626,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
sub: null,
awardType: null,
......@@ -659,6 +661,23 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
userName: null,
org: null,
awardTime: null,
pictureName: null,
pictureUrl: null,
endTime: null,
startTime: null,
}
this.queryParams.startTime = "";
this.queryParams.endTime = "";
this.resetForm("queryParams");
......@@ -759,8 +778,13 @@ export default {
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
height: 32px;
line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teachingAchievements/index.vue
......@@ -433,7 +433,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
userName: "",
......@@ -558,6 +558,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
schoolYear: null,
semester: null,
......@@ -632,7 +634,7 @@ export default {
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
pageSize: 20,
userName: "",
schoolYear: "",
semester: "",
......@@ -719,8 +721,8 @@ export default {
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
height: 30px;
line-height: 30px;
}
::v-deep .el-dialog__body {
......@@ -844,4 +846,9 @@ export default {
}
}
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
</style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teamAward/index.vue
......@@ -7,7 +7,7 @@
<el-form-item label="学年" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" clearable placeholder="请选择"
style="width: 100%;">
<el-option v-for=" dict in dict.type.yearda" :key="dict.value" :label="dict.label"
<el-option v-for="dict in dict.type.yearda" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
</el-select>
......@@ -333,7 +333,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
schoolYear: null,
......@@ -479,6 +479,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
schoolYear: null,
semester: null,
......@@ -509,6 +511,20 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
schoolYear: null,
semester: null,
year: null,
grade: null,
sub: null,
awardSituation: null,
teamMembersContribution: null,
auditState: null,
}
this.resetForm("queryParams");
this.handleQuery();
},
......@@ -582,8 +598,13 @@ export default {
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
height: 32px;
line-height: 32px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/tutorAward/index.vue
......@@ -491,7 +491,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: null,
......@@ -751,6 +751,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
sub: null,
awardType: null,
......@@ -784,6 +786,23 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
sub: null,
awardType: null,
awardRank: null,
awardLevel: null,
resultName: null,
userId: null,
username: null,
org: null,
awardTime: null,
pictureName: null,
pictureurl: null,
}
this.resetForm("queryParams");
this.handleQuery();
},
......@@ -881,9 +900,14 @@ export default {
margin-bottom: 0px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
height: 30px;
line-height: 30px;
}
::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/teacherAssessment/index.vue
......@@ -415,7 +415,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
semester: null,
......@@ -593,6 +593,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
semester: null,
year: null,
......@@ -693,9 +695,14 @@ export default {
margin-bottom: 0px;
}
// 修改 el-dialog 内 el-form-item 的间距
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px; // 你可以根据需要调整这个值来改变输入框之间的距离
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
height: 32px;
line-height: 32px;
}
::v-deep .el-dialog__body {
......
ruoyi-ui/src/views/smartSchool/electronicArchives/workloadInformation/index.vue
......@@ -768,7 +768,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 20,
orderByColumn: "",
isAsc: "asc",
schoolYear: null,
......@@ -947,6 +947,8 @@ export default {
// 表单重置
reset() {
this.form = {
pageNum: 1,
pageSize: 20,
id: null,
schoolYear: null,
semester: null,
......@@ -983,6 +985,8 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.queryParams = {
pageNum: 1,
pageSize: 20,
schoolYear: "",
semester: "",
year: "",
......@@ -1084,9 +1088,13 @@ export default {
margin-bottom: 0px;
}
::v-deep .el-dialog .el-form-item {
margin-bottom: 15px;
}
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
height: 32px;
line-height: 32px;
}
::v-deep .el-dialog__body {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment