diff --git a/.env.development b/.env.development index 83473a3e..d2297b04 100644 --- a/.env.development +++ b/.env.development @@ -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' diff --git a/.env.production b/.env.production index 22880556..195e48a9 100644 --- a/.env.production +++ b/.env.production @@ -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' diff --git a/.env.testing b/.env.testing index 955282d6..d6c3ac9f 100644 --- a/.env.testing +++ b/.env.testing @@ -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' diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index b7f65272..e1dda6e9 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -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:{}, diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index d6c47028..6d975239 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -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 diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index e5cf4c7d..9b6e97ec 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -1,7 +1,7 @@