diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html index e2cdb7092..3ec946a2e 100644 --- a/src/main/ui/main_menu.html +++ b/src/main/ui/main_menu.html @@ -77,7 +77,7 @@
- +
- +
- - - - -
diff --git a/src/main/ui/static/analysis/channels_analysis.js b/src/main/ui/static/analysis/channels_analysis.js index 1ed36e4e3..7cf052150 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('channelsAnalysis', { - url: '/analysis/transaction/channelsAnalysis', + $stateProvider.state('analysis_transaction.channelsAnalysis', { + url: '/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 d453cb506..4659de334 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('customers_analysis_manage', { + $stateProvider.state('analysis_transaction.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 e86ebd640..d47ad3d1d 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('pre_refund', { + $stateProvider.state('analysis_monitoring.pre_refund', { controller: 'preRefundCtrl', templateUrl: '/static/analysis/templates/pre_refund.html', - url: '/analysis/monitoring/pre_refund' + url: '/pre_refund' }) }]); diff --git a/src/main/ui/static/analysis/refund_analysis.js b/src/main/ui/static/analysis/refund_analysis.js index 4133be834..870bbf544 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('refundAnalysis', { - url: '/analysis/transaction/refunds', + $stateProvider.state('analysis_transaction.refundAnalysis', { + url: '/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 1d4283b1d..db4fa595d 100644 --- a/src/main/ui/static/analysis/templates/channels_analysis.html +++ b/src/main/ui/static/analysis/templates/channels_analysis.html @@ -7,7 +7,7 @@ text-align: center; } -
+
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 9b43bebf5..bb65421f4 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; } -
+
diff --git a/src/main/ui/static/analysis/templates/pre_refund.html b/src/main/ui/static/analysis/templates/pre_refund.html index 4aa4d9f82..e56edfa66 100644 --- a/src/main/ui/static/analysis/templates/pre_refund.html +++ b/src/main/ui/static/analysis/templates/pre_refund.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/main/ui/static/analysis/templates/refund_analysis.html b/src/main/ui/static/analysis/templates/refund_analysis.html index e5d5fe207..572b1b0be 100644 --- a/src/main/ui/static/analysis/templates/refund_analysis.html +++ b/src/main/ui/static/analysis/templates/refund_analysis.html @@ -7,7 +7,7 @@ text-align: center; } -
+
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html index b819ad5fe..f1ab22f81 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis.html +++ b/src/main/ui/static/analysis/templates/trans_analysis.html @@ -7,7 +7,7 @@ text-align: center; } -
+
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 082381551..99e9a96c5 100644 --- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html +++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html @@ -7,7 +7,7 @@ text-align: center; } -
+
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 6da6b25d2..2f400fa69 100644 --- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html +++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/main/ui/static/analysis/trans-analysis-monthly.js b/src/main/ui/static/analysis/trans-analysis-monthly.js index 70ff8480b..c1bccba7c 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('transanalysis_monthly', { + $stateProvider.state('analysis_transaction.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:"transanalysis" + sref:"analysis_transaction.transanalysis" }, { key: 'month', label: '按月统计', - sref:"transanalysis_monthly" + sref:"analysis_transaction.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 052320a4c..2087785c3 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('transanalysis', { + $stateProvider.state('analysis_transaction.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:"transanalysis" + sref:"analysis_transaction.transanalysis" }, { key: 'month', label: '按月统计', - sref:"transanalysis_monthly" + sref:"analysis_transaction.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 21ed90ad3..dafc91ff2 100644 --- a/src/main/ui/static/analysis/transaction/analysis-transaction.js +++ b/src/main/ui/static/analysis/transaction/analysis-transaction.js @@ -6,17 +6,16 @@ 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' - // }) - $stateProvider.state('gateway', { - url: '/analysis/transaction/gateway', + $stateProvider.state('analysis_transaction', { + url: '/analysis/transaction', + templateUrl: '/static/analysis/transaction/templates/analysis_transaction.html', + controller: 'analysisTransactionCtrl' + }).state('analysis_transaction.gateway', { + url: '/gateway', templateUrl: '/static/dashboard/templates/dashboard_gateway.html', controller: 'gatewayTransCtrl' - }).state('amountlsAnalysis', { - url: '/analysis/transaction/amountRangeAnalysis', + }).state('analysis_transaction.amountlsAnalysis', { + url: '/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 6e51ca1ea..6b68ee856 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; } -
+

Gateway Analysis