Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-03-23 cb370be00fe6b23a8e13cbbd75c66bab9fed50c9

 src/app/routes/report/report.component.html

@@ -12,13 +12,8 @@
               <div class="title">

                  <div class="title_left"></div>

                  <div class="text">

                     <span *ngFor="let item of items;let i = index">

                        <span *ngIf="i > 0">与</span>

                        {{item.monitorPointName}}

                     </span>

                     <span >

                        实时监测分析

                     </span>

                     <span *ngFor="let item of items;let i = index"><span *ngIf="i > 0">与</span>{{item.monitorPointName}}</span>

                     <span>实时监测分析</span>

                  </div>

                  <div class="title_right"></div>

                  <div class="clear_fix"></div>