Merge branch 'zcwy0417-out' into dev0515

This commit is contained in:
zhangsir
2024-05-16 22:42:13 +08:00
7 changed files with 118 additions and 46 deletions

View File

@@ -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 {
<div class="title" style="margin-top: 20px">线上课程</div>
<div class="progress">
<div v-for="(item,index) in progressData" :key="item">
<div class="uc-course-img" style="width: 212px;height:119px">
<img style="width: 100%;" :src="item.courseImage">
<div class="progress-item" @click="toCaseData(item.courseId)">
<div class="uc-course-img" style="width: 212px;height:119px">
<img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
<img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
</div>
<div class="courseName">{{item.courseName}}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="item.progress" :format="format"></el-progress>
</div>
<div class="courseName">{{item.courseName}}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="item.progress" :format="format"></el-progress>
</div>
</div>
<div>
@@ -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;

View File

@@ -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 {
<div class="title" style="margin-top: 20px">线上课程</div>
<div class="progress">
<div v-for="(item,index) in progressData" :key="item">
<div class="uc-course-img" style="width: 212px;height:119px">
<img style="width: 100%;" :src="item.courseImage">
<div class="progress-item" @click="toCaseData(item.courseId)">
<div class="uc-course-img" style="width: 212px;height:119px">
<img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
<img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
</div>
<div class="courseName">{{item.courseName}}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="item.progress" :format="format"></el-progress>
</div>
<div class="courseName">{{item.courseName}}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="item.progress" :format="format"></el-progress>
</div>
</div>
<div>
@@ -192,8 +198,8 @@ export default {
<div class="twoFactorAuthentication" v-if="statusInfo.reviewResult==1">
<div class="remind">是否进行二次认证</div>
<div style="display: flex;justify-content: center;align-items: center">
<el-button type="primary" @click="getoFactor"></el-button>
<el-button></el-button>
<el-button type="primary" @click="getoFactor(1)"></el-button>
<el-button @click="getoFactor(2)"></el-button>
</div>
</div>
</div>
@@ -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;

View File

@@ -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);
}
}
}
</script>
@@ -124,12 +126,15 @@ export default {
<div class="title" style="margin-top: 20px">线上课程</div>
<div class="progress">
<div v-for="(item,index) in progressData" :key="item">
<div class="uc-course-img" style="width: 212px;height:119px">
<img style="width: 100%;" :src="item.courseImage">
<div class="progress-item" @click="toCaseData(item.courseId)">
<div class="uc-course-img" style="width: 212px;height:119px">
<img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
<img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
</div>
<div class="courseName">{{item.courseName}}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="item.progress" :format="format"></el-progress>
</div>
<div class="courseName">{{item.courseName}}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="item.progress" :format="format"></el-progress>
</div>
</div>
<div class="tip">
@@ -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;

View File

@@ -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 {
<div class="title" style="margin-top: 20px">线上课程</div>
<div class="progress">
<div v-for="(item,index) in progressData" :key="item">
<div class="uc-course-img" style="width: 212px;height:119px">
<img style="width: 100%;" :src="item.courseImage">
<div class="progress-item" @click="toCaseData(item.courseId)">
<div class="uc-course-img" style="width: 212px;height:119px">
<img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
<img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
</div>
<div class="courseName">{{item.courseName}}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="item.progress" :format="format"></el-progress>
</div>
<div class="courseName">{{item.courseName}}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="item.progress" :format="format"></el-progress>
</div>
</div>
<div>
@@ -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;

View File

@@ -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 {
<div class="title" style="margin-top: 20px">线上课程</div>
<div class="progress">
<div v-for="(item,index) in progressData" :key="item">
<div class="uc-course-img" style="width: 212px;height:119px">
<img style="width: 100%;" :src="item.courseImage">
<div class="progress-item" @click="toCaseData(item.courseId)">
<div class="uc-course-img" style="width: 212px;height:119px">
<img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
<img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
</div>
<div class="courseName">{{item.courseName}}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="item.progress" :format="format"></el-progress>
</div>
<div class="courseName">{{item.courseName}}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="item.progress" :format="format"></el-progress>
</div>
</div>
<div>
@@ -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;

View File

@@ -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

View File

@@ -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 {
<div class="title" style="margin-top: 20px">线上课程</div>
<div class="progress">
<div v-for="(item,index) in progressData" :key="item">
<div class="uc-course-img" style="width: 212px;height:119px">
<img style="width: 100%;" :src="item.courseImage">
<div class="progress-item" @click="toCaseData(item.courseId)">
<div class="uc-course-img" style="width: 212px;height:119px">
<img style="width: 100%;" v-if="item.courseImage!=''" :src="item.courseImage">
<img style="width: 100%;" v-else :src="fileBaseUrl+'/pc/images/bgimg/course.png'">
</div>
<div class="courseName">{{item.courseName}}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="item.progress" :format="format"></el-progress>
</div>
<div class="courseName">{{item.courseName}}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="item.progress" :format="format"></el-progress>
</div>
</div>
<div>
@@ -202,7 +208,7 @@ export default {
<div v-if="result.reviewResult==2" class="score" style="color: #797979">请您耐心等待线下认证安排</div>
<div v-if="result.reviewResult==0" class="score" style="color: #4b7900;">恭喜您您的认证分数为{{ result.avgScore }}已经通过认证</div>
<div v-if="result.reviewResult==1" class="score" style="color: #ff0000">很遗憾您的认证分数为{{ result.avgScore }}没有通过认证</div>
</div>f
</div>
</div>
</template>
@@ -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;