diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue
index 4356cb16..7f51b8fb 100644
--- a/src/components/Study/manager.vue
+++ b/src/components/Study/manager.vue
@@ -192,7 +192,7 @@
-->
- 学习人员
+ 学习人员
@@ -260,13 +260,13 @@
- {{scope.row.status == 9? '已完成':'未开始'}}
+ {{scope.row.contentName.split('--')[1]!=='考试'?scope.row.status == 9? '已完成':'未开始':scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}
- {{scope.row.studyDuration}}
+ {{scope.row.contentName.split('--')[1]!=='考试'?scope.row.studyDuration:''}}
@@ -297,7 +297,7 @@
- {{scope.row.progress}}%
+ {{!typePress?scope.row.progress+'%':scope.row.status==9?'已完成':scope.row.status==2?'进行中':'未开始'}}
@@ -346,6 +346,7 @@ export default {
},
data() {
return {
+ typePress: false,
catalogRecordTree:[],
catalogRecordList:[],
resOwnerListMap:[],
@@ -693,7 +694,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;//重置为第一页