marking
/
Learn.Archives.Web
19
0
Fork 0
Code Pull Requests Actions Releases Activity

staging #30

Merged
hy merged 3 commits from staging into master 2025-11-11 17:50:02 +08:00
Conversation 0 Commits 3 Files Changed 2 +23 -5
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ddb331f0fd - Show all commits

13
src/views/student/index.vue
View File

@ -25,7 +25,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="search.schoolId != 0" style="width: 145px">
<el-form-item v-show="search.schoolId" style="width: 145px">
<el-select
v-model="search.grade"
placeholder="年级"
@ -43,7 +43,7 @@
</el-select>
</el-form-item>
<el-form-item style="width: 100px" v-show="search.schoolId != 0">
<el-form-item style="width: 100px" v-show="search.schoolId">
<el-select v-model="search.classId" placeholder="班级" clearable filterable>
<el-option
v-for="item in classList"
@ -476,6 +476,15 @@ const gradeChange = () => {
};
const getClass = () => {
if (
search.schoolId == 0 ||
search.schoolId == undefined ||
search.grade == "" ||
search.grade == undefined
) {
classList.value = [];
return;
}
const data = {
schoolId: search.schoolId || 0,
graduationYear: search.graduationYear || 0,

15
src/views/teacher/index.vue
View File

@ -54,7 +54,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="search.schoolId != 0" style="width: 145px">
<el-form-item v-show="search.schoolId" style="width: 145px">
<el-select
v-model="search.grade"
placeholder="年级"
@ -72,7 +72,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="search.schoolId != 0" style="width: 100px">
<el-form-item v-show="search.schoolId" style="width: 100px">
<el-select v-model="search.classId" placeholder="班级" clearable filterable>
<el-option
v-for="item in classList"
@ -84,7 +84,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="search.schoolId != 0" style="width: 100px">
<el-form-item v-show="search.schoolId" style="width: 100px">
<el-select v-model="search.subjectId" placeholder="科目" clearable filterable>
<el-option
v-for="item in subjectList"
@ -526,6 +526,15 @@ const gradeChange = () => {
};
const getClass = () => {
if (
search.schoolId == 0 ||
search.schoolId == undefined ||
search.grade == "" ||
search.grade == undefined
) {
classList.value = [];
return;
}
const data = {
schoolId: search.schoolId || 0,
graduationYear: search.graduationYear || 0,