Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

趋势图-水球调整



See merge request !62

@@ -283,16 +283,17 @@ export default {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       data.then(res => {
-        if(res && res.object) {
-          if(typeof res.object=='object'){
+        if(res[0] && res[0].object) {
+          let resObj=res[0].object
+          if(typeof resObj=='object'){
             let arr=[];
-            for(let key in res.object){
-              arr.push({num:res.object})
+            for(let key in resObj){
+              arr.push({num:resObj[key],name:key=='usageRate'?'当前使用率':key=='growthRate'?'当前增长率':''})
             }
             this.fillData=arr;
 
           }else{
-            this.fillData=[res.object];
+            this.fillData=[res[0].object];
 
           }
         }