diff --git a/src/components/processStatus.vue b/src/components/processStatus.vue index dde6954c..ac56a6d0 100644 --- a/src/components/processStatus.vue +++ b/src/components/processStatus.vue @@ -58,8 +58,20 @@ export default { this.status.reviewResult=data.reviewResult } } - }else if(data.onlineLearning==2){ + }else if(data.onlineLearning==2 && data.offlineTutoring==1){ this.status.onlineLearning=2 + }else if (data.onlineLearning==2 && data.offlineTutoring==0){ + this.status.onlineLearning=0 + if (data.offlineTutoring==0){ + this.status.offlineTutoring=0 + if (data.endStatus==0){ + this.status.endStatus=0 + this.status.reviewResult=data.reviewResult + }else if (data.endStatus==2){ + this.status.endStatus=2 + this.status.reviewResult=data.reviewResult + } + } } }else if (data.draftStatus==2){ this.status.draftStatus=2 @@ -75,8 +87,20 @@ export default { this.status.reviewResult=data.reviewResult } } - }else if(data.onlineLearning==2){ + }else if(data.onlineLearning==2 && data.offlineTutoring==1){ this.status.onlineLearning=2 + }else if (data.onlineLearning==2 && data.offlineTutoring==0){ + this.status.onlineLearning=0 + if (data.offlineTutoring==0){ + this.status.offlineTutoring=0 + if (data.endStatus==0){ + this.status.endStatus=0 + this.status.reviewResult=data.reviewResult + }else if (data.endStatus==2){ + this.status.endStatus=2 + this.status.reviewResult=data.reviewResult + } + } } } diff --git a/src/views/lecturer/OnlineLearning.vue b/src/views/lecturer/OnlineLearning.vue index 95f42701..2b8944ff 100644 --- a/src/views/lecturer/OnlineLearning.vue +++ b/src/views/lecturer/OnlineLearning.vue @@ -62,7 +62,7 @@ export default { getProgress(id){ getProgress({teacherId:id}).then(res=>{ this.progressData=res.data - if (res.data.length==0){ + if (res.data.length==0 || res.data==null || res.data==''){ this.disabled=true return }