From 47bd4a856396955b66e133400b60edc7ac3889ab Mon Sep 17 00:00:00 2001 From: joshen <445497689@qq.com> Date: Wed, 22 May 2024 16:38:27 +0800 Subject: [PATCH 1/7] message add href --- src/views/portal/user/Message.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/portal/user/Message.vue b/src/views/portal/user/Message.vue index 232f998d..f00f4bb7 100644 --- a/src/views/portal/user/Message.vue +++ b/src/views/portal/user/Message.vue @@ -100,6 +100,10 @@ {{ item.tip }}-{{ item.content }}
{{ item.tip }} + 点击查看 +
+
+ {{ item.tip }}
{{status.onlineLearning==1?'线上学习未完成':status.onlineLearning==2?'线上学习进行中':'线上学习已完成'}}
-
+
@@ -114,13 +113,13 @@ export default {
- + - -
- {{status.reviewResult==3?'未认证':status.reviewResult==2?'认证':status.reviewResult==1?'认证未通过':'认证通过'}}
+ +
+ {{status.reviewResult==3?'认证':status.reviewResult==2?'认证':status.reviewResult==1?'认证未通过':'认证通过'}}
-
+
@@ -135,11 +134,11 @@ export default {
- + - -
- {{status.reviewResult1==3?'未认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证通过'}}
+ +
+ {{status.reviewResult1==3?'认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证通过'}}
@@ -190,6 +189,13 @@ export default { line-height: 20px; margin-top: 12px; } + .tim4 { + font-weight: 400; + font-size: 14px; + color: #31AF0D ; + line-height: 20px; + margin-top: 12px; + } } .line { diff --git a/src/views/lecturer/CoachingSuccess.vue b/src/views/lecturer/CoachingSuccess.vue index b999e1df..ffd9116b 100644 --- a/src/views/lecturer/CoachingSuccess.vue +++ b/src/views/lecturer/CoachingSuccess.vue @@ -37,6 +37,12 @@ export default { baseInfo() { getTeacherInfo({teacherId: this.teacherId}).then(res => { this.teacherInfo=res.data[0] + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } /* * teacherName:教师姓名 teacherNo:教师工号 orgName:组织 positionName:岗位 bandCode:职级 courseName:认证课程名称 courseContent课程内容分类 @@ -44,7 +50,6 @@ export default { * */ this.form.teacherName = res.data[0].teacherName this.form.teacherNo = res.data[0].teacherNo - this.form.orgName = res.data[0].orgName this.form.positionName = res.data[0].positionName this.form.bandCode = res.data[0].bandCode this.form.courseName = res.data[0].courseName diff --git a/src/views/lecturer/FinalDraft.vue b/src/views/lecturer/FinalDraft.vue index 22bf4405..fa966331 100644 --- a/src/views/lecturer/FinalDraft.vue +++ b/src/views/lecturer/FinalDraft.vue @@ -69,12 +69,17 @@ export default { }, baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } this.form.teacherName=res.data[0].teacherName this.form.teacherNo=res.data[0].teacherNo this.form.courseContent_1=res.data[0].courseContent.split('/') this.form.courseIntroduction=res.data[0].courseIntroduction this.form.courseName=res.data[0].courseName - this.form.orgName=res.data[0].orgName this.form.positionName=res.data[0].positionName this.form.bandCode=res.data[0].bandCode //获取初始值 diff --git a/src/views/lecturer/FinalSuccess.vue b/src/views/lecturer/FinalSuccess.vue index 9de96824..990da8e3 100644 --- a/src/views/lecturer/FinalSuccess.vue +++ b/src/views/lecturer/FinalSuccess.vue @@ -74,13 +74,18 @@ export default { baseInfo() { getTeacherInfo({teacherId: this.teacherId}).then(res => { this.teacherInfo = res.data[0] + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } /* * teacherName:教师姓名 teacherNo:教师工号 orgName:组织 positionName:岗位 bandCode:职级 courseName:认证课程名称 courseContent课程内容分类 * courseIntroduction:课程简介 * */ this.form.teacherName = res.data[0].teacherName this.form.teacherNo = res.data[0].teacherNo - this.form.orgName = res.data[0].orgName this.form.positionName = res.data[0].positionName this.form.bandCode = res.data[0].bandCode this.form.courseName = res.data[0].courseName diff --git a/src/views/lecturer/FirstDraft.vue b/src/views/lecturer/FirstDraft.vue index e63b5e49..59be006f 100644 --- a/src/views/lecturer/FirstDraft.vue +++ b/src/views/lecturer/FirstDraft.vue @@ -56,7 +56,6 @@ export default { //获取基本信息 this.teacherId=this.$route.query.teacherId this.baseInfo() - this.getStatus() this.getSysTypeTree().then(rs=>{ this.sysTypeListMap=rs; }) @@ -72,16 +71,29 @@ export default { getStatus(){ getCertificationProcess({teacherId:this.teacherId}).then(res=>{ this.statusInfo=res.data - if (this.statusInfo.draftStatus==0){ - this.disabled=true + if (this.statusInfo.offlineTutoring==0){ + this.$router.push({ + path:'/need/coachingsuccess', + query:{teacherId:this.teacherId} + }) + }else { + this.$router.push({ + path:'/need/onlinelearning', + query:{teacherId:this.teacherId} + }) } }) }, baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } this.form.teacherName=res.data[0].teacherName this.form.teacherNo=res.data[0].teacherNo - this.form.orgName=res.data[0].orgName this.form.positionName=res.data[0].positionName this.form.bandCode=res.data[0].bandCode }) @@ -111,10 +123,7 @@ export default { message: '设置成功', type: 'success' }); - this.$router.push({ - path:'/need/onlinelearning', - query:{teacherId:this.teacherId} - }) + this.getStatus() }else { this.$message({ message:res.msg, diff --git a/src/views/lecturer/Index.vue b/src/views/lecturer/Index.vue index f32863cc..2cd17c04 100644 --- a/src/views/lecturer/Index.vue +++ b/src/views/lecturer/Index.vue @@ -59,46 +59,53 @@ export default { getView(item){ getCertificationProcess({teacherId:item.teacherId}).then(res=>{ var data = res.data - if(data.secondResult==0){ - if (data.endStatus==0){ - this.$router.push({ - path:'/need/twofinals', - query:{teacherId:item.teacherId} - }) - }else if (data.offlineTutoring==0){ - this.$router.push({ - path:'/need/twocoachingsuccess', - query:{teacherId:item.teacherId} - }) - }else if (data.offlineTutoring==1){ - this.$router.push({ - path:'/need/twocoaching', - query:{teacherId:item.teacherId} - }) - } - }else if (data.secondResult==1){ - if (data.endStatus==0){ - this.$router.push({ - path:'/need/finalsuccess', - query:{teacherId:item.teacherId} - }) - }else if (data.offlineTutoring==0 && data.endStatus==1){ - this.$router.push({ - path:'/need/coachingsuccess', - query:{teacherId:item.teacherId} - }) - }else if (data.offlineTutoring==1 && data.onlineLearning==0){ - this.$router.push({ - path:'/need/onlinelearning', - query:{teacherId:item.teacherId} - }) - }else if (data.onlineLearning==2 || data.onlineLearning==1){ - this.$router.push({ - path:'/need/onlinelearning', - query:{teacherId:item.teacherId} - }) - } + if (data.draftStatus==2){ + this.$router.push({ + path:'/need/draft', + query:{teacherId:item.teacherId} + }) + }else if ((data.onlineLearning==1 || data.onlineLearning==0 || data.offlineTutoring==1) && data.secondResult==1){ + this.$router.push({ + path:'/need/onlinelearning', + query:{teacherId:item.teacherId} + }) + }else if (data.endStatus==1 && data.secondResult==1){ + this.$router.push({ + path:'/need/coachingsuccess', + query:{teacherId:item.teacherId} + }) + }else if (data.endStatus==2 && data.secondResult==1){ + this.$router.push({ + path:'/need/final', + query:{teacherId:item.teacherId} + }) + }else if (data.secondResult==1 && (data.reviewResult==2 || data.reviewResult==1)){ + this.$router.push({ + path:'/need/finalsuccess', + query:{teacherId:item.teacherId} + }) + }else if (data.secondResult==0 && data.offlineTutoring==1){ + this.$router.push({ + path:'/need/twoathentication', + query:{teacherId:item.teacherId} + }) + }else if (data.secondResult==0 && data.endStatus==1){ + this.$router.push({ + path:'/need/twocoachingsuccess', + query:{teacherId:item.teacherId} + }) + }else if (data.secondResult==0 && data.endStatus==2){ + this.$router.push({ + path:'/need/twofinal', + query:{teacherId:item.teacherId} + }) + }else { + this.$router.push({ + path:'/need/twofinals', + query:{teacherId:item.teacherId} + }) } + }) }, //查看认证记录 diff --git a/src/views/lecturer/OnlineLearning.vue b/src/views/lecturer/OnlineLearning.vue index 5d2c76ea..956daf13 100644 --- a/src/views/lecturer/OnlineLearning.vue +++ b/src/views/lecturer/OnlineLearning.vue @@ -32,13 +32,18 @@ export default { baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ this.teacherInfo=res.data[0] + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } /* * teacherName:教师姓名 teacherNo:教师工号 orgName:组织 positionName:岗位 bandCode:职级 courseName:认证课程名称 courseContent课程内容分类 * courseIntroduction:课程简介 * */ this.form.teacherName=res.data[0].teacherName this.form.teacherNo=res.data[0].teacherNo - this.form.orgName=res.data[0].orgName this.form.positionName=res.data[0].positionName this.form.bandCode=res.data[0].bandCode this.form.courseName=res.data[0].courseName diff --git a/src/views/lecturer/TwoAthentication.vue b/src/views/lecturer/TwoAthentication.vue index 6c04a0ab..169f1ea9 100644 --- a/src/views/lecturer/TwoAthentication.vue +++ b/src/views/lecturer/TwoAthentication.vue @@ -55,12 +55,17 @@ export default { }, baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } this.pid=res.data[0].pid getTeacherInfo({teacherId:res.data[0].pid}).then(resquest=>{ this.teacherInfo = resquest.data[0] this.form.teacherName=resquest.data[0].teacherName this.form.teacherNo=resquest.data[0].teacherNo - this.form.orgName=resquest.data[0].orgName this.form.positionName=resquest.data[0].positionName this.form.bandCode=resquest.data[0].bandCode this.form.courseName=resquest.data[0].courseName diff --git a/src/views/lecturer/TwoCos.vue b/src/views/lecturer/TwoCos.vue index 159cb7e8..4c9a8074 100644 --- a/src/views/lecturer/TwoCos.vue +++ b/src/views/lecturer/TwoCos.vue @@ -57,13 +57,18 @@ export default { baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ this.pid=res.data[0].pid + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } this.form1.tutor = res.data[0].tutor.split(',') this.form1.tutorTime = res.data[0].tutorTime getTeacherInfo({teacherId:res.data[0].pid}).then(resquest=>{ this.teacherInfo = resquest.data[0] this.form.teacherName=resquest.data[0].teacherName this.form.teacherNo=resquest.data[0].teacherNo - this.form.orgName=resquest.data[0].orgName this.form.positionName=resquest.data[0].positionName this.form.bandCode=resquest.data[0].bandCode this.form.courseName=resquest.data[0].courseName diff --git a/src/views/lecturer/TwoFinal.vue b/src/views/lecturer/TwoFinal.vue index da036c8f..63a70d20 100644 --- a/src/views/lecturer/TwoFinal.vue +++ b/src/views/lecturer/TwoFinal.vue @@ -71,9 +71,14 @@ export default { baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ this.pid=res.data[0].pid + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } this.form.teacherName=res.data[0].teacherName this.form.teacherNo=res.data[0].teacherNo - this.form.orgName=res.data[0].orgName this.form.positionName=res.data[0].positionName this.form.bandCode=res.data[0].bandCode this.form.courseIntroduction=res.data[0].courseIntroduction diff --git a/src/views/lecturer/TwoFinals.vue b/src/views/lecturer/TwoFinals.vue index da237775..5b89c3ca 100644 --- a/src/views/lecturer/TwoFinals.vue +++ b/src/views/lecturer/TwoFinals.vue @@ -62,6 +62,12 @@ export default { baseInfo(){ getTeacherInfo({teacherId:this.teacherId}).then(res=>{ this.pid=res.data[0].pid + var orgNameList=res.data[0].orgName.split('/') + if (orgNameList.length<=3){ + this.form.orgName=res.data[0].orgName + }else { + this.form.orgName=orgNameList[orgNameList.length-3]+'/'+orgNameList[orgNameList.length-2]+'/'+orgNameList[orgNameList.length-1] + } this.form1.tutor = res.data[0].tutor.split(',') this.form1.tutorTime = res.data[0].tutorTime this.form.courseName=res.data[0].courseName @@ -71,7 +77,6 @@ export default { this.teacherInfo = resquest.data[0] this.form.teacherName=resquest.data[0].teacherName this.form.teacherNo=resquest.data[0].teacherNo - this.form.orgName=resquest.data[0].orgName this.form.positionName=resquest.data[0].positionName this.form.bandCode=resquest.data[0].bandCode this.form.coursewareName=resquest.data[0].examineCourseware.coursewareName From a7bdf0ed004d32486801d2060f26e8fb0282ecf7 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 23 May 2024 09:37:10 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/CoachingSuccess.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/lecturer/CoachingSuccess.vue b/src/views/lecturer/CoachingSuccess.vue index ffd9116b..dc8ea684 100644 --- a/src/views/lecturer/CoachingSuccess.vue +++ b/src/views/lecturer/CoachingSuccess.vue @@ -14,7 +14,7 @@ export default { orgName: '' }, progressData: {}, - fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL, + fileBaseUrl: process.env.VUE_APP_BOE_MOBILE_URL, disabled: false, statusInfo: '', teacherInfo:'' From f169d8d8616da77271fa7fd6b2e8371e55ec9f46 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 09:47:49 +0800 Subject: [PATCH 4/7] =?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/components/processStatus.vue | 1 + src/views/lecturer/FirstDraft.vue | 13 ++++++++++--- src/views/lecturer/Index.vue | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/components/processStatus.vue b/src/components/processStatus.vue index 94a2f9c5..dd5fd615 100644 --- a/src/components/processStatus.vue +++ b/src/components/processStatus.vue @@ -60,6 +60,7 @@ export default { } }else if (data.draftStatus==2){ this.status.draftStatus=2 + } }) diff --git a/src/views/lecturer/FirstDraft.vue b/src/views/lecturer/FirstDraft.vue index 59be006f..63c9bb48 100644 --- a/src/views/lecturer/FirstDraft.vue +++ b/src/views/lecturer/FirstDraft.vue @@ -96,6 +96,13 @@ export default { this.form.teacherNo=res.data[0].teacherNo this.form.positionName=res.data[0].positionName this.form.bandCode=res.data[0].bandCode + this.form.courseContent_1=res.data[0].courseContent.split('/') + this.form.courseIntroduction=res.data[0].courseIntroduction + this.form.courseName=res.data[0].courseName + //获取初始值 + this.form.courseNameOne=res.data[0].courseName + this.form.courseIntroductionOne=res.data[0].courseIntroduction + this.form.courseContent_2=res.data[0].courseContent }) }, onSubmit(formName){ @@ -111,9 +118,9 @@ export default { this.form.courseContent = this.form.courseContent_1.join('/'); setOfflineTutoring( {teacherId:this.teacherId, - courseName:this.form.courseName, - courseContent:this.form.courseContent, - courseIntroduction:this.form.courseIntroduction, + courseName:this.form.courseNameOne==this.form.courseName?null:this.form.courseName, + courseContent:this.form.courseContent_2==this.form.courseContent?null:this.form.courseContent, + courseIntroduction:this.form.courseIntroductionOne==this.form.courseIntroduction?null:this.form.courseIntroduction, coursewareUrl:this.form.coursewareUrl, coursewareName:this.form.coursewareName, version:0 diff --git a/src/views/lecturer/Index.vue b/src/views/lecturer/Index.vue index 2cd17c04..63232f93 100644 --- a/src/views/lecturer/Index.vue +++ b/src/views/lecturer/Index.vue @@ -64,7 +64,7 @@ export default { path:'/need/draft', query:{teacherId:item.teacherId} }) - }else if ((data.onlineLearning==1 || data.onlineLearning==0 || data.offlineTutoring==1) && data.secondResult==1){ + }else if ((data.onlineLearning==1 || data.offlineTutoring==1) && data.secondResult==1){ this.$router.push({ path:'/need/onlinelearning', query:{teacherId:item.teacherId} 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 5/7] =?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 }}分，没有通过认证！
From 45889703d6e5d3655211cee2247e4c60edf23a0d 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 16:01:07 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/processStatus.vue | 5 +++-- src/views/lecturer/CoachingSuccess.vue | 4 ++-- src/views/lecturer/FinalDraft.vue | 6 ++++-- src/views/lecturer/FinalSuccess.vue | 4 ++-- src/views/lecturer/FirstDraft.vue | 6 ++++-- src/views/lecturer/OnlineLearning.vue | 6 +----- src/views/lecturer/TwoAthentication.vue | 3 ++- src/views/lecturer/TwoCos.vue | 3 ++- src/views/lecturer/TwoFinal.vue | 6 ++++-- src/views/lecturer/TwoFinals.vue | 3 ++- 10 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/components/processStatus.vue b/src/components/processStatus.vue index 76ffedc0..dde6954c 100644 --- a/src/components/processStatus.vue +++ b/src/components/processStatus.vue @@ -133,7 +133,7 @@ export default {
{{status.endStatus==1?'终稿未上传':status.endStatus==2?'终稿已退回':'终稿已上传'}}
-
+
@@ -151,10 +151,11 @@ export default {
+
{{status.endStatus1==1?'终稿未上传':status.endStatus1==2?'终稿已退回':'终稿已上传'}}
-
+
diff --git a/src/views/lecturer/CoachingSuccess.vue b/src/views/lecturer/CoachingSuccess.vue index dc8ea684..9a624824 100644 --- a/src/views/lecturer/CoachingSuccess.vue +++ b/src/views/lecturer/CoachingSuccess.vue @@ -215,18 +215,18 @@ export default { display: flex; align-items: center; margin-top: 20px; - + flex-wrap: wrap; } .progress>div{ width: 300px; margin-right: 30px; + margin-bottom: 12px; } .courseName { font-weight: 650; color: #333333; font-size: 14px; - margin-top: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/src/views/lecturer/FinalDraft.vue b/src/views/lecturer/FinalDraft.vue index fa966331..2f95f834 100644 --- a/src/views/lecturer/FinalDraft.vue +++ b/src/views/lecturer/FinalDraft.vue @@ -206,13 +206,15 @@ export default {
- + - + div { width: 300px; margin-right: 30px; + margin-bottom: 12px; } .courseName { font-weight: 650; color: #333333; font-size: 14px; - margin-top: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/src/views/lecturer/FirstDraft.vue b/src/views/lecturer/FirstDraft.vue index 63c9bb48..82323993 100644 --- a/src/views/lecturer/FirstDraft.vue +++ b/src/views/lecturer/FirstDraft.vue @@ -212,13 +212,15 @@ export default {
- + - + div{ width: 300px; margin-right: 30px; -} -.progress>div{ - width: 300px; - margin-right: 30px; + margin-bottom: 12px; } .courseName { font-weight: 650; color: #333333; font-size: 14px; - margin-top: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/src/views/lecturer/TwoAthentication.vue b/src/views/lecturer/TwoAthentication.vue index 169f1ea9..9a2cd7f6 100644 --- a/src/views/lecturer/TwoAthentication.vue +++ b/src/views/lecturer/TwoAthentication.vue @@ -248,16 +248,17 @@ export default { display: flex; align-items: center; margin-top: 20px; + flex-wrap: wrap; } .progress > div { width: 300px; margin-right: 30px; + margin-bottom: 12px; } .courseName { font-weight: 650; color: #333333; font-size: 14px; - margin-top: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/src/views/lecturer/TwoCos.vue b/src/views/lecturer/TwoCos.vue index 4c9a8074..26a8a927 100644 --- a/src/views/lecturer/TwoCos.vue +++ b/src/views/lecturer/TwoCos.vue @@ -263,16 +263,17 @@ export default { display: flex; align-items: center; margin-top: 20px; + flex-wrap: wrap; } .progress > div { width: 300px; margin-right: 30px; + margin-bottom: 12px; } .courseName { font-weight: 650; color: #333333; font-size: 14px; - margin-top: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/src/views/lecturer/TwoFinal.vue b/src/views/lecturer/TwoFinal.vue index 63a70d20..4a26ab09 100644 --- a/src/views/lecturer/TwoFinal.vue +++ b/src/views/lecturer/TwoFinal.vue @@ -208,13 +208,15 @@ export default {
- + - + div { width: 300px; margin-right: 30px; + margin-bottom: 12px; } .courseName { font-weight: 650; color: #333333; font-size: 14px; - margin-top: 12px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; From a93b87afd9df6826f7efcfb5488d40dcc4388a77 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, 24 May 2024 16:16:01 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/FinalDraft.vue | 4 +++- src/views/lecturer/FirstDraft.vue | 4 +++- src/views/lecturer/TwoFinal.vue | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/views/lecturer/FinalDraft.vue b/src/views/lecturer/FinalDraft.vue index 2f95f834..79ea3045 100644 --- a/src/views/lecturer/FinalDraft.vue +++ b/src/views/lecturer/FinalDraft.vue @@ -273,6 +273,8 @@ export default { margin-top: 3px; margin-bottom: 3px; } - +::v-deep .el-upload__tip{ + font-size: 18px; +} diff --git a/src/views/lecturer/FirstDraft.vue b/src/views/lecturer/FirstDraft.vue index 82323993..792cf531 100644 --- a/src/views/lecturer/FirstDraft.vue +++ b/src/views/lecturer/FirstDraft.vue @@ -279,6 +279,8 @@ export default { margin-top: 3px; margin-bottom: 3px; } - + ::v-deep .el-upload__tip{ + font-size: 18px; + } diff --git a/src/views/lecturer/TwoFinal.vue b/src/views/lecturer/TwoFinal.vue index 4a26ab09..35f09285 100644 --- a/src/views/lecturer/TwoFinal.vue +++ b/src/views/lecturer/TwoFinal.vue @@ -275,6 +275,8 @@ export default { margin-top: 3px; margin-bottom: 3px; } - +::v-deep .el-upload__tip{ + font-size: 18px; +}