Skip to content

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

修改牛舍分析页 分析详情页(接口无)

parent f7b6c675
Expand all Show whitespace changes
Inline Side-by-side
Showing with 574 additions and 194 deletions
src/app/app-routing.module.ts
View file @ cbab3c11
...@@ -24,6 +24,7 @@ import {EnvHomePage} from './envCtrl/env-home/env-home.page'; ...@@ -24,6 +24,7 @@ import {EnvHomePage} from './envCtrl/env-home/env-home.page';
import {EnvHistoryPage} from './envCtrl/env-history/env-history.page'; import {EnvHistoryPage} from './envCtrl/env-history/env-history.page';
import {EnvAddModelPage} from './envCtrl/env-add-model/env-add-model.page'; import {EnvAddModelPage} from './envCtrl/env-add-model/env-add-model.page';
import {EnvChangeModelPage} from './envCtrl/env-change-model/env-change-model.page'; import {EnvChangeModelPage} from './envCtrl/env-change-model/env-change-model.page';
import {EnvAnalDetailPage} from './envCtrl/env-anal-detail/env-anal-detail.page';
const routes: Routes = [ const routes: Routes = [
{ {
...@@ -71,6 +72,7 @@ const routes: Routes = [ ...@@ -71,6 +72,7 @@ const routes: Routes = [
{path: 'tabs', loadChildren: './envCtrl/tabs/tabs.module#TabsPageModule'}, {path: 'tabs', loadChildren: './envCtrl/tabs/tabs.module#TabsPageModule'},
{path: 'env-add-model', component: EnvAddModelPage}, {path: 'env-add-model', component: EnvAddModelPage},
{path: 'env-change-model', component: EnvChangeModelPage}, {path: 'env-change-model', component: EnvChangeModelPage},
{path: 'env-anal-detail', component: EnvAnalDetailPage},
]; ];
@NgModule({ @NgModule({
......
src/app/app.module.ts
View file @ cbab3c11
...@@ -58,6 +58,7 @@ import {NgxDatatableModule} from '@swimlane/ngx-datatable'; ...@@ -58,6 +58,7 @@ import {NgxDatatableModule} from '@swimlane/ngx-datatable';
import {EnvAlarmDetailPage} from './envCtrl/env-alarm-detail/env-alarm-detail.page'; import {EnvAlarmDetailPage} from './envCtrl/env-alarm-detail/env-alarm-detail.page';
import {EnvAddModelPage} from './envCtrl/env-add-model/env-add-model.page'; import {EnvAddModelPage} from './envCtrl/env-add-model/env-add-model.page';
import {EnvChangeModelPage} from './envCtrl/env-change-model/env-change-model.page'; import {EnvChangeModelPage} from './envCtrl/env-change-model/env-change-model.page';
import {EnvAnalDetailPage} from './envCtrl/env-anal-detail/env-anal-detail.page';
import {DatePipe} from '@angular/common'; import {DatePipe} from '@angular/common';
@NgModule({ @NgModule({
...@@ -90,6 +91,7 @@ import {DatePipe} from '@angular/common'; ...@@ -90,6 +91,7 @@ import {DatePipe} from '@angular/common';
// EnvHomePage, // EnvHomePage,
EnvAddModelPage, EnvAddModelPage,
EnvChangeModelPage, EnvChangeModelPage,
EnvAnalDetailPage
], ],
entryComponents: [], entryComponents: [],
imports: [ imports: [
......
src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.html
View file @ cbab3c11
...@@ -92,36 +92,5 @@ ...@@ -92,36 +92,5 @@
</div> </div>
</div> </div>
<!--<div class="jazz-timeline-wrapper">-->
<!--<div class="jazz-timeline multiline-timeline thin-timeline">-->
<!--<div class="timeline-post opal-post opal-trail" >-->
<!--<div class="timeline-meta">-->
<!--<div class="meta-details"></div>-->
<!--</div>-->
<!--<div class="timeline-icon icon-dot-full">-->
<!--<div class="timeline-bar"></div>-->
<!--</div>-->
<!--<div class="timeline-content">-->
<!--<div style="width: 60%">-->
<!--<h2 class="content-title"> {{item.description}} </h2>-->
<!--<div class="content-details">-->
<!--<p> {{item.troubleTime}} </p>-->
<!--</div>-->
<!--</div>-->
<!--<div style="width: 40%">-->
<!--<i class="vo v-yichuli" *ngIf="item.disposeState === 1"></i>-->
<!--</div>-->
<!--</div>&lt;!&ndash; timeline content &ndash;&gt;-->
<!--</div>&lt;!&ndash; .timeline-post &ndash;&gt;-->
<!--</div>-->
<!--</div>-->
</ion-content> </ion-content>
src/app/envCtrl/env-alarm/env-alarm.page.html
View file @ cbab3c11
...@@ -53,45 +53,6 @@ ...@@ -53,45 +53,6 @@
</div> </div>
</ion-card-content> </ion-card-content>
<!-- <ion-card-content style="padding-top: 5px; padding-bottom: 5px;">-->
<!-- <div class="sub" style="text-align: center; " style="width:100%">-->
<!-- &lt;!&ndash;<ion-icon name="ios-heart" style="padding: auto"></ion-icon>&ndash;&gt;-->
<!-- <ion-row style="width:100%">-->
<!-- <ion-col style="padding: 5px; width:51%; border-right:1px solid lightgray">-->
<!-- <div>-->
<!-- <div style="height: 60px; float:left; width: 40%">-->
<!-- <ion-icon name="ios-heart" style="padding: auto"></ion-icon>-->
<!-- </div>-->
<!-- <div style="height: 60px; float:left; width: 60%">-->
<!-- <div style="height: 35px; float:left;width: 100%">-->
<!-- <span class="label">未解决</span><span style="color:#d33939; font-size:24px;">{{item.devErr}}</span>-->
<!-- </div>-->
<!-- <div style="height: 25px; float:left;width: 100%">-->
<!-- <span class="label">总数</span><span>{{item.devErrTotal}}</span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </ion-col>-->
<!-- <ion-col style="padding: 5px; width:48%">-->
<!-- <div>-->
<!-- <div style="height: 60px; float:left; width: 40%">-->
<!-- <ion-icon name="ios-heart" style="padding: auto"></ion-icon>-->
<!-- </div>-->
<!-- <div style="height: 60px; float:left; width: 60%">-->
<!-- <div style="height: 35px; float:left;width: 100%">-->
<!-- <span class="label">未解决</span><span style="color:#f0ca45; font-size:24px;">{{item.alarm}}</span>-->
<!-- </div>-->
<!-- <div style="height: 25px; float:left;width: 100%">-->
<!-- <span class="label">总数</span><span>{{item.alarmTotal}}</span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </ion-col>-->
<!-- </ion-row>-->
<!-- </div>-->
<!-- </ion-card-content>-->
</ion-card> </ion-card>
</ion-content> </ion-content>
src/app/envCtrl/env-anal/env-anal.page.html
View file @ cbab3c11
...@@ -4,13 +4,131 @@ ...@@ -4,13 +4,131 @@
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content color='light' style="height: 100%"> <ion-content color='light'>
<ion-item lines="full"> <ion-item lines="full">
<div> <div style="width:50%">
<ion-button color="primary" style="display: inline-block">输入牛舍单产奶量并分析 >></ion-button> <ion-button color="secondary" style="display: inline-block" (click)="toDetail($event)">输入牛舍单产奶量并分析 >></ion-button>
</div>
<div style="width:50%; text-align: right;padding-right: 20px;">
<ion-datetime displayFormat="YYYY-MM-DD" cancelText="取消" doneText="确认" [(ngModel)]="today" style="font-size:16px; position: relative;"></ion-datetime>
</div>
</ion-item>
<h1 style="
font-size: 16px;
padding-left: 5px;
border-left: 5px solid #28c9bd;
line-height: 25px;
margin-bottom: 5px;">牛舍单产奶量排名</h1>
<div style="width:100%; padding-left:10px; padding-right:10px;">
<ion-item lines="full" class="rankItem">
<div class="rankIcon">
<img [src]="'../../assets/img/rank1.png'">
</div>
<div style="width:20%">
5号牛舍
</div>
<div style="width:50%">
<ion-progress-bar color="secondary" value="0.95"></ion-progress-bar>
</div>
<div class="rankValue">
140
</div>
</ion-item>
<ion-item lines="full" class="rankItem">
<div class="rankIcon">
<img [src]="'../../assets/img/rank2.png'">
</div>
<div style="width:20%">
8号牛舍
</div>
<div style="width:50%">
<ion-progress-bar color="secondary" value="0.80"></ion-progress-bar>
</div>
<div class="rankValue">
125
</div>
</ion-item>
<ion-item lines="full" class="rankItem">
<div class="rankIcon">
<img [src]="'../../assets/img/rank3.png'">
</div>
<div style="width:20%">
1号牛舍
</div>
<div style="width:50%">
<ion-progress-bar color="secondary" value="0.75"></ion-progress-bar>
</div>
<div class="rankValue">
105
</div>
</ion-item>
<ion-item lines="full" class="rankItem">
<div class="rankIcon">
24
</div>
<div style="width:20%">
24号牛舍
</div>
<div style="width:50%">
<ion-progress-bar color="secondary" value="0.50"></ion-progress-bar>
</div>
<div class="rankValue">
55
</div>
</ion-item>
<ion-item lines="full" class="rankItem">
<div class="rankIcon">
23
</div>
<div style="width:20%">
23号牛舍
</div>
<div style="width:50%">
<ion-progress-bar color="secondary" value="0.3"></ion-progress-bar>
</div>
<div class="rankValue">
35
</div> </div>
</ion-item> </ion-item>
<ion-item lines="full" class="rankItem">
<div class="rankIcon">
26
</div>
<div style="width:20%">
26号牛舍
</div>
<div style="width:50%">
<ion-progress-bar color="secondary" value="0.2"></ion-progress-bar>
</div>
<div class="rankValue">
20
</div>
</ion-item>
</div>
<h1 style="
font-size: 16px;
padding-left: 5px;
border-left: 5px solid #28c9bd;
line-height: 25px;
margin-bottom: 5px;">风机参数比较</h1>
<div style="width:100%; padding-left:10px; padding-right:10px; height: 300px">
<div #fanChartsContent id="fanChartsContent" class="echart-pie"></div>
</div>
<h1 style="
font-size: 16px;
padding-left: 5px;
border-left: 5px solid #28c9bd;
line-height: 25px;
margin-bottom: 5px;">喷淋参数比较</h1>
<div style="width:100%; padding-left:10px; padding-right:10px; height: 300px">
<div #showerChartsContent id="showerChartsContent" class="echart-pie"></div>
</div>
<h1 style=" <h1 style="
font-size: 16px; font-size: 16px;
...@@ -18,5 +136,17 @@ ...@@ -18,5 +136,17 @@
border-left: 5px solid #28c9bd; border-left: 5px solid #28c9bd;
line-height: 25px; line-height: 25px;
margin-bottom: 5px;">温湿度曲线图</h1> margin-bottom: 5px;">温湿度曲线图</h1>
<div echarts [options]="chartOption" class="demo-chart"></div> <div style="width:100%; padding-left:10px; padding-right:10px; height: 300px">
<div style="width:95%; background-color: #fff; border-radius: 10px 10px 0px 0px">
<div style="width:85%; margin:auto; padding-top: 10px">
<ion-segment scrollable style="position: sticky; margin-top:10px;" color="secondary" (ionChange)="segmentChanged($event)">
<ion-segment-button style="border-radius: 20px; margin-right:5px" *ngFor="let item of fieldRegionNameList" [value]="item.name" [checked]="item.checked">
<ion-label style="font-size:10px">{{item.name}}</ion-label>
</ion-segment-button>
</ion-segment>
</div>
</div>
<div #tempAndHumiChartsContent id="tempAndHumiChartsContent" class="echart-pie" style="border-radius: 0px 0px 10px 10px"></div>
</div>
</ion-content> </ion-content>
src/app/envCtrl/env-anal/env-anal.page.scss
View file @ cbab3c11
...@@ -65,8 +65,10 @@ ...@@ -65,8 +65,10 @@
position: fixed; position: fixed;
padding: 10px; padding: 10px;
width: 95%; width: 95%;
height: 380px; height: 270px;
margin-bottom: 15px; margin-bottom: 15px;
border-radius: 10px;
background-color: #fff;
} }
.subItem{ .subItem{
...@@ -74,3 +76,21 @@ ...@@ -74,3 +76,21 @@
--padding-start: 0px; --padding-start: 0px;
padding-left:5px; padding-left:5px;
} }
.rankItem {
font-size: 16px;
--padding-start: 0px;
--padding-end: 0px;
height: 45px;
}
.rankIcon {
width:10%;
text-align:center
}
.rankValue {
width:20%;
padding-left:5px;
font-size: 14px
}
src/app/envCtrl/env-anal/env-anal.page.ts
View file @ cbab3c11
This diff is collapsed.
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