diff --git a/src/main/websrc/js/app/app.js b/src/main/websrc/js/app/app.js index 356d551..66a830d 100644 --- a/src/main/websrc/js/app/app.js +++ b/src/main/websrc/js/app/app.js @@ -181,37 +181,6 @@ $scope.$broadcast("conentresize",true); } - //flag:1一级菜单显示权限 2:编辑权限 - $rootScope.hasTheMenu = function(name,flag,getmenus){ - var menus = $rootScope.curRoleAuth.roleAuthDetailList.filter(function(item){ - if(angular.isDefined(flag) && flag == 1){ - if($rootScope.isweb){ - return item.parentAuth == name && $scope.webHideMenus.indexOf(item.auth)==-1; - } - else{ - return item.parentAuth == name; - } - } - if(angular.isDefined(flag) && flag == 2){ - return item.auth == name && item.edit == true; - } - else{ - if(name == 'export'){ - return $rootScope.hasTheMenu(name,1); - } - else{ - return item.auth == name && item.view == true; - } - - } - }); - if(angular.isDefined(getmenus)){ - return menus; - } - else{ - return menus.length>0; - } - } $rootScope.showSubMenus = function(mainMenu){ if($scope.channelAlert){ return false; @@ -245,13 +214,6 @@ } if($rootScope.isSuper || $rootScope.isManage || $rootScope.isAppManage){ return true; - }else{ - if($rootScope.curRoleAuth){ - return $scope.hasTheMenu(name,flag); - } - else{ - return false; - } } } $rootScope.hasEditPower = function(){ @@ -378,7 +340,7 @@ ToolService.getMenuSubmitData(n); } }); - + $scope.pwdPlacehold = "仅支持数字,大小写字母,且至少包含其中2种,长度限制为6-18位"; } })();