diff --git a/src/assets/images/E-learning2.png b/src/assets/images/E-learning2.png new file mode 100644 index 00000000..d5cf969a Binary files /dev/null and b/src/assets/images/E-learning2.png differ diff --git a/src/components/processStatus.vue b/src/components/processStatus.vue index 71d0b3b0..7b35004a 100644 --- a/src/components/processStatus.vue +++ b/src/components/processStatus.vue @@ -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 {
-
{{status.onlineLearning==1?'线上学习未完成':'线上学习已完成'}}
+ +
{{status.onlineLearning==1?'线上学习未完成':status.onlineLearning==2?'线上学习进行中':'线上学习已完成'}}
@@ -209,9 +118,9 @@ export default {
- {{status.reviewResult==3?'未认证':status.reviewResult==2?'认证中':status.reviewResult==1?'认证未通过':'认证通过'}}
+ {{status.reviewResult==3?'未认证':status.reviewResult==2?'认证':status.reviewResult==1?'认证未通过':'认证通过'}}
-
+
@@ -230,7 +139,7 @@ export default {
- {{status.reviewResult1==3?'未认证':status.reviewResult1==2?'认证中':status.reviewResult1==1?'认证未通过':'认证通过'}}
+ {{status.reviewResult1==3?'未认证':status.reviewResult1==2?'认证':status.reviewResult1==1?'认证未通过':'认证通过'}}
diff --git a/src/views/lecturer/CoachingPage.vue b/src/views/lecturer/CoachingPage.vue index c3bf7e21..35c806a1 100644 --- a/src/views/lecturer/CoachingPage.vue +++ b/src/views/lecturer/CoachingPage.vue @@ -84,9 +84,9 @@ export default { diff --git a/src/views/lecturer/CoachingSuccess.vue b/src/views/lecturer/CoachingSuccess.vue index ed29b975..b999e1df 100644 --- a/src/views/lecturer/CoachingSuccess.vue +++ b/src/views/lecturer/CoachingSuccess.vue @@ -137,7 +137,9 @@ export default {
- {{ form.courseName }} +
+ {{ form.courseName }} +
@@ -162,7 +164,7 @@ export default {
-
{{ item.courseName }}
+
{{ item.courseName }}
当前进度
@@ -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 { diff --git a/src/views/lecturer/FinalDraft.vue b/src/views/lecturer/FinalDraft.vue index 6c8db5e4..22bf4405 100644 --- a/src/views/lecturer/FinalDraft.vue +++ b/src/views/lecturer/FinalDraft.vue @@ -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> diff --git a/src/views/lecturer/FinalSuccess.vue b/src/views/lecturer/FinalSuccess.vue index 21d071a3..9de96824 100644 --- a/src/views/lecturer/FinalSuccess.vue +++ b/src/views/lecturer/FinalSuccess.vue @@ -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 {
- {{ form.courseName }} +
+ {{ form.courseName }} +
@@ -203,7 +205,7 @@ export default {
-
{{ item.courseName }}
+
{{ item.courseName }}
当前进度
@@ -235,11 +237,11 @@ export default { 很遗憾，您的认证分数为{{ result.avgScore }}分，没有通过认证！ -
+
是否进行二次认证？
是
-
否
+
否
@@ -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; +} diff --git a/src/views/lecturer/FirstDraft.vue b/src/views/lecturer/FirstDraft.vue index 626bc36d..e63b5e49 100644 --- a/src/views/lecturer/FirstDraft.vue +++ b/src/views/lecturer/FirstDraft.vue @@ -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" diff --git a/src/views/lecturer/Index.vue b/src/views/lecturer/Index.vue index 2b743dd8..f32863cc 100644 --- a/src/views/lecturer/Index.vue +++ b/src/views/lecturer/Index.vue @@ -28,7 +28,7 @@ export default { query:{teacherId:teacherId} }) }, - //列表 + // 列表 getList(){ this.params.teacherNo=this.userInfo.userNo pageList(this.params).then(res=>{ @@ -36,7 +36,12 @@ export default { this.total=res.data.page.total }) }, - //重置 + // 搜索 + searchList(){ + this.params.pageNo = 1; + this.getList(); + }, + // 重置 closePageFind(){ this.params.courseName = ''; this.params.pageNo = 1; @@ -50,7 +55,7 @@ export default { this.params.pageNo = val; this.getList(); }, - //根据认证状态跳转页面 + // 根据认证状态跳转页面 getView(item){ getCertificationProcess({teacherId:item.teacherId}).then(res=>{ var data = res.data @@ -79,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){ @@ -129,15 +134,10 @@ export default {