From b63a663a5fa91092850e078aedacbe1668761a0b Mon Sep 17 00:00:00 2001
From: "zhu.yawen" <zhu.yawen@ustcinfo.com>
Date: Mon, 13 Nov 2023 16:17:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=B0=8F=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BigScreenDesign/RulerTool/SketchRuler.vue       |  6 +++---
 .../packages/BigScreenDesign/SettingPanel.vue       | 13 +++++++++++++
 data-room-ui/packages/BigScreenDesign/index.vue     |  1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/data-room-ui/packages/BigScreenDesign/RulerTool/SketchRuler.vue b/data-room-ui/packages/BigScreenDesign/RulerTool/SketchRuler.vue
index 6544fee0..e2669f4d 100644
--- a/data-room-ui/packages/BigScreenDesign/RulerTool/SketchRuler.vue
+++ b/data-room-ui/packages/BigScreenDesign/RulerTool/SketchRuler.vue
@@ -349,7 +349,7 @@ export default {
       const canvasRect = document
         .querySelector('#canvas')
         .getBoundingClientRect()
-      const container = document.querySelector('#selectWin').getBoundingClientRect()
+      // const container = document.querySelector('#selectWin').getBoundingClientRect()
       const screenContainer = document.querySelector('#screen-container').getBoundingClientRect()
       const draggableElement = document.getElementById('selectionWin')
       // 标尺开始的刻度
@@ -368,8 +368,8 @@ export default {
         const leftDrag = canvasRect.left - this.canvasLeft
         const topDrag = canvasRect.top - this.canvasTop
         // 小方块需要移动的距离
-        const leftLength = leftDrag / (screenContainer.width - screensRect.width - 9) * (container.width - draggableElement.getBoundingClientRect().width)
-        const topLength = topDrag / (screenContainer.height - screensRect.height - 9) * (container.height - draggableElement.getBoundingClientRect().height)
+        const leftLength = leftDrag / (screenContainer.width - screensRect.width - 9) * (150 - 30)
+        const topLength = topDrag / (screenContainer.height - screensRect.height - 9) * (150 - 30)
         draggableElement.style.left = -leftLength + 'px'
         draggableElement.style.top = -topLength + 'px'
       }
diff --git a/data-room-ui/packages/BigScreenDesign/SettingPanel.vue b/data-room-ui/packages/BigScreenDesign/SettingPanel.vue
index 6478d495..29cc77b5 100644
--- a/data-room-ui/packages/BigScreenDesign/SettingPanel.vue
+++ b/data-room-ui/packages/BigScreenDesign/SettingPanel.vue
@@ -65,6 +65,19 @@ export default {
     return {
     }
   },
+  watch: {
+    rightVisiable (value) {
+      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)) {
+          mapElement.style.right = parseInt(window.getComputedStyle(leftElement).width) + parseInt(window.getComputedStyle(contentElement).width) - 320 - parseInt(window.getComputedStyle(mapElement).width) + 'px'
+        }
+      }
+    }
+  },
   computed: {
     ...mapState('bigScreen', {
       activeItem: state => state.activeItemConfig,
diff --git a/data-room-ui/packages/BigScreenDesign/index.vue b/data-room-ui/packages/BigScreenDesign/index.vue
index b547048f..ce8a4e3a 100644
--- a/data-room-ui/packages/BigScreenDesign/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/index.vue
@@ -244,6 +244,7 @@ export default {
       if (!value) {
         mapElement.style.bottom = parseFloat(window.getComputedStyle(mapElement).bottom) + 150 + 'px'
       } else {
+        this.$refs.Rules.handleScroll()
         mapElement.style.bottom = parseFloat(window.getComputedStyle(mapElement).bottom) - 150 + 'px'
       }
     },