From fbae009d06f93ec1987f0a9639083264864d69a9 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Sun, 8 Apr 2018 16:07:07 +0800
Subject: [PATCH] modify html

---
 .../web/PartnerDashboardController.java       |  5 -----
 .../ui/static/dashboard/partner-dashboard.js  | 22 +++++++++----------
 .../templates/partner_dashboard.html          | 14 +++++++-----
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerDashboardController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerDashboardController.java
index dda589b27..d11025051 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerDashboardController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/PartnerDashboardController.java
@@ -55,11 +55,6 @@ public class PartnerDashboardController {
     public JSONObject transCommon(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner, AnalysisBean partnerAnalysisBean) {
         return dashboardService.getCommonAnalysis(partner,partnerAnalysisBean);
     }
-    @PartnerMapping("{client_moniker}/basic_info")
-    public JSONObject commonAnalysis(@PathVariable String client_moniker, @ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner) {
-        return partnerCardDashboardService.getCommonAnalysis(client_moniker);
-    }
-
     @PartnerMapping("/trans_type_analysis")
     public List<JSONObject> getTransTypesAnalysis(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject partner,AnalysisBean partnerAnalysisBean) {
         JSONObject params = partnerAnalysisBean.toParams("timezone");
diff --git a/src/main/ui/static/dashboard/partner-dashboard.js b/src/main/ui/static/dashboard/partner-dashboard.js
index 3c93d7418..c2dea5647 100644
--- a/src/main/ui/static/dashboard/partner-dashboard.js
+++ b/src/main/ui/static/dashboard/partner-dashboard.js
@@ -642,23 +642,27 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct
         $scope.pagination = {};
         $scope.clientMoniker = $scope.currentUser.client_moniker;
         $scope.loadDashboard = function () {
-            loadBasicInfo()
             loadTransCommon();
             getAvgOrderAndCustomer();
+            getExchangeRate();
 
         };
         $scope.loadDashboard();
-        function loadBasicInfo() {
-            $http.get('/dashboard/partner/' + $scope.clientMoniker + '/basic_info').then(function (resp) {
-                $scope.basicinfo = resp.data;
-            });
-        }
         function loadTransCommon() {
             var params = {begin: $filter('date')(new Date(), 'yyyyMMdd'), end: $filter('date')(new Date(), 'yyyyMMdd')};
             $http.get('/dashboard/partner/trans_common',{params:params}).then(function (resp) {
                 $scope.transcommon = resp.data;
             });
         }
+        function getExchangeRate() {
+            $http.get('/dashboard/system/exchange_rates', {params: $scope.scales[0].params()}).then(function (resp) {
+                if (resp.data && resp.data.length > 0) {
+                    $scope.wechat_rate = resp.data[0].Wechat.exchange_rate;
+                    $scope.alipay_rate = resp.data[0].Alipay.exchange_rate;
+                    $scope.exchange_date = resp.data[0].date.substr(0, 10);
+                }
+            });
+        }
         function loadTradeAmountInTypes(params) {
             var tradeInTypeConfig = {
                 chart: {
@@ -1061,12 +1065,6 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct
 
         $scope.loadSettlementLogs = function (page) {
             var params = angular.copy($scope.params);
-            // if (params.datefrom) {
-            //     params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd');
-            // }
-            // if (params.dateto) {
-            //     params.dateto = $filter('date')(params.dateto, 'yyyyMMdd');
-            // }
             params.page = page || $scope.pagination.page || 1;
             params.limit = 8;
             $http.get('/dashboard/partner/' +  $scope.clientMoniker + '/settlement_logs', {params: params}).then(function (resp) {
diff --git a/src/main/ui/static/dashboard/templates/partner_dashboard.html b/src/main/ui/static/dashboard/templates/partner_dashboard.html
index 244b84572..fcab9e18b 100644
--- a/src/main/ui/static/dashboard/templates/partner_dashboard.html
+++ b/src/main/ui/static/dashboard/templates/partner_dashboard.html
@@ -220,7 +220,7 @@
         </div>
         <div class="col-md-3 col-sm-6 col-xs-12">
             <div class="mini-stat clearfix bg-white">
-                <span class="mini-stat-icon bg-light"><i class="fa fa-cube text-warning"></i></span>
+                <span class="mini-stat-icon bg-light"><i class="ion ion-person-stalker text-warning"></i></span>
                 <div class="mini-stat-info text-right text-muted">
                     <span class="counter text-warning" ng-bind="transcommon.today.new_customers">5210</span>
                     New Customers
@@ -250,13 +250,15 @@
             <div class="card m-b-30">
                 <div class="card-body">
                     <h4 class="mt-0 header-title">Transaction Time Analysis</h4>
+
                     <ul class="list-inline widget-chart m-t-20 text-center">
+                        <li><b>Exchange Rate</b></li>
                         <li>
-                            <h6 class=""><b>{{basicinfo.rate_value.wechat_rate_value}}%</b></h6>
+                            <h6 class=""><b>{{wechat_rate}}%</b></h6>
                             <img src="/static/images/wechatpay_sign.png"/> Wechat
                         </li>
                         <li>
-                            <h6 class=""><b>{{basicinfo.rate_value.ali_rate_value}}%</b></h6>
+                            <h6 class=""><b>{{alipay_rate}}%</b></h6>
                             <img src="/static/images/alipay_sign.png"/> Alipay
                         </li>
                     </ul>
@@ -309,9 +311,9 @@
         </div>
     </div>-->
     <div class="row">
-        <div class="col-md-8 col-sm-8 col-xs-12">
+        <div class="col-md-8 col-sm-8 col-xs-12" >
             <div class="card m-b-30">
-                <div class="card-body">
+                <div class="card-body" style="height: 500px">
                     <h4 class="mt-0 m-b-15 header-title">Settlement Logs</h4>
 
                     <div class="table-responsive">
@@ -365,7 +367,7 @@
                 <div class="card-body">
                     <h4 class="mt-0 header-title">交易类型分布-交易量</h4>
 
-                    <div class="chart" style="height: 400px" echarts="trade_type_chart"
+                    <div class="chart" style="height: 445px" echarts="trade_type_chart"
                          ng-class="{nodata:trade_type_chart.nodata}"></div>
                 </div>
             </div>