From b757bc84a653beecc5ff4a9d946c8667a8f51df4 Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Wed, 30 Nov 2022 10:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lineCharts/widget-line-compare.js         | 20 ++++++++++---------
 .../pieCharts/widget-pie-nightingale.js       |  2 +-
 .../configure/pieCharts/widget-piechart.js    |  4 ++--
 .../widget/line/widgetLineCompareChart.vue    | 14 ++++++-------
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js
index ef093368..a0b9a663 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-compare.js
@@ -321,7 +321,7 @@ export const widgetLineCompare = {
             {
               type: 'el-input-text',
               label: '坐标名',
-              name: 'xName',
+              name: 'nameX',
               required: false,
               placeholder: '',
               value: ''
@@ -414,14 +414,15 @@ export const widgetLineCompare = {
             {
               type: 'el-input-text',
               label: '坐标名',
-              name: 'textNameYTop',
+              name: 'textNameY',
               require: false,
               placeholder: '',
               value: ''
-            }, {
+            },
+            {
               type: 'vue-color',
               label: '坐标名颜色',
-              name: 'nameColorYTop',
+              name: 'nameColorY',
               required: false,
               placeholder: '',
               value: '#fff',
@@ -429,7 +430,7 @@ export const widgetLineCompare = {
             {
               type: 'el-input-number',
               label: '坐标名字号',
-              name: 'nameFontSizeYTop',
+              name: 'nameFontSizeY',
               required: false,
               placeholder: '',
               value: 14,
@@ -530,14 +531,15 @@ export const widgetLineCompare = {
             {
               type: 'el-input-text',
               label: '坐标名',
-              name: 'textNameYBottom',
+              name: 'textNameY',
               require: false,
               placeholder: '',
               value: ''
-            }, {
+            },
+            {
               type: 'vue-color',
               label: '坐标名颜色',
-              name: 'nameColorYBottom',
+              name: 'nameColorY',
               required: false,
               placeholder: '',
               value: '#fff',
@@ -545,7 +547,7 @@ export const widgetLineCompare = {
             {
               type: 'el-input-number',
               label: '坐标名字号',
-              name: 'nameFontSizeYBottom',
+              name: 'nameFontSizeY',
               required: false,
               placeholder: '',
               value: 14,
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js
index a025e8ac..88ec3219 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-pie-nightingale.js
@@ -277,7 +277,7 @@ export const widgetPieNightingale = {
               name: 'legendFontSize',
               required: false,
               placeholder: '',
-              value: 16,
+              value: 12,
             },
             {
               type: 'el-input-number',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js
index 348f8910..ecc9c62e 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/pieCharts/widget-piechart.js
@@ -272,12 +272,12 @@ export const widgetPiechart = {
               value: '#fff',
             },
             {
-              type: 'el-input-text',
+              type: 'el-input-number',
               label: '字体字号',
               name: 'legendFontSize',
               required: false,
               placeholder: '',
-              value: 16,
+              value: 12,
             },
             {
               type: 'el-input-number',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue
index e0ccd747..9d9f79b7 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue
@@ -308,7 +308,7 @@ export default {
       const xAxis0 = {
         gridIndex: 0,
         show: optionsSetup.isShowX,
-        name: optionsSetup.xName, // 坐标轴名称
+        name: optionsSetup.nameX, // 坐标轴名称
         nameTextStyle: {
           color: optionsSetup.nameColorX,
           fontSize: optionsSetup.nameFontSizeX
@@ -364,10 +364,10 @@ export default {
         splitNumber: optionsSetup.splitNumberYTop,
         show: optionsSetup.isShowYTop,
         scale: optionsSetup.scaleYTop, // 缩放
-        name: optionsSetup.textNameYTop, // 坐标轴名称
+        name: optionsSetup.textNameY, // 坐标轴名称
         nameTextStyle: {
-          color: optionsSetup.nameColorYTop,
-          fontSize: optionsSetup.nameFontSizeYTop
+          color: optionsSetup.nameColorY,
+          fontSize: optionsSetup.nameFontSizeY
         },
         axisLabel: {
           show: true,
@@ -406,10 +406,10 @@ export default {
         splitNumber: optionsSetup.splitNumberYBottom,
         show: optionsSetup.isShowYBottom,
         scale: optionsSetup.scaleYBottom, // 缩放
-        name: optionsSetup.textNameYBottom, // 坐标轴名称
+        name: optionsSetup.textNameY, // 坐标轴名称
         nameTextStyle: {
-          color: optionsSetup.nameColorYBottom,
-          fontSize: optionsSetup.nameFontSizeYBottom
+          color: optionsSetup.nameColorY,
+          fontSize: optionsSetup.nameFontSizeY
         },
         inverse: true, // 翻转
         axisLabel: {