From 5f4a03bf1499cb191231bd361ddef5dd9605224d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B8=85=E6=AD=A6?= Date: Mon, 16 Jun 2025 17:35:42 +0800 Subject: [PATCH 1/6] =?UTF-8?q?bug=EF=BC=9A=E8=A7=A3=E5=86=B3=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E7=95=8C=E9=9D=A2=E7=BC=A9=E6=94=BE=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/bigscreenDesigner/viewer/index.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/report-ui/src/views/bigscreenDesigner/viewer/index.vue b/report-ui/src/views/bigscreenDesigner/viewer/index.vue index a86eded5..96bdff8a 100644 --- a/report-ui/src/views/bigscreenDesigner/viewer/index.vue +++ b/report-ui/src/views/bigscreenDesigner/viewer/index.vue @@ -96,11 +96,15 @@ export default { this.bigScreenStyle.transform='scale('+scale.scalex+','+scale.scaley+')' }, getScale(){ - let width=this.dashboard.width; - let height=this.dashboard.height; - return{ - scalex:(window.innerWidth)/width, - scaley:(window.innerHeight)/height, + let width = this.dashboard.width + let height = this.dashboard.height + // 固定宽度比例 + const scalex = window.innerWidth / width + // 高度按相同比例缩放，但允许超出屏幕高度 + const scaley = scalex + return { + scalex, + scaley } }, } From a48aa984c63e602b4666fe14fb2d6ecc37b4d29a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B8=85=E6=AD=A6?= Date: Tue, 24 Jun 2025 10:21:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat=EF=BC=9A=E6=97=A5=E5=8E=86=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81=E8=81=94=E5=8A=A8=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/linkageLogic.js | 5 ++ .../tools/configure/texts/widget-calendar.js | 29 ++++++- .../designer/widget/texts/widgetCalendar.vue | 76 +++++++++++++------ 3 files changed, 86 insertions(+), 24 deletions(-) diff --git a/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js b/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js index bd966e90..3f81cdb0 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js +++ b/report-ui/src/views/bigscreenDesigner/designer/linkageLogic.js @@ -22,6 +22,11 @@ export const lickageParamsConfig = [ code: 'widget-form-time', paramsKey: ['startTime','endTime'] }, + { + name: '日历', + code: 'widget-calendar', + paramsKey: ['date'] + }, { name: '柱图', code: 'widget-barchart', 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 0247fa91..07caf034 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 @@ -112,6 +112,21 @@ export const widgetCalendar = { required: false, placeholder: '', value: 'rgb(0, 0, 0)' + },{ + type: 'vue-color', + label: '选中背景色', + name: 'selectedBackground', + required: false, + placeholder: '', + value: 'rgb(11, 180, 241)' + }, + { + type: 'vue-color', + label: '选中文字颜色', + name: 'selectedTextColor', + required: false, + placeholder: '', + value: 'rgb(0, 0, 0)' }, { type: 'el-switch', @@ -123,7 +138,19 @@ export const widgetCalendar = { }, ] } - ] + ], + [{ + name: '组件联动', + list: [ + { + type: 'componentLinkage', + label: '', + name: 'componentLinkage', + required: false, + value: [] + } + ] + }] ], data: [ { diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetCalendar.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetCalendar.vue index 4358c913..c5d1640d 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetCalendar.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetCalendar.vue @@ -18,9 +18,11 @@ :class="{ 'out-of-range': day.isOutOfRange, 'current-month': day.isCurrentMonth, - 'today': day.isToday + 'today': day.isToday, + 'selected': day.date === selectDayStr }" - :style="cellStyle(day.isToday)" + :style="cellStyle(day.isToday, day.date === selectDayStr)" + @click="selectDay(day)" >
{{ day.day }}
@@ -34,13 +36,17 @@