修改问题

pages/metrics/index.vue

@@ -15,7 +15,7 @@
 		</view>
 	
 		<qiun-title-bar title="规上工业企业"/>
-	    <view class="block-box display-wrap items-center" style="justify-content: space-evenly;height: 340rpx;">
+	    <view class="block-box display-wrap items-center" style="justify-content: space-around;height: 320rpx;">
 			 <view class="block-box-content" style="background-color: #77AFCA;" @click="goScale('规上工业企业')">
 				 <view class="font-size30">规上工业企业</view>
 				 <view>{{standard_sized_count}}</view>
@@ -106,29 +106,29 @@
 	
 	    <qiun-title-bar title="科技创新指标" style="border-top:10rpx solid #f2f2f2;margin-bottom: 10rpx;" />
 	    <view class="block-box display-around items-center">
-	    	 <view class="block-box-content" style="width:47%;color: #555;" @click="goScale('科技创新企业','high_tech')">
+	    	 <view class="block-box-content" style="width:46%;color: #555;" @click="goScale('科技创新企业','high_tech')">
 	    		 <view class="font-size30">国家高新技术企业</view>
 	    		 <view>{{techData.target.high ||'-'}}/<text style="color: red;">{{techData.finish.high ||'-'}}</text></view>
 	    	 </view>
-	    	 <view class="block-box-content" style="width:47%;color: #555;" @click="goScale('科技创新企业','tech')">
+	    	 <view class="block-box-content" style="width:46%;color: #555;" @click="goScale('科技创新企业','tech')">
 	    		 <view class="font-size30">科技型中小企业</view>
 	    		 <view>{{techData.target.mini ||'-'}}/<text style="color: red;">{{techData.finish.mini ||'-'}}</text></view>
 	    	 </view>
 		</view>
-		<view class="display-around-column items-center" style="height: 620rpx; margin: 10rpx 0 10rpx 0;">
-		   <view class="block-box-content" style="width:97%;color: #555;" @click="goScale('科技创新企业','standard_industry')">
+		<view class="display-around-column items-center" style="height: 640rpx; margin: 10rpx 0 10rpx 0;">
+		   <view class="block-box-content" style="width:96%;color: #555;" @click="goScale('科技创新企业','standard_industry')">
 		   				 <view class="font-size30">累计研发投入规上工业企业</view>
 		   				 <view>{{techData.target.standard_industry ||'-'}}/<text style="color: red;">{{techData.finish.standard_industry ||'-'}}</text></view>
 		   </view>
-		   <view class="block-box-content" style="width:97%;color: #555;" @click="goScale('科技创新企业','standard_service')">
+		   <view class="block-box-content" style="width:96%;color: #555;" @click="goScale('科技创新企业','standard_service')">
 		   				 <view class="font-size30">累计研发投入规上服务业企业</view>
 		   				 <view>{{techData.target.standard_service ||'-'}}/<text style="color: red;">{{techData.finish.standard_service ||'-'}}</text></view>
 		    </view>
-		    <view class="block-box-content" style="width:97%;color: #555;" @click="goScale('科技创新企业','rd_five_percent' )">
+		    <view class="block-box-content" style="width:96%;color: #555;" @click="goScale('科技创新企业','rd_five_percent' )">
 		   				 <view class="font-size30">累计研发投入占主营业务5%的企业</view>
 		   				 <view>{{techData.target.rd_five_percent ||'-'}}/<text style="color: red;">{{techData.finish.rd_five_percent ||'-'}}</text></view>
 		   </view>
-		   <view class="block-box-content" style="width:97%;color: #555;" @click="goScale('科技创新企业','rd_five_million')">
+		   <view class="block-box-content" style="width:96%;color: #555;" @click="goScale('科技创新企业','rd_five_million')">
 		   				 <view class="font-size30">累计研发投入500万以上的企业</view>
 		   				 <view>{{techData.target.rd_five_million ||'-'}}/<text style="color: red;">{{techData.finish.rd_five_million ||'-'}}</text></view>
 		   </view>
@@ -147,12 +147,14 @@
 		<!-- <qiun-title-bar title="各新城规上工业企业数量"/> -->
 		<view class="title-second">各新城{{sortSelect}}</view>
 		<view class="charts-box">
-			<qiun-data-charts  type="column" :chartData="ereaData.chartDataBar" background="#4C4C4C"/>
+			<qiun-data-charts  type="mix" :chartData="ereaData.chartDataBar" 
+			:opts="{yAxis:{showTitle:false,padding:5,data:[{position:'left',textAlign:'left',fontSize:10},{position:'right',textAlign:'right',min: -60,max: 30,fontSize:10,format:'lineRaitoY'},{position:'right',disabled:true}]}}" 
+			 background="#4C4C4C"/>
 		</view>
 		<!-- <qiun-title-bar title="各新城规上工业企业数量占比"/> -->
 		<view class="title-second">各新城{{sortSelect}}占比</view>
 		<view class="charts-box" style="margin-bottom: 20rpx;">
-			<qiun-data-charts   type="pie" :chartData="ereaData.chartDataPie" :opts="{legend:{fontSize:10}}" background="#4C4C4C"/>
+			<qiun-data-charts   type="pie" :chartData="ereaData.chartDataPie" :opts="{legend:{fontSize:13}}" background="#4C4C4C"/>
 		</view>
 	</view>
 </template>
@@ -241,7 +243,7 @@
 				  continue_project_count:'',
 				  investment_count:'',
 				  chartData:{
-					  categories: ["市级", "新区级","新城级"],
+					  categories: ["省级","市级", "新区级","新城级"],
 					  series: [
 						{   
 							name: "数量",
@@ -266,9 +268,20 @@
 					  "categories": [],
 					  "series": [
 							{
-								"name":'',
+								"name":"",
+								"index": 0,
 								"data": [],
-							}
+								"type": "column"
+							},
+							{
+								"name": "折线",
+								"index": 1,
+								"data": [],
+								"type": "line",
+								"color":"#cc0000",
+								"textSize":10, 
+								"format":'lineRaito'
+							},
 						]
 				  },
 				  chartDataPie:{
@@ -547,7 +560,11 @@
 			  this.importantData.new_project_count = data.new_project_count|| '-';
 			  this.importantData.continue_project_count = data.continue_project_count|| '-';
 			  this.importantData.investment_count = data.investment_count ? (data.investment_count/10000).toFixed(2):0
-			  this.importantData.chartData.series[0].data = [data.city_level_count,data.area_level_count,data.new_city_level_count] 
+			  if(data.province_level_count == 0 && data.city_level_count == 0 && data.area_level_count == 0 && data.new_city_level_count == 0){
+				 this.importantData.chartData.series[0].data = []  
+			  }else{
+				 this.importantData.chartData.series[0].data = [data.province_level_count,data.city_level_count,data.area_level_count,data.new_city_level_count]
+			  }
 			  //this.importantData.chartData.series[0].data = [5,16,21]
 			  for(let key in data.month_list ){
 				 lineBalanceList.push(data.month_list[key].balance)
@@ -630,16 +647,25 @@
 			  });
 		  },
 		  ereaInfoFilter(data){
-			  let categoriesList = [], barData = [], pieData = [];
+			  let categoriesList = [], barData = [], pieData = [],lineData = [];
 			  for(let key in data.area_list ){
+				     if(data.area_list[key].name !== '西咸新区'){
+						data.area_list[key].name =  (data.area_list[key].name).substr(0,2)
+					 }
 				     categoriesList.push(data.area_list[key].name);
-					 barData.push(data.area_list[key].value)
+					 barData.push(Number(data.area_list[key].value));
+					 if(data.area_list[key].ratio){
+						lineData.push(Number(data.area_list[key].ratio)) 
+					 }
 					 pieData.push(data.area_list[key])
 			  }
 			  this.ereaData.chartDataBar.categories = categoriesList;
 			  this.ereaData.chartDataPie.categories = categoriesList;
 			  this.ereaData.chartDataBar.series[0].name =  "各新城" + this.sortSelect;
 			  this.ereaData.chartDataBar.series[0].data = barData;
+			  // this.ereaData.chartDataBar.series[1].name =  "各新城" + this.sortSelect;
+			  this.ereaData.chartDataBar.series[1].data = lineData;
+			  console.log(this.ereaData.chartDataBar)
 			  pieData.forEach((item)=>{item.value = Number(item.value)})
 			  this.ereaData.chartDataPie.series[0].data =pieData.filter((item)=>{return item.name !== '西咸新区'});
 		  },
@@ -751,7 +777,7 @@
 		align-items: center;
 		font-size: 34rpx;
 		border-radius: 10rpx;
-		width: 45%;
+		width: 46%;
 		height: 140rpx;
 		color: #fff;
 		background-color:#F2F2F2;

pages/metrics/largeScale/index.vue

@@ -147,9 +147,9 @@
 		      success: (res) => {
 		        if (res.data.code === 200) {
 		          this.companyList = res.data.data;
-				  if(sort === 'area'){
-					 this.companyList.reverse(); 
-				  }
+				  // if(sort === 'area'){
+					 // this.companyList.reverse(); 
+				  // }
 		        }
 		      },
 		      fail: () => {

uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js

@@ -59,6 +59,8 @@ const cfu = {
 	"fix1":function(val,index,opts,series){return series.otherData[index] + '%'},
     "xAxisDemo1":function(val){return val+'年'},
 	"fix0":function(val){return Math.ceil(val)},
+	"lineRaito":function(val){return val.toFixed(2) +'%'},
+	"lineRaitoY":function(val){return val.toFixed(1) +'%'},
     "xAxisDemo2":function(val){return formatDateTime(val,'h:m')},
     "seriesDemo1":function(val){return val+'元'},
     "tooltipDemo1":function(item, category, index, opts){