From e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 03 Aug 2018 16:56:41 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/grid-trace/grid-trace.component.html | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/grid-trace/grid-trace.component.html b/src/app/routes/grid-trace/grid-trace.component.html
index 4e431c6..8ae5417 100644
--- a/src/app/routes/grid-trace/grid-trace.component.html
+++ b/src/app/routes/grid-trace/grid-trace.component.html
@@ -1,4 +1,7 @@
<div class="content__title">
<h1>������������</h1>
</div>
-<pro-header [title]="'Page Name'"></pro-header>
+<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>
--
Gitblit v1.8.0