seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed unused code issues in Admin UI

pull/61/MERGE
13621160019@163.com 2021-08-17 22:11:30 +08:00
parent 8697c66c67
commit cac434cc5d
4 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/app/config.router.js
View File

@ -13,18 +13,15 @@ app
$rootScope.$state = $state;
$transitions.onStart( { }, function(trans) {
if ($location.$$path.indexOf('login')==-1) {
var currentUser = undefined;
if ($window.localStorage.getItem("currentUser")){
currentUser = JSON.parse($window.localStorage.getItem("currentUser"));
}
console.log(currentUser);
console.log(currentUser == undefined);
console.log(currentUser.is_admin === false);
if (currentUser == undefined || currentUser.is_admin === false) {
$window.localStorage.removeItem("currentUser");
return $state.target("login.login");
} else {
$rootScope.pageTitle = trans.to().data.pageTitle;
return undefined;
}
}
});

3
admin/app/controllers/login/login.controller.js
View File

@ -22,7 +22,6 @@ app.controller('LoginController', function (
$scope.login = function (user) {
$scope.dataLoading = true;
LoginService.login(user, function (response) {
console.log(response);
if (angular.isDefined(response.status) && response.status === 200) {
// toaster type options: 'error','info','wait','success','warning'
toaster.pop({
@ -83,8 +82,6 @@ app.controller('LoginController', function (
$scope.onKeypress = function ($event) {
if ($event.charCode == 13) {
$scope.login($scope.user);
} else {
return;
}
};

12
admin/app/controllers/main.controller.js
View File

@ -24,17 +24,5 @@ app.controller('MainController', [
$rootScope.bufferToStr=function(buffer){
return String.fromCharCode.apply(null, new Uint8Array(buffer));
};
$rootScope.isAdminCookie=function(){
var currentUser = undefined;
if ($window.localStorage.getItem("currentUser")){
currentUser = JSON.parse($window.localStorage.getItem("currentUser"));
}
if (currentUser != undefined && currentUser.is_admin ==true) {
return true;
}else{
return false;
}
}
}
]);

6
admin/views/common/navigation.html
View File

@ -11,7 +11,7 @@
{{'MY_EMS_NAME' | translate }}
</div>
</li>
<li ng-show="isAdminCookie()" ng-class="{active: $state.includes('settings')}">
<li ng-class="{active: $state.includes('settings')}">
<a href=""><i class="fa fa-gears"></i> <span class="nav-label">{{ 'MENU.SETTINGS.SETTINGS' | translate }}</span> <span class="fa arrow"></span></a>
<ul class="nav nav-second-level collapse" ng-class="{in: $state.includes('settings')}">
<li ui-sref-active="active"><a ui-sref="settings.category">{{ 'MENU.SETTINGS.CATEGORY' | translate }}</a></li>
@ -36,7 +36,7 @@
<li ui-sref-active="active"><a ui-sref="settings.knowledgefile">{{ 'MENU.SETTINGS.KNOWLEDGEFILE' | translate }}</a></li>
</ul>
</li>
<li ng-show="isAdminCookie()" ng-class="{active: $state.includes('fdd')}">
<li ng-class="{active: $state.includes('fdd')}">
<a href=""><i class="fa fa-bell-o"></i> <span class="nav-label">{{ 'MENU.FDD.FDD' | translate }} </span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level collapse" ng-class="{in: $state.includes('fdd')}">
<li ui-sref-active="active"><a ui-sref="fdd.rule">{{ 'MENU.FDD.RULE' | translate }}</a></li>
@ -46,7 +46,7 @@
<li ui-sref-active="active"><a ui-sref="fdd.wechatmessage">{{ 'MENU.FDD.WECHATALARM' | translate }}</a></li>
</ul>
</li>
<li ng-show="isAdminCookie()" ng-class="{active: $state.includes('users')}">
<li ng-class="{active: $state.includes('users')}">
<a href=""><i class="fa fa-user"></i> <span class="nav-label">{{ 'MENU.USERSETTING.USERSETTING' | translate }}</span> <span class="fa arrow"></span></a>
<ul class="nav nav-second-level collapse" ng-class="{in: $state.includes('users')}">
<li ui-sref-active="active"><a ui-sref="users.user">{{ 'MENU.USERSETTING.USER' | translate }}</a></li>