Merge branch 'zcwy-master' into 'master'

Zcwy master

See merge request !108

src/components/Course/exam.vue

@@ -409,14 +409,14 @@ export default {
       this.curIndex++;
       this.curItem=this.paper.items[this.curIndex];
     },
-    debounce(func, delay) {
+    throttle(func, delay) {
-      let timerId;
+      let lastExecTime = 0;
       return function (...args) {
-        if (timerId) clearTimeout(timerId);
+        const now = Date.now();
-        timerId = setTimeout(() => {
+        if (now - lastExecTime >= delay) {
           func.apply(this, args);
-          timerId = null;
+          lastExecTime = now;
-        }, delay);
+        }
       };
     },
     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;//重置为第一页

src/views/portal/case/Detail.vue

@@ -187,6 +187,7 @@ import apiMessage from '@/api/system/message.js';
 import apiDict from "@/api/modules/dict.js"
 import { encrypt } from '@/utils/jsencrypt.js';
 import cookies from 'vue-cookies'
+import { formatDate } from "@/utils/datetime.js"
 import { cutFullName } from "@/utils/tools.js";
 import apiPlace from "@/api/phase2/place.js"
 import portalFloatTools from "@/components/PortalFloatTools.vue";
@@ -279,7 +280,8 @@ export default {
       //结束之前的查看取时间
       apiCase.endReadTimer({
         caseId,
-        browseDuration: Math.ceil(time)
+        browseDuration: Math.ceil(time),
+        createTime:formatDate(new Date())
       })
     },
     allRequests(id = '') {

src/views/study/TaskList.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
-     <div style="display:flex; padding-left:20px; width:100%">
+     <!-- <div style="display:flex; padding-left:20px; width:100%">
       <div style="width:100px">完成情况</div>
       <div class="progress"><div class="msg">课程完成情况</div> <el-progress :text-inside="true" :stroke-width="16" :percentage="porcessData.course"  status="warning" class="progressItem"> </el-progress> </div>
       <div class="progress" ><div class="msg">项目完成情况</div> <el-progress :text-inside="true" :stroke-width="16" :percentage="porcessData.project" status="success" class="progressItem"> </el-progress>  </div>
       <div class="progress"><div class="msg">路径图完成情况</div> <el-progress :text-inside="true" :stroke-width="16" :percentage="porcessData.router" class="progressItem"> </el-progress>  </div>
      
-      </div>
+      </div> -->
     <div style="display: flex; justify-content: space-between; padding: 12px 32px 10px 22px;">
       <div style="display: flex; justify-content: flex-start">
         <div>