-
-
全部
-
+
+
+
+
-
-
-
外部精选
-
+
+ 请选择年份
+
+
+
+
-
-
@@ -112,7 +128,7 @@
搜索条件
{{
- tag.name }}
+ tag.name }}
清除
@@ -125,13 +141,13 @@
全部课程
+ :class="{ actice: course.orderField == 'DEFAULT' }">全部课程
最热
+ :class="{ actice: course.orderField == 'HOT' }">最热
最新
+ :class="{ actice: course.orderField == 'NEW' }">最新
好评率
+ :class="{ actice: course.orderField == 'GOOD' }">好评率
共找到{{ count }}个结果
@@ -148,11 +164,23 @@
学习项目
+
+
+
+ {{ tag }}
+
+
+ :disabled="!keyword.showTitle">
@@ -160,7 +188,7 @@
-
+
开课时间：{{ cinfo.startTime }}
@@ -176,7 +204,7 @@
+ :praises="false" :shares="false" :views="false">
{{ toScore(cinfo.courseScore) }}分
@@ -221,7 +249,7 @@
+ layout="total, prev, pager, next, jumper" @change-page="currentChange">
@@ -258,17 +286,6 @@
创新力专区课程版权已到期！
-
@@ -296,7 +313,7 @@ import {formatDate, formatUserNumber, toScore} from "@/utils/tools.js";
import apiSearchterm from "@/api/modules/searchterm.js";
import apiPlace from "@/api/phase2/place.js"
import {qualityCourseTimeMark, qualityPageList} from "@/api/phase2"
-
+import apiCourseTag from '@/api/modules/courseTag.js'
export default {
name: "index",
components: {
@@ -317,7 +334,7 @@ export default {
},
// 取消搜索条件标签展示
- stagList() { //计算出选择的内容
+ /*stagList() { //计算出选择的内容
let list = [];
if (this.keyword) {
list.push({
@@ -327,12 +344,6 @@ export default {
checked: true
})
}
- // 取消 全部 内部专享 外部精选 三种的显示
- // this.ctypeList.forEach(item => {
- // if (item.checked) {
- // list.push(item);
- // }
- // });
this.oneList.forEach(one => {
var twoChildChecked = false;//是否有下级
one.children.forEach(two => {
@@ -354,22 +365,77 @@ export default {
list.push(one);
}
})
- // this.oneList.forEach(item=>{
- // if(item.checked){
- // list.push(item);
- // }
- // });
- // this.twoList.forEach(item=>{
- // if(item.checked){
- // list.push(item);
- // }
- // });
- // this.threeList.forEach(item=>{
- // if(item.checked){
- // list.push(item);
- // }
- // });
- //console.log(list,'list');
+ return list;
+ },*/
+
+ stagList() {
+ let list = [];
+
+ // 关键词
+ if (this.keyword) {
+ list.push({
+ type: 0,
+ id: 'keyword',
+ name: this.keyword,
+ tagName: this.keyword,
+ checked: true
+ });
+ }
+
+ // 课程类型
+ this.ctypeList.forEach(item => {
+ if (item.checked) {
+ list.push({
+ ...item,
+ tagName: item.name
+ });
+ }
+ });
+
+ // 热点标签 - 这是关键修复
+ this.hotTagsList.forEach(item => {
+ if (item.checked) {
+ list.push({
+ ...item,
+ name: item.tagName || item.name,
+ tagName: item.tagName || item.name,
+ type: 14
+ });
+ }
+ });
+
+ // 三级分类
+ this.oneList.forEach(one => {
+ var twoChildChecked = false;
+ one.children.forEach(two => {
+ if (two.checked) {
+ twoChildChecked = true;
+ }
+ var threeChildChecked = false;
+ two.children.forEach(three => {
+ if (three.checked) {
+ list.push({
+ ...three,
+ tagName: three.name
+ });
+ threeChildChecked = true;
+ }
+ });
+ if (two.checked && !threeChildChecked) {
+ list.push({
+ ...two,
+ tagName: two.name
+ });
+ }
+ });
+ if (one.checked && !twoChildChecked) {
+ list.push({
+ ...one,
+ tagName: one.name
+ });
+ }
+ });
+
return list;
},
ctypeTagAll() {
@@ -378,24 +444,6 @@ export default {
});
return !flag;
},
- // oneTagAll() {
- // let flag = this.oneList.some(item => {
- // return item.checked;
- // });
- // return !flag;
- // },
- // twoTagAll() {
- // let flag = this.twoList.some(item => {
- // return item.checked;
- // });
- // return !flag;
- // },
- // threeTagAll() {
- // let flag = this.threeList.some(item => {
- // return item.checked;
- // });
- // return !flag;
- // }
},
data() {
return {
@@ -463,7 +511,9 @@ export default {
searchRecords: [],
hotList: [],
totalPages: 1,
- localSessionKey: this.$xpage.constants.localCourseFiltersKey
+ localSessionKey: this.$xpage.constants.localCourseFiltersKey,
+ hotTagsList: [],
+ isAllHotTagsSelected: true,
};
},
// 受众需要每次刷新
@@ -483,17 +533,6 @@ export default {
qualityCourseTimeMark().then(response=>{
this.years = response.data.result
})
- // let screenWidth = window.screen.availWidth;
- // if (screenWidth < 1280) {
- // this.course.pageSize = 9;
- // this.columns = 3;
- // } else if (screenWidth < 1600) {
- // this.course.pageSize = 12;
- // this.columns = 3;
- // } else if (screenWidth >= 1600) {
- // this.course.pageSize = 15;
- // this.columns = 3;
- // }
let el_top = document.querySelector("#searchbar");
let el_search = document.querySelector("#searchbar");
@@ -519,8 +558,6 @@ export default {
this.loadSysTypes();
this.getScoreList();
this.getHotList();
- // this.toCourseDetail(item);
- // this.orderChange(id);
//查询排行榜，页面打开只查询一次
let localKey = "user_" + this.userInfo.sysId + "_gids";
if (this.audiences.length == 0) {
@@ -539,30 +576,48 @@ export default {
}
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();//广告位
-
},
beforeDestroy() {
// window.removeEventListener("scroll", this.handleScroll);
},
methods: {
+
+ // isAllHotTagsSelected() {
+ // return !this.hotTagsList.some(tag => tag.checked);
+ // },
+ handleClearHotTags() {
+ // 清除所有热点标签的选中状态
+ this.hotTagsList.forEach(tag => {
+ tag.checked = false;
+ });
+ this.isAllHotTagsSelected = true;
+ // 清空course.tags
+ this.course.tags = '';
+
+ // 触发搜索
+ this.searchData();
+ },
+ handleTagClick(item, list,type) {
+ console.info('切换标签 item = ' + item)
+ this.isAllHotTagsSelected = false;
+ item.checked = !item.checked;
+ // 更新course.tags
+ const checkedTags = this.hotTagsList.filter(tag => tag.checked);
+ let tagIds = checkedTags.map(tag => tag.id).join(',');
+ this.course.tags = tagIds;
+ this.$forceUpdate();
+ this.searchData(type);
+
+ // 强制触发stagList重新计算
+ // this.$nextTick(() => {
+ // this.searchData(type);
+ // });
+ },
+
+
// 改变分页
currentChange(val) {
this.course.pageIndex = val
@@ -644,16 +699,61 @@ export default {
}
},
//搜索条件
+ // 搜索条件
stagClose(tag, tagIndex) {
this.courseChosen = void 0;
tag.checked = false;
+
if (tag.type == 0) {
+ // 关键词类型
this.keyword = '';
+ } else if (tag.type == 1) {
+ // 课程类型
+ this.ctypeList.forEach(item => {
+ if (item.id == tag.id) {
+ item.checked = false;
+ }
+ });
+ } else if (tag.type == 14) {
+ // 热点标签类型
+ this.hotTagsList.forEach(item => {
+ if (item.id == tag.id) {
+ item.checked = false;
+ }
+ });
+ // 更新course.tags
+ const checkedHotTags = this.hotTagsList.filter(tag => tag.checked);
+ let tagIds = checkedHotTags.map(tag => tag.id).join(',');
+ this.course.tags = tagIds;
+ } else if (tag.type == 11 || tag.type == 12 || tag.type == 13) {
+ // 三级分类标签
+ this.oneList.forEach(one => {
+ if (one.id == tag.id) {
+ one.checked = false;
+ }
+ one.children.forEach(two => {
+ if (two.id == tag.id) {
+ two.checked = false;
+ }
+ two.children.forEach(three => {
+ if (three.id == tag.id) {
+ three.checked = false;
+ }
+ });
+ });
+ });
}
+
this.navTitle = []
this.searchData();
},
+ isTagMatched(tag) {
+ // 检查stagList中是否有匹配的标签
+ return this.stagList.some(searchTag =>
+ searchTag.tagName === tag || searchTag.name === tag
+ );
+ },
// 导航全选
handleTypeAllClick(t) {
if (t == 1) {
@@ -691,10 +791,23 @@ export default {
handleClearTags() {
//清空所有的条件
this.keyword = '';
- // 取消搜索条件标签展示
- // this.ctypeList.forEach(item => {
- // item.checked = false;
- // });
+
+ // 清除课程类型
+ this.ctypeList.forEach(item => {
+ item.checked = false;
+ });
+
+ // 清除热点标签
+ this.hotTagsList.forEach(item => {
+ item.checked = false;
+ });
+ // 清空course.tags
+ this.course.tags = '';
+
+ // 清除年份选择
+ this.yearChosen = [];
+
+ // 清除三级分类
this.oneList.forEach(one => {
one.checked = false;
one.children.forEach(two => {
@@ -704,7 +817,8 @@ export default {
})
})
});
- // 清除左侧被选中的内容
+
+ // 清除左侧被选中的内容
this.courseChosen = void 0;
this.twoList = [];
this.threeList = [];
@@ -713,6 +827,7 @@ export default {
sessionStorage.removeItem(this.localSessionKey)
this.searchData();
},
+
// 导航切换(录播课，线下课，学习项目)
handleTypeClick(item, list) {
// item.checked = !item.checked;
@@ -751,57 +866,6 @@ export default {
})
})
})
-
- // item.checked = !item.checked;
- //使用上面一行是可以多选，使用下面是单选
- // list.forEach(row => {
- // row.checked = false;
- // })
- // item.checked = true;
- // //以下是新的规则的修改，
- // if (!item.checked) {
- // //清空它下面的所有的中的
- // item.children.forEach(subItem => {
- // subItem.checked = false;
- // if (subItem.children) {
- // subItem.children.forEach(sub => {
- // sub.checked = false;
- // })
- // }
- // });
- // if (level == 1) {
- // this.twoList = [];
- // this.threeList = [];
- // }
- // if (level == 2) {
- // this.threeList = [];
- // }
- // this.searchData();
- // return;
- // }
-
- // let $this = this;
- // if (level == 1) { //一级的情况
- // this.twoList = [];
- // this.threeList = [];
- // let lastCheked = null;
- // item.children.forEach(two => {
- // $this.twoList.push(two);
- // if (two.checked) {
- // lastCheked = two;
- // }
- // });
- // if (lastCheked != null) {
- // $this.threeList = lastCheked.children;
- // item.children.forEach(three => {
- // });
- // }
- // } else if (level == 2) { //二级的情况
- // this.threeList = item.children;
- // } else if (level == 3) { //三级的情况
-
- // }
- //this.handleChangeTypes(item);
this.searchData();
},
// 无用
@@ -811,18 +875,6 @@ export default {
this.twoList = [];
this.threeList = [];
let $this = this;
- // this.oneList.forEach(one=>{
- // if(one.checked){
- // one.children.forEach(two=>{
- // $this.twoList.push(two);
- // if(two.checked){
- // two.children.forEach(three=>{
- // $this.threeList.push(three);
- // })
- // }
- // });
- // }
- // })
this.oneList.forEach(one => {
if (one.checked) {
one.children.forEach(two => {
@@ -853,15 +905,6 @@ export default {
checked: false
}
if (item.children) {
- //增加死数据
- // item.children.push({
- // type: 12,
- // id: item.id * (index + 200),
- // name: '线上品牌系列课程',
- // children: [],
- // checked: false,
- // newData: true
- // })
item.children.forEach(subItem => {
let newSubItem = {
type: 12,
@@ -928,47 +971,16 @@ export default {
this.keyword = val;
this.searchData();
},
-
- // 滚动
- // handleScroll() {
- // if (this.courseList.length > 6) {
-
- // let innerHeight = document.querySelector("#couser-list-content").clientHeight;
- // let outerHeight = document.documentElement.clientHeight;
- // let scrollTop = document.documentElement.scrollTop;
- // let outerWidth = document.querySelector(".xcontent2-minor").clientWidth;
- // if (outerHeight + scrollTop + 350 >= innerHeight) {
- // if (this.moreState == 1 && this.course.pageIndex < 4) {
- // this.loadMore();
- // }
- // }
- // //console.log(this.course.pageIndex,'this.course.pageIndex');
- // //加此判断，是为了没有数据时的闪动问题
- // //if(this.course.pageIndex >1){
- // if (scrollTop > 1176) {
- // document.querySelector("#fixd-box").style.cssText =
- // "position: fixed;top: -882px;width:" + outerWidth + "px";
- // } else {
- // document.querySelector("#fixd-box").style.cssText = "position: static";
- // }
- // //}
- // }
- // },
-
- toNeedCourse() {// 上传
- // 需要先切换标签
- //this.$store.dispatch('SetCurIdentity',2);
- //this.$router.push('/need/course?open=new');
+ toNeedCourse() {
this.$refs.floatTools.toNeedCourse();
-
},
- searchData() {
+ searchData(type) {
this.course.pageIndex = 1;
this.noPageList = true; //判断接口是否还有数据
this.noDataList = true; //判断接口是否还有数据
this.courseList = [];
this.totalPages = 4;
- this.search();
+ this.search(type);
},
inputOn() {
this.$forceUpdate();
@@ -1128,17 +1140,12 @@ export default {
return list;
},
// 查询
- async search () {
- //
+ async search (type) {
if (this.searching) {
this.$message.warning("正在搜索中，请待搜索完成后再重新搜索");
return;
}
this.searching = true;
- //测试时间格式化
- // let s=1650973801;
- // var d = new Date(1650973801*1000);
- // console.log(formatDateByFmt(d,'yyyy-MM-dd hh:mm'),'data');
this.saveLocalFilters();
let that = this;
if (this.keyword) {
@@ -1149,7 +1156,6 @@ export default {
this.course.audiences = this.audiences.join(",");
}
//console.log(this.userInfo)
- //this.course.companyId=this.userInfo.companyId;
this.course.type = "";//不使用单查询了
this.course.types = "";
this.course.sysType1 = "";
@@ -1172,6 +1178,20 @@ export default {
that.course.sysType3 += item.id;
}
});
+ if (!type && type !== 1){
+ apiCourseTag.getHotTagList(that.course).then(rs => {
+ if (rs.status == 200) {
+ // 保留已选中标签的状态
+ const currentCheckedTags = this.hotTagsList.filter(tag => tag.checked);
+ this.hotTagsList = rs.result.map(tag => ({
+ ...tag,
+ checked: currentCheckedTags.some(checkedTag => checkedTag.id === tag.id)
+ }));
+ } else {
+ console.log(rs.message);
+ }
+ })
+ }
this.isFind = true;
this.course.device = 1;
@@ -1191,6 +1211,9 @@ export default {
params.pageNum = pageIndex
params.orderByType = orderField
params.courseSource = this.ctypeList.findIndex(e => e.checked)
+ if (params.courseSource === -1) {
+ params.courseSource = 0
+ }
this.yearChosen.length && (params.years = this.yearChosen)
params.courseName = this.keyword
delete params.userId
@@ -1203,44 +1226,8 @@ export default {
console.log(res.status)
if (res.status === 200) {
this.totalPages = res.data.result.pages;
- // res.result.list.forEach(item => {
- // if (item.startTime != '') {
- // item.startTime = formatDateByFmt(new Date(item.startTime * 1000), 'yyyy-MM-dd hh:mm')
- // //let time = item.startTime.split('-');
- // //item.startTime = `${time[0]}年${time[1]}月${time[2]}日`
- // }
- // //教师转化
- // if (item.teacher) {
- // item.teacher = item.teacher.split(',').filter(itemValue => itemValue !== 'BOE教师').join(',');
- // // if (dotIdx > 0) {
- // // item.teacher = item.teacher.substring(0, dotIdx);
- // // }
- // }
- // if (item.teacher && item.teacher == 'BOE教师') {
- // item.teacher = '';
- // }
- //
- // //转化标红显示
- // item.title = item.name;
- // if (that.course.keyword) {
- // item.name = that.brightenKeyword(item.name, that.course.keyword);
- // item.keywordsActive = that.brightenKeywords(item.keywordsList, that.course.keyword)
- // console.log(item.keywordsActive);
- // } else {
- // item.name = item.name;
- // }
- // });
const list = res.data.result.records ?? []
- // list.forEach(course=>{
- // const id = course.courseId
- //
- // apiCourse.getTeacherByCourseIDs([id]).then(res=>{
- // console.log(res, "ids res")
- // course.teacher = res.result[0].names[0]
- // console.log(`course.teacher`, course.teacher)
- // })
- // })
this.courseList = list
if (this.newData) {
@@ -1301,18 +1288,7 @@ export default {
this.moreState = 2;
});
},
- // showInApply() {
- // this.inapply.show = true;
- // },
- // pushEnter(type) {
- // this.type1.push(type);
- // },
- // deleteOut(type) {
- // this.type1 = this.type.filter(item => item != type);
- // },
- // chooseShow(type) {
- // return this.type1.some(item => item == type);
- // },
+
getAnkingData() {
apiCourse.ranking().then(res => {
if (res.status == 200) {
@@ -1887,7 +1863,7 @@ export default {
right: 23.5%;
// bottom: 26%;
top: 0;
- height: 20;
+ height: 20px;
line-height: 20px;
font-size: 12px;
color: #FFFFFF;
@@ -2117,7 +2093,7 @@ export default {
border-radius: 8px;
::v-deep .el-input {
- width: 420px;
+ //width: 420px;
height: 38px;
//margin-bottom: 13px;
@@ -2202,30 +2178,18 @@ export default {
}
}
}
-
-// .course-form {
-// width: 100%;
-// margin: 10px 0;
-// ::v-deep.el-button {
-// width: 100%;
-// color: #fff;
-// }
-// }
-
-// .right-box {
-// .add-btn {
-// width: 100%;
-// padding: 15px 0;
-// }
-// .ranking-card {
-// margin-top: 0px;
-// }
-
-// .ranking-data {
-// margin: 10px 0;
-// color: #999999;
-// }
-// }]
+.hot-tags-wrapper {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 15px;
+ align-items: center;
+ padding-top: 2px;
+}
+.search-div.nav {
+ display: block;
+ width: 100%;
+ clear: both;
+}
.search-item-type {
line-height: 25px;
padding-right: 10px;
@@ -2251,4 +2215,6 @@ export default {
.option-active {
color: #387DF7;
-}
+}
+
+