冲突修正

fengxiang

2018-03-13 936bb39145eee86530f61d3345f8125ddd778225

 src/app/routes/analysis/query/query.component.html

@@ -153,4 +153,4 @@
        </div>      
</nz-card>
</form>
<div echarts [options]="chartOption" class="line-chart" (chartInit)="onChartInit($event)"></div>  
<div echarts [options]="chartOption" [loading]="chartLoading" class="line-chart" (chartInit)="onChartInit($event)"></div>