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

大屏及电子税务局页面样式修改，业务性能指标的图例颜色



See merge request !61

@@ -43,14 +43,14 @@ export default {
         const colorArr1 = [
         const colorArr1 = [
             'rgba(151,213,244, 0.8)',
             'rgba(151,213,244, 0.8)',
             'rgba(239,224,167, 0.8)',
             'rgba(239,224,167, 0.8)',
-            'rgba(229,171,209, 0.8)',
+            'rgba(119,250,162, 0.8)',
             'rgba(151,170,255, 0.8)'
             'rgba(151,170,255, 0.8)'
         ]
         ]
         //   全透明的颜色值
         //   全透明的颜色值
         const colorArr2 = [
         const colorArr2 = [
             'rgba(151,213,244, 0)',
             'rgba(151,213,244, 0)',
             'rgba(239,224,167, 0)',
             'rgba(239,224,167, 0)',
-            'rgba(229,171,209, 0)',
+            'rgba(119,250,162, 0)',
             'rgba(151,170,255, 0)'
             'rgba(151,170,255, 0)'
         ]
         ]
         // 挂载完
         // 挂载完

@@ -162,7 +162,7 @@ export default {
 
 
                 return {
                 return {
                     type: 'pie',
                     type: 'pie',
-                    radius: ['28%', '42%'],
+                    radius: ['20%', '50%'],
                     center: centerArr[index],
                     center: centerArr[index],
                     color:colorData,
                     color:colorData,
                     // minAngle: 15,//最小角度
                     // minAngle: 15,//最小角度
@@ -178,6 +178,7 @@ export default {
                         // alignTo: 'labelLine',
                         // alignTo: 'labelLine',
                         formatter: '{c}个',
                         formatter: '{c}个',
                         // padding:[10,-20,5,10],
                         // padding:[10,-20,5,10],
+                        position: 'inside',
                         color:'#ffffff'
                         color:'#ffffff'
                     },
                     },
                     data: dataArr
                     data: dataArr

@@ -82,7 +82,7 @@ export default {
                 },
                 },
                 xAxis: {
                 xAxis: {
                     type: 'category',
                     type: 'category',
-                    data: props.legendData,
+                    data: proxy.legendData,
                     axisLine:{
                     axisLine:{
                         show:true,//是否显示坐标线
                         show:true,//是否显示坐标线
                         lineStyle: {
                         lineStyle: {