浏览代码

更新chart

wzz 4 年之前
父节点
当前提交
20b42962a7

+ 12 - 7
pages/metrics/index.vue

@@ -160,13 +160,14 @@
 				categories: ["工业增加值增速", "先进制造业总产值"],
 				series: [
 					{   name: "目标任务",
-						data: [35, 36],
-						textOffset: 200,
-						format:'yAxisDemo1',
+						data: [3, 4],
+						otherData:[22,33],
+						format:'moreDataShow',
 					},
 				    {   name: "目前已完成", 
-						data: [18, 27],
-						format:'yAxisDemo1',
+						data: [5, 6],
+						otherData:[44,55],
+						format:'moreDataShow',
 					},
 					]
 			  },
@@ -218,7 +219,7 @@
 		 }
 	  },
 	  onLoad() {
-	  	this.getStandardChart()
+	  //	this.getStandardChart()
 	  },
 	  methods:{
 		  getStandardChart(){
@@ -249,21 +250,25 @@
 			    },
 			    success: (res) => {
 			      if (res.data.code === 200) {
-				   let targetData = [] , finishData = [];
+				   let targetData,targetData1,finishData,finishData1 = [];
 				   // this.chartData.series[0].data = res.data.data.target
 				   // this.chartData.series[1].data = res.data.data.finish
 				   res.data.data.target.forEach((item,index)=>{
 					   if(item.source !== '0'){
 						   targetData.push(Number(item.increase_balance))
+						   targetData1.push(Number(item.increase_ratio))
 					   }
 				   })
 				   res.data.data.finish.forEach((item,index)=>{
 					   if(item.source !== '0'){
 						   finishData.push(Number(item.increase_balance))
+						   finishData1.push(Number(item.increase_ratio))
 					   }
 				   })
 				   this.chartData.series[0].data = targetData
+				   this.chartData.series[0].otherData = targetData1
 				   this.chartData.series[1].data = finishData
+				   this.chartData.series[1].otherData = finishData1
 			      }
 			    },
 			    fail: () => {

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

@@ -54,7 +54,7 @@ const cfu = {
   "option":{},
   //下面是自定义format配置,因除H5端外的其他端无法通过props传递函数,只能通过此属性对应下标的方式来替换
   "formatter":{
-    "yAxisDemo1":function(val){return val.toFixed(2)+'亿'},
+    "moreDataShow":function(val,index,opts,series){return val.toFixed(2)+'亿' + ';' + series.otherData[index] + '%'},
     "yAxisDemo2":function(val){return val.toFixed(2)},
     "xAxisDemo1":function(val){return val+'年'},
     "xAxisDemo2":function(val){return formatDateTime(val,'h:m')},

+ 2 - 2
uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js

@@ -2118,9 +2118,9 @@ function drawBarPointText(points, series, config, context, opts) {
       if (typeof data[index] === 'object' && data[index] !== null) {
         value = data[index].value ;
       }
-      var formatVal = series.formatter ? series.formatter(value,index) : value;
+      var formatVal = series.formatter ? series.formatter(value,index,opts,series) : value;
       context.setTextAlign('left');
-      context.fillText(String(formatVal), item.x + 4 * opts.pix , item.y + fontSize / 2 - 3 );
+      context.fillText(String(formatVal), item.x - 40 * opts.pix , item.y + fontSize / 2 - 3 );
       context.closePath();
       context.stroke();
     }