diff --git a/src/api/modules/courseAudit.js b/src/api/modules/courseAudit.js index 7856f8f7..483e8d87 100644 --- a/src/api/modules/courseAudit.js +++ b/src/api/modules/courseAudit.js @@ -18,6 +18,11 @@ const hrbpAuditList = function(query) { return ajax.post('/xboe/m/course/manage/audit-pagelist', query); } +/**HRBP已审核的列表*/ +const hrbpHasAuditList = function(query) { + return ajax.post('/xboe/m/course/manage/audit-pagelist', query); +} + /** * hrbp审核提交 * @param {Object} data diff --git a/src/router/index.js b/src/router/index.js index 6abb9bea..bbe5ef44 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -51,7 +51,7 @@ export const constantRoutes = [{ hidden: true, component: (resolve) => require(['@/views/portal/course/Index'], resolve), name: 'course', - meta: { title: '课程', icon: 'dashboard', noCache: true, affix: false }, + meta: { title: '课程',keepAlive:true, icon: 'dashboard', noCache: true, affix: false }, }, { path: '/course/micro', @@ -65,7 +65,7 @@ export const constantRoutes = [{ hidden: true, component: (resolve) => require(['@/views/portal/course/Detail'], resolve), name: 'courseDetail', - meta: { title: '课程详情', icon: 'dashboard', noCache: true, affix: false }, + meta: { title: '课程详情',keepAlive:true, icon: 'dashboard', noCache: true, affix: false }, }, // 课程预览 { @@ -105,21 +105,21 @@ export const constantRoutes = [{ hidden: true, component: (resolve) => require(['@/views/study/coursenew'], resolve), name: 'courseStudyIndex', - meta: { title: '课程学习', icon: 'dashboard', noCache: true, affix: false }, + meta: { title: '课程学习',keepAlive:true, icon: 'dashboard', noCache: true, affix: false }, }, { path: '/case', hidden: true, component: (resolve) => require(['@/views/portal/case/Index'], resolve), name: 'case', - meta: { title: '案例', icon: 'dashboard', noCache: true, affix: false }, + meta: { title: '案例',keepAlive:true, icon: 'dashboard', noCache: false, affix: true }, }, { path: '/case/detail', hidden: true, component: (resolve) => require(['@/views/portal/case/Detail'], resolve), name: 'caseDetail', - meta: { title: '案例详情', icon: 'dashboard', noCache: true, affix: false }, + meta: { title: '案例详情',keepAlive:true, icon: 'dashboard', noCache: false, affix: true }, }, { path: '/article', diff --git a/src/security.js b/src/security.js index 194a9258..742427cf 100644 --- a/src/security.js +++ b/src/security.js @@ -36,6 +36,8 @@ router.beforeEach((to, from, next) => { } else { //后续这里需要增加一定的控制 if (!store.getters.init) { + sessionStorage.removeItem(xpage.constants.localCaseFiltersKey); + sessionStorage.removeItem(xpage.constants.localCourseFiltersKey); // 判断当前控制台是否已拉取完数据 store.dispatch('InitData').then(res => { //加载白名单信息 @@ -60,6 +62,7 @@ router.beforeEach((to, from, next) => { //NProgress.done(); }) } else { + to.meta.keepAlive = true next(); } diff --git a/src/utils/xpage.js b/src/utils/xpage.js index 60bfc46e..3b2554c0 100644 --- a/src/utils/xpage.js +++ b/src/utils/xpage.js @@ -1,7 +1,9 @@ /**页面设置的一些常量,方便,用于一个处理只写一处,不要多处写*/ const constants={ fileBaseUrl:'/upload', - newLoginKey:'boe_new_login' + newLoginKey:'boe_new_login', + localCaseFiltersKey:'local_case_ids', //本地临时查询条件的缓存 + localCourseFiltersKey:'local_course_ids',//本地临时查询条件的缓存 } /**返回个人主页的id参数*/ diff --git a/src/views/examine/Reviewed.vue b/src/views/examine/Reviewed.vue index b958acf5..68359257 100644 --- a/src/views/examine/Reviewed.vue +++ b/src/views/examine/Reviewed.vue @@ -214,7 +214,7 @@ export default { }, async searchData() { this.params.status = 9; - this.params.aid=this.userInfo.aid; + this.params.auditAid=this.userInfo.aid; this.params.userType=2;//这里指hrbp管理查询 this.params.pageIndex = this.page.pageIndex; this.params.pageSize = this.page.pageSize; diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index 44d620ac..60fdce0a 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -235,6 +235,10 @@ export default { ); }, + beforeRouteLeave(to, from, next){ + to.meta.keepAlive=true; + next(); + }, beforeDestroy(){ window.removeEventListener("scroll",this.handleScroll); clearInterval(this.setTimeCase); diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index 050ad8a1..1fb6c437 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -47,9 +47,9 @@
全部
-
{{item.name}}
+
{{item.name}}({{item.explanation}})
- +