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] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=9B=BE=E8=B0=B1=E4=BD=8D?=
 =?UTF-8?q?=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 @@
             </ul>
         </div>
         <ul class="user_info">
-            <!-- <li class="info-item">
-                <div class="lat_lon_sec">
-                    <input
-                        onkeyup="this.value=this.value.replace(/[^\d.]/g, '')" 
-                        class="search_input_common lon" placeholder="经度" />
-                    <input 
-                        onkeyup="this.value=this.value.replace(/[^\d.]/g, '')" 
-                        class="search_input_common lat" placeholder="纬度" />
-                    <span class="iconfont icon-search lat_lon_search"></span>
-                </div>
-            </li>
-            <li class="info-item">
-                <div class="search-prov">
-                    <input class="search_input" placeholder="请输入地点" />
-                    <span class="search_icon iconfont icon-search">
-                    </span>
-                </div>
-            </li> -->
             <span class="search-Panel">
                 <input class="search-input-item prov" placeholder="请输入地点" />
                 <input onkeyup="this.value=this.value.replace(/[^\d.]/g, '')" class="search-input-item lon" placeholder="经度" />
@@ -74,19 +56,6 @@
                     </ul>
                 </div>
             </span>
-
-            <!-- <li class="info-item">
-                <div class="search-area">
-                    <div class="show_detail">
-                        <span class="iconfont icon-gengduo more_icon"></span>
-                        <ul class="detail_info">
-                            <li class="info_txt" data-key="prov">地点</li>
-                            <li class="info_txt" data-key="lon">经纬度</li>
-                            <li class="info_txt" data-key="voice">语音</li>
-                        </ul>
-                    </div>
-                </div>
-            </li> -->
             <li class="info-item">
                 <div class="show_detail">
                     <img class="user_img" src="./image/3.jpg" />
@@ -115,43 +84,47 @@
             </a>
         </div>
     </div>
-  <div class="fixed-left">
-    <div class="video_img">
-        <div class="div-video" style="background: #1D346F;">
-            <video width="100%" height="100%" controls>
-                <source class="video" src="./image/西藏/1.mp4" type="video/mp4">
-                <source src="movie.ogg" type="video/ogg" style="width: 400px;">
-                Your browser does not support the video tag.
-            </video>
+    <div class="map-container">
+        <div class="fixed-left">
+            <div class="screen-btn screen-open" id="btn">
+                <span class="screen_icon iconfont icon-kuoda"></span>
+            </div>
+            <div class="left_echart" id="mainGraph"></div>  
+            <div class="video_img">
+                <div class="div-video" style="background: #1D346F;">
+                    <video width="100%" height="100%" controls>
+                        <source class="video" src="./image/西藏/1.mp4" type="video/mp4">
+                        <source src="movie.ogg" type="video/ogg" style="width: 400px;">
+                        Your browser does not support the video tag.
+                    </video>
+                </div>
+                <div class="slider slider_one_big_picture">
+                    <div>
+                        <img class="picture" style="width: 100%;height: 100%;" src="./image/西藏/1.jpg" />
+                    </div>
+                    <div>
+                        <img class="picture" style="width: 100%;height: 100%;" src="./image/西藏/2.jpg" />
+                    </div>
+                    <div>
+                        <img class="picture" style="width: 100%;height: 100%;" src="./image/西藏/3.jpg" />
+                    </div>
+                    <div>
+                        <img class="picture" style="width: 100%;height: 100%;" src="./image/西藏/4.jpg" />
+                    </div>
+                    <div>
+                        <img class="picture" style="width: 100%;height: 100%;" src="./image/西藏/5.jpg" />
+                    </div>
+                    <!-- <div class="next_button"></div>
+                    <div class="prev_button"></div> -->
+                    <!-- <div class="nav_indicators"></div>   -->
+                </div>
+            </div>        
         </div>
-        <div class="slider slider_one_big_picture">
-            <div>
-                <img class="picture" style="width: 400px;height: 180px;" src="./image/西藏/1.jpg" />
-            </div>
-            <div>
-                <img class="picture" style="width: 400px;height: 180px;" src="./image/西藏/2.jpg" />
-            </div>
-            <div>
-                <img class="picture" style="width: 400px;height: 180px;" src="./image/西藏/3.jpg" />
-            </div>
-            <div>
-                <img class="picture" style="width: 400px;height: 180px;" src="./image/西藏/4.jpg" />
-            </div>
-            <div>
-                <img class="picture" style="width: 400px;height: 180px;" src="./image/西藏/5.jpg" />
-            </div>
-            <div class="next_button"></div>
-            <div class="prev_button"></div>
-            <div class="nav_indicators"></div>  
-        </div>
-    </div>        
-  </div>
-  <div class="left_echart" id="mainGraph"></div>  
-
-    <div class="screen-btn screen-open" id="btn">
-        <span class="screen_icon iconfont icon-kuoda"></span>
+    
+        
+        <div id="maps" style="height: 100%; width: 100%;"></div>
     </div>
-    <div id="maps" style="height: 100vh; width: 100%;"></div>
+    
   
   <script type="text/javascript" src="./js/jQuery-1.8.3.min.js"></script>
   <script type="text/javascript" src="./js/jquery.easy_slides.js"></script>