From 7e84621812bdb22d7eda4af05bee1c80c896793a Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Thu, 19 Dec 2019 15:16:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=9B=BE=E8=B0=B1?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/demo.css | 12 ++++-- css/flexleft.css | 13 ++++-- css/slider.css | 2 +- map.html | 105 ++++++++++++++++++----------------------------- 4 files changed, 58 insertions(+), 74 deletions(-) diff --git a/css/demo.css b/css/demo.css index 6d65b77..97b5f02 100644 --- a/css/demo.css +++ b/css/demo.css @@ -92,9 +92,9 @@ body{ height: 40%; } .screen-btn{ - position: fixed; - left: -50px; - top: 70px; + position: absolute; + right: 15px; + top: 15px; color: #fff; z-index: 100; cursor: pointer; @@ -365,4 +365,10 @@ body{ } .voice-btn a:hover{ color: rgba(255,255,255,1); +} + +.map-container{ + position: relative; + width: 100%; + height: 100vh; } \ No newline at end of file diff --git a/css/flexleft.css b/css/flexleft.css index 871fe5b..8a5fd79 100644 --- a/css/flexleft.css +++ b/css/flexleft.css @@ -1,12 +1,12 @@ .fixed-left{ - position: fixed; + position: absolute; top: 0px; bottom: 0; left: -400px; width: 400px; - padding-top: 60px; z-index: 40; transition: width .3s; + height: 100%; } .fixed-left::before{ @@ -21,6 +21,11 @@ .fixed-left.active{ width: 100%; + position: fixed; + top: 60px; + left: 0px; + height: 100%; + } /* .fixed-left.active .left_echart{ @@ -166,9 +171,9 @@ .left_echart{ - position: fixed !important; + position: absolute !important; height: 60%; - left: -100%; + left: 0; top: 0; width: 400px; z-index: 50; diff --git a/css/slider.css b/css/slider.css index 731a3c5..572c221 100644 --- a/css/slider.css +++ b/css/slider.css @@ -3,7 +3,7 @@ .slider_one_big_picture { position: relative; width: 100%; - height: 100%; + height: 40%; margin: 0 auto; user-select: none; /*overflow: hidden;*/ diff --git a/map.html b/map.html index c26d60b..6076292 100755 --- a/map.html +++ b/map.html @@ -43,24 +43,6 @@ - -
  • @@ -115,43 +84,47 @@
    -
    -
    -
    - +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    + + +
    +
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    - -
    - + + +
    -
    + From b203736558bc9ec969bd5a6048a63b43391cd0da Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Thu, 19 Dec 2019 15:45:01 +0800 Subject: [PATCH 2/2] map-left --- css/flexleft.css | 4 ++++ map.html | 1 + 2 files changed, 5 insertions(+) diff --git a/css/flexleft.css b/css/flexleft.css index 8a5fd79..5d5c1c9 100644 --- a/css/flexleft.css +++ b/css/flexleft.css @@ -67,6 +67,10 @@ transition: .3s; box-sizing: border-box; } +.map_header.active{ + opacity: 0; + z-index: 49; +} .logo_txt{ margin-left: 15px; diff --git a/map.html b/map.html index 6076292..cd86761 100755 --- a/map.html +++ b/map.html @@ -560,6 +560,7 @@ latOrLonSearch(); }) + // 左侧滑屏结束后调用该事件，重新渲染知识图谱 // $('.fixed-left').on('transitionend', function () { // console.log('滑屏结束时，调用渲染知识图谱');