Skip to content

M
muChangApp
Commit 9dc429bb authored by yating.lin's avatar yating.lin
Browse files
Options

修改牛舍历史页

parent cbab3c11
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 40 deletions
src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.html
View file @ 9dc429bb
......@@ -35,13 +35,13 @@
<ion-item lines="full" class="ionItem" style="height: 45px;">
<div style="width: 28%">
<ion-datetime displayFormat="YYYY/MM" cancelText="取消" doneText="确认" [(ngModel)]="startTime" (ionChange)="reflush()"></ion-datetime>
<ion-datetime style="position: relative;" displayFormat="YYYY/MM" cancelText="取消" doneText="确认" [(ngModel)]="startTime" (ionChange)="reflush()"></ion-datetime>
</div>
<div style="width: 2%">
<span>~</span>
</div>
<div style="width: 30%">
<ion-datetime displayFormat="YYYY/MM" cancelText="取消" doneText="确认" [(ngModel)]="stopTime" style="margin-left: 3px;" (ionChange)="reflush()"></ion-datetime>
<ion-datetime style="position: relative;" displayFormat="YYYY/MM" cancelText="取消" doneText="确认" [(ngModel)]="stopTime" style="margin-left: 3px;" (ionChange)="reflush()"></ion-datetime>
</div>
<div style="width: 40%">
<div class="note" style="margin-bottom: 5px;">
......@@ -78,7 +78,10 @@
<div *ngIf="item.data.NH3" class="warnContent">氨气: {{item.data.NH3}} ppm</div>
</div>
<div style="width:30%; float: left">
<img *ngIf="displayArea === 'trouble' && item.disposeState === 0" [src]="'../../assets/img/troubleDisposeState' + item.disposeState + '.png'" class="warnIcon" (click)="onRecvClick(item)">
<div *ngIf="displayArea === 'trouble' && item.disposeState === 0" >
<ion-button color="secondary" style="display: inline-block; width: 55px; height: 30px; font-size: 12px; border-radius: 20px;" (click)="onRecvClick(item)">确认修复</ion-button>
</div>
<!-- <img *ngIf="displayArea === 'trouble' && item.disposeState === 0" [src]="'../../assets/img/troubleDisposeState' + item.disposeState + '.png'" class="warnIcon" (click)="onRecvClick(item)">-->
<!-- <ion-button color="primary" size="small" style="display: inline-block" *ngIf="a.disposeState === 0" (click)='onRecvClick(a)'>确认修复</ion-button>-->
<img *ngIf="displayArea === 'trouble' && item.disposeState === 1" [src]="'../../assets/img/troubleDisposeState' + item.disposeState + '.png'" class="warnIcon">
......
src/app/envCtrl/env-alarm/env-alarm.page.html
View file @ 9dc429bb
<ion-header> <!-- style="background-color: #F3F4F4" translucent="false" -->
<ion-header>
<ion-toolbar>
<ion-title class="title">牛舍告警一览</ion-title>
</ion-toolbar>
......
src/app/envCtrl/env-alarm/env-alarm.page.scss
View file @ 9dc429bb
......@@ -36,14 +36,14 @@
background-size:100% 100%;-moz-background-size:100% 100%;
}
.title{
margin-bottom: 5px;
padding-top: 5px;
align-items:center;
justify-content: center;
color: #717171;
font-size: 14px;
}
//.title{
// margin-bottom: 5px;
// padding-top: 5px;
// align-items:center;
// justify-content: center;
// color: #717171;
// font-size: 14px;
//}
.sub{
padding-bottom: 3px;
......
src/app/envCtrl/env-detail/env-detail.page.scss
View file @ 9dc429bb
......@@ -6,8 +6,8 @@
.title{
text-align: center;
padding-left: 0px;
font-weight: lighter;
font-size: large
//font-weight: lighter;
//font-size: large
}
.home-bar{
......
src/app/envCtrl/env-history/env-history.page.html
View file @ 9dc429bb
......@@ -9,28 +9,25 @@
<ion-content color='light' style="height: 100%; padding-top: 30px;">
<div style="padding-top: 10px">
<h1 class="subTittle">牛舍热应激状态</h1> <span [ngClass]="{'perfect': analResult === '优','good': analResult === '良','bad': analResult === '差'}" margin-start="10px;">{{analResult}}</span>
<h1 class="subTittle">牛舍热应激状态</h1>
<div style="width:100%; padding: 10px">
<img [src]="'../../assets/img/level-best.png'" style="width:50px !important">
</div>
<h1 class="subTittle">近8个小时环境参数曲线</h1>
<div echarts [options]="chartOption" class="demo-chart"></div>
<h1 class="subTittle">近8个小时环境参数表</h1>
<div>
<ngx-datatable class='material' [rows]="rows" [columnMode]="'force'" [scrollbarH]="true" [scrollbarV]="true" style="white-space: nowrap; text-align: center">
<ngx-datatable-column name="时间" prop="time" width="100">
<div style="width: 98%">
<ngx-datatable class="material" [rows]="rows" [columnMode]="'force'" [scrollbarH]="true" [scrollbarV]="true" style="white-space: nowrap; text-align: center; font-size:14px">
<ngx-datatable-column name="时间" prop="time" width="80">
</ngx-datatable-column>
<ngx-datatable-column name="热应激" prop="thi" width="60">
</ngx-datatable-column>
<ngx-datatable-column name="温度" prop="temp" width="80">
</ngx-datatable-column>
<ngx-datatable-column name="湿度" prop="humi" width="80">
</ngx-datatable-column>
<ngx-datatable-column name="光照" prop="AA" width="80">
</ngx-datatable-column>
<ngx-datatable-column name="风机" prop="BB" width="80">
<ngx-datatable-column name="温度" prop="temp" width="60">
</ngx-datatable-column>
<ngx-datatable-column name="喷淋" prop="CC" width="80">
<ngx-datatable-column name="湿度" prop="humi" width="60">
</ngx-datatable-column>
<ngx-datatable-column name="照明" prop="DD" width="80">
<ngx-datatable-column name="氨气浓度" prop="NH3" width="80">
</ngx-datatable-column>
</ngx-datatable>
</div>
......
src/app/envCtrl/env-history/env-history.page.scss
View file @ 9dc429bb
......@@ -43,8 +43,8 @@
.title {
text-align: center;
padding-left: 0px;
font-weight: lighter;
font-size: large
//font-weight: lighter;
//font-size: large
}
.subTittle {
......
src/app/envCtrl/env-history/env-history.page.ts
View file @ 9dc429bb
......@@ -14,12 +14,10 @@ export class EnvHistoryPage implements OnInit {
constructor(private api: Api, private ac: ActivatedRoute, private load: Load) {
}
item = {fieldRegionNo: ''};
item: any = {};
// --------------------------------------------------------------------------------
// TODO 以下为假数据 待删除
analResult = '优';
chartOption = {
backgroundColor: '#F0F8FF',
visualMap: [
......@@ -42,13 +40,13 @@ export class EnvHistoryPage implements OnInit {
// 时间 热应激 温度 湿度 光照 风机 喷淋 照明
rows = [
{time: '17:00', thi: '轻', temp: '23.8', humi: '56', AA: '70', BB: '55%', CC: 'O', DD: 'X'},
{time: '17:30', thi: '中', temp: '27.2', humi: '43', AA: '80', BB: '55%', CC: 'X', DD: 'O'},
{time: '18:00', thi: '轻', temp: '23.2', humi: '61', AA: '99', BB: '55%', CC: 'O', DD: 'X'},
{time: '18:30', thi: '轻', temp: '23.1', humi: '47', AA: '100', BB: '55%', CC: 'X', DD: 'O'},
{time: '19:00', thi: '轻', temp: '20.2', humi: '43', AA: '60', BB: '55%', CC: 'O', DD: 'X'},
{time: '19:30', thi: '轻', temp: '21.6', humi: '34', AA: '50', BB: '55%', CC: 'O', DD: 'X'},
{time: '20:00', thi: '轻', temp: '22.5', humi: '43', AA: '40', BB: '55%', CC: 'X', DD: 'O'},
{time: '17:00', thi: '轻', temp: '23.8', humi: '56', NH3: '70'},
{time: '17:30', thi: '中', temp: '27.2', humi: '43', NH3: '80'},
{time: '18:00', thi: '轻', temp: '23.2', humi: '61', NH3: '99'},
{time: '18:30', thi: '轻', temp: '23.1', humi: '47', NH3: '100'},
{time: '19:00', thi: '轻', temp: '20.2', humi: '43', NH3: '60'},
{time: '19:30', thi: '轻', temp: '21.6', humi: '34', NH3: '50'},
{time: '20:00', thi: '轻', temp: '22.5', humi: '43', NH3: '40'},
];
// --------------------------------------------------------------------------------
......@@ -72,7 +70,8 @@ export class EnvHistoryPage implements OnInit {
this.load.toLoad('加载中...', false);
}
this.api.cowshedApp.getRealDataByFieldRegionNo([{'fieldRegionNo': this.item.fieldRegionNo}, (data) => {
// TODO 测试用假数据
data.fieldRegionName = '1号牛舍';
if (data) {
this.item = data;
}
......
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