Merge branch 'zcwy-master' into 'dev0515'

Zcwy master

See merge request !107

src/components/Course/exam.vue

@@ -409,14 +409,14 @@ export default {
       this.curIndex++;
       this.curItem=this.paper.items[this.curIndex];
     },
-    debounce(func, delay) {
-      let timerId;
+    throttle(func, delay) {
+      let lastExecTime = 0;
       return function (...args) {
-        if (timerId) clearTimeout(timerId);
-        timerId = setTimeout(() => {
+        const now = Date.now();
+        if (now - lastExecTime >= delay) {
           func.apply(this, args);
-          timerId = null;
-        }, delay);
+          lastExecTime = now;
+        }
       };
     },
     present(){ //提交前处理

src/components/Study/manager.vue

@@ -192,7 +192,7 @@
               </el-table-column>-->
               <el-table-column label="学习人员" width="110">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="info" @click="getCatalogue(scope.row)" >学习人员</el-button>
+                  <el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentName)" >学习人员</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -260,7 +260,8 @@
               </el-table-column>
               <el-table-column prop="status" label="状态">
                 <template slot-scope="scope">
-                  <span>{{scope.row.status == 9? '已完成':'未开始'}}</span>
+                  <span v-if="scope.row.contentName.split('--')[1]=='考试'">{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span>
+                  <span v-else>{{scope.row.status == 9? '已完成':'未开始'}}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="duration" label="进度">
@@ -297,7 +298,7 @@
         <el-table-column prop="finishTime" label="完成时间" width="180"></el-table-column>
         <el-table-column label="状态"  width="100">
             <template slot-scope="scope">
-                 {{scope.row.progress}}%
+                 {{!typePress?scope.row.progress+'%':scope.row.status==9?'已完成':scope.row.status==2?'进行中':'未开始'}}
                 </template>
         </el-table-column>
       </el-table>
@@ -346,6 +347,7 @@ export default {
   },
   data() {
     return {
+      typePress: false,
       catalogRecordTree:[],
       catalogRecordList:[],
       resOwnerListMap:[],
@@ -693,7 +695,12 @@ export default {
       this.study.pageIndex = val;
       this.getSignupList();
     },
-    getCatalogue(row) {
+    getCatalogue(row,type) {
+      if(type=='考试'){
+        this.typePress = true
+      }else{
+        this.typePress = false
+      }
       this.contentId = row.id;
       this.study.catalogueShow = true;
       this.learningSituation.pageIndex = 1;//重置为第一页