首页图表tooltip逻辑调整

frontend/saas-web/app/view/home/charts/MonthIO.js

@@ -42,24 +42,27 @@ Ext.define('saas.view.home.charts.MonthIO', {
             tooltip: {
                 trigger: 'axis',
                 formatter: function (params, ticket, callback) {
-                    var p1 = params[0],
-                    marker1 = p1.marker,
-                    seriesName1 = p1.seriesName,
-                    name1 = p1.name,
-                    value1 = p1.value,
-                    p2 = params[1],
-                    marker2 = p2.marker,
-                    seriesName2 = p2.seriesName,
-                    value2 = p2.value,
-                    total = value1 + value2;
+                    var name = '',
+                    total = 0,
+                    series = [];
 
-                    total = saas.util.BaseUtil.numberFormat(total, 4, true);
-                    value1 = saas.util.BaseUtil.numberFormat(value1, 4, true);
-                    value2 = saas.util.BaseUtil.numberFormat(value2, 4, true);
+                    for(var x = 0; x < params.length; x++) {
+                        var p = params[x],
+                        marker = p.marker,
+                        seriesName = p.seriesName,
+                        name = p.name,
+                        value = p.value;
+
+                        total += value;
 
-                    return name1 + ': ' + total + ' <br/>' +
-                        marker1 + seriesName1 + ': ' + value1 + '<br/>' +
-                        marker2 + seriesName2 + ': ' + value2;
+                        value = saas.util.BaseUtil.numberFormat(value, 4, true);
+                        
+                        series.push(marker + seriesName + ': ' + value);
+                    }
+
+                    total = saas.util.BaseUtil.numberFormat(total, 4, true);
+                    
+                    return name + ': ' + total + '<br/>' + series.join('<br/>');
                 }
             },
             legend: {

frontend/saas-web/app/view/home/charts/ProfitDetail.js

@@ -46,18 +46,27 @@ Ext.define('saas.view.home.charts.ProfitDetail', {
             tooltip: {
                 trigger: 'axis',
                 formatter: function (params, ticket, callback) {
-                    var p = params[0],
-                    marker = p.marker,
-                    name = p.name,
-                    value = p.value;
-                    
-                    if(name.length > 7) {
-                        name = Ext.String.insert(name, '<br/>', 7)
+                    var name = '',
+                    series = [];
+
+                    for(var x = 0; x < params.length; x++) {
+                        var p = params[x],
+                        marker = p.marker,
+                        seriesName = p.seriesName,
+                        name = p.name,
+                        value = p.value;
+
+                        value = saas.util.BaseUtil.numberFormat(value, 4, true);
+
+                        series.push(marker + ': ' + value);
                     }
 
-                    value = saas.util.BaseUtil.numberFormat(value, 4, true);
+                    if(name.length > 9) {
+                        name = Ext.String.insert(name, '<br/>', 7)
+                    }
+        
 
-                    return name + ':<br/>' + marker + value;
+                    return name + ': ' + '<br/>' + series.join('<br/>');
                 }
             },
             xAxis: {

frontend/saas-web/app/view/home/charts/SaleTrend.js

@@ -61,22 +61,22 @@ Ext.define('saas.view.home.charts.SaleTrend', {
             tooltip: {
                 trigger: 'axis',
                 formatter: function (params, ticket, callback) {
-                    var p1 = params[0],
-                    marker1 = p1.marker,
-                    seriesName1 = p1.seriesName,
-                    name1 = p1.name,
-                    value1 = p1.value,
-                    p2 = params[1],
-                    marker2 = p2.marker,
-                    seriesName2 = p2.seriesName,
-                    value2 = p2.value;
+                    var name = '',
+                    series = [];
 
-                    value1 = saas.util.BaseUtil.numberFormat(value1, 4, true);
-                    value2 = saas.util.BaseUtil.numberFormat(value2, 4, true);
+                    for(var x = 0; x < params.length; x++) {
+                        var p = params[x],
+                        marker = p.marker,
+                        seriesName = p.seriesName,
+                        name = p.name,
+                        value = p.value;
 
-                    return name1 + ': ' + '<br/>' +
-                        marker1 + seriesName1 + ': ' + value1 + '<br/>' +
-                        marker2 + seriesName2 + ': ' + value2;
+                        value = saas.util.BaseUtil.numberFormat(value, 4, true);
+
+                        series.push(marker + seriesName + ': ' + value);
+                    }
+
+                    return name + ': ' + '<br/>' + series.join('<br/>');
                 }
             },
             legend: {

frontend/saas-web/app/view/home/charts/StockAmount.js

@@ -39,14 +39,22 @@ Ext.define('saas.view.home.charts.StockAmount', {
             tooltip: {
                 trigger: 'axis',
                 formatter: function (params, ticket, callback) {
-                    var p = params[0],
-                    marker = p.marker,
-                    name = p.name,
-                    value = p.value;
+                    var name = '',
+                    series = [];
 
-                    value = saas.util.BaseUtil.numberFormat(value, 4, true);
+                    for(var x = 0; x < params.length; x++) {
+                        var p = params[x],
+                        marker = p.marker,
+                        seriesName = p.seriesName,
+                        name = p.name,
+                        value = p.value;
 
-                    return name + ':<br/>' + marker + value;
+                        value = saas.util.BaseUtil.numberFormat(value, 4, true);
+
+                        series.push(marker + ': ' + value);
+                    }
+
+                    return name + ': ' + '<br/>' + series.join('<br/>');
                 }
             },
             grid: {