hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-09 19:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev0731' into 'master'

Browse Source 
Dev0731

See merge request !23
This commit is contained in:
joshen
2023-08-17 20:57:39 +08:00
parent cbf181b4fb 4b2816e183
commit 6daced36c3
6 changed files with 94 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.env.development
View File

@@ -45,3 +45,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
# scorm课件的播放url地址
VUE_APP_SCORM_URL = 'http://localhost:9083/scorm-player'
#案例组织领域类型
VUE_APP_CASE_TYPE = '90'

3
.env.production
View File

@@ -43,3 +43,6 @@ VUE_APP_LOGIN_URL='https://u.boe.com/web/'
# scorm课件的播放url地址
VUE_APP_SCORM_URL = 'https://u.boe.com/newscorm/scorm-player'
#案例组织领域类型
VUE_APP_CASE_TYPE = '155'

3
.env.testing
View File

@@ -42,3 +42,6 @@ VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/'
# scorm课件的播放url地址
VUE_APP_SCORM_URL = 'https://u-pre.boe.com/newscorm/scorm-player'
#案例组织领域类型
VUE_APP_CASE_TYPE = '90'

12
src/components/PortalHeader.vue
View File

@@ -153,6 +153,10 @@ export default {
goSearch:{
type: Number,
default: 0,
},
keywords:{
type:String,
default:''
}
},
@@ -170,6 +174,14 @@ export default {
}
}
},
watch:{
keywords(newval){
console.log(newval,9999);
if(this.findType == '1'){
this.keyword = newval
}
}
},
data() {
return {
popupConfig:{},

7
src/views/portal/case/Index.vue
View File

@@ -361,6 +361,7 @@ export default {
},
data() {
return {
caseType:process.env.VUE_APP_CASE_TYPE,//类型
caseYears:[],
refId: '',//消息跳转案例的id
selectList: [],//点击选中的list
@@ -574,7 +575,9 @@ export default {
console.log(isBack, 'isBack');
// Promise.all([apiType.items("org_domain"), apiCase.majorTypes()]).then(rs => {
// 90是测试环境，155是生产环境
Promise.all([apiType.treeList(1,155,1), apiCase.majorTypes()]).then(rs => {
console.log(this.caseType);
Promise.all([apiType.treeList(1,Number(this.caseType ?? 155),1), apiCase.majorTypes()]).then(rs => {
if (rs[0].code == 200) {
const {records} = rs[0].data
records.forEach(item => {
@@ -1070,7 +1073,7 @@ export default {
},
async getCaseData() {
// this.saveLocalFilters();//存储本地刷新有记录
this.saveLocalFilters();//存储本地刷新有记录
let majorTypeList = [];
let allFielclass = JSON.parse(JSON.stringify(this.getAllFielclass()));
// 获取树状id

118
src/views/portal/course/Index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div id="couser-list-content" class="couser-list-content">
<div class="course-banner">
<portal-header current="course" textColor="#fff" @emitInput="emitInput" @showClass="showClass"></portal-header>
<portal-header current="course" textColor="#fff" :keywords="keyword" @emitInput="emitInput" @showClass="showClass"></portal-header>
</div>
<div style="padding-top:30px">
<div class="xcontent2">
@@ -714,38 +714,38 @@ export default {
// this.toCourseDetail(item);
// this.orderChange(id);
//查询排行榜，页面打开只查询一次
let localKey = "user_" + this.userInfo.sysId + "_gids";
if (this.audiences.length == 0) {
//let hasIds;
let hasIds = sessionStorage.getItem(localKey);
if (hasIds && hasIds.length > 0) {
this.audiences = hasIds.split(",");
this.search();
} else {
apiUserbasic.getInAudienceIds().then(rs => {
if (rs.status == 200) {
this.audiences = rs.result;
sessionStorage.setItem(localKey, this.audiences);
} else {
console.log(rs.message);
}
this.search();
})
// Promise.all([apiOldCourse.audience(this.userInfo.sysId),apiUserGroup.userGroupIds()]).then(rs=>{
// //console.log(rs,'rs');
// let aids=[];
// if(rs[0].status==200){
// aids.push(rs[0].result);
// }
// if(rs[1].status==200){
// aids.push(rs[1].result);
// }
// this.audiences=aids;
// sessionStorage.setItem(localKey,this.audiences);
// this.search();
// })
}
}
// let localKey = "user_" + this.userInfo.sysId + "_gids";
// if (this.audiences.length == 0) {
// //let hasIds;
// let hasIds = sessionStorage.getItem(localKey);
// if (hasIds && hasIds.length > 0) {
// this.audiences = hasIds.split(",");
// this.search();
// } else {
// apiUserbasic.getInAudienceIds().then(rs => {
// if (rs.status == 200) {
// this.audiences = rs.result;
// sessionStorage.setItem(localKey, this.audiences);
// } else {
// console.log(rs.message);
// }
// // this.search();
// })
// // Promise.all([apiOldCourse.audience(this.userInfo.sysId),apiUserGroup.userGroupIds()]).then(rs=>{
// // //console.log(rs,'rs');
// // let aids=[];
// // if(rs[0].status==200){
// // aids.push(rs[0].result);
// // }
// // if(rs[1].status==200){
// // aids.push(rs[1].result);
// // }
// // this.audiences=aids;
// // sessionStorage.setItem(localKey,this.audiences);
// // this.search();
// // })
// }
// }
//this.searchterm();//搜索词已经没有了
this.couresreso();//广告位
@@ -799,22 +799,39 @@ export default {
let hasData = sessionStorage.getItem(this.localSessionKey);
let $this = this;
if (hasData) {
// let typeCodeList=JSON.parse(hasData);
// typeCodeList.forEach(item=>{
// if(item.type==0){
// this.keyword=item.name;
// }else if(item.type==1){
// if(item.id==20){
// $this.ctypeList[0].checked=true;
// }else if(item.id==30){
// $this.ctypeList[1].checked=true;
// }else if(item.id==40){
// $this.ctypeList[2].checked=true;
// }
// }else{ //三级分类的处理，如果一个分类选中多个，显示哪个，显示第一个，是否可以
// }
// })
let typeCodeList=JSON.parse(hasData);
typeCodeList.forEach(item=>{
if(item.type==0){
this.keyword=item.name;
}else if(item.type==1){
if(item.id==20){
$this.ctypeList[0].checked=true;
}else if(item.id==30){
$this.ctypeList[1].checked=true;
}else if(item.id==40){
$this.ctypeList[2].checked=true;
}
}else{ //三级分类的处理，如果一个分类选中多个，显示哪个，显示第一个，是否可以
this.oneList.forEach(one => {
if(one.id == item.id && item.type == '11'){
this.navTitle = [{ ...one }]
one.checked = true
}
one.children.forEach(two => {
if(two.id == item.id && item.type == '12'){
this.navTitle = [{ ...one }, { ...two }]
two.checked = true
}
two.children.forEach(three => {
if(three.id == item.id && item.type == '13'){
this.navTitle = [{ ...one }, { ...two }, { ...three }]
three.checked = true
}
})
})
})
}
})
}
},
//搜索条件
@@ -880,6 +897,7 @@ export default {
this.threeList = [];
this.navTitle = [];
this.newData = false;
sessionStorage.removeItem(this.localSessionKey)
this.searchData();
},
// 导航切换(录播课，线下课，学习项目)
@@ -1057,11 +1075,11 @@ export default {
})
}
$this.oneList.push(newItem);
console.log(newItem);
});
this.loadLocalFilters();
this.search()
}
} catch (error) {
console.log(error);