Merge remote-tracking branch 'origin/developer' into developerM

src/main/resources/static/js/supplier-center/encyclopedia/mixins/chartsMixin.js

@@ -191,7 +191,10 @@ const chartsMixin = function () {// 通知消息
                     },
                     xAxis: {
                         type: 'category',
-                        data: data.names
+                        data: data.names,
+                        axisLabel: {
+                            interval: 0 // 每两个标签显示一个
+                        }
                     },
                     yAxis: {
                         type: 'value'
@@ -206,13 +209,13 @@ const chartsMixin = function () {// 通知消息
                             emphasis: {
                                 focus: 'series'
                             },
-                            barGap:'55%',
-                            barCategoryGap:'55%',
+                            barGap:'65%',
+                            barCategoryGap:'65%',
                             data: data.values,
                             itemStyle: {
                                 color: function(params) {
                                     // params 是当前柱状图的数据点信息对象
-                                    const colorList = ['#07c160','#d48265','#fa5151','#1890ff'];
+                                    const colorList = ['#07c160','#d48265','#fa5151','#fc4246','#1890ff'];
                                     return colorList[params.dataIndex]
                                 }
                             }
@@ -253,7 +256,11 @@ const chartsMixin = function () {// 通知消息
                     },
                     xAxis: {
                         type: 'category',
-                        data: data.names
+                        data: data.names,
+                        axisLabel: {
+                            interval: 0 // 每两个标签显示一个
+                        }
+
                     },
                     yAxis: {
                         type: 'value',
@@ -268,13 +275,13 @@ const chartsMixin = function () {// 通知消息
                             emphasis: {
                                 focus: 'series'
                             },
-                            barGap:'55%',
-                            barCategoryGap:'55%',
+                            barGap:'65%',
+                            barCategoryGap:'65%',
                             data: data.values,
                             itemStyle: {
                                 color: function(params) {
                                     // params 是当前柱状图的数据点信息对象
-                                    const colorList = ['#07c160','#d48265','#fa5151','#1890ff'];
+                                    const colorList = ['#07c160','#d48265','#fa5151','#fc4246','#1890ff'];
                                     return colorList[params.dataIndex]
                                 }
                             }