bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update map

This commit is contained in:
jack 2018-06-24 14:24:22 +08:00
parent bb1fca0e68
commit 966c8dca2a
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/default/views/scripts/map/index.phtml
View File

@ -62,14 +62,11 @@ $this->headLink()->appendStylesheet('/static-sanjy-np/css/map.css');
</div> </div>
<!-- 功能按钮 --> <!-- 功能按钮 -->
<div class="rightButton"> <div class="rightButton">
<a href="#" class="a_demo_two" id="btn-back-to-sjy">回到三江源</a> <a href="javascript:void(0);" class="a_demo_two" id="btn-back-to-sjy">回到三江源</a>
<a href="#" class="a_demo_two">关闭所有图层</a> <a href="javascript:void(0);" class="a_demo_two" id="btn-close-layers">关闭所有图层</a>
</div> </div>
</div><!-- mapContainer --> </div><!-- mapContainer -->
</div> </div>
<script src="/static-sanjy-np/js/echarts.min.js"></script>
<script src="/static-sanjy-np/js/mychart.js"></script>
<script src="/static-sanjy-np/js/map.js"></script> <script src="/static-sanjy-np/js/map.js"></script>
<script type="text/javascript"> <script type="text/javascript">
/*新闻轮播图时间控制*/ /*新闻轮播图时间控制*/

12
htdocs/static-sanjy-np/js/map.js
View File

@ -1,5 +1,4 @@
var center = [10599381.969998538, 4091531.57875448]; var center = [10599381.969998538, 4091531.57875448];
var WESTDC_TILE_SERVER = 'http://210.77.68.221:27011';
var WESTDC_MAP_SERVER = "http://210.77.79.190:20015"; var WESTDC_MAP_SERVER = "http://210.77.79.190:20015";
// $(document).ready(function(){ // $(document).ready(function(){
@ -204,4 +203,15 @@ $('#btn-back-to-sjy').click(function(){
}); });
}); });
$('#btn-close-layers').click(function(){
for(var i in layers){
map.removeLayer(layers[i].layer);
if(textLayers[layers[i].title])
map.removeLayer(textLayers[layers[i].title]);
}
flyTo(center, 7, 2000, function(){
});
});
$('#layers-selector').show(); $('#layers-selector').show();

2
shipitfile.js
View File

@ -7,7 +7,7 @@ module.exports = function (shipit) {
shipit.task('deploy', async function () { shipit.task('deploy', async function () {
try{ try{
await shipit.remote('sudo /usr/bin/git pull', {'cwd': '/var/www/poles.ac.cn'}); await shipit.remote('sudo /usr/bin/git pull', {'cwd': '/var/www/sjynp.cn'});
// await shipit.remote('/usr/local/bin/pm2 restart henan', {'cwd': '/home/mapljx/henan/henanWeb'}); // await shipit.remote('/usr/local/bin/pm2 restart henan', {'cwd': '/home/mapljx/henan/henanWeb'});
}catch (e){ }catch (e){
console.log(e.message); console.log(e.message);