diff --git a/data-room-ui/packages/BigScreenDesign/RulerTool/SketchRuler.vue b/data-room-ui/packages/BigScreenDesign/RulerTool/SketchRuler.vue
index 060db777..d5856302 100644
--- a/data-room-ui/packages/BigScreenDesign/RulerTool/SketchRuler.vue
+++ b/data-room-ui/packages/BigScreenDesign/RulerTool/SketchRuler.vue
@@ -55,31 +55,6 @@
-
@@ -111,7 +86,6 @@ export default {
},
data () {
return {
- mapShow: true, // 小地图显示与否
canvasLeft: 0, // 存储画布到视口的left距离
canvasTop: 0, // 存储画布到视口的top距离
isDrag: false, // 小地图白块是否拖拽
@@ -160,15 +134,6 @@ export default {
if (this.fitZoom === this.zoom) {
this.initZoom()
}
- },
- mapShow (value) {
- const mapElement = document.getElementById('minimap')
- // const selectElement = document.getElementById('selectWin')
- if (!value) {
- mapElement.style.bottom = parseFloat(window.getComputedStyle(mapElement).bottom) + 150 + 'px'
- } else {
- mapElement.style.bottom = parseFloat(window.getComputedStyle(mapElement).bottom) - 150 + 'px'
- }
}
},
computed: {
@@ -301,10 +266,6 @@ export default {
ev.preventDefault()
}
},
- // 控制小地图显示与隐藏
- showMinimap () {
- this.mapShow = !this.mapShow
- },
// 小地图拖拽
viewMapDrag () {
const mapElement = document.getElementById('minimap')
diff --git a/data-room-ui/packages/BigScreenDesign/index.vue b/data-room-ui/packages/BigScreenDesign/index.vue
index a87b7029..fa6a20fb 100644
--- a/data-room-ui/packages/BigScreenDesign/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/index.vue
@@ -32,6 +32,31 @@
tabindex="1000"
@keydown="designKeydown"
>
+
{
@@ -527,11 +566,11 @@ export default {
display: flex;
background-color: #1d1e20;
height: calc(100vh - 40px);
- overflow: hidden;
+ // overflow: hidden;
.grid-wrap-box {
flex: 1;
- overflow: hidden;
+ // overflow: hidden;
position: relative;
margin: 8px 0 0 8px;
@@ -566,4 +605,45 @@ export default {
}
}
}
+.minimap{
+ position: absolute ;
+ bottom: 20px;
+ right: 20px;
+ border: 1px solid #f6f7fb;
+ z-index:1000;
+}
+.minimap .mapHeader{
+ background-color:#303640;
+ box-sizing:border-box;
+ padding: 0 10px;
+ display: flex;
+ justify-content: space-between;
+ height: 20px;
+ width: 150px;
+ font-size: 12px;
+ border-bottom: 1px solid #fff;
+ color: #ffffff;
+ cursor: pointer;
+ span {
+ user-select: none;
+ }
+}
+
+.minimap .selectWin{
+ background-color: #232832;
+ height: 150px;
+ width: 150px;
+ position: relative;
+}
+
+.minimap .selectionWin{
+ position: absolute;
+ left: 0px;
+ top: 0px;
+ width: 30px;
+ height: 30px;
+ background-color: white;
+ opacity: 0.5;
+ cursor: move;
+}