From 5e335d1c0d49fe001ab6c8bcdd044f9a5993c7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E5=8F=91?= <2577324884@qq.com>
Date: Fri, 31 May 2024 14:29:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=81=87=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/processStatus.vue      | 28 +++++++++++++++++++++++++--
 src/views/lecturer/OnlineLearning.vue |  2 +-
 2 files changed, 27 insertions(+), 3 deletions(-)

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
         }