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

fengxiang

2018-05-15 0fedf4949561e5eece7dc55c2dfc4963a5cbb6b2

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

@@ -17,7 +17,7 @@
               <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 *ngFor="let item of items;let i = index"><span *ngIf="i > 0">与</span>{{item.monitorPointName}}{{item.professionName}}</span>

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

                  </div>

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

@@ -29,12 +29,12 @@
                  <div class="{{i % 2 == 0 ? 'left' : 'right'}}">

                     <div class="text_t">

                        <div class="text_t_left"></div>

                        <div class="text_t_bg">{{item.monitorPointName}}</div>

                        <div class="text_t_bg">{{item.monitorPointName}}{{item.professionName}}</div>

                        <div class="text_t_right"></div>

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

                     </div>

                     <p *ngIf="item.monitorPointId" class="text1">公司地址：{{item.monitorPointAddress}}</p>

                     <p class="text1">拥有监测设备{{item.deviceCount}}台</p>

                     <p class="text1">拥有监测设备{{item.deviceCount?item.deviceCount:0}}台</p>

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

                  </div> 

               </div>