From 66c78586d3f2d9f854994bf7e7a9d5aed27d9c2f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 02 一月 2024 10:15:17 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/home/map.html | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index bf23ea1..e214aa3 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -17,14 +17,14 @@
.pointContainer {
display: flex;
justify-content: center;
- margin-top: 1px;
+ /*margin-top: 1px;*/
}
.pointBox {
background: #bababa;
width: 40px;
height: 40px;
- margin-right: 1px;
+ /*margin-right: 1px;*/
display: flex;
justify-content: center;
align-items: center;
@@ -434,7 +434,7 @@
<div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 10" :style="{background: currentLev==10?'red':''}">10F</button></div>
</div>
</div>
- <div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2000 ? 'margin-top: 0px;' : 'flex: 5;margin-top: -70px;'">
+ <div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2100 ? 'margin-top: 0px;' : 'flex: 5;margin-top: -70px;'">
<el-slider v-model="showScale" :marks="showScaleMarks"></el-slider>
<div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
<div class="hoverCard" style="width: 100%;">
@@ -650,7 +650,7 @@
created(){
this.init()
- this.getOutSite()
+ // this.getOutSite()
},
watch: {
map: {
--
Gitblit v1.9.1