|
@@ -1204,7 +1204,7 @@ export default {
|
|
|
let _gradeCourse = 0; //各年级上传课程
|
|
|
let _subjectCourse = 0; //各学科上传课程
|
|
|
let _courseArray = [];
|
|
|
- _subject.push({ name: "其他" });
|
|
|
+ // _subject.push({ name: "其他" });
|
|
|
|
|
|
for (var i = 0; i < _grade.length; i++) {
|
|
|
_courseArray.push({
|
|
@@ -1242,10 +1242,10 @@ export default {
|
|
|
for (var j = 0; j < _courseArray[i].subject.length - 1; j++) {
|
|
|
sum += _courseArray[i].subject[j].course;
|
|
|
}
|
|
|
- _courseArray[i].subject[_courseArray[i].subject.length - 1].course =
|
|
|
- _courseArray[i].courseid.length - sum < 0
|
|
|
- ? 0
|
|
|
- : _courseArray[i].courseid.length - sum;
|
|
|
+ // _courseArray[i].subject[_courseArray[i].subject.length - 1].course =
|
|
|
+ // _courseArray[i].courseid.length - sum < 0
|
|
|
+ // ? 0
|
|
|
+ // : _courseArray[i].courseid.length - sum;
|
|
|
}
|
|
|
for (var j = 0; j < _subject.length; j++) {
|
|
|
for (var z = 0; z < _course.length; z++) {
|
|
@@ -1370,18 +1370,18 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- weekCourse2.push({
|
|
|
- name: "其他",
|
|
|
- id: "",
|
|
|
- lastCourse:
|
|
|
- lastWeekCouseCount - lastCourseidWeek.length > 0
|
|
|
- ? lastWeekCouseCount - lastCourseidWeek.length
|
|
|
- : 0,
|
|
|
- toCourse:
|
|
|
- toWeekCouseCount - toCourseidWeek.length > 0
|
|
|
- ? toWeekCouseCount - toCourseidWeek.length
|
|
|
- : 0,
|
|
|
- });
|
|
|
+ // weekCourse2.push({
|
|
|
+ // name: "其他",
|
|
|
+ // id: "",
|
|
|
+ // lastCourse:
|
|
|
+ // lastWeekCouseCount - lastCourseidWeek.length > 0
|
|
|
+ // ? lastWeekCouseCount - lastCourseidWeek.length
|
|
|
+ // : 0,
|
|
|
+ // toCourse:
|
|
|
+ // toWeekCouseCount - toCourseidWeek.length > 0
|
|
|
+ // ? toWeekCouseCount - toCourseidWeek.length
|
|
|
+ // : 0,
|
|
|
+ // });
|
|
|
|
|
|
this.weekCourse2 = weekCourse2;
|
|
|
|