Merge branch 'master-v32-lushangqing' into 'master'

大屏 业务量图例数据，申报率增加图例



See merge request !75

@@ -10,19 +10,19 @@ export default {
             allData: [{
                 name: "今日业务量",
                 data: [
-                    { name: "涉税文书",value: "116211", color: "#0D45FE"},
-                    { name: "网上申报",value: "106195", color: "#00FFB9"},
-                    { name: "网络发票",value: "712804", color: "#A35CFF"}
+                    { name: "涉税文书",value: "116411", color: "#00FFB9"},
+                    { name: "网上申报",value: "106595", color: "#A35CFF"},
+                    { name: "网络发票",value: "712204", color: "#0D45FE"}
                 ]
             }, {
                 name: "本月业务量",
                 data: [
-                    { name: "涉税文书",value: "116411", color: "#0D45FE"},
-                    { name: "网上申报",value: "106595", color: "#00FFB9"},
-                    { name: "网络发票",value: "712204", color: "#A35CFF"}
+                    { name: "涉税文书",value: "116411", color: "#00FFB9"},
+                    { name: "网上申报",value: "106595", color: "#A35CFF"},
+                    { name: "网络发票",value: "712204", color: "#0D45FE"}
                 ]
             }],
-            colorData:['#0D45FE','#00FFB9','#A35CFF','#3d4b73'],
+            colorData:['#0D45FE','#A35CFF','#00FFB9','#3d4b73'],
             titleFontSize: 30
         }
     },
@@ -231,7 +231,7 @@ export default {
                             fontSize:12,
                         },
                         formatter:function(name){
-                            let data=dataOption.series[0].data;
+                            let data=dataOption.series[1].data;
                             let tarValue=0;
                             data.map((item,index)=>{
                                 if(item.name==name){

@@ -123,15 +123,17 @@ export default {
             }
             this.declareNumer = this.allData.polyline.declareNumer
             // 图例的数据
-            const legendArr = this.allData.polyline.data.data.map(item => {
-                return item.name
-            })
+            const legendArr=[];
+            legendArr.push(seriesName)
+            // const legendArr = this.allData.polyline.data.data.map(item => {
+            //     return item.name
+            // })
             //x轴数据
             let xAxisDataLength=seriesData.length;
             let xAxisData=[];
-           /* for(let i=1;i<=xAxisDataLength;i++){
+            for(let i=1;i<=xAxisDataLength;i++){
                 xAxisData.push(i)
-            }*/
+            }
             xAxisData=timeArr;
             this.optionData = {
                 title: {