From 55879c5c20856a40b17b33fc4073375972c4ae18 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Mon, 22 Oct 2018 11:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=AE=A1=E7=90=86ui=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/main_menu.html                    | 85 ++++++++++++++-----
 src/main/ui/managev2.html                     |  2 +-
 .../ui/static/analysis/channels_analysis.js   |  4 +-
 .../analysis/manage-customers-orders.js       |  2 +-
 src/main/ui/static/analysis/pre_refund.js     |  4 +-
 .../ui/static/analysis/refund_analysis.js     |  4 +-
 .../analysis/templates/channels_analysis.html |  9 ++
 .../templates/manage_customers_orders.html    |  4 +-
 .../static/analysis/templates/pre_refund.html | 18 ++--
 .../analysis/templates/refund_analysis.html   |  9 ++
 .../analysis/templates/trans_analysis.html    | 18 ++--
 .../templates/trans_analysis_monthly.html     |  9 ++
 .../transaction_amount_Analysis.html          |  9 ++
 .../static/analysis/trans-analysis-monthly.js |  6 +-
 src/main/ui/static/analysis/trans-analysis.js |  6 +-
 .../transaction/analysis-transaction.js       | 17 ++--
 .../templates/dashboard_gateway.html          |  2 +-
 17 files changed, 146 insertions(+), 62 deletions(-)

diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html
index 3b0aa58eb..e2cdb7092 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/main_menu.html
@@ -138,7 +138,7 @@
                     </a>
                 </div>
                 <div ng-if="('monitor'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_monitoring.pre_refund" ui-sref-opts="{reload:true}">
+                    <a ui-sref="pre_refund" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_arrears.png"/>
                         <div class="description-text">
@@ -147,19 +147,66 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('transAnalysis'|withModule)||('dashboard'|withModule)||
-                ('customer_analysis'|withModule)||
-                ('customerRankingAnalysisApp'|withModule)||
-                ('partner_analysis'|withModule)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_transaction" ui-sref-opts="{reload:true}">
+                <div ng-if="('transAnalysis'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="transanalysis" ui-sref-opts="{reload:true}">
                     <div class="description-block">
                         <img src="/static/images/main_menu/transaction_original_statistics.png"/>
                         <div class="description-text">
-                            <span class="description-text">原统计</span>
+                            <span class="description-text">交易数据</span>
                         </div>
                     </div>
                     </a>
                 </div>
+                <div ng-if="('dashboard'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="gateway" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">Gateway统计</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('customer_analysis'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="customers_analysis_manage" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">消费者统计</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('refundAnalysisApp'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="refundAnalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">退款统计</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('channels_Analysis'|withModule)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="channelsAnalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">支付通道</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div ng-if="('dashboard'|withModule)&&(currentUser.org_id==null)" class="col-sm-2 col-xs-6">
+                    <a ui-sref="amountlsAnalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/transaction_original_statistics.png"/>
+                            <div class="description-text">
+                                <span class="description-text">交易金额分析</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
                 <div ng-if="'log'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="logview.notify_logs" ui-sref-opts="{reload:true}">
                     <div class="description-block">
@@ -343,23 +390,23 @@
             </div>
             <div class="row">
                 <div ng-if="'bdsale'|withModule" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_bd.bdanalysis" ui-sref-opts="{reload:true}">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/bd_sales_volume.png"/>
-                        <div class="description-text">
-                            <span class="description-text">BD销售量</span>
+                    <a ui-sref="bdanalysis" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_sales_volume.png"/>
+                            <div class="description-text">
+                                <span class="description-text">BD销售量</span>
+                            </div>
                         </div>
-                    </div>
                     </a>
                 </div>
                 <div ng-if="('bdprize'|withModule)&&(currentUser.org_id==null||currentUser.org_id==1)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="analysis_bd.bd_prizes" ui-sref-opts="{reload:true}">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/bd_commission.png"/>
-                        <div class="description-text">
-                            <span class="description-text">BD提成</span>
+                    <a ui-sref="bd_prizes" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/bd_commission.png"/>
+                            <div class="description-text">
+                                <span class="description-text">BD提成</span>
+                            </div>
                         </div>
-                    </div>
                     </a>
                 </div>
                 <div ng-if="'1000'|withRole" class="col-sm-2 col-xs-6">
diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html
index f23f25c7f..ff1052bdf 100644
--- a/src/main/ui/managev2.html
+++ b/src/main/ui/managev2.html
@@ -316,7 +316,7 @@ margin-bottom: 10%;"/>
             </div>
         </nav>
     </header>
-    <div style="margin-left: 0;min-height: 890px" ui-view autoscroll="false">
+    <div class="content-wrapper autoheight" style="margin-left: 0;" ui-view autoscroll="false" >
         <div class="backgroud">
             <div class="total_logo">
                 <a><img src="/static/images/manage_total_logo.png"> </a>
diff --git a/src/main/ui/static/analysis/channels_analysis.js b/src/main/ui/static/analysis/channels_analysis.js
index 7cf052150..1ed36e4e3 100644
--- a/src/main/ui/static/analysis/channels_analysis.js
+++ b/src/main/ui/static/analysis/channels_analysis.js
@@ -6,8 +6,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
     var app = angular.module('channelsAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.channelsAnalysis', {
-            url: '/channelsAnalysis',
+        $stateProvider.state('channelsAnalysis', {
+            url: '/analysis/transaction/channelsAnalysis',
             templateUrl: '/static/analysis/templates/channels_analysis.html',
             controller: 'channelsCtrl'
         })
diff --git a/src/main/ui/static/analysis/manage-customers-orders.js b/src/main/ui/static/analysis/manage-customers-orders.js
index 4659de334..d453cb506 100644
--- a/src/main/ui/static/analysis/manage-customers-orders.js
+++ b/src/main/ui/static/analysis/manage-customers-orders.js
@@ -3,7 +3,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('customersAnalysisManage', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.customers_analysis_manage', {
+        $stateProvider.state('customers_analysis_manage', {
             url: '/analysis/customers',
             templateUrl: '/static/analysis/templates/manage_customers_orders.html',
             controller: 'customersAnalysisCtrl'
diff --git a/src/main/ui/static/analysis/pre_refund.js b/src/main/ui/static/analysis/pre_refund.js
index d47ad3d1d..e86ebd640 100644
--- a/src/main/ui/static/analysis/pre_refund.js
+++ b/src/main/ui/static/analysis/pre_refund.js
@@ -6,10 +6,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
            'use strict';
            var app = angular.module('preRefundApp', ['ui.router']);
            app.config(['$stateProvider', function ($stateProvider) {
-               $stateProvider.state('analysis_monitoring.pre_refund', {
+               $stateProvider.state('pre_refund', {
                    controller: 'preRefundCtrl',
                    templateUrl: '/static/analysis/templates/pre_refund.html',
-                   url: '/pre_refund'
+                   url: '/analysis/monitoring/pre_refund'
                })
            }]);
 
diff --git a/src/main/ui/static/analysis/refund_analysis.js b/src/main/ui/static/analysis/refund_analysis.js
index 870bbf544..4133be834 100644
--- a/src/main/ui/static/analysis/refund_analysis.js
+++ b/src/main/ui/static/analysis/refund_analysis.js
@@ -3,8 +3,8 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
     var app = angular.module('refundAnalysisApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch']);
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.refundAnalysis', {
-            url: '/refunds',
+        $stateProvider.state('refundAnalysis', {
+            url: '/analysis/transaction/refunds',
             templateUrl: '/static/analysis/templates/refund_analysis.html',
             controller: 'refundListCtrl'
         })
diff --git a/src/main/ui/static/analysis/templates/channels_analysis.html b/src/main/ui/static/analysis/templates/channels_analysis.html
index 89eac868c..1d4283b1d 100644
--- a/src/main/ui/static/analysis/templates/channels_analysis.html
+++ b/src/main/ui/static/analysis/templates/channels_analysis.html
@@ -7,6 +7,15 @@
         text-align: center;
     }
 </style>
+<section class="content-header">
+    <h1>Channels Analysis</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Analysis
+        </li>
+        <li class="active">Channels</li>
+    </ol>
+</section>
 <section class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html
index bb65421f4..9b43bebf5 100644
--- a/src/main/ui/static/analysis/templates/manage_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html
@@ -7,7 +7,7 @@
         text-align: center;
     }
 </style>
-<!--<section class="content-header">
+<section class="content-header">
     <h1>Customers Analysis</h1>
     <ol class="breadcrumb">
         <li>
@@ -15,7 +15,7 @@
         </li>
         <li class="active">Customers</li>
     </ol>
-</section>-->
+</section>
 <div class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/pre_refund.html b/src/main/ui/static/analysis/templates/pre_refund.html
index efa6f0803..4aa4d9f82 100644
--- a/src/main/ui/static/analysis/templates/pre_refund.html
+++ b/src/main/ui/static/analysis/templates/pre_refund.html
@@ -1,12 +1,12 @@
-<!--<section class="content-header">-->
-    <!--<h1>商户活跃度统计</h1>-->
-    <!--<ol class="breadcrumb">-->
-        <!--<li>-->
-            <!--<i class="fa fa-shopping-cart"></i> Analysis-->
-        <!--</li>-->
-        <!--<li class="active">商户活跃度统计</li>-->
-    <!--</ol>-->
-<!--</section>-->
+<section class="content-header">
+    <h1>Pre Refund</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Analysis
+        </li>
+        <li class="active">Pre Refund</li>
+    </ol>
+</section>
 <section class="content">
     <div class="row">
         <div class="box">
diff --git a/src/main/ui/static/analysis/templates/refund_analysis.html b/src/main/ui/static/analysis/templates/refund_analysis.html
index 0414880ef..e5d5fe207 100644
--- a/src/main/ui/static/analysis/templates/refund_analysis.html
+++ b/src/main/ui/static/analysis/templates/refund_analysis.html
@@ -7,6 +7,15 @@
         text-align: center;
     }
 </style>
+<section class="content-header">
+    <h1>Refund Analysis</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Analysis
+        </li>
+        <li class="active">Refund</li>
+    </ol>
+</section>
 <div class="content">
     <div class="content">
         <div class="box-solid">
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 9fac48e1a..b819ad5fe 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -7,15 +7,15 @@
         text-align: center;
     }
 </style>
-<!--<section class="content-header">-->
-    <!--<h1>Transaction Data</h1>-->
-    <!--<ol class="breadcrumb">-->
-        <!--<li>-->
-            <!--<i class="fa fa-list-alt"></i> Analysis-->
-        <!--</li>-->
-        <!--<li class="active">Transaction Data</li>-->
-    <!--</ol>-->
-<!--</section>-->
+<section class="content-header">
+    <h1>Transaction Data</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Analysis
+        </li>
+        <li class="active">Transaction Data</li>
+    </ol>
+</section>
 <div class="content">
     <div class="row">
         <div style="text-align: right" class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index 624069fa8..082381551 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -7,6 +7,15 @@
         text-align: center;
     }
 </style>
+<section class="content-header">
+    <h1>Transaction Data</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Analysis
+        </li>
+        <li class="active">Transaction Data</li>
+    </ol>
+</section>
 <div class="content">
     <div class="row">
         <div style="text-align: right" class="col-sm-12">
diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
index 5f4be2c4e..6da6b25d2 100644
--- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
+++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
@@ -1,3 +1,12 @@
+<section class="content-header">
+    <h1>Transaction Amount Analysis</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-list-alt"></i> Analysis
+        </li>
+        <li class="active">Transaction Amount</li>
+    </ol>
+</section>
 <div class="content">
     <div class="row">
         <div class="col-sm-12">
diff --git a/src/main/ui/static/analysis/trans-analysis-monthly.js b/src/main/ui/static/analysis/trans-analysis-monthly.js
index c1bccba7c..70ff8480b 100644
--- a/src/main/ui/static/analysis/trans-analysis-monthly.js
+++ b/src/main/ui/static/analysis/trans-analysis-monthly.js
@@ -3,7 +3,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('transAnalysisMonthly', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.transanalysis_monthly', {
+        $stateProvider.state('transanalysis_monthly', {
             url: '/analysis/transaction_monthly',
             templateUrl: '/static/analysis/templates/trans_analysis_monthly.html',
             controller: 'transAnalysisMonthlyCtrl'
@@ -15,12 +15,12 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                 {
                     key: 'day',
                     label: '按日统计',
-                    sref:"analysis_transaction.transanalysis"
+                    sref:"transanalysis"
                 },
                 {
                     key: 'month',
                     label: '按月统计',
-                    sref:"analysis_transaction.transanalysis_monthly"
+                    sref:"transanalysis_monthly"
                 }
             ];
             $scope.currentScalekey = 'month';
diff --git a/src/main/ui/static/analysis/trans-analysis.js b/src/main/ui/static/analysis/trans-analysis.js
index 2087785c3..052320a4c 100644
--- a/src/main/ui/static/analysis/trans-analysis.js
+++ b/src/main/ui/static/analysis/trans-analysis.js
@@ -3,7 +3,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('transAnalysis', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction.transanalysis', {
+        $stateProvider.state('transanalysis', {
             url: '/analysis/transaction',
             templateUrl: '/static/analysis/templates/trans_analysis.html',
             controller: 'transAnalysisCtrl'
@@ -15,12 +15,12 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an
                 {
                     key: 'day',
                     label: '按日统计',
-                    sref:"analysis_transaction.transanalysis"
+                    sref:"transanalysis"
                 },
                 {
                     key: 'month',
                     label: '按月统计',
-                    sref:"analysis_transaction.transanalysis_monthly"
+                    sref:"transanalysis_monthly"
                 }
             ];
             $scope.currentScalekey = 'day';
diff --git a/src/main/ui/static/analysis/transaction/analysis-transaction.js b/src/main/ui/static/analysis/transaction/analysis-transaction.js
index dafc91ff2..21ed90ad3 100644
--- a/src/main/ui/static/analysis/transaction/analysis-transaction.js
+++ b/src/main/ui/static/analysis/transaction/analysis-transaction.js
@@ -6,16 +6,17 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('analysisTransaction', ['ui.bootstrap', 'ui.router', 'ngEcharts']);
     app.config(['$stateProvider', function ($stateProvider) {
-        $stateProvider.state('analysis_transaction', {
-            url: '/analysis/transaction',
-            templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html',
-            controller: 'analysisTransactionCtrl'
-        }).state('analysis_transaction.gateway', {
-            url: '/gateway',
+        // $stateProvider.state('analysis_transaction', {
+        //     url: '/analysis/transaction',
+        //     templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html',
+        //     controller: 'analysisTransactionCtrl'
+        // })
+        $stateProvider.state('gateway', {
+            url: '/analysis/transaction/gateway',
             templateUrl: '/static/dashboard/templates/dashboard_gateway.html',
             controller: 'gatewayTransCtrl'
-        }).state('analysis_transaction.amountlsAnalysis', {
-            url: '/amountRangeAnalysis',
+        }).state('amountlsAnalysis', {
+            url: '/analysis/transaction/amountRangeAnalysis',
             templateUrl: '/static/analysis/templates/transaction_amount_Analysis.html',
             controller: 'transactionAmountCtrl'
         })
diff --git a/src/main/ui/static/dashboard/templates/dashboard_gateway.html b/src/main/ui/static/dashboard/templates/dashboard_gateway.html
index 6b68ee856..6e51ca1ea 100644
--- a/src/main/ui/static/dashboard/templates/dashboard_gateway.html
+++ b/src/main/ui/static/dashboard/templates/dashboard_gateway.html
@@ -7,7 +7,7 @@
         text-align: center;
     }
 </style>
-<section class="content-header" ng-if="dashboardPage">
+<section class="content-header">
     <h1>
         Gateway Analysis
     </h1>