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

fengxiang

2018-03-23 7f762717c4580a17377a33cf04351fa3abaea61d

 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>

@@ -28,7 +23,12 @@
            <div class="content">

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

                  <div class="{{i % 2 == 0 ? 'left' : 'right'}}">

                     <h2>{{item.monitorPointName}}</h2>

                     <div class="text_t">

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

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

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

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

                     </div>

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

                     <p class="text1">该公司拥有设备{{item.deviceCount}}台</p>

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

@@ -42,7 +42,7 @@


      <div id="content" style="display: none;">

         <div *ngFor="let i of sensorArr">

            <div id="mydiv{{i}}" style="height: 485.3px; width: 1000px"></div>

            <div id="mydiv{{i}}" style="height: 485.35px; width: 1000px"></div>

         </div>

      </div>