From 41e86f18656e274b4cb2b7fd5ad935eee73cfb45 Mon Sep 17 00:00:00 2001 From: "zhu.yawen" Date: Tue, 14 Nov 2023 13:57:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=B0=8F=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E4=BD=8D=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/BigScreenDesign/SettingPanel.vue | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/data-room-ui/packages/BigScreenDesign/SettingPanel.vue b/data-room-ui/packages/BigScreenDesign/SettingPanel.vue index 29cc77b5..285f7994 100644 --- a/data-room-ui/packages/BigScreenDesign/SettingPanel.vue +++ b/data-room-ui/packages/BigScreenDesign/SettingPanel.vue @@ -63,18 +63,28 @@ export default { }, data () { return { + count: 0, + right: 0 } }, watch: { rightVisiable (value) { + const leftElement = document.querySelector('.bs-left-panel') + const contentElement = document.querySelector('.grid-wrap-box') + // const rightElement = document.querySelector('.bs-right-panel-wrap') + const mapElement = document.querySelector('.minimap') if (value) { - const leftElement = document.querySelector('.bs-left-panel') - const contentElement = document.querySelector('.grid-wrap-box') - // const rightElement = document.querySelector('.bs-right-panel-wrap') - const mapElement = document.querySelector('.minimap') if (parseInt(window.getComputedStyle(mapElement).right) > parseInt(window.getComputedStyle(leftElement).width) + parseInt(window.getComputedStyle(contentElement).width) - 320 - parseInt(window.getComputedStyle(mapElement).width)) { + // 此时距离超出可视范围 + this.count = 1 + this.right = window.getComputedStyle(mapElement).right mapElement.style.right = parseInt(window.getComputedStyle(leftElement).width) + parseInt(window.getComputedStyle(contentElement).width) - 320 - parseInt(window.getComputedStyle(mapElement).width) + 'px' } + } else { + if (this.count === 1) { + mapElement.style.right = this.right + this.count-- + } } } }, From beae7e2811c77110a2c11edd2a1dc1768659f62c Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Tue, 14 Nov 2023 14:09:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=BE=B9=E6=A1=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=80=8F=E6=98=8E=E5=BA=A6=E5=B1=9E=E6=80=A7=E6=94=B9=E4=B8=BA?= =?UTF-8?q?Float?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/module/chart/components/ScreenBorderChart.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenBorderChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenBorderChart.java index a09b77f4..62038cd9 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenBorderChart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenBorderChart.java @@ -53,7 +53,7 @@ public class ScreenBorderChart extends Chart { private String gradientDirection; @ApiModelProperty(notes = "透明度") - private Integer opacity; + private Float opacity; @ApiModelProperty(notes = "字体大小") private Integer fontSize;