From be954a94120a2d15e4b096358adbcef1ce183075 Mon Sep 17 00:00:00 2001
From: qianming <qianming@anji-plus.com>
Date: Wed, 14 Jul 2021 10:37:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E5=9B=BE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/report/bigscreen/designer/tools.js   | 18 +++++++++---------
 .../widget/pie/widgetPiePercentageChart.vue    | 10 ++++++----
 2 files changed, 15 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 46014bfa..746d8276 100644
--- a/report-ui/src/views/report/bigscreen/designer/tools.js
+++ b/report-ui/src/views/report/bigscreen/designer/tools.js
@@ -5315,7 +5315,7 @@ const widgetTools = [
           value: ''
         },
         [
-          {
+          /*{
             name: '标题设置',
             list: [
               {
@@ -5378,14 +5378,14 @@ const widgetTools = [
                 value: 'center'
               }
             ],
-          },
+          },*/
           {
             name: '数值设置',
             list: [
               {
                 type: 'vue-color',
                 label: '数值颜色',
-                name: 'textColor',
+                name: 'textNumColor',
                 required: false,
                 placeholder: '',
                 value: '#fff'
@@ -5393,15 +5393,15 @@ const widgetTools = [
               {
                 type: 'el-input-number',
                 label: '数值字体',
-                name: 'textFontSize',
+                name: 'textNumFontSize',
                 required: false,
                 placeholder: '',
-                value: 60
+                value: 40
               },
               {
                 type: 'el-select',
                 label: '字体粗细',
-                name: 'textFontWeight',
+                name: 'textNumFontWeight',
                 required: false,
                 placeholder: '',
                 selectOptions: [
@@ -5426,7 +5426,7 @@ const widgetTools = [
                 name: 'textPerFontSize',
                 required: false,
                 placeholder: '',
-                value: 30
+                value: 20
               },
               {
                 type: 'el-select',
@@ -5444,7 +5444,7 @@ const widgetTools = [
               }
             ],
           },
-          {
+          /*{
             name: '图例操作',
             list: [
               {
@@ -5516,7 +5516,7 @@ const widgetTools = [
                 value: ''
               },
             ],
-          },
+          },*/
         ],
       ],
       // 数据
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPiePercentageChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPiePercentageChart.vue
index 9c5db24b..ef575326 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPiePercentageChart.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/pie/widgetPiePercentageChart.vue
@@ -353,7 +353,7 @@ export default {
       };
     },
     editorOptions() {
-      //this.setOptionsTitle();
+      this.setOptionsTitle();
       //this.setOptionsTooltip();
       //this.setOptionsLegend();
       //this.setOptionsColor();
@@ -366,12 +366,14 @@ export default {
       title.y = "center";
       const rich = {
         nums: {
-          fontSize: optionsCollapse.textFontSize,
-          color: optionsCollapse.textColor
+          fontSize: optionsCollapse.textNumFontSize,
+          color: optionsCollapse.textNumColor,
+          fontWeight: optionsCollapse.textNumFontWeight
         },
         percent: {
           fontSize: optionsCollapse.textPerFontSize,
-          color: optionsCollapse.textPerColor
+          color: optionsCollapse.textPerColor,
+          fontWeight: optionsCollapse.textPerFontWeight
         }
       };
       title.textStyle['rich'] = rich;