diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue index f32d383f..77a01cae 100644 --- a/src/components/UserCenter/menu.vue +++ b/src/components/UserCenter/menu.vue @@ -298,7 +298,7 @@ 我的必修 - + 我的选修 @@ -563,15 +563,19 @@ export default { ] Promise.all(promises).then(() => { sessionStorage.setItem('totalNums', this.fistTotals + this.pathTotals + this.growTotal); - if(path == '/uc/study/task'){ + if(path == '/uc/study/task' && (route.query.type === undefined|| route.query.type === null)){ if(this.fistTotals != 0){ this.$router.push('/uc/study/task?type=1') + this.activeMenu = '/uc/study/task?type=1' }else if (this.growTotal != 0){ this.$router.push('/uc/study/growth') + this.activeMenu = '/uc/study/growth' }else if (this.pathTotals != 0){ this.$router.push('/uc/study/task?type=2') + this.activeMenu = '/uc/study/task?type=2' }else{ this.$router.push('/uc/study/task?type=9') + this.activeMenu = '/uc/study/task?type=9' } } }); diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue index aa231537..53ed01ef 100644 --- a/src/views/exam/ExamList.vue +++ b/src/views/exam/ExamList.vue @@ -1078,6 +1078,10 @@ export default { }) }, deleteData(row) { + if(row.refType == 14 && row.refStatus == 1){ + this.$message.error('该考试已被专业力必修引用,不能删除!') + return + } this.$confirm('此操作将永久删除该考试, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消',