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

src/pages/course/classPlan.vue

@@ -175,6 +175,12 @@
                       <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
                     </div>
                   </div>
+                  <div class="plan_Inner" style="align-items:center;">
+                    <div class="plan_LeftTitle">课程进度：</div>
+                    <div class="plan_RightInner">
+                      <el-progress :percentage="subItem.CompleteProgress"></el-progress>
+                    </div>
+                  </div>
                 </el-collapse-item>
               </el-collapse>
             </td>
@@ -209,6 +215,12 @@
                       <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
                     </div>
                   </div>
+                  <div class="plan_Inner" style="align-items:center;">
+                    <div class="plan_LeftTitle">课程进度：</div>
+                    <div class="plan_RightInner">
+                      <el-progress :percentage="subItem.CompleteProgress"></el-progress>
+                    </div>
+                  </div>
                 </el-collapse-item>
               </el-collapse>
             </td>
@@ -245,6 +257,12 @@
                       <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
                     </div>
                   </div>
+                  <div class="plan_Inner" style="align-items:center;">
+                    <div class="plan_LeftTitle">课程进度：</div>
+                    <div class="plan_RightInner">
+                      <el-progress :percentage="subItem.CompleteProgress"></el-progress>
+                    </div>
+                  </div>
                 </el-collapse-item>
               </el-collapse>
             </td>
@@ -279,6 +297,12 @@
                       <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
                     </div>
                   </div>
+                  <div class="plan_Inner" style="align-items:center;">
+                    <div class="plan_LeftTitle">课程进度：</div>
+                    <div class="plan_RightInner">
+                      <el-progress :percentage="subItem.CompleteProgress"></el-progress>
+                    </div>
+                  </div>
                 </el-collapse-item>
               </el-collapse>
             </td>
@@ -313,6 +337,12 @@
                       <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
                     </div>
                   </div>
+                  <div class="plan_Inner" style="align-items:center;">
+                    <div class="plan_LeftTitle">课程进度：</div>
+                    <div class="plan_RightInner">
+                      <el-progress :percentage="subItem.CompleteProgress"></el-progress>
+                    </div>
+                  </div>
                 </el-collapse-item>
               </el-collapse>
             </td>
@@ -347,6 +377,12 @@
                       <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
                     </div>
                   </div>
+                  <div class="plan_Inner" style="align-items:center;">
+                    <div class="plan_LeftTitle">课程进度：</div>
+                    <div class="plan_RightInner">
+                      <el-progress :percentage="subItem.CompleteProgress"></el-progress>
+                    </div>
+                  </div>
                 </el-collapse-item>
               </el-collapse>
             </td>
@@ -381,6 +417,12 @@
                       <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
                     </div>
                   </div>
+                  <div class="plan_Inner" style="align-items:center;">
+                    <div class="plan_LeftTitle">课程进度：</div>
+                    <div class="plan_RightInner">
+                      <el-progress :percentage="subItem.CompleteProgress"></el-progress>
+                    </div>
+                  </div>
                 </el-collapse-item>
               </el-collapse>
             </td>
@@ -473,6 +515,13 @@
             this.ClassRoomList.unshift(obj);
           }
         })
+      },
+      //获取进度条
+      getProgress(num, total) {
+        if (num == 0 || total == 0) {
+          return 0;
+        }
+        return (Math.round(num / total * 100) / 100.00);
       }
     }
   };