diff --git a/src/components/teacherselect.vue b/src/components/teacherselect.vue index 489dcb8..70a59ee 100644 --- a/src/components/teacherselect.vue +++ b/src/components/teacherselect.vue @@ -42,13 +42,13 @@ style="overflow: auto; height: 450px; overflow-x: hidden" :scrollbar-always-on="true"> - - - + --> @@ -105,7 +105,7 @@ export default { oldTotal: 0, oldCurrent: 1, Total: 0, - pageSize: 10, + pageSize: 1000, pageNum: 0, pageSizeOptions: [10, 20, 50, 100, 150, 200], disabled: false, diff --git a/src/views/atten-information/atten-information.vue b/src/views/atten-information/atten-information.vue index 589a5a4..958a3b6 100644 --- a/src/views/atten-information/atten-information.vue +++ b/src/views/atten-information/atten-information.vue @@ -1,1484 +1,899 @@ - - - + \ No newline at end of file diff --git a/src/views/atten-information/attenProfession.vue b/src/views/atten-information/attenProfession.vue index cf643e8..dce4ef8 100644 --- a/src/views/atten-information/attenProfession.vue +++ b/src/views/atten-information/attenProfession.vue @@ -936,7 +936,7 @@ export default { }); }); - }, + }, exportExcel() { //this.HTTPCount++; //this.tipContent = '正在导出数据文件,时间稍长,请耐心等待'; diff --git a/src/views/collage-information/collage-information.vue b/src/views/collage-information/collage-information.vue index 9588715..431bb46 100644 --- a/src/views/collage-information/collage-information.vue +++ b/src/views/collage-information/collage-information.vue @@ -238,7 +238,7 @@ - + @@ -549,15 +549,13 @@ export default { getclinfodetail(id,HeadTeacherNum) { //获取编辑信息 getClassInfodetail({ gcid: id }).then((res) => { - - debugger let data = res; this.formItem = { collegeId: data.CollegeId, selectId: data.MajorId, ClassinfoGrade: data.Grade || '', Counselor: data.CounselorNum || '', - ClassRemark: data.HeadTeacherNum || '', + ClassRemark: data.ClassRemark || '', Name: data.Name, ClassInfoId: data.ClassInfoId, TrainingStartTime:data.TrainingStartTime, @@ -590,7 +588,7 @@ export default { MajorId: 1, TeacherName:this.formItem.TeacherName, ClassRemark:this.formItem.ClassRemark, - ClassinfoGrade: '',//this.formItem.ClassinfoGrade + ClassinfoGrade: '1',//this.formItem.ClassinfoGrade HeadTeacherNum: this.formItem.TeacherNumber }; @@ -681,20 +679,20 @@ export default { let datas = { ClassinfoId: this.formItem.ClassInfoId, Name: this.formItem.Name, - HeadTeacherNum: this.formItem.TeacherNumber, + HeadTeacherNum: this.formItem.HeadTeacherNum, TrainingStartTime: this.formItem.TrainingStartTime, TrainingEndTime: this.formItem.TrainingEndTime, TeacherName:this.formItem.TeacherName, ClassRemark:this.formItem.ClassRemark, - ClassinfoGrade: '', + Grade: '1',// 年级 collegeId:1, MajorId: 1, - Grade: '', CounselorNum: '', }; - + + debugger console.log(datas); postClassInfoeditinfo(datas).then((res) => { diff --git a/src/views/courseStatistics/courseStatistics.vue b/src/views/courseStatistics/courseStatistics.vue index 0f2eb93..e03a2a3 100644 --- a/src/views/courseStatistics/courseStatistics.vue +++ b/src/views/courseStatistics/courseStatistics.vue @@ -8,17 +8,17 @@
- - - + --> diff --git a/src/views/teach-log/teach-log.vue b/src/views/teach-log/teach-log.vue index 51d2035..7949b55 100644 --- a/src/views/teach-log/teach-log.vue +++ b/src/views/teach-log/teach-log.vue @@ -5,52 +5,22 @@
-
-
- - - - +
+ - - - - - - - - - - - - + +
+ 搜索 -
+ - + + + @@ -86,9 +58,7 @@ 校外教师 - - - + @@ -189,7 +159,7 @@ - + 校内 校外 @@ -262,18 +232,18 @@ - + +