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/map/components/campusBuildingSearch.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/components/map/components/campusBuildingSearch.vue b/src/components/map/components/campusBuildingSearch.vue
index f0c0af6..291e028 100644
--- a/src/components/map/components/campusBuildingSearch.vue
+++ b/src/components/map/components/campusBuildingSearch.vue
@@ -52,7 +52,6 @@
name: 'campusBuildingSearch',
data () {
return {
- DC: null,
shortcutList: [
{
bgimg: '/img/search/org.png',
@@ -121,7 +120,6 @@
])
},
created () {
- this.DC = global.DC
},
methods: {
searchValueChange () {
@@ -265,7 +263,7 @@
this.newPopup(param)
this.viewer.flyToPosition(
- new this.DC.Position(
+ new global.DC.Position(
Number(param.jd),
Number(param.wd),
300,
@@ -279,11 +277,11 @@
},
newPopup (item) {
- const position = this.DC.Transform.transformWGS84ToCartesian(
- new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
+ const position = global.DC.Transform.transformWGS84ToCartesian(
+ new global.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
)
// eslint-disable-next-line no-unused-vars
- var popup = new this.DC.DivForms(this.viewer, {
+ var popup = new global.DC.DivForms(this.viewer, {
domId: 'divFormsDomBox',
position: [position]
})
@@ -386,7 +384,7 @@
}
.map-campus-shortcut {
- margin-top: 20px;
+ margin-top: 40px;
width: 100%;
// height: 330px;
height: auto;
@@ -394,19 +392,18 @@
border-radius: 5px;
.shortcut-box {
- padding-top: 36px;
height: auto;
ul {
display: flex;
width: 100%;
height: auto;
- justify-content: flex-start;
+ // justify-content: space-around;
flex-wrap: wrap;
li {
- margin: 0 13px;
- width: 84px;
- height: 76px;
+ margin: 22.5px 0 0 22.5px;
+ width: 80px;
+ height: 70px;
.el-button {
width: 80px;
@@ -440,6 +437,10 @@
border: 1px solid #000;
}
}
+
+ li:last-child {
+ margin-bottom: 22.5px;
+ }
}
}
}
--
Gitblit v1.9.3