diff --git a/data-room-ui/packages/G2Plots/进度图/圆角进度条.js b/data-room-ui/packages/G2Plots/进度图/圆角进度条.js index ca816fa4..77c2a791 100644 --- a/data-room-ui/packages/G2Plots/进度图/圆角进度条.js +++ b/data-room-ui/packages/G2Plots/进度图/圆角进度条.js @@ -90,7 +90,7 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce // 图表配置 new Gauge('domName', option) const option = { // 数据将要放入到哪个字段中 - dataKey: 'data', + dataKey: 'percent', // 图表内边距 appendPadding: [0, 0, 0, 0], data, diff --git a/data-room-ui/packages/G2Plots/进度图/水波图.js b/data-room-ui/packages/G2Plots/进度图/水波图.js index 520454df..c3f9f812 100644 --- a/data-room-ui/packages/G2Plots/进度图/水波图.js +++ b/data-room-ui/packages/G2Plots/进度图/水波图.js @@ -176,7 +176,7 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce // 图表配置 new Liquid('domName', option) const option = { // 数据将要放入到哪个字段中 - dataKey: 'data', + dataKey: 'percent', // 图表内边距 appendPadding: [0, 0, 0, 0], data, diff --git a/data-room-ui/packages/G2Plots/进度图/钻石水波图.js b/data-room-ui/packages/G2Plots/进度图/钻石水波图.js index c016224b..69fe9e4b 100644 --- a/data-room-ui/packages/G2Plots/进度图/钻石水波图.js +++ b/data-room-ui/packages/G2Plots/进度图/钻石水波图.js @@ -173,6 +173,8 @@ const dataHandler = '// 取返回数据列表的第一项指标值\noption.perce // 图表配置 new Liquid('domName', option) const option = { + // 数据将要放入到哪个字段中 + dataKey: 'percent', renderer: 'canvas', // 图表内边距 appendPadding: [0, 0, 0, 0], diff --git a/data-room-ui/packages/js/api/bigScreenApi.js b/data-room-ui/packages/js/api/bigScreenApi.js index 789898ef..caa595f3 100644 --- a/data-room-ui/packages/js/api/bigScreenApi.js +++ b/data-room-ui/packages/js/api/bigScreenApi.js @@ -9,7 +9,9 @@ export function saveScreen(data) { data.chartList.forEach((item) => { if (item.type == 'customComponent') { const a = JSON.parse(item.option) - a[a.dataKey] = [] + if (a.data) { + a.data = [] + } item.option=JSON.stringify(a) item.setting=item.setting.map((x) => { const {field,value,...obj}=x diff --git a/data-room-ui/packages/js/mixins/commonMixins.js b/data-room-ui/packages/js/mixins/commonMixins.js index dcfe11ab..d65e5d4c 100644 --- a/data-room-ui/packages/js/mixins/commonMixins.js +++ b/data-room-ui/packages/js/mixins/commonMixins.js @@ -258,7 +258,7 @@ export default { config = this.dataFormatting(config, _res) if (this.chart) { // 单指标组件和多指标组件的changeData传参不同 - if (['Liquid', 'Gauge', 'RingProgress'].includes(config.chartType)) { + if (['Liquid', 'Gauge', 'RingProgress', 'Progress'].includes(config.chartType)) { this.chart.changeData(config.option.percent) } else { this.chart.changeData(config.option.data)