diff --git a/src/components/Course/exam.vue b/src/components/Course/exam.vue
index f5a98de8..2b743b04 100644
--- a/src/components/Course/exam.vue
+++ b/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(){ //提交前处理
diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue
index 4356cb16..7fca576d 100644
--- a/src/components/Study/manager.vue
+++ b/src/components/Study/manager.vue
@@ -192,7 +192,7 @@
-->
- 学习人员
+ 学习人员
@@ -260,7 +260,8 @@
- {{scope.row.status == 9? '已完成':'未开始'}}
+ {{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}
+ {{scope.row.status == 9? '已完成':'未开始'}}
@@ -297,7 +298,7 @@
- {{scope.row.progress}}%
+ {{!typePress?scope.row.progress+'%':scope.row.status==9?'已完成':scope.row.status==2?'进行中':'未开始'}}
@@ -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;//重置为第一页
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index be0d17ce..bf733d64 100644
--- a/src/views/portal/case/Detail.vue
+++ b/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 = '') {
diff --git a/src/views/study/TaskList.vue b/src/views/study/TaskList.vue
index 648bcd00..b9d0a739 100644
--- a/src/views/study/TaskList.vue
+++ b/src/views/study/TaskList.vue
@@ -1,12 +1,12 @@