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版本。
-例如:MSSQLSERVER 2014,请将Druid版本降低为1.2.1以下(需要修改源码)。
- 常见问题:https://report.anji-plus.com/report-doc/guide/question.html
## 商业授权 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;