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

src/pages/financial/TeamRevenueReport.vue

@@ -1473,6 +1473,7 @@
             query: {
               ClassId: rowData.ClassId,
               School_Id: rowData.SchoolId,
+              ClassName:encodeURI(rowData.ClassName), 
               blank: 'y'
             }
           })

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -3344,7 +3344,8 @@
             path: '/course/' + path,
             query: {
               'ClassId': item.ClassId,
-              'School_Id': item.School_Id
+              'School_Id': item.School_Id,
+              'ClassName': encodeURI(item.ClassName) ,
             }
           })
         } else {

src/pages/financial/financalDocument/FinancialDocumentsDetail.vue

@@ -2204,7 +2204,9 @@
             path: '/course/' + path,
             query: {
               'ClassId': item.ClassId,
-              'School_Id': item.School_Id
+              'School_Id': item.School_Id,
+              'ClassName': encodeURI(item.ClassName) ,
+
             }
           })
         } else {

src/pages/teacher/components/mateitem.vue

@@ -37,7 +37,7 @@
           <div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
             <div class="plan_LeftTitle">课程进度：</div>
             <div class="plan_RightInner">
-              <el-progress :percentage="subItem.CompleteProgress"></el-progress>
+              {{subItem.Ranks}}/{{subItem.TotalPlanNum}}
             </div>
           </div>
         </div>