From ea452ca285843928402815da9042ac41be642b9d Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Wed, 17 Nov 2021 10:56:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BE=E5=88=86=E7=99=BE=E5=9B=BE=E5=8A=A8?=
 =?UTF-8?q?=E9=9D=99=E6=95=B0=E6=8D=AE=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                  | 3 ---
 .../designer/tools/echartsConfigJson/widget-gauge.js       | 4 +++-
 .../tools/echartsConfigJson/widget-pie-percentage.js       | 4 +++-
 .../bigscreen/designer/widget/percent/widgetGauge.vue      | 3 ++-
 .../designer/widget/percent/widgetPiePercentageChart.vue   | 7 ++++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 2fdf64a7..7fa7b036 100644
--- a/README.md
+++ b/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>
 
 ## 商业授权
diff --git a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-gauge.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-gauge.js
index 9ebbdd32..473b6854 100644
--- a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-gauge.js
+++ b/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',
diff --git a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-pie-percentage.js b/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-pie-percentage.js
index 34c22e40..22221703 100644
--- a/report-ui/src/views/report/bigscreen/designer/tools/echartsConfigJson/widget-pie-percentage.js
+++ b/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',
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/percent/widgetGauge.vue b/report-ui/src/views/report/bigscreen/designer/widget/percent/widgetGauge.vue
index 6c26c7d8..74e07d31 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/percent/widgetGauge.vue
+++ b/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 = {
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/percent/widgetPiePercentageChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/percent/widgetPiePercentageChart.vue
index 51df152c..bed2427f 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/percent/widgetPiePercentageChart.vue
+++ b/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;