From 4e6c9301dcdb20a4920b6d2915ad24f9787af495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E5=8F=91?= <2577324884@qq.com> Date: Thu, 23 May 2024 14:53:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/final_draft2.png | Bin 0 -> 3484 bytes src/assets/images/first_draft2.png | Bin 0 -> 2895 bytes src/components/processStatus.vue | 42 ++++++++++++++++++++------ src/views/lecturer/FinalSuccess.vue | 2 +- src/views/lecturer/OnlineLearning.vue | 1 + src/views/lecturer/TwoFinals.vue | 2 +- 6 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 src/assets/images/final_draft2.png create mode 100644 src/assets/images/first_draft2.png diff --git a/src/assets/images/final_draft2.png b/src/assets/images/final_draft2.png new file mode 100644 index 0000000000000000000000000000000000000000..2617131ade83227c76f36b02ffed2dd62b737e93 GIT binary patch literal 3484 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 KMNUMnLSTZ?eXIij literal 0 HcmV?d00001 diff --git a/src/assets/images/first_draft2.png b/src/assets/images/first_draft2.png new file mode 100644 index 0000000000000000000000000000000000000000..5a4263d4671c89d9b594354379bd757c3b96f20b GIT binary patch literal 2895 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

^k8-r;vmV7Crjk9O~P$3~Io1bEG8_YN?< z2z*X~*MRqq=&b>t7vM=Fo`+CRtKQDaN|Y_(5b7-m1Xf>ihfvr5yUOaAbrwJ4@#={W zZ_4A<6CVZwykpi=T1knjpf^LQ5JZXq+)`bUn3d*i2rH?51f@zK5=Ld^$EnWQvGLHR z?vYoOlFrNMvVMMlZ$zVgs>}NGBvgLwiK?pKL*#c*ssJLU{*qGXA;LqW{|le*Sat1O tp4MGfeVjrW0)aBbV&xKv5PFM|{{!O=j^AS!B#;0A002ovPDHLkV1iePoGbtU literal 0 HcmV?d00001 diff --git a/src/components/processStatus.vue b/src/components/processStatus.vue index dd5fd615..76ffedc0 100644 --- a/src/components/processStatus.vue +++ b/src/components/processStatus.vue @@ -53,6 +53,9 @@ export default { 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.onlineLearning==2){ @@ -60,7 +63,21 @@ export default { } }else if (data.draftStatus==2){ this.status.draftStatus=2 - + if (data.onlineLearning==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.onlineLearning==2){ + this.status.onlineLearning=2 + } } }) @@ -76,6 +93,9 @@ export default { if (data.endStatus==0){ this.status.endStatus1=0 this.status.reviewResult1=data.reviewResult + }else if (data.endStatus==2){ + this.status.endStatus1=2 + this.status.reviewResult1=data.reviewResult } } } @@ -89,17 +109,18 @@ export default {

+ -
{{status.draftStatus==1?'初稿未上传':'初稿已上传'}}
+
{{status.draftStatus==1?'初稿未上传':status.draftStatus==2?'初稿已退回':'初稿已上传'}}
-
+
{{status.onlineLearning==1?'线上学习未完成':status.onlineLearning==2?'线上学习进行中':'线上学习已完成'}}
-
+
@@ -109,16 +130,17 @@ export default {
-
{{status.endStatus==1?'终稿未上传':'终稿已上传'}}
+ +
{{status.endStatus==1?'终稿未上传':status.endStatus==2?'终稿已退回':'终稿已上传'}}
-
+
- {{status.reviewResult==3?'认证':status.reviewResult==2?'认证':status.reviewResult==1?'认证未通过':'认证通过'}}
+ {{status.reviewResult==3?'认证':status.reviewResult==2?'认证':status.reviewResult==1?'认证未通过':'认证已通过'}}
@@ -130,16 +152,16 @@ export default {
-
{{status.endStatus1==1?'终稿未上传':'终稿已上传'}}
+
{{status.endStatus1==1?'终稿未上传':status.endStatus1==2?'终稿已退回':'终稿已上传'}}
-
+
- {{status.reviewResult1==3?'认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证通过'}}
+ {{status.reviewResult1==3?'认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证已通过'}}
diff --git a/src/views/lecturer/FinalSuccess.vue b/src/views/lecturer/FinalSuccess.vue index 990da8e3..3ae14f20 100644 --- a/src/views/lecturer/FinalSuccess.vue +++ b/src/views/lecturer/FinalSuccess.vue @@ -235,7 +235,7 @@ export default {
认证结果
请您耐心等待线下认证安排！
-
+
恭喜您，您的认证分数为{{ result.avgScore }}分，已经通过认证！
diff --git a/src/views/lecturer/OnlineLearning.vue b/src/views/lecturer/OnlineLearning.vue index 956daf13..4c58524c 100644 --- a/src/views/lecturer/OnlineLearning.vue +++ b/src/views/lecturer/OnlineLearning.vue @@ -192,6 +192,7 @@ export default { display: flex; align-items: center; margin-top: 20px; + flex-wrap: wrap; } .progress>div{ diff --git a/src/views/lecturer/TwoFinals.vue b/src/views/lecturer/TwoFinals.vue index 5b89c3ca..e08d9aa0 100644 --- a/src/views/lecturer/TwoFinals.vue +++ b/src/views/lecturer/TwoFinals.vue @@ -231,7 +231,7 @@ export default {
认证结果
请您耐心等待线下认证安排！
-
恭喜您，您的认证分数为{{ result1.avgScore }}分，已经通过认证！
+
恭喜您，您的认证分数为{{ result1.avgScore }}分，已经通过认证！
很遗憾，您的认证分数为{{ result1.avgScore }}分，没有通过认证！