微调

src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.html

@@ -93,7 +93,7 @@
               <div style="width:65%; float: left">
                 <h3 style="margin-bottom: 5px;" class="font-content-title">{{item.description}}</h3>
                 <div *ngIf="item.data !== null && item.data.temp !== undefined && item.data.temp !== null && item.data.temp !== ''" class="warnContent font-content">温度: {{item.data.temp | number:'0.1-1'}} ℃</div>
-                <div *ngIf="item.data !== null && item.data.humid !== undefined && item.data.humid !== null && item.data.humid !== ''" class="warnContent font-content">湿度: {{item.data.humid | number:'0.0-0'}} % RH</div>
+                <div *ngIf="item.data !== null && item.data.humid !== undefined && item.data.humid !== null && item.data.humid !== ''" class="warnContent font-content">湿度: {{item.data.humid | number:'0.1-1'}} % RH</div>
                 <div *ngIf="item.data !== null && item.data.heatStressLevel !== undefined && item.data.heatStressLevel !== null && item.data.heatStressLevel !== ''" class="warnContent font-content">热应激等级: {{item.data.heatStressLevel}}</div>
                 <div *ngIf="item.data !== null && item.data.liquidPump !== undefined && item.data.liquidPump !== null  && item.data.liquidPump !== ''" class="warnContent font-content">供液泵: {{item.data.liquidPump | number:'0.0-3'}} MPa</div>
                 <div *ngIf="item.data !== null && item.data.press !== undefined && item.data.press !== null && item.data.press !== ''" class="warnContent font-content">电磁阀: {{item.data.press | number:'0.0-3'}} MPa</div>

src/app/envCtrl/env-detail/env-detail.page.html

@@ -16,8 +16,8 @@
         <span *ngIf="item.ts" class="right font-ts">{{item.ts | date: 'yyyy-MM-dd HH:mm'}}</span>
     </div>
     <div style="background-color: #F0F0F0;" align="center">
-          <v-kanban-small class="home-bar" name="温度" [inData]="item.temp" iconWidth="50%" unit="℃" [iconImg]="'../../assets/img/icon-temp.png'" [fontColor]="item.tempColor" fontSize="14px"></v-kanban-small>
-          <v-kanban-small class="home-bar" name="湿度" [inData]="item.humi" iconWidth="50%" unit="% RH" [iconImg]="'../../assets/img/icon-humi.png'" [fontColor]="item.humiColor"  fontSize="14px"></v-kanban-small>
+          <v-kanban-small class="home-bar" name="温度" [inData]="item.temp | number:'0.1-1'" iconWidth="50%" unit="℃" [iconImg]="'../../assets/img/icon-temp.png'" [fontColor]="item.tempColor" fontSize="14px"></v-kanban-small>
+          <v-kanban-small class="home-bar" name="湿度" [inData]="item.humi | number:'0.1-1'" iconWidth="50%" unit="% RH" [iconImg]="'../../assets/img/icon-humi.png'" [fontColor]="item.humiColor"  fontSize="14px"></v-kanban-small>
           <v-kanban-small class="home-bar" name="热应激" [inData]="item.heatStressLevelName" iconWidth="35%" [iconImg]="'../../assets/img/icon-heat.png'" [fontColor]="item.heatStressColor" fontSize="14px"></v-kanban-small>
           <v-kanban-small class="home-bar" name="在离舍" [inData]="inHouseName" iconWidth="35%" [iconImg]="'../../assets/img/icon-house.png'" iconColor="#62C7CC" fontSize="14px"></v-kanban-small>
     </div>

src/app/envCtrl/env-history/env-history.page.html

@@ -18,26 +18,25 @@
     <div echarts [options]="chartOption" class="demo-chart"></div>
     <h1 class="main-title">近8个小时环境参数表</h1>
     <div class="div-table">
-
+      <!--[scrollbarH]="true"-->
       <ngx-datatable class="material"
                      [messages]="{emptyMessage: '<br>暂无数据'}"
                      [rows]="tableRows"
                      [columnMode]="ColumnMode.force"
-                     [scrollbarH]="true"
                      [scrollbarV]="false"
                      [headerHeight]="48"
                      [rowClass]="getRowClass"
                      [cssClasses]="'font-content'"
                      style="text-align: center; background-color: #ffffff;" class="font-content">
-        <ngx-datatable-column name="时间" prop="ts" [width]="70">
+        <ngx-datatable-column name="时间" prop="ts" width="70">
         </ngx-datatable-column>
-        <ngx-datatable-column name="热应激" prop="thi" [width]="70">
+        <ngx-datatable-column name="热应激" prop="thi" width="70">
         </ngx-datatable-column>
-        <ngx-datatable-column name="温度<br>℃" prop="temp" [width]="60">
+        <ngx-datatable-column name="温度<br>℃" prop="temp" width="60">
         </ngx-datatable-column>
-        <ngx-datatable-column name="湿度<br>% RH" prop="humi" [width]="60">
+        <ngx-datatable-column name="湿度<br>% RH" prop="humi" width="60">
         </ngx-datatable-column>
-        <ngx-datatable-column name="氨气浓度<br>ppm" prop="NH3" [width]="75">
+        <ngx-datatable-column name="氨气浓度<br>ppm" prop="NH3" width="75">
         </ngx-datatable-column>
       </ngx-datatable>
     </div>

src/app/envCtrl/env-history/env-history.page.ts

@@ -147,7 +147,7 @@ export class EnvHistoryPage implements OnInit {
         const times = [];
         if (param.temp && param.temp.constructor === Array) {
             param.temp.map(item => {
-                times.push(this.datePipe.transform(item.time, 'hh:mm'));
+                times.push(this.datePipe.transform(item.time, 'HH:mm'));
                 temp.push(Number(item.value).toFixed(2));
             });
         }
@@ -311,7 +311,7 @@ export class EnvHistoryPage implements OnInit {
             if (this.hasAllData(item)) {
                 this.tableRows.push({
                     id: index + 1,
-                    ts: this.datePipe.transform(item.ts, 'hh:mm'),
+                    ts: this.datePipe.transform(item.ts, 'HH:mm'),
                     thi: item.heatStressLevel,
                     temp: item.temp.toFixed(2),
                     humi: item.humi.toFixed(1),

src/app/envCtrl/env-home/env-home.page.html

@@ -60,7 +60,7 @@
           <div *ngIf="item.NH3 === '--'" class="detailInfo" style="width: 40%">氨气: &nbsp;{{'--'}}ppm</div>
           <div *ngIf="item.temp !== '--'" class="detailInfo" style="width: 40%">温度: &nbsp;<span class="{{item.tempColor}}Color">{{item.temp | number:'0.1-1'}}℃</span></div>
           <div *ngIf="item.temp === '--'" class="detailInfo" style="width: 40%">温度: &nbsp;{{'--'}}℃</div>
-          <div *ngIf="item.humi !== '--'" class="detailInfo" style="width: 40%">湿度: &nbsp;<span class="{{item.humiColor}}Color">{{item.humi | number:'0.0-0'}}% RH</span></div>
+          <div *ngIf="item.humi !== '--'" class="detailInfo" style="width: 40%">湿度: &nbsp;<span class="{{item.humiColor}}Color">{{item.humi | number:'0.1-1'}}% RH</span></div>
           <div *ngIf="item.humi === '--'" class="detailInfo" style="width: 40%">湿度: &nbsp;{{'--'}}% RH</div>
         </div>
         <div class="bottom">

src/global.scss

@@ -346,6 +346,7 @@ img {
   background-color: #424242;
   color: #ffffff;
   height: unset !important;
+  border-right: 1px solid white;
 }
 
 .ngx-datatable .datatable-body {