Skip to content

T
traffic-front
Commit ecba8143 authored by frank.xa.zhang's avatar frank.xa.zhang
Browse files
Options

fixed main page-- frank

parent bff1ff2e
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 10 deletions
atms-web/src/main/webapp/Scripts/app.js
View file @ ecba8143
...@@ -371,15 +371,16 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls', ...@@ -371,15 +371,16 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
}; };
$rootScope.changeLanguage(region); $rootScope.changeLanguage(region);
waterMark({ // waterMark({
systemId: '2500', // systemId: '2500',
//当前用户ID // //当前用户ID
userId: loginContext.localName, // userId: loginContext.localName,
textStyle: 'rgba(0,0,0,0.05)', // textStyle: 'rgba(0,0,0,0.05)',
imgHeightDis: 230, // imgHeightDis: 230,
imgWidthDis: 230, // imgWidthDis: 230,
containerEl: document.querySelector('body') // containerEl: document.querySelector('body')
}); // });
$rootScope.isFront = true;
// publish unbeforeunload event to child scopes // publish unbeforeunload event to child scopes
$scope.onbeforeunload = function () { $scope.onbeforeunload = function () {
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ ecba8143
...@@ -3828,7 +3828,7 @@ ...@@ -3828,7 +3828,7 @@
//showUserTab(); //showUserTab();
checkUserPermission(); checkUserPermission();
loadDatagrid(); loadDatagrid();
$scope.location = $scope.$root.currentLanguage; $scope.location = $scope.$root.isFront;
$timeout(function () { $timeout(function () {
$scope.isLoadComplete = true; $scope.isLoadComplete = true;
if ($scope.location) { if ($scope.location) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment