修改bug3.0

This commit is contained in:
李志发
2024-05-22 12:20:10 +08:00
parent c7267a0acd
commit 958a93c935
14 changed files with 354 additions and 320 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@@ -2,7 +2,10 @@
import {getCertificationProcess} from "@/api/modules/lecturer";
export default {
props: ['teacherId'],
props: {
teacherId:String,
pid:String
},
data(){
return{
status:{
@@ -11,167 +14,72 @@ export default {
onlineLearning:1,
offlineTutoring:1,
endStatus:1,
reviewResult:2,
reviewResult:3,
offlineTutoring1:1,
endStatus1:1,
reviewResult1:2,
reviewResult1:3,
}
}
},
mounted() {
this.getCertificationProcess()
created() {
if (this.pid==null || this.pid==''){
this.getCertificationProcess()
}else {
this.getCertificationProcess()
this.getCertificationProcess1()
}
},
watch: {
teacherId: {
handler(newVal) {
if (newVal) {
console.log(newVal)
this.getCertificationProcess()
}
}
},
},
methods:{
getCertificationProcess(){
getCertificationProcess({teacherId:this.teacherId}).then(res=>{
let data=res.data
if (data.secondResult==0 && data.reviewResult==0){
this.status={
secondResult:0,
draftStatus:0,
onlineLearning:0,
offlineTutoring:0,
endStatus:0,
reviewResult:1,
offlineTutoring1:0,
endStatus1:0,
reviewResult1:0,
}
}else if (data.secondResult==0 && data.reviewResult==1){
this.status={
secondResult:0,
draftStatus:0,
onlineLearning:0,
offlineTutoring:0,
endStatus:0,
reviewResult:1,
offlineTutoring1:0,
endStatus1:0,
reviewResult1:1,
}
}else if (data.secondResult==0 && data.endStatus==0){
this.status={
secondResult:0,
draftStatus:0,
onlineLearning:0,
offlineTutoring:0,
endStatus:0,
reviewResult:1,
offlineTutoring1:0,
endStatus1:0,
reviewResult1:2,
}
}else if (data.secondResult==0 && data.offlineTutoring==0){
this.status={
secondResult:0,
draftStatus:0,
onlineLearning:0,
offlineTutoring:0,
endStatus:0,
reviewResult:1,
offlineTutoring1:0,
endStatus1:1,
reviewResult1:2,
}
}else if (data.secondResult==0 && data.reviewResult==2){
this.status={
secondResult:0,
draftStatus:0,
onlineLearning:0,
offlineTutoring:0,
endStatus:0,
reviewResult:1,
offlineTutoring1:1,
endStatus1:1,
reviewResult1:2,
}
} else if (data.secondResult==1 && data.reviewResult==0){
this.status={
secondResult:1,
draftStatus:0,
onlineLearning:0,
offlineTutoring:0,
endStatus:0,
reviewResult:0,
offlineTutoring1:1,
endStatus1:1,
reviewResult1:2,
}
}else if (data.secondResult==1 && data.reviewResult==1){
this.status={
secondResult:1,
draftStatus:0,
onlineLearning:0,
offlineTutoring:0,
endStatus:0,
reviewResult:1,
offlineTutoring1:1,
endStatus1:1,
reviewResult1:2,
}
}else if (data.secondResult==1 && data.endStatus==0){
this.status={
secondResult:1,
draftStatus:0,
onlineLearning:0,
offlineTutoring:0,
endStatus:0,
reviewResult:2,
offlineTutoring1:1,
endStatus1:1,
reviewResult1:2,
}
}else if (data.secondResult==1 && data.offlineTutoring==0){
this.status={
secondResult:1,
draftStatus:0,
onlineLearning:0,
offlineTutoring:0,
endStatus:1,
reviewResult:2,
offlineTutoring1:1,
endStatus1:1,
reviewResult1:2,
}
}else if (data.secondResult==1 && data.onlineLearning==0){
this.status={
secondResult:1,
draftStatus:0,
onlineLearning:0,
offlineTutoring:1,
endStatus:1,
reviewResult:2,
offlineTutoring1:1,
endStatus1:1,
reviewResult1:2,
}
}else if (data.secondResult==1 && data.draftStatus==0){
this.status={
secondResult:1,
draftStatus:0,
onlineLearning:1,
offlineTutoring:1,
endStatus:1,
reviewResult:2,
offlineTutoring1:1,
endStatus1:1,
reviewResult1:2,
}
}else{
this.status={
secondResult:1,
draftStatus:1,
onlineLearning:1,
offlineTutoring:1,
endStatus:1,
reviewResult:2,
offlineTutoring1:1,
endStatus1:1,
reviewResult1:3,
if(data.draftStatus==0){
this.status.draftStatus=0
if (data.onlineLearning==0){
this.status.onlineLearning=0
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.onlineLearning==2){
this.status.onlineLearning=2
}
}else if (data.draftStatus==2){
this.status.draftStatus=2
}
})
},
getCertificationProcess1(){
getCertificationProcess({teacherId:this.pid}).then(res=>{
console.log(res)
let data=res.data
if(data.secondResult==0){
this.status.secondResult=0
if (data.offlineTutoring==0){
this.status.offlineTutoring1=0
if (data.endStatus==0){
this.status.endStatus1=0
this.status.reviewResult1=data.reviewResult
}
}
}
})
}
}
};
@@ -188,7 +96,8 @@ export default {
<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">
<div :class="status.onlineLearning==1?'tim1':'tim'">{{status.onlineLearning==1?'线上学习未完成':'线上学习已完成'}}</div>
<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="process">
@@ -209,9 +118,9 @@ export default {
<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>
{{status.reviewResult==3?'未认证':status.reviewResult==2?'认证':status.reviewResult==1?'认证未通过':'认证通过'}}</div>
</div>
<div :class="status.reviewResult==3?'line1':status.reviewResult==2?'line3':status.reviewResult==1?'line2':'line'" v-if="status.secondResult==0"></div>
<div :class="status.reviewResult==3?'line1':status.reviewResult==2?'line':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">
@@ -230,7 +139,7 @@ export default {
<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>
{{status.reviewResult1==3?'未认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证通过'}}</div>
</div>
</div>
</template>

View File

@@ -84,9 +84,9 @@ export default {
<el-form-item required label="辅导时间:">
<el-date-picker
v-model="value2"
type="date"
type="datetime"
placeholder="选择日期"
format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>

View File

@@ -137,7 +137,9 @@ export default {
<div>
<el-col :span="11">
<el-form-item label="认证课程名称:" prop="courseName">
{{ form.courseName }}
<div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;cursor: pointer;" :title="form.courseName">
{{ form.courseName }}
</div>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -162,7 +164,7 @@ export default {
<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="courseName" :title="item.courseName">{{ item.courseName }}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="parseInt(item.progress)" :color="parseInt(item.progress)=='100'?'#31AF0D':'#FFA050'"></el-progress>
</div>
@@ -220,6 +222,11 @@ export default {
color: #333333;
font-size: 14px;
margin-top: 12px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
width: 100%;
}
.smallTitle {

View File

@@ -2,6 +2,7 @@
import {mapActions, mapGetters} from "vuex";
import {getCertificationProcess, getTeacherInfo, setOfflineTutoring, treeList} from "@/api/modules/lecturer"
import processStatus from "@/components/processStatus.vue";
import axios from "axios";
export default {
name: "FinalDraft",
components: {processStatus},
@@ -143,6 +144,14 @@ export default {
message: '上传失败',
type: 'error'
});
},
beforeUpload(file) {
axios.defaults.timeout = 30000;
const isLt2M = file.size / 1024 / 1024 <= 500;
if (!isLt2M) {
this.$message.error('文件大小超出500M请重新上传');
}
return isLt2M;
}
},
created() {
@@ -209,6 +218,7 @@ export default {
:on-success="handlSuccess"
:on-error="handlError"
:limit="1"
:before-upload="beforeUpload"
:on-remove="handRemove"
multiple>
<i class="el-icon-upload"></i>

View File

@@ -49,9 +49,9 @@ export default {
query: {teacherId: this.newTeacherId}
})
} else {
this.isFalse = false
this.$router.push('/need/lecturer')
}
}else {
} else {
this.$message({
message: res.msg,
type: 'error'
@@ -135,7 +135,7 @@ export default {
}
})
},
getJumplist(){
getJumplist() {
this.$router.push('/need/lecturer')
}
}
@@ -176,7 +176,9 @@ export default {
<div>
<el-col :span="11">
<el-form-item label="认证课程名称:" prop="courseName">
{{ form.courseName }}
<div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;cursor: pointer;" :title="form.courseName">
{{ form.courseName }}
</div>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -203,7 +205,7 @@ export default {
<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="courseName" :title="item.courseName">{{ item.courseName }}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="parseInt(item.progress)"
:color="parseInt(item.progress)=='100'?'#31AF0D':'#FFA050'"></el-progress>
@@ -235,11 +237,11 @@ export default {
很遗憾您的认证分数为{{ result.avgScore }}没有通过认证
</div>
</div>
<div class="twoFactorAuthentication" v-if="statusInfo.reviewResult==1&&isFalse&&statusInfo.second!=2">
<div class="twoFactorAuthentication" v-if="statusInfo.reviewResult==1&&statusInfo.second==0">
<img src="../../assets/images/rightImg.png" alt="">
<div class="titleAuthentication">是否进行二次认证</div>
<div class="yes" @click="getoFactor(1)"></div>
<div class="no" @click="getJumplist"></div>
<div class="no" @click="getoFactor(2)"></div>
</div>
</div>
</template>
@@ -274,6 +276,11 @@ export default {
color: #333333;
font-size: 14px;
margin-top: 12px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
width: 100%;
}
.smallTitle {
@@ -298,7 +305,7 @@ export default {
.score {
margin-top: 28px;
font-size: 14px;
font-size: 18px;
color: #333333;
font-weight: 400;
}
@@ -311,18 +318,21 @@ export default {
border-radius: 6px;
display: flex;
align-items: center;
img{
img {
width: 20px;
height: 20px;
margin-left: 23px;
}
.titleAuthentication{
.titleAuthentication {
font-weight: 500;
font-size: 16px;
color: #333333;
margin-left: 16px;
}
.yes{
.yes {
width: 64px;
height: 24px;
background: #409EFF;
@@ -337,10 +347,11 @@ export default {
margin-left: 20px;
cursor: pointer;
}
.no{
.no {
width: 64px;
height: 24px;
background:rgba(64,158,255,0.1);
background: rgba(64, 158, 255, 0.1);
border: 1px solid #409EFF;
font-weight: 400;
font-size: 14px;
@@ -377,4 +388,12 @@ export default {
color: #333333;
line-height: 40px;
}
.over {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
width: 580px;
}
</style>

View File

@@ -2,6 +2,7 @@
import {mapActions, mapGetters} from "vuex";
import {getCertificationProcess, getTeacherInfo, setOfflineTutoring, treeList} from "@/api/modules/lecturer"
import processStatus from '@/components/processStatus.vue';
import axios from "axios";
export default {
name: "FirstDraft",
computed: {
@@ -146,6 +147,14 @@ export default {
message: '上传失败',
type: 'error'
});
},
beforeUpload(file) {
axios.defaults.timeout = 30000;
const isLt2M = file.size / 1024 / 1024 <= 500;
if (!isLt2M) {
this.$message.error('文件大小超出500M请重新上传');
}
return isLt2M;
}
},
@@ -202,6 +211,7 @@ export default {
action="/activityApi/certification/uploadCourseware"
accept=".ppt,.pptx,.pdf"
:on-success="handlSuccess"
:before-upload="beforeUpload"
:on-error="handlError"
:limit="1"
:on-remove="handRemove"

View File

@@ -84,12 +84,12 @@ export default {
})
}else if (data.offlineTutoring==0 && data.endStatus==1){
this.$router.push({
path:'/need/final',
path:'/need/coachingsuccess',
query:{teacherId:item.teacherId}
})
}else if (data.offlineTutoring==1 && data.onlineLearning==0){
this.$router.push({
path:'/need/coaching',
path:'/need/onlinelearning',
query:{teacherId:item.teacherId}
})
}else if (data.onlineLearning==2 || data.onlineLearning==1){
@@ -155,7 +155,7 @@ export default {
<span style="font-size:18px;color:#333">{{ item.draftStatus==1?item.examineName:item.courseName }}</span>
</div>
<div class="summary-item">
<div>{{ item.draftStatus==1?item.description:item.courseIntroduction }}</div>
<div>{{ item.reviewResult==3?item.description:item.courseIntroduction }}</div>
</div>
<div class="uc-course-text">
{{ item.reviewResult==3||item.reviewResult==2?'报名时间':'认证时间' }}{{ item.reviewResult==3||item.reviewResult==2?item.createTime:item.reviewTime }}

View File

@@ -18,7 +18,8 @@ export default {
fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL,
disabled:false,
statusInfo:'',
teacherInfo:''
teacherInfo:'',
pid:''
}
},
created() {
@@ -56,6 +57,10 @@ export default {
getProgress(id){
getProgress({teacherId:id}).then(res=>{
this.progressData=res.data
if (res.data.length==0){
this.disabled=true
return
}
res.data.forEach((item,index)=>{
if (item.progress!=100){
this.disabled=true
@@ -96,7 +101,7 @@ export default {
<template>
<div>
<process-status :teacherId="teacherId"></process-status>
<process-status :teacherId="teacherId.toString()" :pid="pid.toString()"></process-status>
<div class="title">基本信息</div>
<el-container>
<div class="form-table">
@@ -127,8 +132,10 @@ export default {
</div>
<div>
<el-col :span="11">
<el-form-item label="认证课程名称:" prop="courseName">
{{form.courseName}}
<el-form-item label="认证课程名称:" prop="courseName">
<div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;cursor: pointer;" :title="form.courseName">
{{ form.courseName }}
</div>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -153,7 +160,7 @@ export default {
<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="courseName" :title="item.courseName">{{ item.courseName }}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="parseInt(item.progress)" :color="parseInt(item.progress)=='100'?'#31AF0D':'#FFA050'"></el-progress>
</div>
@@ -190,11 +197,16 @@ export default {
width: 300px;
margin-right: 30px;
}
.courseName{
.courseName {
font-weight: 650;
color: #333333;
font-size: 14px;
margin-top: 12px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
width: 100%;
}
.smallTitle{
color:#134054;

View File

@@ -67,6 +67,8 @@ export default {
this.form.courseContent=resquest.data[0].courseContent
this.form.courseIntroduction=resquest.data[0].courseIntroduction
this.form.coursewareName=resquest.data[0].examineCourseware.coursewareName
this.form.tutor = resquest.data[0].tutor.split(',')
this.form.tutorTime = resquest.data[0].tutorTime
//获取学习进度
this.getReviewResult()
this.addTeacher()
@@ -129,7 +131,7 @@ export default {
<template>
<div>
<process-status :teacherId="teacherId"></process-status>
<process-status :teacherId="pid.toString()" :pid="teacherId.toString()"></process-status>
<div class="title">基本信息</div>
<el-container>
<div class="form-table">
@@ -161,7 +163,9 @@ export default {
<div>
<el-col :span="11">
<el-form-item label="认证课程名称:" prop="courseName">
{{ form.courseName }}
<div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;cursor: pointer;" :title="form.courseName">
{{ form.courseName }}
</div>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -188,12 +192,28 @@ export default {
<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="courseName" :title="item.courseName">{{ item.courseName }}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="parseInt(item.progress)"
:color="parseInt(item.progress)=='100'?'#31AF0D':'#FFA050'"></el-progress>
</div>
</div>
<div>
<div class="title" style="margin-top: 20px">线下辅导</div>
<el-container>
<div class="form-table">
<el-form>
<el-form-item label="辅导老师:">
<span v-for="(item,index) in form.tutor" :key="item"
style="display: inline-block;margin-right: 20px">{{ item }}</span>
</el-form-item>
<el-form-item label="辅导时间:">
{{ form.tutorTime }}
</el-form-item>
</el-form>
</div>
</el-container>
</div>
<div>
<div class="title" style="margin-top: 20px">认证结果</div>
<div v-if="statusInfo1.reviewResult==2" class="score">请您耐心等待线下认证安排</div>
@@ -201,7 +221,7 @@ export default {
<div v-if="statusInfo1.reviewResult==1" class="score" style="color: #ff0000">很遗憾您的认证分数为{{ result.avgScore }}没有通过认证</div>
</div>
<div>
<div class="title" style="margin-top: 20px">线下辅导</div>
<div class="title" style="margin-top: 20px">二次线下辅导</div>
<div class="tip">提示您的线上课程已经学习完毕快去进行下一步吧</div>
</div>
<el-button type="primary" style="margin-top: 20px;margin-left: 80px" @click="getJump()">下一步</el-button>
@@ -228,11 +248,16 @@ export default {
width: 300px;
margin-right: 30px;
}
.courseName{
.courseName {
font-weight: 650;
color: #333333;
font-size: 14px;
margin-top: 12px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
width: 100%;
}
.smallTitle{
color:#134054;
@@ -252,7 +277,7 @@ export default {
}
.score {
margin-top: 28px;
font-size: 14px;
font-size: 18px;
color: #333333;
font-weight: 400;
}

View File

@@ -1,5 +1,5 @@
<script>
import {addTeacher, getCertificationProcess, setOfflineTutoring} from "@/api/modules/lecturer";
import {addTeacher, getCertificationProcess, getTeacherInfo, setOfflineTutoring} from "@/api/modules/lecturer";
import processStatus from "@/components/processStatus.vue";
export default {
@@ -10,7 +10,8 @@ export default {
options: [],
value: '',
value2:'',
teacherId:''
teacherId:'',
pid:''
}
},
created() {
@@ -18,6 +19,9 @@ export default {
this.teacherId=this.$route.query.teacherId
//获取老师列表
this.getTeacherList()
getTeacherInfo({teacherId:this.teacherId}).then(res=> {
this.pid = res.data[0].pid
})
},
methods:{
getTeacherList() {
@@ -56,7 +60,7 @@ export default {
<template>
<div>
<process-status :teacherId="teacherId"></process-status>
<process-status :teacherId="pid.toString()" :pid="teacherId.toString()"></process-status>
<div class="title">二次线下辅导</div>
<el-container>
<div class="form-table">
@@ -83,9 +87,9 @@ export default {
<el-form-item required label="辅导时间:">
<el-date-picker
v-model="value2"
type="date"
type="datetime"
placeholder="选择日期"
format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>

View File

@@ -11,91 +11,89 @@ import processStatus from "@/components/processStatus.vue";
export default {
name: "TwoCos",
components: {processStatus},
data() {
return {
teacherId: '',
form: {
teacherName: '',
teacherNo: '',
orgName: ''
data(){
return{
teacherId:'',
form:{
teacherName:'',
teacherNo:'',
orgName:''
},
progressData: {},
fileBaseUrl: process.env.VUE_APP_BOE_MOBILE_URL,
disabled: false,
statusInfo: '',
statusInfo1: '',
result: '',
newTeacherId: '',
pid: '',
teacherInfo: ''
progressData:{},
fileBaseUrl:process.env.VUE_APP_BOE_MOBILE_URL,
disabled:false,
statusInfo:'',
result:'',
newTeacherId:'',
pid:'',
statusInfo1:'',
teacherInfo:'',
form1:{}
}
},
created() {
//读取路由参数
this.teacherId = this.$route.query.teacherId
this.teacherId=this.$route.query.teacherId
//获取教师基本信息
this.baseInfo()
// this.getReviewResult()
},
methods: {
methods:{
//获取认证结果
getReviewResult() {
getReviewResult({teacherId: this.pid}).then(res => {
this.result = res.data
getReviewResult(){
getReviewResult({teacherId:this.pid}).then(res=>{
this.result=res.data
})
},
//获取教师认证状态
getStatus() {
getCertificationProcess({teacherId: this.teacherId}).then(res => {
this.statusInfo = res.data
getStatus(){
getCertificationProcess({teacherId:this.teacherId}).then(res=>{
this.statusInfo=res.data
})
getCertificationProcess({teacherId: this.pid}).then(res => {
this.statusInfo1 = res.data
getCertificationProcess({teacherId:this.pid}).then(res=>{
this.statusInfo1=res.data
})
},
baseInfo() {
getTeacherInfo({teacherId: this.teacherId}).then(res => {
this.pid = res.data[0].pid
this.form.tutor = res.data[0].tutor.split(',')
this.form.tutorTime = res.data[0].tutorTime
getTeacherInfo({teacherId: res.data[0].pid}).then(resquest => {
baseInfo(){
getTeacherInfo({teacherId:this.teacherId}).then(res=>{
this.pid=res.data[0].pid
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
this.form.courseContent = resquest.data[0].courseContent
this.form.courseIntroduction = resquest.data[0].courseIntroduction
if (res.data[0].examineCourseware == '' || resquest.data[0].examineCourseware == null) {
} else {
this.form.coursewareName = resquest.data[0].examineCourseware.coursewareName
}
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
this.form.courseContent=resquest.data[0].courseContent
this.form.courseIntroduction=resquest.data[0].courseIntroduction
this.form.coursewareName=resquest.data[0].examineCourseware.coursewareName
this.form.tutor = resquest.data[0].tutor.split(',')
this.form.tutorTime = resquest.data[0].tutorTime
//获取学习进度
this.getReviewResult()
this.addTeacher()
this.getStatus()
this.getReviewResult()
})
/*
* teacherName:教师姓名 teacherNo:教师工号 orgName:组织 positionName:岗位 bandCode:职级 courseName:认证课程名称 courseContent课程内容分类
* courseIntroduction:课程简介
* */
})
},
addTeacher() {
addTeacher({pageNo: 1, pageSize: 10, keyword: this.form.teacherNo}).then(res => {
addTeacher(){
addTeacher({pageNo:1,pageSize:10,keyword:this.form.teacherNo}).then(res=>{
this.getProgress(res.data[0].id)
})
},
getProgress(id) {
getProgress({teacherId: id}).then(res => {
this.progressData = res.data
res.data.forEach((item, index) => {
if (item.progress != 100) {
this.disabled = true
getProgress(id){
getProgress({teacherId:id}).then(res=>{
this.progressData=res.data
res.data.forEach((item,index)=>{
if (item.progress!=100){
this.disabled=true
return
}
})
@@ -104,13 +102,13 @@ export default {
format(percentage) {
return percentage === 100 ? '满' : `${percentage}%`;
},
getJump() {
getJump(){
this.$router.push({
path: '/need/twofinal',
query: {teacherId: this.teacherId}
path:'/need/twofinal',
query:{teacherId:this.teacherId}
})
},
toCaseData(courseId) {
toCaseData(courseId){
this.$router.push("/course/studyindex?id=" + courseId);
},
downloadFile() {
@@ -136,7 +134,7 @@ export default {
<template>
<div>
<process-status :teacherId="teacherId"></process-status>
<process-status :teacherId="pid.toString()" :pid="teacherId.toString()"></process-status>
<div class="title">基本信息</div>
<el-container>
<div class="form-table">
@@ -168,7 +166,9 @@ export default {
<div>
<el-col :span="11">
<el-form-item label="认证课程名称:" prop="courseName">
{{ form.courseName }}
<div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;cursor: pointer;" :title="form.courseName">
{{ form.courseName }}
</div>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -195,26 +195,14 @@ export default {
<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="courseName" :title="item.courseName">{{ item.courseName }}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="parseInt(item.progress)"
:color="parseInt(item.progress)=='100'?'#31AF0D':'#FFA050'"></el-progress>
</div>
</div>
<div>
<div class="title" style="margin-top: 20px">认证结果</div>
<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>
<div>
<div class="title" style="margin-top: 20px">二次线下辅导</div>
<div class="title" style="margin-top: 20px">线下辅导</div>
<el-container>
<div class="form-table">
<el-form>
@@ -229,73 +217,86 @@ export default {
</div>
</el-container>
</div>
<div class="tip">
提示您已完成线下辅导快去进行下一步吧
<div>
<div class="title" style="margin-top: 20px">认证结果</div>
<div v-if="statusInfo1.reviewResult==2" class="score">请您耐心等待线下认证安排</div>
<div v-if="statusInfo1.reviewResult==0" class="score" style="color: #4b7900;">恭喜您您的认证分数为{{ result.avgScore }}已经通过认证</div>
<div v-if="statusInfo1.reviewResult==1" class="score" style="color: #ff0000">很遗憾您的认证分数为{{ result.avgScore }}没有通过认证</div>
</div>
<el-button type="primary" style="margin-top: 20px;" @click="getJump()">下一步</el-button>
<div>
<div class="title" style="margin-top: 20px">二次线下辅导</div>
<el-container>
<div class="form-table">
<el-form>
<el-form-item label="辅导老师:">
<span v-for="(item,index) in form1.tutor" :key="item"
style="display: inline-block;margin-right: 20px">{{ item }}</span>
</el-form-item>
<el-form-item label="辅导时间:">
{{ form1.tutorTime }}
</el-form-item>
</el-form>
</div>
</el-container>
</div>
<el-button type="primary" style="margin-top: 20px;margin-left: 80px" @click="getJump()">下一步</el-button>
</div>
</template>
<style scoped lang="scss">
.title {
.title{
font-size: 16px;
font-weight: 800;
border-bottom: 1px solid rgba(153, 153, 153, 0.2);
padding: 2px 2px 20px 2px;
}
.form-table {
.form-table{
width: 100%;
margin-top: 20px;
}
.progress {
display: flex;
align-items: center;
margin-top: 20px;
}
.progress > div {
width: 300px;
margin-right: 30px;
}
.courseName {
font-weight: 650;
color: #333333;
font-size: 14px;
margin-top: 12px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
width: 100%;
}
.smallTitle {
color: #134054;
font-size: 12px;
.smallTitle{
color:#134054;
font-size:12px;
margin-top: 7px;
}
::v-deep .el-form-item__content {
::v-deep .el-form-item__content{
font-weight: 500;
}
::v-deep .el-form-item {
::v-deep .el-form-item{
margin-bottom: 0px;
}
.tip {
.tip{
color: #333333;
font-size: 14px;
margin-top: 20px;
}
.score {
margin-top: 28px;
font-size: 14px;
font-size: 18px;
color: #333333;
font-weight: 400;
}
.twoFactorAuthentication {
.twoFactorAuthentication{
width: 344px;
height: 135px;
padding: 2px 2px 2px 2px;
@@ -308,7 +309,6 @@ export default {
justify-content: center;
align-items: center;
}
.remind {
margin-bottom: 20px;
box-sizing: border-box;

View File

@@ -2,6 +2,7 @@
import {mapActions, mapGetters} from "vuex";
import {getCertificationProcess, getTeacherInfo, setOfflineTutoring, treeList} from "@/api/modules/lecturer"
import processStatus from "@/components/processStatus.vue";
import axios from "axios";
export default {
name: "TwoFinal",
components: {processStatus},
@@ -35,6 +36,7 @@ export default {
coursewareUrl:'',
courseContent_1:''
},
pid:'',
rules: {
courseName: [
{required: true, message: '请输入认证课程名称', trigger: 'change'},
@@ -68,6 +70,7 @@ export default {
},
baseInfo(){
getTeacherInfo({teacherId:this.teacherId}).then(res=>{
this.pid=res.data[0].pid
this.form.teacherName=res.data[0].teacherName
this.form.teacherNo=res.data[0].teacherNo
this.form.orgName=res.data[0].orgName
@@ -143,6 +146,14 @@ export default {
message: '上传失败',
type: 'error'
});
},
beforeUpload(file) {
axios.defaults.timeout = 30000;
const isLt2M = file.size / 1024 / 1024 <= 500;
if (!isLt2M) {
this.$message.error('文件大小超出500M请重新上传');
}
return isLt2M;
}
},
created() {
@@ -159,7 +170,7 @@ export default {
<template>
<div>
<process-status :teacherId="teacherId"></process-status>
<process-status :teacherId="pid.toString()" :pid="teacherId.toString()"></process-status>
<div class="title">二次认证-上传终稿</div>
<el-container>
<div class="form-table">
@@ -210,6 +221,7 @@ export default {
:on-error="handlError"
:limit="1"
:on-remove="handRemove"
:before-upload="beforeUpload"
multiple>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>

View File

@@ -28,7 +28,10 @@ export default {
result1:'',
newTeacherId:'',
pid:'',
teacherInfo:''
teacherInfo:'',
form1:{
}
}
},
created() {
@@ -58,31 +61,31 @@ export default {
},
baseInfo(){
getTeacherInfo({teacherId:this.teacherId}).then(res=>{
this.teacherInfo = res.data[0]
this.pid=res.data[0].pid
this.form1.tutor = res.data[0].tutor.split(',')
this.form1.tutorTime = res.data[0].tutorTime
this.form.courseName=res.data[0].courseName
this.form.courseContent=res.data[0].courseContent
this.form.courseIntroduction=res.data[0].courseIntroduction
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.coursewareName=resquest.data[0].examineCourseware.coursewareName
this.form.tutor = resquest.data[0].tutor.split(',')
this.form.tutorTime = resquest.data[0].tutorTime
//获取学习进度
this.getReviewResult()
this.addTeacher()
this.getStatus()
})
/*
* 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
this.form.courseContent=res.data[0].courseContent
this.form.courseIntroduction=res.data[0].courseIntroduction
if (res.data[0].examineCourseware==''||res.data[0].examineCourseware==null){
}else {
this.form.coursewareName=res.data[0].examineCourseware.coursewareName
}
this.form.tutor=res.data[0].tutor.split(',')
this.form.tutorTime=res.data[0].tutorTime
this.pid=res.data[0].pid
//获取学习进度
this.addTeacher()
this.getStatus()
this.getReviewResult()
})
},
addTeacher(){
@@ -137,7 +140,7 @@ export default {
<template>
<div>
<process-status :teacherId="teacherId"></process-status>
<process-status :teacherId="pid.toString()" :pid="teacherId.toString()"></process-status>
<div class="title">基本信息</div>
<el-container>
<div class="form-table">
@@ -169,7 +172,9 @@ export default {
<div>
<el-col :span="11">
<el-form-item label="认证课程名称:" prop="courseName">
{{ form.courseName }}
<div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;cursor: pointer;" :title="form.courseName">
{{ form.courseName }}
</div>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -196,12 +201,28 @@ export default {
<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="courseName" :title="item.courseName ">{{ item.courseName }}</div>
<div class="smallTitle">当前进度</div>
<el-progress :percentage="parseInt(item.progress)"
:color="parseInt(item.progress)=='100'?'#31AF0D':'#FFA050'"></el-progress>
</div>
</div>
<div>
<div class="title" style="margin-top: 20px">线下辅导</div>
<el-container>
<div class="form-table">
<el-form>
<el-form-item label="辅导老师:">
<span v-for="(item,index) in form.tutor" :key="item"
style="display: inline-block;margin-right: 20px">{{ item }}</span>
</el-form-item>
<el-form-item label="辅导时间:">
{{ form.tutorTime }}
</el-form-item>
</el-form>
</div>
</el-container>
</div>
<div>
<div class="title" style="margin-top: 20px">认证结果</div>
<div v-if="result1.reviewResult==2" class="score">请您耐心等待线下认证安排</div>
@@ -214,10 +235,10 @@ export default {
<div class="form-table">
<el-form>
<el-form-item label="辅导老师:">
<span v-for="(item,index) in form.tutor" :key="item" style="display: inline-block;margin-right: 20px">{{item}}</span>
<span v-for="(item,index) in form1.tutor" :key="item" style="display: inline-block;margin-right: 20px">{{item}}</span>
</el-form-item>
<el-form-item label="辅导时间:">
{{form.tutorTime}}
{{form1.tutorTime}}
</el-form-item>
</el-form>
</div>
@@ -252,11 +273,16 @@ export default {
width: 300px;
margin-right: 30px;
}
.courseName{
.courseName {
font-weight: 650;
color: #333333;
font-size: 14px;
margin-top: 12px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
width: 100%;
}
.smallTitle{
color:#134054;
@@ -276,7 +302,7 @@ export default {
}
.score {
margin-top: 28px;
font-size: 14px;
font-size: 18px;
color: #333333;
font-weight: 400;
}