purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化页面，去掉多余的打印

Browse Source
This commit is contained in:
季圣华
2021-06-18 21:25:00 +08:00
parent a13fcfcd21
commit 74c87d8d29
5 changed files with 128 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jshERP-web/src/components/menu/index.js
View File

@@ -103,8 +103,8 @@ export default {
return null return null
}, },
renderMenuItem (menu) { renderMenuItem (menu) {
// const target = menu.meta.target || null const target = null
// const tag = target && 'a' || 'router-link' const tag = target && 'a' || 'router-link'
let props = { to: { name: menu.name } } let props = { to: { name: menu.name } }
if(menu.route && menu.route === '0'){ if(menu.route && menu.route === '0'){
props = { to: { path: menu.path } } props = { to: { path: menu.path } }

8
jshERP-web/src/components/page/GlobalLayout.vue
View File

@@ -132,10 +132,10 @@
//this.menus = this.mainRouters.find((item) => item.path === '/').children; //this.menus = this.mainRouters.find((item) => item.path === '/').children;
this.menus = this.permissionMenuList this.menus = this.permissionMenuList
// 根据后台配置菜单，重新排序加载路由信息 // 根据后台配置菜单，重新排序加载路由信息
console.log('----加载菜单逻辑----') //console.log('----加载菜单逻辑----')
console.log(this.mainRouters) //console.log(this.mainRouters)
console.log(this.permissionMenuList) //console.log(this.permissionMenuList)
console.log('----navTheme------'+this.navTheme) //console.log('----navTheme------'+this.navTheme)
//--update-end----author:scott---date:20190320------for:根据后台菜单配置，判断是否路由菜单字段，动态选择是否生成路由（为了支持参数URL菜单）------ //--update-end----author:scott---date:20190320------for:根据后台菜单配置，判断是否路由菜单字段，动态选择是否生成路由（为了支持参数URL菜单）------
}, },
methods: { methods: {

2
jshERP-web/src/store/modules/permission.js
View File

@@ -58,7 +58,7 @@ const permission = {
}, },
mutations: { mutations: {
SET_ROUTERS: (state, data) => { SET_ROUTERS: (state, data) => {
console.log('-----mutations---SET_ROUTERS----', data) //console.log('-----mutations---SET_ROUTERS----', data)
state.addRouters = data state.addRouters = data
state.routers = constantRouterMap.concat(data) state.routers = constantRouterMap.concat(data)
// console.log('-----mutations last ---SET_ROUTERS----', state.routers) // console.log('-----mutations last ---SET_ROUTERS----', state.routers)

240
jshERP-web/src/utils/hasPermission.js
View File

@@ -1,120 +1,120 @@
import { USER_AUTH,SYS_BUTTON_AUTH } from "@/store/mutation-types" import { USER_AUTH,SYS_BUTTON_AUTH } from "@/store/mutation-types"
const hasPermission = { const hasPermission = {
install (Vue, options) { install (Vue, options) {
console.log(options); //console.log(options);
Vue.directive('has', { Vue.directive('has', {
inserted: (el, binding, vnode)=>{ inserted: (el, binding, vnode)=>{
console.log("页面权限控制----"); console.log("页面权限控制----");
//console.time() //console.time()
//节点权限处理，如果命中则不进行全局权限处理 //节点权限处理，如果命中则不进行全局权限处理
if(!filterNodePermission(el, binding, vnode)){ if(!filterNodePermission(el, binding, vnode)){
filterGlobalPermission(el, binding, vnode); filterGlobalPermission(el, binding, vnode);
} }
//console.timeEnd() //计时结束并输出时长 //console.timeEnd() //计时结束并输出时长
} }
}); });
} }
}; };
/** /**
* 流程节点权限控制 * 流程节点权限控制
*/ */
export function filterNodePermission(el, binding, vnode) { export function filterNodePermission(el, binding, vnode) {
let permissionList = []; let permissionList = [];
try { try {
let obj = vnode.context.$props.formData; let obj = vnode.context.$props.formData;
if (obj) { if (obj) {
let bpmList = obj.permissionList; let bpmList = obj.permissionList;
for (let bpm of bpmList) { for (let bpm of bpmList) {
if(bpm.type != '2') { if(bpm.type != '2') {
permissionList.push(bpm); permissionList.push(bpm);
} }
} }
}else{ }else{
return false; return false;
} }
} catch (e) { } catch (e) {
//console.log("页面权限异常----", e); //console.log("页面权限异常----", e);
} }
if (permissionList === null || permissionList === "" || permissionList === undefined||permissionList.length<=0) { if (permissionList === null || permissionList === "" || permissionList === undefined||permissionList.length<=0) {
//el.parentNode.removeChild(el) //el.parentNode.removeChild(el)
return false; return false;
} }
console.log("流程节点页面权限--NODE--"); console.log("流程节点页面权限--NODE--");
let permissions = []; let permissions = [];
for (let item of permissionList) { for (let item of permissionList) {
if(item.type != '2') { if(item.type != '2') {
permissions.push(item.action); permissions.push(item.action);
} }
} }
//console.log("页面权限----"+permissions); //console.log("页面权限----"+permissions);
//console.log("页面权限----"+binding.value); //console.log("页面权限----"+binding.value);
if (!permissions.includes(binding.value)) { if (!permissions.includes(binding.value)) {
//el.parentNode.removeChild(el) //el.parentNode.removeChild(el)
return false; return false;
}else{ }else{
for (let item2 of permissionList) { for (let item2 of permissionList) {
if(binding.value === item2.action){ if(binding.value === item2.action){
return true; return true;
} }
} }
} }
return false; return false;
} }
/** /**
* 全局权限控制 * 全局权限控制
*/ */
export function filterGlobalPermission(el, binding, vnode) { export function filterGlobalPermission(el, binding, vnode) {
console.log("全局页面权限--Global--"); console.log("全局页面权限--Global--");
let permissionList = []; let permissionList = [];
let allPermissionList = []; let allPermissionList = [];
//let authList = Vue.ls.get(USER_AUTH); //let authList = Vue.ls.get(USER_AUTH);
let authList = JSON.parse(sessionStorage.getItem(USER_AUTH) || "[]"); let authList = JSON.parse(sessionStorage.getItem(USER_AUTH) || "[]");
for (let auth of authList) { for (let auth of authList) {
if(auth.type != '2') { if(auth.type != '2') {
permissionList.push(auth); permissionList.push(auth);
} }
} }
//console.log("页面权限--Global--",sessionStorage.getItem(SYS_BUTTON_AUTH)); //console.log("页面权限--Global--",sessionStorage.getItem(SYS_BUTTON_AUTH));
let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || "[]"); let allAuthList = JSON.parse(sessionStorage.getItem(SYS_BUTTON_AUTH) || "[]");
for (let gauth of allAuthList) { for (let gauth of allAuthList) {
if(gauth.type != '2') { if(gauth.type != '2') {
allPermissionList.push(gauth); allPermissionList.push(gauth);
} }
} }
//设置全局配置是否有命中 //设置全局配置是否有命中
let invalidFlag = false;//无效命中 let invalidFlag = false;//无效命中
if(allPermissionList != null && allPermissionList != "" && allPermissionList != undefined && allPermissionList.length > 0){ if(allPermissionList != null && allPermissionList != "" && allPermissionList != undefined && allPermissionList.length > 0){
for (let itemG of allPermissionList) { for (let itemG of allPermissionList) {
if(binding.value === itemG.action){ if(binding.value === itemG.action){
if(itemG.status == '0'){ if(itemG.status == '0'){
invalidFlag = true; invalidFlag = true;
break; break;
} }
} }
} }
} }
if(invalidFlag){ if(invalidFlag){
return; return;
} }
if (permissionList === null || permissionList === "" || permissionList === undefined||permissionList.length<=0) { if (permissionList === null || permissionList === "" || permissionList === undefined||permissionList.length<=0) {
el.parentNode.removeChild(el); el.parentNode.removeChild(el);
return; return;
} }
let permissions = []; let permissions = [];
for (let item of permissionList) { for (let item of permissionList) {
if(item.type != '2'){ if(item.type != '2'){
permissions.push(item.action); permissions.push(item.action);
} }
} }
if (!permissions.includes(binding.value)) { if (!permissions.includes(binding.value)) {
el.parentNode.removeChild(el); el.parentNode.removeChild(el);
} }
} }
export default hasPermission; export default hasPermission;

2
jshERP-web/src/utils/request.js
View File

@@ -12,7 +12,7 @@ import { ACCESS_TOKEN } from "@/store/mutation-types"
* @type {*|string} * @type {*|string}
*/ */
let apiBaseUrl = window._CONFIG['domianURL'] || "/jshERP-boot"; let apiBaseUrl = window._CONFIG['domianURL'] || "/jshERP-boot";
console.log("apiBaseUrl= ",apiBaseUrl) //console.log("apiBaseUrl= ",apiBaseUrl)
// 创建 axios 实例 // 创建 axios 实例
const service = axios.create({ const service = axios.create({
baseURL: apiBaseUrl, // api base_url baseURL: apiBaseUrl, // api base_url