diff --git a/src/views/standard/setUp/archived.vue b/src/views/standard/setUp/archived.vue index 82297fb..249602a 100644 --- a/src/views/standard/setUp/archived.vue +++ b/src/views/standard/setUp/archived.vue @@ -18,7 +18,7 @@ 选择分班年级: @@ -155,7 +155,7 @@ export default { loadingClass: false, loadingDown: false, step: 1, - gradeName: "", + grade: "", gradeList: [], classIds: [], classList: [], @@ -250,11 +250,11 @@ export default { this.gradeList = data.list?.map((item) => { return { - value: item.gradeName, + value: item.grade, label: item.gradeName, }; }) || []; - this.gradeName = this.gradeList[0]?.value; + this.grade = this.gradeList[0]?.value; this._QueryClass(); } else { this.$message.error(info); @@ -265,7 +265,7 @@ export default { this.classList = []; this.loadingClass = true; const { data, status, info } = await this.$request.schoolClassList({ - gradeName: this.gradeName, + grade: this.grade, }); this.loadingClass = false; if (status === 0) { diff --git a/src/views/standard/setUp/student.vue b/src/views/standard/setUp/student.vue index c7783e8..01f0fc7 100644 --- a/src/views/standard/setUp/student.vue +++ b/src/views/standard/setUp/student.vue @@ -36,7 +36,7 @@
@@ -81,9 +81,7 @@
班级列表
    @@ -99,14 +97,16 @@
-

- 共筛选出{{ studentList.length }}名学生。 -

- +
+

+ 共筛选出{{ studentList.length }}名学生。 +

+
+

基站SN:{{ clazzDetail.stationSn }}

+

配对码:{{ clazzDetail.pairingCode }}

+

频点:{{ clazzDetail.frequency }}

+
+
  • - {{ `${item.grade}-${item.className}(${item.createdTime})` }} + {{ `${item.gradeName}-${item.className}(${item.createdTime})` }}

    @@ -304,7 +304,7 @@ export default { }, clazzDetail: { stationSn: "", pairingCode: "", frequency: "" }, query: { - gradeName: "", + grade: "", classId: "", studentCode: "", studentName: "", @@ -528,7 +528,7 @@ export default { this.query.classId = ""; query.studentName = this.query.studentName; this.query.studentCode = ""; - this.query.gradeName = ""; + this.query.grade = ""; } else if (type == 2) { if (!this.query.studentName) { this.$message.warning("输入学生学号~"); @@ -537,21 +537,21 @@ export default { this.query.classId = ""; query.studentCode = this.query.studentCode; this.query.studentName = ""; - this.query.gradeName = ""; + this.query.grade = ""; } else if (type == 3) { this.query.studentName = ""; this.query.studentCode = ""; - query.gradeName = this.query.gradeName; + query.grade = this.query.grade; query.classId = this.query.classId; } else { query = this.query; } - if (query.gradeName == 80) { + if (query.grade == 80) { query.status = 1; - delete query.gradeName; - } else if (query.gradeName == 81) { + delete query.grade; + } else if (query.grade == 81) { query.status = 2; - delete query.gradeName; + delete query.grade; } else { query.status = 0; } @@ -573,18 +573,18 @@ export default { this.gradeList = data.list?.map((item) => { return { - value: item.gradeName, + value: item.grade, label: item.gradeName, }; }) || []; - this.query.gradeName = this.gradeList[0]?.value; + this.query.grade = this.gradeList[0]?.value; } else { this.$message.error(info); } }, async _QueryClass(value) { const { data, status, info } = await this.$request.schoolClassList({ - gradeName: value || this.query.gradeName, + grade: value || this.query.grade, }); if (status === 0) { this.classList = [...data.list] || []; @@ -702,6 +702,10 @@ export default { .stu-detail { flex: 1; border-left: 0.5px solid #eee; + &-tit{ + display: flex; + justify-content: space-between; + } .total { padding: 15px 12px; font-size: 14px; diff --git a/src/views/standard/setUp/teacher.vue b/src/views/standard/setUp/teacher.vue index e816bd7..3e7774f 100644 --- a/src/views/standard/setUp/teacher.vue +++ b/src/views/standard/setUp/teacher.vue @@ -720,32 +720,32 @@ export default { this.query.gradeClassSub = []; } else { query = { ...this.query }; - query.gradeNames = []; + query.grades = []; query.classIds = []; query.subjectNames = []; this.query.gradeClassSub?.map((item) => { if (item.length == 1) { - if (!query.gradeNames.includes(item[0])) { - query.gradeNames.push(item[0]); + if (!query.grades.includes(item[0])) { + query.grades.push(item[0]); } } else if (item.length == 2) { if (!query.classIds.includes(item[1])) { query.classIds.push(item[1]); } - query.gradeNames.includes(item[0]) && - query.gradeNames.remove(item[0]); + query.grades.includes(item[0]) && + query.grades.remove(item[0]); } else if (item.length == 3) { if (!query.subjectNames.includes(item[2])) { query.subjectNames.push(item[2]); } - query.gradeNames.includes(item[0]) && - query.gradeNames.remove(item[0]); + query.grades.includes(item[0]) && + query.grades.remove(item[0]); query.classIds.includes(item[0]) && query.classIds.remove(item[0]); } }); delete query.gradeClassSub; - query.gradeNames.length ? "" : delete query.gradeNames; + query.grades.length ? "" : delete query.grades; query.classIds.length ? "" : delete query.classIds; query.subjectNames.length ? "" : delete query.subjectNames; query.teacherName.length ? "" : delete query.teacherName; @@ -801,7 +801,7 @@ export default { }; }); this.gradeClassSubList.push({ - value: item.gradeName, + value: item.grade, label: item.gradeName, id: item.grade, children: item.classList.map((clazz) => { @@ -814,7 +814,7 @@ export default { }), }); return { - value: item.gradeName, + value: item.grade, label: item.gradeName, id: item.grade, children: [...subList],