fixed main page-- frank

atms-web/src/main/webapp/Scripts/app.js

@@ -371,15 +371,16 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
             };
             $rootScope.changeLanguage(region);
 
-            waterMark({
-                systemId: '2500',
-                //当前用户ID
-                userId: loginContext.localName,
-                textStyle: 'rgba(0,0,0,0.05)',
-                imgHeightDis: 230,
-                imgWidthDis: 230,
-                containerEl: document.querySelector('body')
-            });
+            // waterMark({
+            //     systemId: '2500',
+            //     //当前用户ID
+            //     userId: loginContext.localName,
+            //     textStyle: 'rgba(0,0,0,0.05)',
+            //     imgHeightDis: 230,
+            //     imgWidthDis: 230,
+            //     containerEl: document.querySelector('body')
+            // });
+            $rootScope.isFront = true;
     
             // publish unbeforeunload event to child scopes
             $scope.onbeforeunload = function () {

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -3828,7 +3828,7 @@
                 //showUserTab();
                 checkUserPermission();
                 loadDatagrid();
-                $scope.location = $scope.$root.currentLanguage;
+                $scope.location = $scope.$root.isFront;
                 $timeout(function () {
                     $scope.isLoadComplete = true;
                     if ($scope.location) {