From 653ee2c04fc90d5629667434f576c7ec712e2c26 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Thu, 18 Jan 2018 19:01:26 +0800 Subject: [PATCH] fix~ --- src/main/ui/static/analysis/client_rates.js | 2 ++ src/main/ui/static/analysis/templates/client_rates.html | 4 ++-- src/main/ui/static/payment/tradelog/templates/trade_logs.html | 4 ++-- src/main/ui/static/payment/tradelog/tradelog-manage.js | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/ui/static/analysis/client_rates.js b/src/main/ui/static/analysis/client_rates.js index fff3c0845..4235a8133 100644 --- a/src/main/ui/static/analysis/client_rates.js +++ b/src/main/ui/static/analysis/client_rates.js @@ -69,9 +69,11 @@ define(['angular', 'echarts', 'jquery', 'uiRouter','./monitoring/analysis-monito } else { $scope.chooseLastDays(30); if($filter('withRole')('1000000000000') && $scope.currentUser.org_id){ + $scope.org2 = "ALL Organizations" $scope.loadOrgChild(); } if (!$scope.currentUser.org_id) { + $scope.org2 = "ALL" $scope.loadOrgs(); } if(!($filter('withRole')('1000000000000') && $scope.currentUser.org_id) || $scope.currentUser.org_id){ diff --git a/src/main/ui/static/analysis/templates/client_rates.html b/src/main/ui/static/analysis/templates/client_rates.html index 0f256632a..83009e07e 100644 --- a/src/main/ui/static/analysis/templates/client_rates.html +++ b/src/main/ui/static/analysis/templates/client_rates.html @@ -16,12 +16,12 @@
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html index 29d0e0575..36d8b6f17 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -62,7 +62,7 @@
@@ -70,7 +70,7 @@ diff --git a/src/main/ui/static/payment/tradelog/tradelog-manage.js b/src/main/ui/static/payment/tradelog/tradelog-manage.js index 79d07f627..803839a78 100644 --- a/src/main/ui/static/payment/tradelog/tradelog-manage.js +++ b/src/main/ui/static/payment/tradelog/tradelog-manage.js @@ -77,7 +77,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { $scope.loadTradeLogs(1); }; if (($scope.currentUser.role & parseInt('1000011', 2)) > 0 && !$scope.currentUser.org_id) { - /* $scope.showOrg = 'Organization';*/ + $scope.org2 = "ALL" $http.get('/sys/orgs', {params: {}}).then(function (resp) { $scope.orgs = resp.data; }); @@ -90,6 +90,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { }) }; if(($scope.currentUser.role & parseInt('1000000000000', 2)) > 0 && ($scope.currentUser.org_id != null)){ + $scope.org2 = "ALL Organizations" $scope.loadOrgs(); }