| 
					
				 | 
			
			
				@@ -72,6 +72,10 @@ $(document).ready(function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     console.log(expensesBarDatas); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     const expensesBarChart = echarts.init(document.getElementById('expensesBarChart')); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // 判断是万元还是元 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    const yfPrices =  _.map(expensesBarDatas, 'yf_price'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    const useWang = yfPrices.some(v => v >= 10000000); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    const displayData = useWang ? yfPrices.map(v => v / 10000) : yfPrices; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     const expensesBarOption = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         color: ['#b5c4b1','#965454','#9ca8b8','#d8caaf'], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         title : { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -82,7 +86,7 @@ $(document).ready(function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         calculable : true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         legend: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            data:['支付金额','占总金额比例'] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            data:[`支付金额${useWang ? '(万元)' : '(元)'}`,'占总金额比例'] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         dataZoom: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             {show: true,start: 0, end: 100} 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -100,7 +104,7 @@ $(document).ready(function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 name : '金额', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 position:'left', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 axisLabel : { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    formatter: '{value} 元' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    formatter: value => useWang ? `${value}万元` : `${value}元` 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 splitArea : {show : true} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -116,11 +120,11 @@ $(document).ready(function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         series : [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                name:'支付金额', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                name:`支付金额${useWang ? '(万元)' : '(元)'}`, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 type:'bar', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 tooltip : {formatter: "{b}<br/>{a}:{c} %"}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 stack: '结算金额', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                data: _.map(expensesBarDatas, 'yf_price'), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                data: displayData, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 name:'占总金额比例', 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -205,6 +209,10 @@ $(document).ready(function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     console.log(incomeBarDatas); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     const incomeBarChart = echarts.init(document.getElementById('incomeBarChart')); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // 判断是万元还是元 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    const incomeYfPrices =  _.map(incomeBarDatas, 'yf_price'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    const incomeUseWang = incomeYfPrices.some(v => v >= 10000000); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    const incomeDisplayData = incomeUseWang ? incomeYfPrices.map(v => v / 10000) : incomeYfPrices; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     const incomeBarOption = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         color: ['#a27e7e','#656565','#b5c4b1','#d8caaf'], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         title : { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -215,7 +223,7 @@ $(document).ready(function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         calculable : true, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         legend: { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            data:['回款金额','占总金额比例'] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            data:[`回款金额${incomeUseWang ? '(万元)' : '(元)'}`,'占总金额比例'] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         dataZoom: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             {show: true,start: 0, end: 100} 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -233,7 +241,7 @@ $(document).ready(function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 name : '金额', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 position:'left', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 axisLabel : { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    formatter: '{value} 元' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    formatter:  value => incomeUseWang ? `${value}万元` : `${value}元` 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 splitArea : {show : true} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -249,11 +257,11 @@ $(document).ready(function() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         series : [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                name:'回款金额', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                name:`回款金额${incomeUseWang ? '(万元)' : '(元)'}`, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 type:'bar', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 tooltip : {formatter: "{b}<br/>{a}:{c} %"}, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 stack: '回款金额', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                data: _.map(incomeBarDatas, 'yf_price'), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                data: incomeDisplayData, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 name:'占总金额比例', 
			 |