修改是否被合并修改

src/views/stuRecodeManager/index.vue

@@ -247,10 +247,12 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="是否被合并">
+          <el-table-column align="center" label="合并类型">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.courseSchedule.newCourseId > 0 ? "是" : "否" }}
+                <!-- {{ scope.row.courseSchedule.newCourseId > 0 ? "是" : "否" }} -->
+                {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId == scope.row.courseScheduleId ? '合并课' : null }}
+                {{ scope.row.courseSchedule.newCourseId > 0 && scope.row.courseSchedule.newCourseId != scope.row.courseScheduleId ? '被合并课' : null }}
               </div>
             </template>
           </el-table-column>

src/views/studentManager/components/studentRecord.vue

@@ -195,13 +195,15 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="是否被合并">
-            <template slot-scope="scope">
-              <div>
-                {{ scope.row.courseSchedule.newCourseId > 0 ? '是' : '否' }}
-              </div>
-            </template>
-          </el-table-column>
+          <el-table-column align="center" label="合并类型">
+              <template slot-scope="scope">
+                <div>
+                  <!-- {{ scope.row.courseSchedule.newCourseId > 0 ? '是' : '否' }} -->
+                  {{ scope.row.newCourseId > 0 && scope.row.newCourseId == scope.row.courseScheduleId ? '合并课' : null }}
+                  {{ scope.row.newCourseId > 0 && scope.row.newCourseId != scope.row.courseScheduleId ? '被合并课' : null }}
+                </div>
+              </template>
+            </el-table-column>
           <el-table-column align="center" label="签到时间" width="180px">
             <template slot-scope="scope">
               <div>

src/views/studentManager/components/teamAndcourse.vue

@@ -150,10 +150,12 @@
                             label="课程状态">
               <template slot-scope="scope">{{ scope.row.courseSchedule.status | coursesStatus }}</template>
             </el-table-column>
-            <el-table-column align="center" label="是否被合并">
+            <el-table-column align="center" label="合并类型">
               <template slot-scope="scope">
                 <div>
-                  {{ scope.row.courseSchedule.newCourseId > 0 ? '是' : '否' }}
+                  <!-- {{ scope.row.courseSchedule.newCourseId > 0 ? '是' : '否' }} -->
+                  {{ scope.row.newCourseId > 0 && scope.row.newCourseId == scope.row.courseScheduleId ? '合并课' : null }}
+                  {{ scope.row.newCourseId > 0 && scope.row.newCourseId != scope.row.courseScheduleId ? '被合并课' : null }}
                 </div>
               </template>
             </el-table-column>

src/views/teacherManager/teacherDetail/components/resetComponent.vue

@@ -66,9 +66,13 @@
           </el-table-column>
           <el-table-column align="center"
                            prop="newCourseId"
-                           label="是否被合并"
+                           label="合并类型"
                            width="130px">
-            <template slot-scope="scope">{{ scope.row.newCourseId > 0 ? '是' : '否' }}</template>
+            <template slot-scope="scope">
+              <!-- {{ scope.row.newCourseId > 0 ? '是' : '否' }} -->
+              {{ scope.row.newCourseId > 0 && scope.row.newCourseId == scope.row.id ? '合并课' : null }}
+              {{ scope.row.newCourseId > 0 && scope.row.newCourseId != scope.row.id ? '被合并课' : null }}
+            </template>
           </el-table-column>
           <el-table-column align="center"
                            prop="isCallNames"

src/views/teamDetail/components/studentList.vue

@@ -1575,4 +1575,10 @@ export default {
     }
   }
 }
+.statistic {
+    padding: 20px 0;
+    text-align: center;
+    width: 100%;
+    margin: auto!important;
+}
 </style>

src/views/teamDetail/teamCourseList.vue

@@ -250,9 +250,12 @@
           </el-table-column>
           <el-table-column align="center"
                            prop="newCourseId"
-                           label="是否被合并"
+                           label="合并类型"
                            width="130px">
-            <template slot-scope="scope">{{ scope.row.newCourseId > 0 ? '是' : '否' }}</template>
+            <template slot-scope="scope">
+              {{ scope.row.newCourseId > 0 && scope.row.newCourseId == scope.row.id ? '合并课' : null }}
+              {{ scope.row.newCourseId > 0 && scope.row.newCourseId != scope.row.id ? '被合并课' : null }}
+            </template>
           </el-table-column>
           <el-table-column align="center"
                            prop="isCallNames"