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 | 112 ++++++++++++++++++++++++++-----------------------------
1 files changed, 53 insertions(+), 59 deletions(-)
diff --git a/src/components/mapol.vue b/src/components/mapol.vue
index b668f48..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缁村垏鎹�"
@@ -35,8 +59,8 @@
<!-- </div>-->
<div
- v-show="$store.state.isNaviget"
class="sindagis-map-compass"
+ style=" bottom: 130px; right: 40px;"
>
<span
class="left"
@@ -97,22 +121,22 @@
init2DMap() {
var layerBase = [];
- if (!is_production) {
- // window.vectorLayer = new TileLayer({
- // source: new XYZ({
- // url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}",
- // }),
- // })
- window.vectorLayer = new TileLayer({
- source: new XYZ({
- url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=6&x={x}&y={y}&z={z}",
- }),
- })
- layerBase = [vectorLayer]
- }
+ // if (!is_production) {
+ // var vectorLayer = new TileLayer({
+ // source: new XYZ({
+ // url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}",
+ // }),
+ // })
+ // var imageLayer = new TileLayer({
+ // source: new XYZ({
+ // url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=6&x={x}&y={y}&z={z}",
+ // }),
+ // })
+ // layerBase = [vectorLayer, imageLayer]
+ // }
window.map = new Map({
target: "mapol",
- layers: layerBase,
+ // layers: layerBase,
view: new View({
center: [105.02, 34.9],
zoom: 4,
@@ -140,17 +164,23 @@
})
});
window.map.addLayer(window.olBaseMapLayer);
-
+ } else {
+ window.olBaseMapLayer = new TileLayer({
+ source: new XYZ({
+ url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=6&x={x}&y={y}&z={z}",
+ }),
+ })
+ window.map.addLayer(window.olBaseMapLayer);
}
- // var scaleLine = new ScaleLine({
- // units: "metric"
- // });
- // map.addControl(scaleLine);
+ var scaleLine = new ScaleLine({
+ units: "metric"
+ });
+ map.addControl(scaleLine);
map.on("moveend", function (e) {
console.log(($(window).width() - $(".ol-scale-line-inner").width()) + "px");
@@ -175,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()
@@ -297,14 +327,13 @@
}
.ol-scale-line {
bottom: 55px !important;
+ right: 130px !important;
}
.sindagis-map-compass {
position: absolute;
- right: 50px;
- bottom: 90px;
+
z-index: 5;
- right: 25px;
width: 52px;
height: 54px;
background: url("../assets/img/compass.png") 0% 0% / 266px no-repeat;
@@ -364,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%;
@@ -408,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