Browse Source

处理问题

wzz 3 years ago
parent
commit
1613f14c48
1 changed files with 38 additions and 31 deletions
  1. 38 31
      pages/metrics/index.vue

+ 38 - 31
pages/metrics/index.vue

@@ -48,7 +48,7 @@
 		<!-- <qiun-title-bar title="工业产值"/> -->
 		<view class="title-second">工业产值</view>
 		<view class="charts-box">
-		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'}}" :chartData="chartData2"/>
+		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'},yAxis:{boundaryGap:'justify',data:[{position:'left',textAlign:'left',fontSize:10}]}}" :chartData="chartData2"/>
 		</view>
 		
 		<qiun-title-bar title="工业投资" style="border-top:10rpx solid #f2f2f2" />
@@ -74,7 +74,7 @@
 		<!-- <qiun-title-bar title="工业投资额"/> -->
 		<view class="title-second">工业投资额</view>
 		<view class="charts-box">
-		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'}}" :chartData="industryData.chartData2"/>
+		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'},yAxis:{boundaryGap:'justify',data:[{position:'left',textAlign:'left',fontSize:10}]}}" :chartData="industryData.chartData2"/>
 		</view>
 	
 	
@@ -101,7 +101,7 @@
 	    <!-- <qiun-title-bar title="工业投资额"/> -->
 		<view class="title-second">工业投资额</view>
 		<view class="charts-box">
-		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'}}" :chartData="importantData.chartData2"/>
+		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',yAxis:{boundaryGap:'justify',data:[{position:'left',textAlign:'left',fontSize:10}]}}" :chartData="importantData.chartData2"/>
 		</view>
 	
 	    <qiun-title-bar title="科技创新指标" style="border-top:10rpx solid #f2f2f2;margin-bottom: 10rpx;" />
@@ -191,7 +191,7 @@
 					]
 			  },
 			  chartDataBarOpt:{extra:{bar:{linearType:'custom',barBorderCircle:true}}},
-			  companyOpts:{enableScroll: false,xAxis:{scrollShow: true,itemCount:5},yAxis:{splitNumber:3}},
+			  companyOpts:{enableScroll: false,xAxis:{scrollShow: true,itemCount:5},yAxis:{data:[{min:0,max:3,tofix:2}]}},
 			  chartData1:{
 				  "categories": [],
 				  "series": [
@@ -277,7 +277,7 @@
 								"type": "column"
 							},
 							{
-								"name": "折线",
+								"name": "增速",
 								"index": 1,
 								"data": [],
 								"type": "line",
@@ -292,26 +292,6 @@
 					  "series": [
 							  {
 								  "data": [
-									  // {
-										 //  "name": "空港",
-										 //  "value": 50
-									  // },
-									  // {
-										 //  "name": "沣东",
-										 //  "value": 30
-									  // },
-									  // {
-										 //  "name": "秦汉",
-										 //  "value": 20
-									  // },
-									  // {
-										 //  "name": "泾河",
-										 //  "value": 18
-									  // },
-									  // {
-										 //  "name": "沣西",
-										 //  "value": 8
-									  // }
 								  ]
 							  }
 						  ]
@@ -321,7 +301,7 @@
 	  },
 	  onLoad() {
 		this.makeMonthArr(this.dateYear)  
-	  	this.topChartFn(this.dateYear,this.dateMonth)
+	  //	this.topChartFn(this.dateYear,this.dateMonth)
 	  },
 	  methods:{
 		  topChartFn(year,month){
@@ -382,14 +362,28 @@
 				   if(dataList.target.length){
 					   dataList.target.forEach((item,index)=>{
 						   if(item.source == '1'){
-							   targetRatio1 = Number(item.increase_ratio) || 0		
+							   targetRatio1 = Number(item.increase_ratio) || 0
+							   let dataObj = {
+								   value:Number(item.increase_ratio),
+								   color:'#1890FF'
+							   }
+							   if(Number(item.increase_ratio) === 0 && Number(item.increase_balance) === 0){
+							   		dataObj.color = '#4c4c4c'
+							   }
 							   targetData.push(Number(item.increase_balance))
-							   targetData1.push(Number(item.increase_ratio))
+							   targetData1.push(dataObj)
 						   }
 						   if(item.source == '2'){
 							   targetRatio2 = Number(item.increase_ratio) || 0
+							   let dataObj = {
+								   value:Number(item.increase_ratio),
+								   color:'#1890FF'
+							   }
+							   if(Number(item.increase_ratio) === 0 && Number(item.increase_balance) === 0){
+							   		dataObj.color = '#4c4c4c'
+							   }
 							   targetData.push(Number(item.increase_balance))
-							   targetData1.push(Number(item.increase_ratio))
+							   targetData1.push(dataObj)
 						   }
 					   })
 				   }
@@ -401,14 +395,20 @@
 							   value:Number(item.increase_ratio),
 							   color:Number(item.increase_ratio) > targetRatio1 ? '#68d889' : '#cc0000'
 						   }
+						   if(Number(item.increase_ratio) === 0 && Number(item.increase_balance) === 0){
+							   dataObj.color = '#4c4c4c'
+						   }
 						   finishData.push(Number(item.increase_balance))
 						   finishData1.push(dataObj)
 						 }
-						   if(item.source == '2'){
+						if(item.source == '2'){
 							   let dataObj = {
 								   value:Number(item.increase_ratio),
 								   color:Number(item.increase_ratio) > targetRatio2 ? '#68d889' : '#cc0000'
 							   }
+							   if(Number(item.increase_ratio) === 0 && Number(item.increase_balance) === 0){
+							   		dataObj.color = '#4c4c4c'
+							   }
 							   finishData.push(Number(item.increase_balance))
 							   finishData1.push(dataObj)
 						   }
@@ -505,8 +505,15 @@
 							techRatio = Number(item.increase_ratio) || 0					 
 					   }
 					   if(item.source !== '0'){
+						   let dataObj = {
+							   value:Number(item.increase_ratio),
+							   color:'#1890FF'
+						   }
+						   if(Number(item.increase_ratio) === 0 && Number(item.increase_balance) === 0){
+						   		dataObj.color = '#4c4c4c'
+						   }
 						   targetData.push(Number(item.increase_balance))
-						   targetData1.push(Number(item.increase_ratio))
+						   targetData1.push(dataObj)
 					   }
 				   })
 			  }