From 065669d31914a2f65c48d351417f48e49bd79c0c Mon Sep 17 00:00:00 2001 From: lixuliang <lixuliang_hd@126.com> Date: 星期三, 13 三月 2024 11:30:46 +0800 Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/PM20221203225_MobileWeb --- src/components/rightMenu/bottom2.vue | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/components/rightMenu/bottom2.vue b/src/components/rightMenu/bottom2.vue index 85a6458..56874b4 100644 --- a/src/components/rightMenu/bottom2.vue +++ b/src/components/rightMenu/bottom2.vue @@ -10,7 +10,7 @@ <img src="@/assets/img/collection/recover.png" /> </div> </div> - <div class="mapTool2" v-show="test.fwval"> + <div class="mapTool2"> <div class="tool-rotate" @click="zoomIn" title="鏀惧ぇ"> <img src="@/assets/img/collection/add.png" /> </div> @@ -23,41 +23,45 @@ </template> <style scoped> + .mapTool { - width: 51px; + width: 0.42rem; /* border-radius: 10px; */ /* background: #ffffff; */ /* margin-bottom: 8px; */ } + .mapTool .tool-rotate img { width: 100%; } + .mapTool2 { - width: 40px; - height: 80px; - margin: 0 auto; + width: 0.32rem; + margin: auto; background: #ffffff; box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.21); - border-radius: 13px; + border-radius: 10px; display: flex; flex-direction: column; - justify-content: space-evenly; align-items: center; + justify-content: center; } -.mapTool2 .tool-rotate img { - width: 18px; -} -.border { - width: 36px; - height: 1px; - border: 1px solid #e5e5e5; +.mapTool2 .tool-rotate{ + height: 0.33rem; + line-height: 0.33rem; } -/* .tool-rotate { - padding: 8px; -} */ +.mapTool2 .tool-rotate img { + width: 0.17rem; +} + +.border { + width: 100%; + height: 1px; + border: 0.005rem solid #f3f3f3; +} </style> - + <script> import Bus from "../../js/bus.js"; import store from "@/utils/store2"; @@ -74,7 +78,7 @@ }, }; }, - mounted() {}, + mounted() { }, watch: { "state.show": { handler(newVal) { @@ -121,7 +125,7 @@ flyBack() { window.mapapi.getView().animate({ // 鍙缃渶瑕佺殑灞炴�у嵆鍙� - center: [116.52217697339846, 39.75979421847914], // 涓績鐐� + center: ol.proj.fromLonLat([116.52217697339846, 39.75979421847914]), // 涓績鐐� zoom: 12, // 缂╂斁绾у埆 rotation: undefined, // 缂╂斁瀹屾垚view瑙嗗浘鏃嬭浆寮у害 duration: 1000, // 缂╂斁鎸佺画鏃堕棿锛岄粯璁や笉闇�瑕佽缃� -- Gitblit v1.9.3