Эх сурвалжийг харах

百分百图动静数据一致

qianming 3 жил өмнө
parent
commit
ea452ca285

+ 0 - 3
README.md

@@ -169,9 +169,6 @@ sql文件的目录在:report-core --> src --> main --> resources -- > db.migra
 - Jdk 11
 - Mysql 8.0(8.0.23/26版本没有问题,8.0.21版本存在问题)
 
-AJ-Report 使用Druid,版本为1.2.6,如果你觉得你配置都是正常但是数据源测试不过,请尝试修改pom文件降低Druid版本。 <br>
-例如:MSSQLSERVER 2014,请将Druid版本降低为1.2.1以下(需要修改源码)。 <br>
-
 常见问题:https://report.anji-plus.com/report-doc/guide/question.html <br>
 
 ## 商业授权

+ 3 - 1
report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-gauge.js

@@ -324,7 +324,9 @@ export const widgetGauge = {
         placeholder: '',
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
-        value: 50,
+        value: [
+          {"num":50}
+        ],
       },
       {
         type: 'dycustComponents',

+ 3 - 1
report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-pie-percentage.js

@@ -201,7 +201,9 @@ export const widgetPiePercentage = {
           placeholder: '',
           relactiveDom: 'dataType',
           relactiveDomValue: 'staticData',
-          value: 60,
+          value: [
+            {"num":60}
+          ],
         },
         {
           type: 'dycustComponents',

+ 2 - 1
report-ui/src/views/report/bigscreen/designer/widget/percent/widgetGauge.vue

@@ -259,9 +259,10 @@ export default {
     staticDataFn(val) {
       const optionsSetup = this.optionsSetup;
       const series = this.options.series;
+      const num = val[0]['num'];
       const data = [
         {
-          value: val
+          value: num
         }
       ]
       const detail = {

+ 4 - 3
report-ui/src/views/report/bigscreen/designer/widget/percent/widgetPiePercentageChart.vue

@@ -445,9 +445,10 @@ export default {
     },
     staticDataFn(val) {
       const title = this.options.title;
-      title.text = '{nums|' + val + '}{percent|%}';
-      this.options.series[6]['data'][0]['value'] = val;
-      this.options.series[6]['data'][1]['value'] = 100 - val;
+      const num = val[0]['num'];
+      title.text = '{nums|' + num + '}{percent|%}';
+      this.options.series[6]['data'][0]['value'] = num;
+      this.options.series[6]['data'][1]['value'] = 100 - num;
     },
     dynamicDataFn(val, refreshTime) {
       if (!val) return;