Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/stuMan/StudentProgress.vue

@@ -25,7 +25,12 @@
             <tr>
               <td class="sticky-column coursebg">课程</td>
               <td class="coursebg " v-for="(x, i) in students" :key="i">
-                {{ x.CourseName }}
+                <template v-if="x.CourseRate<=6">
+                   {{ x.NewCourseName }}
+                </template>
+                <template v-else>
+                   {{ x.CourseName }}
+                </template>
               </td>
             </tr>
             <tr>
@@ -495,7 +500,8 @@ export default {
           for (let i = 0; i < maxTemp; i++) {
             this.chapters.push({
               ChapterId: i + 1,
-              ChapterName: `第${i + 1}次`
+              ChapterName: `第${i + 1}次`,
+              ChapterGradeNo: i+1
             });
           }
           this.currentCourse.ClassHours = maxTemp;