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;
}
-
+