From f8b47b24affbe71093c7c1237c076299b907c6a5 Mon Sep 17 00:00:00 2001
From: Raod <1130305001@qq.com>
Date: Thu, 1 Jul 2021 13:41:41 +0800
Subject: [PATCH 1/2] color

---
 .../src/views/report/bigscreen/designer/tools.js    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js
index 738643d0..581a2834 100644
--- a/report-ui/src/views/report/bigscreen/designer/tools.js
+++ b/report-ui/src/views/report/bigscreen/designer/tools.js
@@ -3112,7 +3112,8 @@ const widgetTools = [
                 value: '#fff'
               },
             ],
-          }, {
+          },
+          {
             name: '坐标轴边距设置',
             list: [
               {
@@ -3145,7 +3146,8 @@ const widgetTools = [
                 value: 10,
               },
             ],
-          }, {
+          },
+          {
             name: '图例操作',
             list: [
               {
@@ -3217,7 +3219,8 @@ const widgetTools = [
                 value: ''
               },
             ],
-          }, {
+          },
+          {
             name: '自定义配色',
             list: [
               {
@@ -3225,7 +3228,7 @@ const widgetTools = [
                 label: '',
                 name: 'customColor',
                 required: false,
-                value: [{ color: '#ED0E0E' }, { color: '#6CCD17' }],
+                value: [{ color: '#004DA7FF' }, { color: '#00F4FFFF' }],
               },
             ],
           },
@@ -4362,7 +4365,7 @@ const widgetTools = [
                 label: '',
                 name: 'customColor',
                 required: false,
-                value: [{ color: '#ED0E0E' }, { color: '#6CCD17' }, { color: '#172CCD' }, { color: '#B817CD' }, { color: '#AFCD17' }],
+                value: [{ color: '#0CD2E6' }, { color: '#00BFA5' }, { color: '#FFC722' }, { color: '#886EFF' }, { color: '#008DEC' }],
               },
             ],
           },

From 2658286f66837d144a448b3773f96e5ce75fb8ba Mon Sep 17 00:00:00 2001
From: Raod <1130305001@qq.com>
Date: Thu, 1 Jul 2021 14:03:39 +0800
Subject: [PATCH 2/2] color

---
 .../src/views/report/bigscreen/designer/tools.js     | 12 +++++++-----
 .../bigscreen/designer/widget/widgetBarlinechart.vue | 10 ++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js
index 581a2834..956d5cf9 100644
--- a/report-ui/src/views/report/bigscreen/designer/tools.js
+++ b/report-ui/src/views/report/bigscreen/designer/tools.js
@@ -2740,7 +2740,7 @@ const widgetTools = [
                 name: 'pointSize',
                 required: false,
                 placeholder: '',
-                value: 10,
+                value: 5,
               },
               {
                 type: 'el-switch',
@@ -2772,10 +2772,11 @@ const widgetTools = [
                 name: 'lineWidth',
                 required: false,
                 placeholder: '',
-                value: 4,
+                value: 3,
               },
             ],
-          }, {
+          },
+          {
             name: '柱体设置',
             list: [
               {
@@ -2803,7 +2804,8 @@ const widgetTools = [
                 value: 0,
               },
             ],
-          }, {
+          },
+          {
             name: '标题设置',
             list: [
               {
@@ -3228,7 +3230,7 @@ const widgetTools = [
                 label: '',
                 name: 'customColor',
                 required: false,
-                value: [{ color: '#004DA7FF' }, { color: '#00F4FFFF' }],
+                value: [{ color: '#00F4FFFF' }, { color: '#42fffd' }],
               },
             ],
           },
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue b/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue
index ad922909..2b5fe52b 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/widgetBarlinechart.vue
@@ -38,7 +38,7 @@ export default {
             type: "category",
             data: [],
             axisLabel: {
-              show: true,
+              show: false,
               textStyle: {
                 color: "#fff"
               }
@@ -220,9 +220,6 @@ export default {
               fontSize: optionsCollapse.fontSizeY
             }
           },
-          splitLine: {
-            show: false
-          },
           axisLine: {
             show: true,
             lineStyle: {
@@ -252,9 +249,6 @@ export default {
               fontSize: optionsCollapse.fontSizeY
             }
           },
-          splitLine: {
-            show: false
-          },
           axisLine: {
             show: true,
             lineStyle: {
@@ -262,7 +256,7 @@ export default {
             }
           },
           splitLine: {
-            show: true,
+            show: false,
             lineStyle: {
               color: optionsCollapse.splitLineColorY
             }