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

fengxiang

2018-03-20 a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c

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

@@ -7,7 +7,7 @@
         <div class="t_bg">

            <img src="./assets/img/logo.png">

            

            <h1>2018年01月昆山环境监测报告</h1>

            <h1>{{title}}昆山环境监测报告</h1>

            <div class="container">

               <div class="title">

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

@@ -26,14 +26,14 @@
            </div>

            

            <div class="content">

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

                  <div class="left">

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

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

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

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

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

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

                  </div> 

               </div> -->

               </div>

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

            </div>

         </div>

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


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

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

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

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

         </div>

      </div>



@@ -52,7 +52,7 @@


      <div class="bg"  *ngIf="! spinning">

         <div class="t_bg_b">

            <h1>2018年01月份数据报表总结分析</h1>

            <h1>{{title}}数据报表总结分析</h1>

         </div>

      </div>