Merge branch 'master' of http://git.trustie.net/qiubing/geo_info_platform
This commit is contained in:
commit
7b2fd58c49
12
css/demo.css
12
css/demo.css
|
|
@ -92,9 +92,9 @@ body{
|
||||||
height: 40%;
|
height: 40%;
|
||||||
}
|
}
|
||||||
.screen-btn{
|
.screen-btn{
|
||||||
position: fixed;
|
position: absolute;
|
||||||
left: -50px;
|
right: 15px;
|
||||||
top: 70px;
|
top: 15px;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|
@ -365,4 +365,10 @@ body{
|
||||||
}
|
}
|
||||||
.voice-btn a:hover{
|
.voice-btn a:hover{
|
||||||
color: rgba(255,255,255,1);
|
color: rgba(255,255,255,1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.map-container{
|
||||||
|
position: relative;
|
||||||
|
width: 100%;
|
||||||
|
height: 100vh;
|
||||||
}
|
}
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
.fixed-left{
|
.fixed-left{
|
||||||
position: fixed;
|
position: absolute;
|
||||||
top: 0px;
|
top: 0px;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
left: -400px;
|
left: -400px;
|
||||||
width: 400px;
|
width: 400px;
|
||||||
padding-top: 60px;
|
|
||||||
z-index: 40;
|
z-index: 40;
|
||||||
transition: width .3s;
|
transition: width .3s;
|
||||||
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fixed-left::before{
|
.fixed-left::before{
|
||||||
|
|
@ -21,6 +21,11 @@
|
||||||
|
|
||||||
.fixed-left.active{
|
.fixed-left.active{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
position: fixed;
|
||||||
|
top: 60px;
|
||||||
|
left: 0px;
|
||||||
|
height: 100%;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* .fixed-left.active .left_echart{
|
/* .fixed-left.active .left_echart{
|
||||||
|
|
@ -62,6 +67,10 @@
|
||||||
transition: .3s;
|
transition: .3s;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
.map_header.active{
|
||||||
|
opacity: 0;
|
||||||
|
z-index: 49;
|
||||||
|
}
|
||||||
|
|
||||||
.logo_txt{
|
.logo_txt{
|
||||||
margin-left: 15px;
|
margin-left: 15px;
|
||||||
|
|
@ -166,9 +175,9 @@
|
||||||
|
|
||||||
|
|
||||||
.left_echart{
|
.left_echart{
|
||||||
position: fixed !important;
|
position: absolute !important;
|
||||||
height: 60%;
|
height: 60%;
|
||||||
left: -100%;
|
left: 0;
|
||||||
top: 0;
|
top: 0;
|
||||||
width: 400px;
|
width: 400px;
|
||||||
z-index: 50;
|
z-index: 50;
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
.slider_one_big_picture {
|
.slider_one_big_picture {
|
||||||
position: relative;
|
position: relative;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 40%;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
/*overflow: hidden;*/
|
/*overflow: hidden;*/
|
||||||
|
|
|
||||||
106
map.html
106
map.html
|
|
@ -43,24 +43,6 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<ul class="user_info">
|
<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">
|
<span class="search-Panel">
|
||||||
<input class="search-input-item prov" placeholder="请输入地点" />
|
<input class="search-input-item prov" placeholder="请输入地点" />
|
||||||
<input onkeyup="this.value=this.value.replace(/[^\d.]/g, '')" class="search-input-item lon" placeholder="经度" />
|
<input onkeyup="this.value=this.value.replace(/[^\d.]/g, '')" class="search-input-item lon" placeholder="经度" />
|
||||||
|
|
@ -74,19 +56,6 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</span>
|
</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">
|
<li class="info-item">
|
||||||
<div class="show_detail">
|
<div class="show_detail">
|
||||||
<img class="user_img" src="./image/3.jpg" />
|
<img class="user_img" src="./image/3.jpg" />
|
||||||
|
|
@ -115,43 +84,47 @@
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="fixed-left">
|
<div class="map-container">
|
||||||
<div class="video_img">
|
<div class="fixed-left">
|
||||||
<div class="div-video" style="background: #1D346F;">
|
<div class="screen-btn screen-open" id="btn">
|
||||||
<video width="100%" height="100%" controls>
|
<span class="screen_icon iconfont icon-kuoda"></span>
|
||||||
<source class="video" src="./image/西藏/1.mp4" type="video/mp4">
|
</div>
|
||||||
<source src="movie.ogg" type="video/ogg" style="width: 400px;">
|
<div class="left_echart" id="mainGraph"></div>
|
||||||
Your browser does not support the video tag.
|
<div class="video_img">
|
||||||
</video>
|
<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>
|
||||||
<div class="slider slider_one_big_picture">
|
|
||||||
<div>
|
|
||||||
<img class="picture" style="width: 400px;height: 180px;" src="./image/西藏/1.jpg" />
|
<div id="maps" style="height: 100%; width: 100%;"></div>
|
||||||
</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>
|
</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-1.8.3.min.js"></script>
|
||||||
<script type="text/javascript" src="./js/jquery.easy_slides.js"></script>
|
<script type="text/javascript" src="./js/jquery.easy_slides.js"></script>
|
||||||
|
|
@ -587,6 +560,7 @@
|
||||||
latOrLonSearch();
|
latOrLonSearch();
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
// 左侧滑屏结束后调用该事件，重新渲染知识图谱
|
// 左侧滑屏结束后调用该事件，重新渲染知识图谱
|
||||||
// $('.fixed-left').on('transitionend', function () {
|
// $('.fixed-left').on('transitionend', function () {
|
||||||
// console.log('滑屏结束时，调用渲染知识图谱');
|
// console.log('滑屏结束时，调用渲染知识图谱');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue