From bba55ea50ded4ff434cd0d5f7d533c0d0f2d4b10 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 16 May 2024 12:26:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/CoachingSuccess.vue | 2 +- src/views/lecturer/FinalSuccess.vue | 2 +- src/views/lecturer/OnlineLearning.vue | 2 +- src/views/lecturer/TwoAthentication.vue | 2 +- src/views/lecturer/TwoCos.vue | 2 +- src/views/lecturer/TwoFinals.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/lecturer/CoachingSuccess.vue b/src/views/lecturer/CoachingSuccess.vue index 6b883d93..2e45a644 100644 --- a/src/views/lecturer/CoachingSuccess.vue +++ b/src/views/lecturer/CoachingSuccess.vue @@ -134,7 +134,7 @@ export default {
- +
{{item.courseName}}
当前进度
diff --git a/src/views/lecturer/FinalSuccess.vue b/src/views/lecturer/FinalSuccess.vue index 29109f81..b45116f5 100644 --- a/src/views/lecturer/FinalSuccess.vue +++ b/src/views/lecturer/FinalSuccess.vue @@ -161,7 +161,7 @@ export default {
- +
{{item.courseName}}
当前进度
diff --git a/src/views/lecturer/OnlineLearning.vue b/src/views/lecturer/OnlineLearning.vue index 8ecd5116..a2cf3b63 100644 --- a/src/views/lecturer/OnlineLearning.vue +++ b/src/views/lecturer/OnlineLearning.vue @@ -125,7 +125,7 @@ export default {
- +
{{item.courseName}}
当前进度
diff --git a/src/views/lecturer/TwoAthentication.vue b/src/views/lecturer/TwoAthentication.vue index 9e07fd19..dcf15643 100644 --- a/src/views/lecturer/TwoAthentication.vue +++ b/src/views/lecturer/TwoAthentication.vue @@ -160,7 +160,7 @@ export default {
- +
{{item.courseName}}
当前进度
diff --git a/src/views/lecturer/TwoCos.vue b/src/views/lecturer/TwoCos.vue index 6cb093fa..6e194d21 100644 --- a/src/views/lecturer/TwoCos.vue +++ b/src/views/lecturer/TwoCos.vue @@ -166,7 +166,7 @@ export default {
- +
{{item.courseName}}
当前进度
diff --git a/src/views/lecturer/TwoFinals.vue b/src/views/lecturer/TwoFinals.vue index c51a9db0..5ce7f476 100644 --- a/src/views/lecturer/TwoFinals.vue +++ b/src/views/lecturer/TwoFinals.vue @@ -169,7 +169,7 @@ export default {
- +
{{item.courseName}}
当前进度
From b1b752ac7cb399a75fa3955c084cf7409dacbcc4 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 16 May 2024 22:41:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=8F=8A=E6=B5=81=E7=A8=8B=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/CoachingSuccess.vue | 23 ++++++++++++----- src/views/lecturer/FinalSuccess.vue | 33 ++++++++++++++++--------- src/views/lecturer/OnlineLearning.vue | 24 ++++++++++++------ src/views/lecturer/TwoAthentication.vue | 23 ++++++++++++----- src/views/lecturer/TwoCos.vue | 23 ++++++++++++----- src/views/lecturer/TwoFinal.vue | 13 +++++++--- src/views/lecturer/TwoFinals.vue | 25 +++++++++++++------ 7 files changed, 118 insertions(+), 46 deletions(-) diff --git a/src/views/lecturer/CoachingSuccess.vue b/src/views/lecturer/CoachingSuccess.vue index 2e45a644..2ac3d22c 100644 --- a/src/views/lecturer/CoachingSuccess.vue +++ b/src/views/lecturer/CoachingSuccess.vue @@ -12,7 +12,7 @@ export default { orgName:'' }, progressData:{}, - fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL, + fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL, disabled:false, statusInfo:'' } @@ -76,6 +76,9 @@ export default { path:'/need/final', query:{teacherId:this.teacherId} }) + }, + toCaseData(courseId){ + this.$router.push("/course/studyindex?id=" + courseId); } } @@ -133,12 +136,15 @@ export default {
线上课程
-
- +
+
+ + +
+
{{item.courseName}}
+
当前进度
+
-
{{item.courseName}}
-
当前进度
-
@@ -179,6 +185,11 @@ export default { .progress{ display: flex; align-items: center; + .progress-item{ + margin-top: 10px; + margin-right: 10px; + cursor: pointer; + } } .progress>div{ max-width: 250px; diff --git a/src/views/lecturer/FinalSuccess.vue b/src/views/lecturer/FinalSuccess.vue index b45116f5..0d95f62c 100644 --- a/src/views/lecturer/FinalSuccess.vue +++ b/src/views/lecturer/FinalSuccess.vue @@ -18,7 +18,7 @@ export default { orgName:'' }, progressData:{}, - fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL, + fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL, disabled:false, statusInfo:'', result:'', @@ -35,12 +35,12 @@ export default { }, methods:{ //前往二次认证 - getoFactor(){ - secondExamine({teacherId:this.teacherId}).then(res=>{ + getoFactor(second){ + secondExamine({teacherId:this.teacherId,second,}).then(res=>{ this.newTeacherId=res.data.replace(/[^0-9]/ig,'') if (res.code==200){ this.$router.push({ - path:'/need/twoauthentication', + path:'/need/twoathentication', query:{teacherId:this.newTeacherId} }) } @@ -103,6 +103,9 @@ export default { path:'/need/final', query:{teacherId:this.teacherId} }) + }, + toCaseData(courseId){ + this.$router.push("/course/studyindex?id=" + courseId); } } @@ -160,12 +163,15 @@ export default {
线上课程
-
- +
+
+ + +
+
{{item.courseName}}
+
当前进度
+
-
{{item.courseName}}
-
当前进度
-
@@ -192,8 +198,8 @@ export default {
是否进行二次认证？
- 是 - 否 + 是 + 否
@@ -214,6 +220,11 @@ export default { .progress{ display: flex; align-items: center; + .progress-item{ + margin-top: 10px; + margin-right: 10px; + cursor: pointer; + } } .progress>div{ max-width: 250px; diff --git a/src/views/lecturer/OnlineLearning.vue b/src/views/lecturer/OnlineLearning.vue index a2cf3b63..70116328 100644 --- a/src/views/lecturer/OnlineLearning.vue +++ b/src/views/lecturer/OnlineLearning.vue @@ -12,7 +12,7 @@ export default { orgName:'' }, progressData:{}, - fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL, + fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL, disabled:false, statusInfo:'' } @@ -67,8 +67,10 @@ export default { path:'/need/coaching', query:{teacherId:this.teacherId} }) + }, + toCaseData(courseId){ + this.$router.push("/course/studyindex?id=" + courseId); } - } } @@ -124,12 +126,15 @@ export default {
线上课程
-
- +
+
+ + +
+
{{item.courseName}}
+
当前进度
+
-
{{item.courseName}}
-
当前进度
-
@@ -154,6 +159,11 @@ export default { .progress{ display: flex; align-items: center; + .progress-item{ + margin-top: 10px; + margin-right: 10px; + cursor: pointer; + } } .progress>div{ max-width: 250px; diff --git a/src/views/lecturer/TwoAthentication.vue b/src/views/lecturer/TwoAthentication.vue index dcf15643..81607cd8 100644 --- a/src/views/lecturer/TwoAthentication.vue +++ b/src/views/lecturer/TwoAthentication.vue @@ -18,7 +18,7 @@ export default { orgName:'' }, progressData:{}, - fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL, + fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL, disabled:false, statusInfo:'', result:'', @@ -102,6 +102,9 @@ export default { path:'/need/twocoaching', query:{teacherId:this.teacherId} }) + }, + toCaseData(courseId){ + this.$router.push("/course/studyindex?id=" + courseId); } } @@ -159,12 +162,15 @@ export default {
线上课程
-
- +
+
+ + +
+
{{item.courseName}}
+
当前进度
+
-
{{item.courseName}}
-
当前进度
-
@@ -196,6 +202,11 @@ export default { .progress{ display: flex; align-items: center; + .progress-item{ + margin-top: 10px; + margin-right: 10px; + cursor: pointer; + } } .progress>div{ max-width: 250px; diff --git a/src/views/lecturer/TwoCos.vue b/src/views/lecturer/TwoCos.vue index 6e194d21..a1023765 100644 --- a/src/views/lecturer/TwoCos.vue +++ b/src/views/lecturer/TwoCos.vue @@ -18,7 +18,7 @@ export default { orgName:'' }, progressData:{}, - fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL, + fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL, disabled:false, statusInfo:'', statusInfo1:'', @@ -108,6 +108,9 @@ export default { path:'/need/twofinal', query:{teacherId:this.teacherId} }) + }, + toCaseData(courseId){ + this.$router.push("/course/studyindex?id=" + courseId); } } @@ -165,12 +168,15 @@ export default {
线上课程
-
- +
+
+ + +
+
{{item.courseName}}
+
当前进度
+
-
{{item.courseName}}
-
当前进度
-
@@ -217,6 +223,11 @@ export default { .progress{ display: flex; align-items: center; + .progress-item{ + margin-top: 10px; + margin-right: 10px; + cursor: pointer; + } } .progress>div{ max-width: 250px; diff --git a/src/views/lecturer/TwoFinal.vue b/src/views/lecturer/TwoFinal.vue index 505b6af4..021af9e9 100644 --- a/src/views/lecturer/TwoFinal.vue +++ b/src/views/lecturer/TwoFinal.vue @@ -71,6 +71,13 @@ export default { 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 + this.form.courseContent_1=res.data[0].courseContent.split('/') + 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){ @@ -86,9 +93,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:1 diff --git a/src/views/lecturer/TwoFinals.vue b/src/views/lecturer/TwoFinals.vue index 5ce7f476..964737b2 100644 --- a/src/views/lecturer/TwoFinals.vue +++ b/src/views/lecturer/TwoFinals.vue @@ -18,7 +18,7 @@ export default { orgName:'' }, progressData:{}, - fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL, + fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL, disabled:false, statusInfo:'', statusInfo1:'', @@ -111,6 +111,9 @@ export default { path:'/need/twofinal', query:{teacherId:this.teacherId} }) + }, + toCaseData(courseId){ + this.$router.push("/course/studyindex?id=" + courseId); } } @@ -168,12 +171,15 @@ export default {
线上课程
-
- +
+
+ + +
+
{{item.courseName}}
+
当前进度
+
-
{{item.courseName}}
-
当前进度
-
@@ -202,7 +208,7 @@ export default {
请您耐心等待线下认证安排！
恭喜您，您的认证分数为{{ result.avgScore }}分，已经通过认证！
很遗憾，您的认证分数为{{ result.avgScore }}分，没有通过认证！
-
f +
@@ -221,6 +227,11 @@ export default { .progress{ display: flex; align-items: center; + .progress-item{ + margin-top: 10px; + margin-right: 10px; + cursor: pointer; + } } .progress>div{ max-width: 250px; From 28e01b6f99e647e10601aa54571b1ac63a85d420 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 17 May 2024 09:02:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E5=90=A6=E4=B8=8D=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/FinalSuccess.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/lecturer/FinalSuccess.vue b/src/views/lecturer/FinalSuccess.vue index 0d95f62c..f8e2cb72 100644 --- a/src/views/lecturer/FinalSuccess.vue +++ b/src/views/lecturer/FinalSuccess.vue @@ -39,10 +39,12 @@ export default { secondExamine({teacherId:this.teacherId,second,}).then(res=>{ this.newTeacherId=res.data.replace(/[^0-9]/ig,'') if (res.code==200){ - this.$router.push({ - path:'/need/twoathentication', - query:{teacherId:this.newTeacherId} - }) + if(second!=2){ + this.$router.push({ + path:'/need/twoathentication', + query:{teacherId:this.newTeacherId} + }) + } } }) },