From d91f0dfcd2ef95fb3624d94ade24fe69a9169a58 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 04 二月 2024 15:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/P2022036_Web2
---
src/components/mapol.vue | 65 +++++++++++++-------------------
1 files changed, 26 insertions(+), 39 deletions(-)
diff --git a/src/components/mapol.vue b/src/components/mapol.vue
index 3dc2939..56a3a30 100644
--- a/src/components/mapol.vue
+++ b/src/components/mapol.vue
@@ -4,6 +4,17 @@
<div
@click="changeMenulayer"
class="changeLayer"
+ style=" position: absolute;
+ bottom: 84px;
+ right: 46px;
+ height: 30px;
+ width: 30px;
+ z-index: 101;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ border: 1px solid rgba(255, 255, 255, 0.5);"
>
<div
title="搴曞浘鍒囨崲"
@@ -15,6 +26,19 @@
<div
@click="changeMapType"
class="changeMapType"
+ v-if="$store.state.setChangeBaseMap"
+ style=" position: absolute;
+
+ bottom: 52px;
+ right: 46px;
+ height: 30px;
+ width: 30px;
+ z-index: 101;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ border: 1px solid rgba(255, 255, 255, 0.5);"
>
<div
title="2/3缁村垏鎹�"
@@ -36,7 +60,7 @@
<!-- </div>-->
<div
class="sindagis-map-compass"
- style=" bottom: 130px; right: 35px;"
+ style=" bottom: 130px; right: 40px;"
>
<span
class="left"
@@ -181,7 +205,7 @@
},
changeMenulayer() {
- this.$bus.$emit("setChangeBaseMapLayer", true)
+ this.$bus.$emit("setChangeBaseMapLayer", {type:'ol',boolen:true})
// this.isActive = !this.isActive
// this.isMenuLayer = !this.isMenuLayer
// this.setLayerVisible()
@@ -308,10 +332,8 @@
.sindagis-map-compass {
position: absolute;
- right: 50px;
z-index: 5;
-
width: 52px;
height: 54px;
background: url("../assets/img/compass.png") 0% 0% / 266px no-repeat;
@@ -371,30 +393,6 @@
background-size: contain;
}
.changeMapType {
- position: absolute;
- bottom: 52px;
- right: 46px;
- height: 30px;
- width: 30px;
- z-index: 101;
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- border: 1px solid rgba(255, 255, 255, 0.5);
- //position: absolute;
- //bottom: 1%;
- //left: calc(1% + 75px);
- //height: 40px;
- //width: 60px;
- //z-index: 101;
- //display: flex;
- //justify-content: center;
- //align-items: center;
- //// box-shadow: 3px 3px 6px #666;
- //border-radius: 5px;
- //// background: #fff;
- //cursor: pointer;
}
.mapTypeTwo {
width: 100%;
@@ -415,16 +413,5 @@
background-size: contain;
}
.changeLayer {
- position: absolute;
- bottom: 84px;
- right: 46px;
- height: 30px;
- width: 30px;
- z-index: 101;
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- border: 1px solid rgba(255, 255, 255, 0.5);
}
</style>
--
Gitblit v1.9.3