From af96edf7347078e4e376a0c59d8ca3126947f3cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B8=85=E6=AD=A6?= Date: Fri, 6 Jun 2025 09:45:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=97=A5=E5=8E=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E9=83=A8?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- report-ui/src/mixins/queryform.js | 15 ++++++++++++++- .../tools/configure/texts/widget-calendar.js | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/report-ui/src/mixins/queryform.js b/report-ui/src/mixins/queryform.js index 1d5f5262..b0c53ff4 100644 --- a/report-ui/src/mixins/queryform.js +++ b/report-ui/src/mixins/queryform.js @@ -288,7 +288,20 @@ export default { return analysisData; }, widgetcalendar (chartProperties, data) { - return data + const analysisData = []; + for (let i = 0; i < data.length; i++) { + const obj = {}; + for (const key in chartProperties) { + const value = chartProperties[key]; + if (value === "date") { + obj["date"] = data[i][key]; + } else { + obj["data"] = data[i][key]; + } + } + analysisData.push(obj); + } + return analysisData; }, // 坐标系数据解析 coordChartFn(chartProperties, data) { diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-calendar.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-calendar.js index 60182381..0247fa91 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-calendar.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/texts/widget-calendar.js @@ -181,7 +181,7 @@ export const widgetCalendar = { relactiveDom: 'dataType', relactiveDomValue: 'dynamicData', chartType: 'widget-calendar', - dictKey: 'TEXT_PROPERTIES', + dictKey: 'CALENDAR_PROPERTIES', value: '', } ],