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

fengxiang

2018-07-30 7d210afd7f9beccae57f5d234fbbb5dc3e07f435

 src/app/routes/reports/query2/query2.component.html

@@ -25,7 +25,7 @@
                        <th nz-th><span>序号</span></th>
                        <th nz-th><span>站点名称</span></th>
                        <th nz-th class="text-right">
                            <span>因子数值 mg/m3</span>
                            <span>因子数值 {{sensorKey == 'e10'?'mg/m3':'ug/m3'}}</span>
                            <nz-table-sort (nzValueChange)="sort('avg',$event)"></nz-table-sort>
                        </th>
                    </tr>