From 8b4e7bdc5751432be18f3188fbebe13626745c23 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Wed, 1 May 2024 02:33:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 5 +-- src/store/index.js | 2 -- .../projectFront/configManage/roleManage.vue | 32 ++++++++++++------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index ac0287b0..c776097d 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,9 +84,10 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 - // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 + // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 + axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 diff --git a/src/store/index.js b/src/store/index.js index 0c936efe..ae635488 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -63,8 +63,6 @@ export default new Vuex.Store({ // window.location.host + // "/upload/image", //正式环境 // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 - // WORKFLOWURL: 'http://182.90.224.237:9811/#/workspace/forms',//测试平台工作流地址 - // WORKFLOWURL: 'http://182.90.224.237:9814/#/workspace/forms',//鞍钢平台工作流地址 // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址 // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址 //--------------------------------------------------------------------------------------------- diff --git a/src/views/projectFront/configManage/roleManage.vue b/src/views/projectFront/configManage/roleManage.vue index 41f7273b..ac11455e 100644 --- a/src/views/projectFront/configManage/roleManage.vue +++ b/src/views/projectFront/configManage/roleManage.vue @@ -300,21 +300,31 @@ export default { console.log('获取角色配置的菜单',arr); // var arr2 = []; console.log(arr); - if (arr.length > 0) { - arr.forEach(element => { - if (element.authorityId) { - this.dataList.push(element.authorityId); - } - // else{ - // arr2.push(element.moduleId) - // } - }); - } + // if (arr.length > 0) { + // arr.forEach(element => { + // if (element.authorityId) { + // this.dataList.push(element.authorityId); + // } + // // else{ + // // arr2.push(element.moduleId) + // // } + // }); + // } this.$nextTick(() => { - this.$refs.tree.setCheckedKeys(this.dataList); + this.$refs.tree.setCheckedKeys(this.getRelativeKeys(res.result)); }); }); }, + // 根据条件获取需要选中的节点keys + getRelativeKeys(arr) { + let keysArr = []; + arr.map((item) => { + if (!item.hasSubList) { + keysArr.push(item.authorityId); + } + }); + return keysArr; + }, // 取消菜单配置 cancleBtn() { this.Popup.power = false;