From e8e7b70168d5cc8a465c92da28bdcce52e8bf3cc Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 10 Mar 2022 14:48:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobileCortrol/index.vue | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/components/mobileCortrol/index.vue b/src/components/mobileCortrol/index.vue
index ff8a6f1..4357ec4 100644
--- a/src/components/mobileCortrol/index.vue
+++ b/src/components/mobileCortrol/index.vue
@@ -1,21 +1,21 @@
<template>
<div class="m-left-control">
- <div class="m-l-inbut zoom-in" @click="zoomIn()">
- <i class="el-icon-refresh"></i>
- </div>
- <div
+ <!-- <div class="m-l-inbut zoom-in" @click="zoomIn()">
+ <i class="el-icon-refresh"></i>
+ </div> -->
+ <!-- <div
class="m-l-inbut zoom-in m-l-inbut-2d"
:class="{ active: dimension == '3D' }"
@click="zoomIn('3D')"
>
3 维
- </div>
+ </div>-->
<div
class="m-l-inbut zoom-in m-l-inbut-3d"
:class="{ active: dimension == '2.5D' }"
@click="zoomIn('2.5D')"
>
- 2.5维
+ 3D
</div>
</div>
</template>
@@ -25,16 +25,12 @@
export default {
name: "mobileCortrol",
data() {
- return {
- DC: "",
- };
+ return {};
},
computed: {
...mapGetters(["mviewer", "startPointFn", "dimension"]),
},
- created() {
- this.DC = global.DC;
- },
+ created() {},
methods: {
zoomIn(val) {
// this.$store.dispatch("mapFlyTo", {
@@ -59,16 +55,18 @@
};
</script>
-<style scoped lang='scss'>
+<style scoped lang="scss">
.m-left-control {
position: fixed;
left: 20px;
top: 93px;
+ height: 10px;
z-index: 20 !important;
.m-l-inbut {
width: 35px;
height: 35px;
background-color: rgb(33, 150, 243);
+ // background-color: white;
// stroke-width: 10;
// stroke: #fff;
display: flex;
@@ -81,8 +79,13 @@
}
.m-l-inbut-2d {
position: relative;
+ background-color: white;
top: 60px;
- font-size: 14px;
+ font-size: 12px;
+ color: #000;
+ border: 1px solid #a4d1ff;
+ border-radius: 5px 5px 0 0;
+ // box-shadow: 0px 0px 10px #409eff inset;
// &:hover {
// background-color: rgb(21, 136, 230);
// box-shadow: -2px -2px 3px rgb(3, 74, 136) inset;
@@ -90,12 +93,17 @@
}
.m-l-inbut-3d {
@extend .m-l-inbut-2d;
- top: 55px;
+ top: 45px;
+ border-radius: 0 0 5px 5px;
}
.active {
- // background-color: rgb(92, 181, 255);
- box-shadow: -4px -4px 10px rgb(13, 98, 167) inset;
+ background-color: #409eff;
+ border: 1px solid #409eff;
+ color: #fff;
+ border-radius: 5px;
+ z-index: 10;
+ // box-shadow: -4px -4px 10px rgb(13, 98, 167) inset;
// color: rgb(0, 0, 0);
// box-shadow: -4px -4px 10px rgb(13, 98, 167) inset;
transform: translateY(1px);
--
Gitblit v1.9.3