Commit 4d785599 authored by yating.lin's avatar yating.lin

热应激等级List 追加Sort后显示

parent ba96b544
...@@ -375,24 +375,24 @@ ...@@ -375,24 +375,24 @@
<ion-icon name="arrow-down" color="secondary" mode="ios" slot="end" class="iconOpen" *ngIf="isOpenHeatStress" (click)="openItem('heatStressCfg')"></ion-icon> <ion-icon name="arrow-down" color="secondary" mode="ios" slot="end" class="iconOpen" *ngIf="isOpenHeatStress" (click)="openItem('heatStressCfg')"></ion-icon>
</div> </div>
</div> </div>
<div class="item-content-div font-content" style="height: auto" *ngIf="isOpenHeatStress" @shrink @stretch > <div class="item-content-div font-content" style="height: auto; padding-right:0px;" *ngIf="isOpenHeatStress" @shrink @stretch >
<ion-item class="fanItem" lines="none"> <ion-item class="fanItem" lines="none" style="--inner-padding-end: 0px;">
<ion-grid class="sliding-grid"> <ion-grid class="sliding-grid">
<ion-row> <ion-row>
<ion-item lines="none" class="thiItem font-smaller">计算公式 0.81* 温度 +(0.99*温度-14.3)* 湿度+46.3</ion-item> <ion-item lines="none" class="thiItem font-smaller">计算公式 THI=0.81*温度+(0.99*温度-14.3)*湿度+46.3</ion-item>
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-item lines="none" class="thiItem font-content">等级临界值</ion-item> <ion-item lines="none" class="thiItem font-content">等级临界值</ion-item>
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col class="thiItem sliding-col font-content" style="width: 30%; margin-bottom:5px;">应激等级</ion-col> <ion-col class="thiItem sliding-col font-content" style="width: 30%; margin-bottom:5px;">应激等级</ion-col>
<ion-col class="thiItem sliding-col font-content" style="width: 18%; margin-bottom:5px;">THI值(<)</ion-col> <ion-col class="thiItem sliding-col font-content" style="width: 30%; margin-bottom:5px;">THI值(<)</ion-col>
<ion-col class="thiItem sliding-col font-content" style="width: 45%; margin-bottom:5px; text-align:left; padding-left:15px;">预警方式</ion-col> <ion-col class="thiItem sliding-col font-content" style="width: 40%; margin-bottom:5px; text-align:left;">预警方式</ion-col>
</ion-row> </ion-row>
<ion-row *ngFor="let heatStress of curCowshed.heatStressList"> <ion-row *ngFor="let heatStress of curCowshed.heatStressList">
<ion-col class="thiItem sliding-col font-content " style="width: 30%; margin-bottom:5px;">{{heatStress.heatStressLevel}}</ion-col> <ion-col class="thiItem sliding-col font-content " style="width: 30%; margin-bottom:5px;">{{heatStress.heatStressLevel}}</ion-col>
<ion-col class="thiItem sliding-col font-content" style="width: 18%; margin-bottom:5px;">{{heatStress.thi}}</ion-col> <ion-col class="thiItem sliding-col font-content" style="width: 30%; margin-bottom:5px;">{{heatStress.thi}}</ion-col>
<ion-col class="thiItem sliding-col font-content" style="width: 45%; margin-bottom:5px;"> <ion-col class="thiItem sliding-col font-content" style="width: 40%; margin-bottom:5px;">
<ion-select class="heatSelect font-input input-tb-text" multiple="false" cancelText="取消" okText="确认" [(ngModel)]="heatStress.alarmLevel"> <ion-select class="heatSelect font-input input-tb-text" multiple="false" cancelText="取消" okText="确认" [(ngModel)]="heatStress.alarmLevel">
<ion-select-option *ngFor="let alarmWay of alarmWays" [value]="alarmWay.alarmId">{{alarmWay.alarmValue}}</ion-select-option> <ion-select-option *ngFor="let alarmWay of alarmWays" [value]="alarmWay.alarmId">{{alarmWay.alarmValue}}</ion-select-option>
</ion-select> </ion-select>
......
...@@ -186,6 +186,10 @@ export class EnvCfgPage implements OnInit { ...@@ -186,6 +186,10 @@ export class EnvCfgPage implements OnInit {
this.api.config.getByFieldRegionNo([{fieldRegionNo: this.curFieldRegionNo}, (data) => { this.api.config.getByFieldRegionNo([{fieldRegionNo: this.curFieldRegionNo}, (data) => {
if (data) { if (data) {
data.environmentConfigJson = JSON.parse(data.environmentConfigJson.toString()); data.environmentConfigJson = JSON.parse(data.environmentConfigJson.toString());
debugger;
data.heatStressList.sort( (a, b) => {
return a['thi'] > b['thi'] ? 1 : a['thi'] === b['thi'] ? 0 : -1;
});
this.curCowshed = data; this.curCowshed = data;
this.curCowshed.isWisdomModelChecked = this.curCowshed.isWisdomModel ? true : false; this.curCowshed.isWisdomModelChecked = this.curCowshed.isWisdomModel ? true : false;
this.initConfig(); this.initConfig();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment