commit:同步1.3版本

This commit is contained in:
Jerry
2021-01-03 22:29:02 +08:00
parent ef316438da
commit 25023e29b5
706 changed files with 23404 additions and 14179 deletions

View File

@@ -176,7 +176,7 @@ export default {
return new Promise((resolve, reject) => {
CourseTransStatsController.listWithGroup(this, params).then(res => {
resolve({
dataList: res.data.dataList.map((item) => {
dataList: (res.data.dataList || []).map((item) => {
return {...item, gradeIdShowName: item.gradeIdDictMap.name};
}),
totalCount: res.data.totalCount
@@ -218,7 +218,7 @@ export default {
return new Promise((resolve, reject) => {
CourseTransStatsController.listWithGroup(this, params).then(res => {
resolve({
dataList: res.data.dataList.map((item) => {
dataList: (res.data.dataList || []).map((item) => {
return {...item, subjectIdShowName: item.subjectIdDictMap.name};
}),
totalCount: res.data.totalCount
@@ -260,7 +260,7 @@ export default {
return new Promise((resolve, reject) => {
CourseTransStatsController.listWithGroup(this, params).then(res => {
resolve({
dataList: res.data.dataList.map((item) => {
dataList: (res.data.dataList || []).map((item) => {
return {...item, statsDateShowName: this.formatDateByStatsType(item.statsDate, this.formCourseStats.CourseTransStats.statsType)};
}),
totalCount: res.data.totalCount

View File

@@ -227,7 +227,6 @@ export default {
this.formData.StudentClass.className == null ||
this.formData.StudentClass.schoolId == null ||
this.formData.StudentClass.leaderId == null ||
this.formData.StudentClass.finishClassHour == null ||
this.formData.StudentClass.classLevel == null
) {
this.$message.error('请求失败,发现必填参数为空!');

View File

@@ -233,7 +233,6 @@ export default {
this.formData.StudentClass.className == null ||
this.formData.StudentClass.schoolId == null ||
this.formData.StudentClass.leaderId == null ||
this.formData.StudentClass.finishClassHour == null ||
this.formData.StudentClass.classLevel == null
) {
this.$message.error('请求失败,发现必填参数为空!');

View File

@@ -110,8 +110,7 @@ export default {
onUpdateClassCourseClick () {
if (
this.classId == null ||
this.courseId == null ||
this.formData.StudentClass.course.classCourse.courseOrder == null
this.courseId == null
) {
this.$message.error('请求失败,发现必填参数为空!');
return;

View File

@@ -461,11 +461,8 @@ export default {
this.formData.Student.gender == null ||
this.formData.Student.birthday == null ||
this.formData.Student.experienceLevel == null ||
this.formData.Student.totalCoin == null ||
this.formData.Student.leftCoin == null ||
this.formData.Student.gradeId == null ||
this.formData.Student.schoolId == null ||
this.formData.Student.status == null
this.formData.Student.schoolId == null
) {
this.$message.error('请求失败,发现必填参数为空!');
return;