Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

fengxiang

2018-08-03 e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef

1
2
3
4
5
6
7
<div class="content__title">
    <h1>会商沙盘</h1>
</div>
<baidu-map #map [options]="options"  (loaded)="loadMap($event)"   style="display: block;height:400px;">
        <heatmap [dataset]="heatData" [options]="heatOption" (loaded)="loadHeatmap($event)"></heatmap>
        <control type="navigation" [options]="navigationOpts"></control>
</baidu-map>