静态数据调整

report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-gradient-barchart.js

@@ -552,7 +552,13 @@ export const widgetGradientBarchart =  {
         placeholder: '',
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
-          value: {"categories": ["苹果","三星","小米","oppo","vivo"],"series": [{"name": "手机品牌","data": [1000,2229,3879,2379,4079]}]},
+        value: [
+          {"axis": "苹果", "data": 1000},
+          {"axis": "三星", "data": 2229},
+          {"axis": "小米", "data": 3879},
+          {"axis": "oppo", "data": 2379},
+          {"axis": "vivo", "data": 4079},
+        ],
       },
       {
         type: 'dycustComponents',

report-ui/src/views/report/bigscreen/designer/widget/bar/widgetGradientColorBarchart.vue

@@ -384,7 +384,7 @@ export default {
       const optionsSetup = this.optionsSetup;
       const optionsData = this.optionsData; // 数据类型 静态 or 动态
       optionsData.dataType == "staticData"
-        ? this.staticDataFn(optionsData.staticData, optionsSetup)
+        ? this.staticDataFn(optionsData.staticData)
         : this.dynamicDataFn(
           optionsData.dynamicData,
           optionsData.refreshTime,
@@ -392,24 +392,29 @@ export default {
         );
     },
     // 静态数据
-    staticDataFn(val, optionsSetup) {
+    staticDataFn(val) {
-      const staticData = typeof val == "string" ? JSON.parse(val) : val;
+      const optionsSetup = this.optionsSetup;
+      const series = this.options.series;
+      let axis = [];
+      let data = [];
+      for (const i in val) {
+        axis[i] = val[i].axis;
+        data[i] = val[i].data
+      }
       // x轴
       if (optionsSetup.verticalShow) {
         this.options.xAxis.data = [];
-        this.options.yAxis.data = staticData.categories;
+        this.options.yAxis.data = axis;
         this.options.xAxis.type = "value";
         this.options.yAxis.type = "category";
       } else {
-        this.options.xAxis.data = staticData.categories;
+        this.options.xAxis.data = axis;
         this.options.yAxis.data = [];
         this.options.xAxis.type = "category";
         this.options.yAxis.type = "value";
       }
-      // series
-      const series = this.options.series;
       if (series[0].type == "bar") {
-        series[0].data = staticData.series[0].data;
+        series[0].data = data;
       }
     },
     // 动态数据