From dfb033ac6f9ebc0181b3629c082b626d22815c8f Mon Sep 17 00:00:00 2001
From: qianming <qianming@anji-plus.com>
Date: Wed, 18 Aug 2021 17:55:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A0=86=E5=8F=A0=E5=9B=BE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/report/bigscreen/designer/tools.js  | 25 +++----
 .../widget/bar/widgetBarStackChart.vue        | 66 +++++++++++--------
 2 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js
index 19f1d7a7..6b749ab6 100644
--- a/report-ui/src/views/report/bigscreen/designer/tools.js
+++ b/report-ui/src/views/report/bigscreen/designer/tools.js
@@ -5707,19 +5707,11 @@ const widgetTools = [
                 name: 'maxWidth',
                 required: false,
                 placeholder: '',
-                value: 10,
-              },
-              {
-                type: 'el-slider',
-                label: '圆角',
-                name: 'radius',
-                require: false,
-                placeholder: '',
-                value: 5,
+                value: 20,
               },
             ],
           },
-          {
+/*          {
             name: '标题设置',
             list: [
               {
@@ -6050,15 +6042,16 @@ const widgetTools = [
               },
             ],
           },
-          {
+          /!*{
             name: '提示语设置',
             list: [
               {
                 type: 'el-input-number',
                 label: '字体大小',
-                name: 'fontSize',
+                name: 'tipsFontSize',
                 required: false,
                 placeholder: '',
+                value: 16
               },
               {
                 type: 'vue-color',
@@ -6068,7 +6061,7 @@ const widgetTools = [
                 placeholder: '',
               },
             ],
-          },
+          },*!/
           {
             name: '坐标轴边距设置',
             list: [
@@ -6145,11 +6138,11 @@ const widgetTools = [
                 required: false,
                 placeholder: '',
                 selectOptions: [
+                  {code: 'center', name: '居中'},
                   {code: 'left', name: '左对齐'},
                   {code: 'right', name: '右对齐'},
-                  //{code: 'mid', name: '居中'},
                 ],
-                value: 'left'
+                value: 'center'
               },
               {
                 type: 'el-select',
@@ -6176,7 +6169,7 @@ const widgetTools = [
                 value: 'horizontal'
               },
             ],
-          },
+          },*/
           /*{
             name: '自定义配色',
             list: [
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue
index 10dcefdb..27355258 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue
@@ -93,13 +93,14 @@ export default {
   methods: {
     // 修改图标options属性
     editorOptions() {
-      this.setOptionsTitle();
-      this.setOptionsX();
-      this.setOptionsY();
-      this.setOptionsTop();
-      this.setOptionsTooltip();
-      this.setOptionsMargin();
-      this.setOptionsLegend();
+      //this.setOptionBar();
+      //this.setOptionsTitle();
+      //this.setOptionsX();
+      //this.setOptionsY();
+      //this.setOptionsTop();
+      //this.setOptionsTooltip();
+      //this.setOptionsMargin();
+      //this.setOptionsLegend();
       //this.setOptionsColor();
       this.setOptionsData();
     },
@@ -195,11 +196,25 @@ export default {
       };
       this.options.yAxis = yAxis;
     },
-    // 数值设定 or 柱体设置  数值设定字体大小，默认值没回显
+    //柱体设置
+    setOptionBar() {
+      const optionsSetup = this.optionsSetup;
+      const series = this.options.series;
+      const itemStyle = {
+        borderRadius: optionsSetup.radius
+      }
+      const barWidth = optionsSetup.maxWidth;
+      for (const key in series) {
+        if (series[key].type == "bar") {
+          this.options.series[key].itemStyle = itemStyle
+        }
+      }
+      ;
+    },
+    // 数值设定 or 柱体设置
     setOptionsTop() {
       const optionsCollapse = this.optionsSetup;
       const series = this.options.series;
-
       for (const key in series) {
         if (series[key].type == "bar") {
           series[key].label = {
@@ -211,25 +226,23 @@ export default {
             fontWeight: optionsCollapse.fontWeight
           };
           series[key].barWidth = optionsCollapse.maxWidth;
-          console.log(series[key].barWidth)
-          series[key].barMinHeight = optionsCollapse.minHeight;
         }
       }
       this.options.series = series;
     },
     // tooltip 设置
-    setOptionsTooltip() {
-      const optionsCollapse = this.optionsSetup;
-      const tooltip = {
-        trigger: "item",
-        show: true,
-        textStyle: {
-          color: optionsCollapse.lineColor,
-          fontSize: optionsCollapse.fontSize
-        }
-      };
-      this.options.tooltip = tooltip;
-    },
+    /*    setOptionsTooltip() {
+          const optionsCollapse = this.optionsSetup;
+          const tooltip = {
+            trigger: "item",
+            show: true,
+            textStyle: {
+              color: optionsCollapse.lineColor,
+              fontSize: optionsCollapse.tipsFontSize
+            }
+          };
+          this.options.tooltip = tooltip;
+        },*/
     // 边距设置
     setOptionsMargin() {
       const optionsCollapse = this.optionsSetup;
@@ -329,11 +342,12 @@ export default {
         series.push({
           name: yAxisList[i],
           type: "bar",
-          data: data ,
+          data: data,
           barGap: "0%",
-          /*itemStyle: {
+          barWidth : optionsSetup.maxWidth,
+          itemStyle: {
             borderRadius: null
-          }*/
+          }
         })
       }
       this.options.series = series