+
@@ -265,10 +303,6 @@
-
-
-
-
@@ -361,6 +395,8 @@ export default {
},
data() {
return {
+ twoId:'',
+ treeList:[],
caseType:process.env.VUE_APP_CASE_TYPE,//类型
caseYears:[],
refId: '',//消息跳转案例的id
@@ -413,6 +449,9 @@ export default {
notInIds: [],//重复的id
orderField: "id",
orderAsc: false,//排序
+ sysType1:'',
+ sysType2:'',
+ sysType3:''
},
keyWord: "",
anking: 2,
@@ -478,6 +517,29 @@ export default {
list.push(item);
}
});
+ this.treeList.forEach(one => {
+ var twoChildChecked = false;//是否有下级
+ one.children && one.children.forEach(two => {
+ if (two.checked) {
+ twoChildChecked = true;
+ }
+ var threeChildChecked = false;
+ two.children && two.children.forEach(three => {
+ if (three.checked) {
+ list.push(three);
+ threeChildChecked = true;
+ }
+ });
+ if (two.checked && !threeChildChecked) {
+ list.push(two);
+ }
+ });
+ if (one.checked && !twoChildChecked) {
+ list.push(one);
+ }
+ })
+ console.log(list,'计算属性');
+
return list;
},
oneTagAll() {
@@ -626,9 +688,11 @@ export default {
if (this.refId) {
this.queryCondition.type = 'recommend'
}
+ this.loadTypeData();//加载分类
this.getAnkingData();
- this.getPopularity();
this.searchterm();
+ //打开排行榜下边的两个
+ this.getPopularity();
this.getPositive();
this.couresreso();
// window.addEventListener("scroll", this.handleScroll);
@@ -642,6 +706,67 @@ export default {
},
methods: {
+ handleOptionClick(treeItem){
+ this.treeList.forEach(one => {
+ one.checked = false;
+ if (one.id == treeItem.id) {
+ one.checked = true;
+ this.queryCondition.sysType2 = ''
+ this.queryCondition.sysType3 = ''
+ this.queryCondition.sysType1 = one.id
+ }
+ one.children.forEach(two => {
+ two.checked = false;
+ if (two.id == treeItem.id) {
+ two.checked = true
+ this.queryCondition.sysType1 = ''
+ this.queryCondition.sysType3 = ''
+ this.queryCondition.sysType2 = two.id
+ }
+ two.children.forEach(three => {
+ three.checked = false;
+ if (three.id == treeItem.id) {
+ three.checked = true
+ this.queryCondition.sysType1 = ''
+ this.queryCondition.sysType2 = ''
+ this.queryCondition.sysType3 = three.id
+ }
+ })
+ })
+ })
+ this.getCaseData()
+ },
+ // 移入
+ changeIndex(twoId) {
+ this.twoId = twoId
+ },
+ // 移除
+ leaveIndex() {
+ this.twoId = ''
+ },
+ // 加载分类
+ async loadTypeData() {
+ try {
+ const { result, status } = await apiType.tree(1);
+ if (status === 200) {
+ result.forEach(one => {
+ one.checked = false;
+ if(!one.children) one.children = []
+ one.children && one.children.forEach(two => {
+ two.checked = false;
+ if(!two.children) two.children = []
+ two.children && two.children.forEach(three => {
+ three.checked = false;
+ if(!three.children) three.children = []
+ })
+ })
+ })
+ this.treeList = result
+ }
+ } catch (error) {
+ console.log(error);
+ }
+ },
getYears() {
apiCase.caseYears().then(res => {
if (res.status == 200) {
@@ -1232,7 +1357,16 @@ export default {
// }
// },
tagsClose(tag, index) {
- tag.fielclass = false;
+ // 课程分类
+ if(tag.hasOwnProperty('checked')){
+ tag.checked = false;
+ this.queryCondition.sysType1 =''
+ this.queryCondition.sysType2 =''
+ this.queryCondition.sysType3 =''
+ }else{
+ // 案例分类
+ tag.fielclass = false;
+ }
if (tag.type == 0) {
this.keyWord = '';
}
@@ -1334,6 +1468,77 @@ export default {
diff --git a/src/views/portal/course/CourseSeries.vue b/src/views/portal/course/CourseSeries.vue
new file mode 100644
index 00000000..49d8e33d
--- /dev/null
+++ b/src/views/portal/course/CourseSeries.vue
@@ -0,0 +1,297 @@
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ >
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue
index a512a0e9..39b0f4c0 100644
--- a/src/views/portal/course/Index.vue
+++ b/src/views/portal/course/Index.vue
@@ -21,6 +21,10 @@
+
课程分类
@@ -663,18 +667,18 @@ export default {
localSessionKey: this.$xpage.constants.localCourseFiltersKey
};
},
-
- created() {
- let localKey = "user_" + this.userInfo.sysId + "_gids";
- apiUserbasic.getInAudienceIds().then(rs => {
- if (rs.status == 200) {
- this.audiences = rs.result;
- sessionStorage.setItem(localKey, this.audiences);
- } else {
- console.log(rs.message);
- }
- })
- },
+ // 受众需要每次刷新
+ // created() {
+ // let localKey = "user_" + this.userInfo.sysId + "_gids";
+ // apiUserbasic.getInAudienceIds().then(rs => {
+ // if (rs.status == 200) {
+ // this.audiences = rs.result;
+ // sessionStorage.setItem(localKey, this.audiences);
+ // } else {
+ // console.log(rs.message);
+ // }
+ // })
+ // },
mounted() {
let screenWidth = window.screen.availWidth;
// if (screenWidth < 1280) {
@@ -715,38 +719,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();//广告位
@@ -1080,7 +1084,7 @@ export default {
});
this.loadLocalFilters();
- this.search()
+ // this.search()
}
} catch (error) {
console.log(error);
@@ -1577,6 +1581,15 @@ export default {
}
// 三级背景高度
+.course-recommended-style{
+ position: relative;
+ height: 142px;
+ background-image: url('../../../assets/images/course/courserecommended.png');
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ display: flex;
+ align-items: center;
+}
.course-title-style {
position: relative;
height: 100px;
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index a2a48b0c..3440d781 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -491,10 +491,11 @@
}
});
//每一分钟保存一次
- let $this=this;
- this.appendStudyOtherHandle = setTimeout(function() {
- $this.appendStudyOtherTime();
- }, 1000*60);
+ // 取消阅读的每分钟六十秒的计时
+ // let $this=this;
+ // this.appendStudyOtherHandle = setTimeout(function() {
+ // $this.appendStudyOtherTime();
+ // }, 1000*60);
},
//笔记组件触发，播放指定时间