Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/exam

exam-06173-vue/src/views/admin/course/index.vue

@@ -39,7 +39,6 @@
         align="center"
       />
 
-
       <el-table-column
         label="课时"
         prop="periods"

exam-06173-vue/src/views/web/course/list.vue

@@ -71,11 +71,21 @@
           width="150px"
         />
 
+        <el-table-column
+          label="学习进度"
+          prop="proportion"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <el-progress :text-inside="true" :stroke-width="15" :percentage="Number(scope.row.proportion*100).toFixed(0)" color="#c11920" />
+          </template>
+        </el-table-column>
 
         <el-table-column
           label="状态"
           align="center"
-          width="100px"
+          width="120px"
         >
 
           <template slot-scope="scope">