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/poplayer/history2.vue | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/components/poplayer/history2.vue b/src/components/poplayer/history2.vue
index e134ba1..866745f 100644
--- a/src/components/poplayer/history2.vue
+++ b/src/components/poplayer/history2.vue
@@ -30,8 +30,8 @@
data() {
return {
arr: [
- 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
- 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021,
+ 2021, 2020, 2019, 2018, 2017, 2016, 2015, 2014, 2013, 2012, 2011, 2010,
+ 2009, 2008, 2007, 2006, 2005, 2004, 2003, 2002, 2001,
],
currentValue: 2021,
};
@@ -39,7 +39,8 @@
mounted() {
store.setNavigatorShow(false);
store.setMapToolShow(false);
- window.mapapi.getView().setCenter([4.606512, 2.621472]);
+ // window.mapapi.getView().setCenter(ol.proj.fromLonLat([4.606512, 2.621472]));
+ window.mapapi.getView().setCenter(ol.proj.fromLonLat([116.505348, 39.795592]));
addHistoryLayer(this.currentValue);
if (_GLOBAL.GPSMarker) {
window.mapapi.removeLayer(_GLOBAL.GPSMarker);
@@ -53,7 +54,7 @@
close() {
store.setHistoryShow(false);
window.mapapi.removeLayer(this.$global.historyLayer);
- window.mapapi.getView().setCenter([116.505348, 39.795592]);
+ window.mapapi.getView().setCenter(ol.proj.fromLonLat([116.505348, 39.795592]));
store.setNavigatorShow(true);
store.setMapToolShow(true);
},
@@ -68,7 +69,7 @@
}
.searchBtn {
- width: 51px;
+ width: 0.4rem;
/* height: 40px; */
}
@@ -77,7 +78,6 @@
right: 10px;
bottom: 18px;
width: 48px;
- height: 594px;
background: #ffffff;
box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.21);
border-radius: 13px;
@@ -88,10 +88,9 @@
}
.listBox li {
font-weight: bold;
- font-size: 15px;
+ font-size: 0.12rem;
+ line-height: 0.25rem;
color: #1c222f;
- height: 28px;
- line-height: 28px;
border-bottom: 1px solid #e5e5e5;
text-align: center;
}
@@ -104,14 +103,9 @@
color: #127dff;
}
-.mapLeft {
- float: left;
- position: absolute;
- width: 100vw;
- height: 100vh;
-}
-.active {
+
+.listBox .active {
/* background-color: #4590d7; */
color: #127dff;
}
--
Gitblit v1.9.3