Merge branch 'boe_0704_line' into dev0515

This commit is contained in:
zhangsir
2024-07-04 09:55:56 +08:00

View File

@@ -295,6 +295,7 @@ import {courseType} from '../../utils/tools.js';
import apiCourse from '../../api/modules/course.js'; import apiCourse from '../../api/modules/course.js';
// import {resOwnerIndexName,sysTypeIndexName} from '@/utils/type.js'; // import {resOwnerIndexName,sysTypeIndexName} from '@/utils/type.js';
import { mapGetters,mapActions } from 'vuex'; import { mapGetters,mapActions } from 'vuex';
import apiUserbasic from "@/api/boe/userbasic.js"
export default { export default {
name: 'manageCourse', name: 'manageCourse',
components: {courseForm, manager, auditCourse1, auditCourse2,adminPage}, components: {courseForm, manager, auditCourse1, auditCourse2,adminPage},
@@ -303,6 +304,7 @@ export default {
}, },
data() { data() {
return { return {
audiences: [],
forChoose:false, forChoose:false,
pageManage:false, pageManage:false,
showDetails: false, showDetails: false,
@@ -385,6 +387,7 @@ export default {
}; };
}, },
mounted() { mounted() {
this.getAudiences()
let chooseFlag=this.$route.query.f; let chooseFlag=this.$route.query.f;
this.extendRefId=this.$route.query.refId; this.extendRefId=this.$route.query.refId;
this.extendRefType=this.$route.query.refType; this.extendRefType=this.$route.query.refType;
@@ -401,7 +404,7 @@ export default {
} }
// this.getTree(); // this.getTree();
// this.getTypeData(); // this.getTypeData();
this.searchData(); // this.searchData();
this.getResOwnerTree().then(rs=>{ this.getResOwnerTree().then(rs=>{
this.resOwnerListMap=rs; this.resOwnerListMap=rs;
}); });
@@ -415,6 +418,14 @@ export default {
}, },
methods: { methods: {
getAudiences(){
apiUserbasic.getInAudienceIds().then(res=>{
if (res.status == 200) {
this.audiences = res.result;
}
this.searchData();
})
},
showStudent(row){ showStudent(row){
//出现学员管理 //出现学员管理
window.parent.openSelectStu(row); window.parent.openSelectStu(row);
@@ -647,6 +658,9 @@ export default {
this.params.sysType3 = this.sysTypeList[2]; this.params.sysType3 = this.sysTypeList[2];
if(this.$route.query.courseIds) this.params.courseIds = this.$route.query.courseIds.split(','); if(this.$route.query.courseIds) this.params.courseIds = this.$route.query.courseIds.split(',');
if(this.$route.query.projectId) this.params.projectId = this.$route.query.projectId; if(this.$route.query.projectId) this.params.projectId = this.$route.query.projectId;
if(this.audiences && this.audiences.length > 0){
this.params.audiences = this.audiences.join(',');
}
apiCourse.pageList(this.params).then(rs=>{ apiCourse.pageList(this.params).then(rs=>{
if(rs.status==200){ if(rs.status==200){
this.pageData = rs.result.list; this.pageData = rs.result.list;