修改问题

pages/metrics/index.vue

@@ -93,8 +93,8 @@
 	    </view>
 	    <!-- <qiun-title-bar title="重点项目级别分布"/> -->
 		<view class="title-second">重点项目级别分布</view>
-	    <view class="charts-box">
-	        <qiun-data-charts type="bar"   background="#4C4C4C" :opts="{extra:{bar:{linearType:'custom',barBorderCircle:true}}}" :chartData="importantData.chartData"/>
+	    <view class="charts-box">                   
+	        <qiun-data-charts type="bar"  background="#4C4C4C" :chartData="importantData.chartData" :opts="{xAxis:{format:'fix0'},extra:{bar:{linearType:'custom',barBorderCircle:true}}}" />
 	    </view>
 	    <!-- <qiun-title-bar title="工业投资额"/> -->
 		<view class="title-second">工业投资额</view>
@@ -221,7 +221,7 @@
 					  		data: [],
 					  		otherData:[],
 					  		format:'moreDataShow',
-					  		textSize:10
+					  		textSize:10,
 					  	},
 					  	]
 				  },
@@ -341,13 +341,19 @@
 			    },
 			    success: (res) => {
 			      if (res.data.code === 200) {
-				   let targetData = [],targetData1 = [],finishData = [],finishData1 = [];
+				   let targetData = [],targetData1 = [],finishData = [],finishData1 = [],targetRatio1 = '',targetRatio2 = '';
 				   this.standard_sized_count = res.data.data.standard_sized_count || '-';
 				   this.standard_sized_increase_ratio = res.data.data.standard_sized_increase_ratio || '-';
 				   this.advanced_count = res.data.data.advanced_count || '-';
 				   this.advanced_increase_ratio = res.data.data.advanced_increase_ratio || '-';
 				   if(res.data.data.target.length){
 					   res.data.data.target.forEach((item,index)=>{
+						   if(item.source === '2'){
+							   targetRatio2 = Number(item.increase_ratio) || 0
+						   }
+						   if(item.source === '1'){
+							  targetRatio1 = Number(item.increase_ratio) || 0					 
+						   }
 						   if(item.source !== '0'){
 							   targetData.push(Number(item.increase_balance))
 							   targetData1.push(Number(item.increase_ratio))
@@ -355,10 +361,22 @@
 					   })
 				   }
 				   if(res.data.data.finish.length){
-					   res.data.data.finish.forEach((item,index)=>{
-						   if(item.source !== '0'){
+					    res.data.data.finish.forEach((item,index)=>{
+						   if(item.source === '2'){
+							   let dataObj = {
+								   value:Number(item.increase_ratio),
+								   color:Number(item.increase_ratio) > targetRatio2 ? '#68d889' : '#cc0000'
+							   }
+							   finishData.push(Number(item.increase_balance))
+							   finishData1.push(dataObj)
+						   }
+						   if(item.source === '1'){
+							   let dataObj = {
+								   value:Number(item.increase_ratio),
+								   color:Number(item.increase_ratio) > targetRatio1 ? '#68d889' : '#cc0000'
+							   }
 							   finishData.push(Number(item.increase_balance))
-							   finishData1.push(Number(item.increase_ratio))
+							   finishData1.push(dataObj)
 						   }
 					   })
 				   }
@@ -406,6 +424,7 @@
 						categoriesList.push(item.short_name);
 						balanceList.push(item.balance)
 					  })
+					  balanceList = balanceList.map((item)=>{ return (Number(item)/10000).toFixed(2)});
 					 //  res.data.data.month_list.forEach((item)=>{
 						// lineBalanceList.push(item.balance);
 						// lineLast.push(item.last_balance)

pages/metrics/largeScale/detail.vue

@@ -81,19 +81,19 @@
 			 <view class="term">
 					<view class="term-name">累计研发投入费用:</view>
 					<view class="term-value-group">
-					  <p  class="term-value-item">{{ itemObj.insure_count || "-" }}</p>
+					  <p  class="term-value-item">{{ itemObj.rd_balance || "-" }}(万元)</p>
 					</view>
 			  </view>
 			 <view class="term">
 					<view class="term-name">本年度生产总值:</view>
 					<view class="term-value-group">
-					  <p  class="term-value-item">{{ itemObj.value_last_year || "-" }} 万元</p>
+					  <p  class="term-value-item">{{ totalBalance || "-" }}(万元)</p>
 					</view>
 			  </view>
 			<view class="term">
 				<view class="term-name">本年度工业产值增速:</view>
 				<view class="term-value-group">
-				  <p  class="term-value-item">{{ itemObj.increase_ratio || "-" }}</p>
+				  <p  class="term-value-item">{{ totalRatio || "-" }}%</p>
 				</view>
 		 </view>
 		</view>
@@ -115,6 +115,8 @@
 						{name: "本年度",data: [],textSize:'10'},
 					]
 			  },
+			  totalBalance:'',
+			  totalRatio:'',
 			  itemObj:{},
 			  advancedType:{
 					  '0':'否',
@@ -183,6 +185,8 @@
 					  chartList.forEach((item)=>{
 						   chartCategories.push(item.month + '月')
 						   chartData.push(item.balance)
+						   this.totalBalance = item.total_balance;
+						   this.totalRatio = item.total_ratio
 					  }) 
 					   this.chartData.categories = chartCategories;
 					   this.chartData.series[0].data = chartData;

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

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