From 076cd08a4abcae33957e4de5b15babfcb6fed8ce Mon Sep 17 00:00:00 2001
From: Jin Lei <jinlei_182@163.com>
Date: 星期六, 11 十一月 2023 15:32:39 +0800
Subject: [PATCH] [viewer]解决合并冲突
---
src/components/right/right-bottom.vue | 89 ++++++++++++++++++--------------------------
1 files changed, 36 insertions(+), 53 deletions(-)
diff --git a/src/components/right/right-bottom.vue b/src/components/right/right-bottom.vue
index 4712ad3..ce9f49a 100644
--- a/src/components/right/right-bottom.vue
+++ b/src/components/right/right-bottom.vue
@@ -14,47 +14,6 @@
</div>
</el-tooltip>
</div>
- <!-- <div class="mapTool">
- <el-tooltip
- class="item"
- effect="dark"
- content="鍦烘櫙蹇収"
- placement="left"
- popper-class="item_tooltip"
- >
- <div class="legend-bg" @click="screenShot">
- <img class="legendImg" src="@/assets/img/new/mengban.png" />
- </div>
- </el-tooltip>
- </div> -->
- <!-- <div class="mapTool">
- <el-tooltip
- class="item"
- effect="dark"
- content="鐩告満鍙傛暟"
- placement="left"
- popper-class="item_tooltip"
- >
- <div class="legend-bg" @click="getcamera">
- <img class="legendImg" src="@/assets/img/new/mengban.png" />
- </div>
- </el-tooltip>
- </div> -->
-
- <!-- <div class="mapTool">
- <el-tooltip
- class="item"
- effect="dark"
- content="瓒呭浘"
- placement="left"
- popper-class="item_tooltip"
- >
- <div class="legend-bg" @click="S3M()">
- <img class="legendImg" src="@/assets/img/new/mengban.png" />
- </div>
- </el-tooltip>
- </div> -->
-
<div class="mapTool">
<el-tooltip
class="item"
@@ -68,7 +27,7 @@
</div>
</el-tooltip>
</div>
- <div class="mapTool">
+ <!-- <div class="mapTool">
<el-tooltip
class="item"
effect="dark"
@@ -80,7 +39,7 @@
<img class="dwImg" src="@/assets/img/new/location.png" />
</div>
</el-tooltip>
- </div>
+ </div> -->
<div class="mapTool">
<el-tooltip
class="item"
@@ -107,7 +66,7 @@
</div>
</el-tooltip>
</div>
- <div class="mapTool" v-if="isActive">
+ <!-- <div class="mapTool" v-if="isActive">
<el-tooltip
class="item"
effect="dark"
@@ -132,7 +91,7 @@
<img class="qpImg" src="@/assets/img/new/tuichuquanping.png" />
</div>
</el-tooltip>
- </div>
+ </div> -->
<div class="mapTool">
<el-tooltip
class="item"
@@ -159,6 +118,32 @@
</div>
</el-tooltip>
</div>
+ <!-- <div class="mapTool">
+ <el-tooltip
+ class="item"
+ effect="dark"
+ content="鍦烘櫙蹇収"
+ placement="left"
+ popper-class="item_tooltip"
+ >
+ <div class="legend-bg" @click="screenShot">
+ <img class="legendImg" src="@/assets/img/new/mengban.png" />
+ </div>
+ </el-tooltip>
+ </div> -->
+ <!-- <div class="mapTool">
+ <el-tooltip
+ class="item"
+ effect="dark"
+ content="鐩告満鍙傛暟"
+ placement="left"
+ popper-class="item_tooltip"
+ >
+ <div class="legend-bg" @click="getcamera">
+ <img class="legendImg" src="@/assets/img/new/mengban.png" />
+ </div>
+ </el-tooltip>
+ </div> -->
<!-- <div class="mapTool">
<el-tooltip class="item" effect="dark" content="浜屼笁缁村垏鎹�" placement="left">
<el-button class="tool-23mode" @click="_23mode">
@@ -211,9 +196,7 @@
.trigger {
pointer-events: all;
}
-.mapTools {
- /* margin-bottom: 58px; */
-}
+
.mapTool {
margin: 2px 0;
}
@@ -221,8 +204,8 @@
background-image: url("~@/assets/img/new/leftCircle.png");
background-size: 100%;
background-color: transparent;
- width: 54.5px;
- height: 54.5px;
+ width: 35px;
+ height: 35px;
position: relative;
}
.legend-bg:hover {
@@ -238,8 +221,8 @@
/*
.mapTool .el-button {
padding: 0 !important;
- width: 54.5px;
- height: 54.5px;
+ width: 30px;
+ height: 30px;
border: unset;
float: unset;
display: block;
@@ -253,7 +236,7 @@
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
- width: 28px;
+ width: 20px;
}
.button-group-vertical {
--
Gitblit v1.9.3