From 8de1d7b6888c6b349b354e072f6ac0a518a2e0da Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Mon, 5 Feb 2018 14:52:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=B9=B4?=
 =?UTF-8?q?=E4=BB=BD=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/static/analysis/templates/settle_report.html  | 10 +++++++++-
 .../static/config/platformrevenue/platformrevenue.js |  4 +++-
 .../templates/platform_revenue_root.html             | 12 ++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/settle_report.html b/src/main/ui/static/analysis/templates/settle_report.html
index 9089dbfa1..dfc991e0d 100644
--- a/src/main/ui/static/analysis/templates/settle_report.html
+++ b/src/main/ui/static/analysis/templates/settle_report.html
@@ -2,11 +2,19 @@
 <section class="content">
     <div class="box box-default">
         <div class="box-header">
-            <div uib-dropdown>
+           <!-- <div uib-dropdown>
                 <button class="btn btn-primary" uib-dropdown-toggle type="button" ng-bind="params.year"></button>
                 <ul class="dropdown-menu" uib-dropdown-menu role="menu">
                     <li ng-repeat="year in availableYears" role="menuitem"><a role="button" ng-click="initMonth(year)" ng-bind="year"></a></li>
                 </ul>
+            </div>-->
+
+            <div ng-repeat="year in availableYears" style="display: inline">
+                <button class="btn btn-info"
+                        ng-click="initMonth(year)"
+                        ng-bind="year"
+                        ng-class="{'active':year == params.year}"
+                ></button>
             </div>
         </div>
         <div class="box-body">
diff --git a/src/main/ui/static/config/platformrevenue/platformrevenue.js b/src/main/ui/static/config/platformrevenue/platformrevenue.js
index 8924a05a4..f1c28030f 100644
--- a/src/main/ui/static/config/platformrevenue/platformrevenue.js
+++ b/src/main/ui/static/config/platformrevenue/platformrevenue.js
@@ -78,6 +78,7 @@ define(['angular', 'decimal', 'uiRouter', 'angularEcharts', '../../analysis/repo
     }]);
     app.controller('platformRevenueRootCtrl', ['$scope', '$http', '$filter', 'chartParser', function ($scope, $http, $filter, chartParser) {
         $scope.params = {year: new Date().getFullYear()};
+        $scope.availableYears = [new Date().getFullYear() - 1, new Date().getFullYear()];
         $scope.initMonth = function (year) {
             $scope.months = [];
             for (var i = 1; i < 13; i++) {
@@ -93,6 +94,7 @@ define(['angular', 'decimal', 'uiRouter', 'angularEcharts', '../../analysis/repo
             return start <= mon && end >= mon
         };
         $scope.loadYearReport = function (year) {
+            $scope.params.year =  year;
             $http.get('/analysis/platform/revenue/year_reports/' + year).then(function (resp) {
                 $scope.report = resp.data;
                 loadChargeAnalysis(year);
@@ -164,7 +166,7 @@ define(['angular', 'decimal', 'uiRouter', 'angularEcharts', '../../analysis/repo
             })
         }
 
-        $scope.loadYearReport(2017);
+        $scope.loadYearReport(new Date().getFullYear());
     }]);
     return app;
 });
\ No newline at end of file
diff --git a/src/main/ui/static/config/platformrevenue/templates/platform_revenue_root.html b/src/main/ui/static/config/platformrevenue/templates/platform_revenue_root.html
index 850d067ce..1c3bd22c4 100644
--- a/src/main/ui/static/config/platformrevenue/templates/platform_revenue_root.html
+++ b/src/main/ui/static/config/platformrevenue/templates/platform_revenue_root.html
@@ -14,7 +14,7 @@
                 <div class="form-inline">
                     <div class="form-group">
                         <label class="control-label" style="width: 50px">年份</label>
-                            <div uib-dropdown class="btn-group">
+                            <!--<div uib-dropdown class="btn-group">
                                 <button id="single-button" type="button" class="btn btn-primary" style="width: 100px" ng-bind="analysis.analysis_year" uib-dropdown-toggle ng-disabled="disabled">
                                     <span class="caret"></span>
                                 </button>
@@ -23,7 +23,15 @@
                                     <li><a ng-click="loadYearReport(2016)">2016</a></li>
                                     <li><a ng-click="loadYearReport(2017)">2017</a></li>
                                 </ul>
-                            </div>
+                            </div>-->
+
+                        <div ng-repeat="year in availableYears" style="display: inline">
+                            <button class="btn btn-info"
+                                    ng-click="loadYearReport(year)"
+                                    ng-bind="year"
+                                    ng-class="{'active':year == params.year}"
+                            ></button>
+                        </div>
                     </div>
                 </div>
             </div>