diff --git a/src/assets/images/final_draft2.png b/src/assets/images/final_draft2.png new file mode 100644 index 00000000..2617131a Binary files /dev/null and b/src/assets/images/final_draft2.png differ diff --git a/src/assets/images/first_draft2.png b/src/assets/images/first_draft2.png new file mode 100644 index 00000000..5a4263d4 Binary files /dev/null and b/src/assets/images/first_draft2.png differ 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 }}分,没有通过认证!