Merge remote-tracking branch 'boe/dev0515' into dev0515

This commit is contained in:
zhangsir
2024-05-27 17:12:36 +08:00
15 changed files with 212 additions and 99 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@@ -51,9 +51,11 @@ export default {
if (data.offlineTutoring==0){
this.status.offlineTutoring=0
if (data.endStatus==0){
console.log(22222)
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){
@@ -61,6 +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 {
<div class="main">
<div class="process">
<img src="../assets/images/first_draft.png" alt="" v-if="status.draftStatus==1">
<img src="../assets/images/first_draft2.png" alt="" v-if="status.draftStatus==2">
<img src="../assets/images/first_draft1.png" alt="" v-if="status.draftStatus==0">
<div :class="status.draftStatus==1?'tim1':'tim'">{{status.draftStatus==1?'初稿未上传':'初稿已上传'}}</div>
<div :class="status.draftStatus==1?'tim1':status.draftStatus==2?'tim2':'tim'">{{status.draftStatus==1?'初稿未上传':status.draftStatus==2?'初稿已退回':'初稿已上传'}}</div>
</div>
<div :class="status.draftStatus==1?'line1':'line'"></div>
<div :class="status.draftStatus==1?'line1':status.draftStatus==2?'line':'line'"></div>
<div class="process">
<img src="../assets/images/E-learning1.png" alt="" v-if="status.onlineLearning==0">
<img src="../assets/images/E-learning.png" alt="" v-if="status.onlineLearning==1">
<img src="../assets/images/E-learning2.png" alt="" v-if="status.onlineLearning==2">
<div :class="status.onlineLearning==1?'tim1':status.onlineLearning==2?'tim3':'tim'">{{status.onlineLearning==1?'线上学习未完成':status.onlineLearning==2?'线上学习进行中':'线上学习已完成'}}</div>
</div>
<div :class="status.onlineLearning==1?'line1':'line'"></div>
<div :class="status.onlineLearning==1?'line1':status.onlineLearning==2?'line1':'line'"></div>
<div class="process">
<img src="../assets/images/tutoring1.png" alt="" v-if="status.offlineTutoring==0">
<img src="../assets/images/tutoring.png" alt="" v-if="status.offlineTutoring==1">
@@ -109,18 +130,19 @@ export default {
<div class="process">
<img src="../assets/images/final_draft1.png" alt="" v-if="status.endStatus==0">
<img src="../assets/images/final_draft.png" alt="" v-if="status.endStatus==1">
<div :class="status.endStatus==1?'tim1':'tim'">{{status.endStatus==1?'终稿未上传':'终稿已上传'}}</div>
<img src="../assets/images/final_draft2.png" alt="" v-if="status.endStatus==2">
<div :class="status.endStatus==1?'tim1':status.endStatus==2?'tim2':'tim'">{{status.endStatus==1?'终稿未上传':status.endStatus==2?'终稿已退回':'终稿已上传'}}</div>
</div>
<div :class="status.endStatus==1?'line1':'line'"></div>
<div :class="status.endStatus==1?'line1':status.endStatus==2?'line1':'line'"></div>
<div class="process">
<img src="../assets/images/certification.png" alt="" v-if="status.reviewResult==3">
<img src="../assets/images/certification2.png" alt="" v-if="status.reviewResult==2">
<img src="../assets/images/certification.png" alt="" v-if="status.reviewResult==2">
<img src="../assets/images/certification3.png" alt="" v-if="status.reviewResult==1">
<img src="../assets/images/certification1.png" alt="" v-if="status.reviewResult==0">
<div :class="status.reviewResult==3?'tim1':status.reviewResult==2?'tim3':status.reviewResult==1?'tim2':'tim'">
{{status.reviewResult==3?'认证':status.reviewResult==2?'认证':status.reviewResult==1?'认证未通过':'认证通过'}}</div>
<img src="../assets/images/certification4.png" alt="" v-if="status.reviewResult==0">
<div :class="status.reviewResult==3?'tim1':status.reviewResult==2?'tim1':status.reviewResult==1?'tim2':'tim4'">
{{status.reviewResult==3?'认证':status.reviewResult==2?'认证':status.reviewResult==1?'认证未通过':'认证通过'}}</div>
</div>
<div :class="status.reviewResult==3?'line1':status.reviewResult==2?'line':status.reviewResult==1?'line':'line'" v-if="status.secondResult==0"></div>
<div :class="status.reviewResult==3?'line1':status.reviewResult==2?'line1':status.reviewResult==1?'line':'line'" v-if="status.secondResult==0"></div>
<div class="process" v-if="status.secondResult==0">
<img src="../assets/images/tutoring1.png" alt="" v-if="status.offlineTutoring1==0">
<img src="../assets/images/tutoring.png" alt="" v-if="status.offlineTutoring1==1">
@@ -129,17 +151,18 @@ export default {
<div :class="status.offlineTutoring1==1?'line1':'line'"v-if="status.secondResult==0"></div>
<div class="process" v-if="status.secondResult==0">
<img src="../assets/images/final_draft1.png" alt="" v-if="status.endStatus1==0">
<img src="../assets/images/final_draft2.png" alt="" v-if="status.endStatus1==2">
<img src="../assets/images/final_draft.png" alt="" v-if="status.endStatus1==1">
<div :class="status.endStatus1==1?'tim1':'tim'">{{status.endStatus1==1?'终稿未上传':'终稿已上传'}}</div>
<div :class="status.endStatus1==1?'tim1':status.endStatus1==2?'tim2':'tim'">{{status.endStatus1==1?'终稿未上传':status.endStatus1==2?'终稿已退回':'终稿已上传'}}</div>
</div>
<div :class="status.endStatus1==1?'line1':'line'" v-if="status.secondResult==0"></div>
<div :class="status.endStatus1==1?'line1':status.endStatus1==2?'line1':'line'" v-if="status.secondResult==0"></div>
<div class="process" v-if="status.secondResult==0">
<img src="../assets/images/certification.png" alt="" v-if="status.reviewResult1==3">
<img src="../assets/images/certification2.png" alt="" v-if="status.reviewResult1==2">
<img src="../assets/images/certification.png" alt="" v-if="status.reviewResult1==2">
<img src="../assets/images/certification3.png" alt="" v-if="status.reviewResult1==1">
<img src="../assets/images/certification1.png" alt="" v-if="status.reviewResult1==0">
<div :class="status.reviewResult1==3?'tim1':status.reviewResult1==2?'tim3':status.reviewResult1==1?'tim2':'tim'">
{{status.reviewResult1==3?'认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证通过'}}</div>
<img src="../assets/images/certification4.png" alt="" v-if="status.reviewResult1==0">
<div :class="status.reviewResult1==3?'tim1':status.reviewResult1==2?'tim1':status.reviewResult1==1?'tim2':'tim4'">
{{status.reviewResult1==3?'认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证通过'}}</div>
</div>
</div>
</template>
@@ -190,6 +213,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 {

View File

@@ -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:''
@@ -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
@@ -210,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;

View File

@@ -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
//获取初始值
@@ -201,13 +206,15 @@ export default {
</el-col>
</div>
<el-form-item label="认证课程名称:" prop="courseName">
<el-input v-model="form.courseName" placeholder="请输入认证课程名称"></el-input>
<el-input v-model="form.courseName" maxlength="30"
show-word-limit placeholder="请输入认证课程名称"></el-input>
</el-form-item>
<el-form-item label="课程内容分类:" prop="courseContent_1">
<el-cascader placeholder="选择内容分类" style="width:100%" clearable v-model="form.courseContent_1" :props="sysProps" :options="sysTypeListMap"></el-cascader>
</el-form-item>
<el-form-item label="课程简介:" prop="courseIntroduction">
<el-input type="textarea" rows="5" v-model="form.courseIntroduction"></el-input>
<el-input type="textarea" maxlength="150"
show-word-limit rows="5" v-model="form.courseIntroduction"></el-input>
</el-form-item>
<el-form-item label="上传终稿:" required>
<el-upload
@@ -266,6 +273,8 @@ export default {
margin-top: 3px;
margin-bottom: 3px;
}
::v-deep .el-upload__tip{
font-size: 18px;
}
</style>

View File

@@ -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
@@ -230,7 +235,7 @@ export default {
<div>
<div class="title" style="margin-top: 20px">认证结果</div>
<div v-if="statusInfo.reviewResult==2" class="score">请您耐心等待线下认证安排</div>
<div v-if="statusInfo.reviewResult==0" class="score" style="color: #4b7900;">
<div v-if="statusInfo.reviewResult==0" class="score" style="color: #31AF0D;">
恭喜您您的认证分数为{{ result.avgScore }}已经通过认证
</div>
<div v-if="statusInfo.reviewResult==1" class="score" style="color: #ff0000">
@@ -263,19 +268,19 @@ 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;

View File

@@ -56,7 +56,6 @@ export default {
//获取基本信息
this.teacherId=this.$route.query.teacherId
this.baseInfo()
this.getStatus()
this.getSysTypeTree().then(rs=>{
this.sysTypeListMap=rs;
})
@@ -72,18 +71,38 @@ 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
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){
@@ -99,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
@@ -111,10 +130,7 @@ export default {
message: '设置成功',
type: 'success'
});
this.$router.push({
path:'/need/onlinelearning',
query:{teacherId:this.teacherId}
})
this.getStatus()
}else {
this.$message({
message:res.msg,
@@ -196,13 +212,15 @@ export default {
</el-col>
</div>
<el-form-item label="认证课程名称:" prop="courseName">
<el-input v-model="form.courseName" placeholder="请输入认证课程名称"></el-input>
<el-input v-model="form.courseName" maxlength="30"
show-word-limit placeholder="请输入认证课程名称"></el-input>
</el-form-item>
<el-form-item label="课程内容分类:" prop="courseContent_1">
<el-cascader placeholder="选择内容分类" style="width: 100%" clearable v-model="form.courseContent_1" :props="sysProps" :options="sysTypeListMap"></el-cascader>
</el-form-item>
<el-form-item label="课程简介:" prop="courseIntroduction">
<el-input type="textarea" style="width: 100%" rows="5" v-model="form.courseIntroduction"></el-input>
<el-input type="textarea" maxlength="150"
show-word-limit style="width: 100%" rows="5" v-model="form.courseIntroduction"></el-input>
</el-form-item>
<el-form-item label="上传初稿:" required>
<el-upload
@@ -261,6 +279,8 @@ export default {
margin-top: 3px;
margin-bottom: 3px;
}
::v-deep .el-upload__tip{
font-size: 18px;
}
</style>

View File

@@ -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.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}
})
}
})
},
//查看认证记录

View File

@@ -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
@@ -187,21 +192,18 @@ export default {
display: flex;
align-items: center;
margin-top: 20px;
flex-wrap: wrap;
}
.progress>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;

View File

@@ -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
@@ -243,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;

View File

@@ -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
@@ -258,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;

View File

@@ -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
@@ -203,13 +208,15 @@ export default {
</el-col>
</div>
<el-form-item label="认证课程名称:" prop="courseName">
<el-input v-model="form.courseName" placeholder="请输入认证课程名称"></el-input>
<el-input v-model="form.courseName" maxlength="30"
show-word-limit placeholder="请输入认证课程名称"></el-input>
</el-form-item>
<el-form-item label="课程内容分类:" prop="courseContent_1">
<el-cascader placeholder="选择内容分类" style="width: 100%;" clearable v-model="form.courseContent_1" :props="sysProps" :options="sysTypeListMap"></el-cascader>
</el-form-item>
<el-form-item label="课程简介:" prop="courseIntroduction">
<el-input type="textarea" rows="5" v-model="form.courseIntroduction"></el-input>
<el-input type="textarea" maxlength="150"
show-word-limit rows="5" v-model="form.courseIntroduction"></el-input>
</el-form-item>
<el-form-item label="上传终稿:" required>
<el-upload
@@ -268,6 +275,8 @@ export default {
margin-top: 3px;
margin-bottom: 3px;
}
::v-deep .el-upload__tip{
font-size: 18px;
}
</style>

View File

@@ -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
@@ -226,7 +231,7 @@ export default {
<div>
<div class="title" style="margin-top: 20px">认证结果</div>
<div v-if="result1.reviewResult==2" class="score">请您耐心等待线下认证安排</div>
<div v-if="result1.reviewResult==0" class="score" style="color: #4b7900;">恭喜您您的认证分数为{{ result1.avgScore }}已经通过认证</div>
<div v-if="result1.reviewResult==0" class="score" style="color: #31AF0D;">恭喜您您的认证分数为{{ result1.avgScore }}已经通过认证</div>
<div v-if="result1.reviewResult==1" class="score" style="color: #ff0000">很遗憾您的认证分数为{{ result1.avgScore }}没有通过认证</div>
</div>
<div>
@@ -268,16 +273,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;

View File

@@ -100,6 +100,10 @@
{{ item.tip }}-{{ item.content }}
</div>
<div style="cursor: pointer;" @click="returnRouter(item)" class="msg-body-content" v-else>{{ item.tip }}
<span style="color:#0078FC;" v-if="item.refType == '100'||item.refType == '101'">点击查看</span>
</div>
<div style="cursor: pointer;" @click="returnRouter(item)" class="msg-body-content" v-else-if="item.refType == '102'">
{{ item.tip }}
</div>
</div>
<div v-else :class="!item.isRead ? 'infoActive' : ''" style="cursor: pointer;" @click="goRouter(item)"
@@ -425,6 +429,10 @@ export default {
this.$router.push('/qa/answer?id=' + item.refId);
} else if (item.refType == 1) {
this.$router.push('/course/studyindex?id=' + item.refId);
} else if (item.refType == 100) {
this.$router.push('/need/draft?teacherId=' + item.pageParams);
} else if (item.refType == 101) {
this.$router.push('/need/finalsuccess?teacherId=' + item.pageParams);
}
}