Commit 7631c709 authored by zhuangzhuang's avatar zhuangzhuang

微调

parent e72170b8
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<ion-col> <ion-col>
<ion-item class="fanItem"> <ion-item class="fanItem">
<ion-label position="fixed">偏差温度</ion-label> <ion-label position="fixed">偏差温度</ion-label>
<ion-input [(ngModel)]="curCowshed.propertyConfig.toft" (ionFocus)="tempHaveFouch()" (ionBlur)="updateCowshed()"></ion-input> <ion-input [(ngModel)]="curCowshed.propertyConfig.toft" (ionFocus)="tempHaveTouch()" (ionBlur)="updateCowshed()"></ion-input>
<ion-label position="fixed"></ion-label> <ion-label position="fixed"></ion-label>
</ion-item> </ion-item>
</ion-col> </ion-col>
...@@ -54,14 +54,14 @@ ...@@ -54,14 +54,14 @@
<ion-col> <ion-col>
<ion-item class="fanItem"> <ion-item class="fanItem">
<ion-label position="fixed">开启温度</ion-label> <ion-label position="fixed">开启温度</ion-label>
<ion-input (ionFocus)="tempHaveFouch()" [(ngModel)]="fengJi.controlConfig.TU" (ionBlur)="updateCowshed()"></ion-input> <ion-input (ionFocus)="tempHaveTouch()" [(ngModel)]="fengJi.controlConfig.TU" (ionBlur)="updateCowshed()"></ion-input>
<ion-label position="fixed"></ion-label> <ion-label position="fixed"></ion-label>
</ion-item> </ion-item>
</ion-col> </ion-col>
<ion-col> <ion-col>
<ion-item class="fanItem"> <ion-item class="fanItem">
<ion-label position="fixed">关闭温度</ion-label> <ion-label position="fixed">关闭温度</ion-label>
<ion-input (ionFocus)="tempHaveFouch()" [(ngModel)]="fengJi.controlConfig.TL" (ionBlur)="updateCowshed()"></ion-input> <ion-input (ionFocus)="tempHaveTouch()" [(ngModel)]="fengJi.controlConfig.TL" (ionBlur)="updateCowshed()"></ion-input>
<ion-label position="fixed"></ion-label> <ion-label position="fixed"></ion-label>
</ion-item> </ion-item>
</ion-col> </ion-col>
...@@ -88,13 +88,13 @@ ...@@ -88,13 +88,13 @@
<ion-col size="auto" style="font-size: 13px;"> <ion-col size="auto" style="font-size: 13px;">
<ion-item class="fanItem" lines="none"> <ion-item class="fanItem" lines="none">
<ion-label style="width:80px">模式名</ion-label> <ion-label style="width:80px">模式名</ion-label>
<ion-input [(ngModel)]="cfg.name" (ionFocus)="tempHaveFouch()" style="width:80px;" (ionBlur)="updateCowshed()"></ion-input> <ion-input [(ngModel)]="cfg.name" (ionFocus)="tempHaveTouch()" style="width:80px;" (ionBlur)="updateCowshed()"></ion-input>
</ion-item> </ion-item>
</ion-col> </ion-col>
<ion-col size="auto" style="font-size: 13px;"> <ion-col size="auto" style="font-size: 13px;">
<ion-item class="timepickerItem" lines="none"> <ion-item class="timepickerItem" lines="none">
<ion-label style="width:80px">间隔时间</ion-label> <ion-label style="width:80px">间隔时间</ion-label>
<ion-input style="width:50px;" [(ngModel)]="cfg.intverval" (ionFocus)="tempHaveFouch()" (ionBlur)="updateCowshed()"></ion-input> <ion-input style="width:50px;" [(ngModel)]="cfg.intverval" (ionFocus)="tempHaveTouch()" (ionBlur)="updateCowshed()"></ion-input>
<ion-label></ion-label> <ion-label></ion-label>
</ion-item> </ion-item>
</ion-col> </ion-col>
...@@ -103,14 +103,14 @@ ...@@ -103,14 +103,14 @@
<ion-col size="auto" style="font-size: 13px;"> <ion-col size="auto" style="font-size: 13px;">
<ion-item class="fanItem" lines="none"> <ion-item class="fanItem" lines="none">
<ion-label style="width:80px">设置温度</ion-label> <ion-label style="width:80px">设置温度</ion-label>
<ion-input style="width:50px;" [(ngModel)]="cfg.T" (ionFocus)="tempHaveFouch()" (ionBlur)="updateCowshed()"></ion-input> <ion-input style="width:50px;" [(ngModel)]="cfg.T" (ionFocus)="tempHaveTouch()" (ionBlur)="updateCowshed()"></ion-input>
<ion-label></ion-label> <ion-label></ion-label>
</ion-item> </ion-item>
</ion-col> </ion-col>
<!-- <ion-col size="auto" style="font-size: 13px;">--> <!-- <ion-col size="auto" style="font-size: 13px;">-->
<!-- <ion-item class="fanItem" lines="none">--> <!-- <ion-item class="fanItem" lines="none">-->
<!-- <ion-label style="width:80px">偏差温度</ion-label>--> <!-- <ion-label style="width:80px">偏差温度</ion-label>-->
<!-- <ion-input [(ngModel)]="penLinCfg.A" (ionFocus)="tempHaveFouch()" style="width:50px;"></ion-input>--> <!-- <ion-input [(ngModel)]="penLinCfg.A" (ionFocus)="tempHaveTouch()" style="width:50px;"></ion-input>-->
<!-- </ion-item>--> <!-- </ion-item>-->
<!-- </ion-col>--> <!-- </ion-col>-->
</ion-row> </ion-row>
...@@ -118,14 +118,14 @@ ...@@ -118,14 +118,14 @@
<ion-col size="auto" style="font-size: 13px;"> <ion-col size="auto" style="font-size: 13px;">
<ion-item class="fanItem" lines="none"> <ion-item class="fanItem" lines="none">
<ion-label style="width:80px">A区喷水时间</ion-label> <ion-label style="width:80px">A区喷水时间</ion-label>
<ion-input style="width:50px;" [(ngModel)]="cfg.A" (ionFocus)="tempHaveFouch()" (ionBlur)="updateCowshed()"></ion-input> <ion-input style="width:50px;" [(ngModel)]="cfg.A" (ionFocus)="tempHaveTouch()" (ionBlur)="updateCowshed()"></ion-input>
<ion-label></ion-label> <ion-label></ion-label>
</ion-item> </ion-item>
</ion-col> </ion-col>
<ion-col size="auto" style="font-size: 13px;"> <ion-col size="auto" style="font-size: 13px;">
<ion-item class="fanItem" lines="none"> <ion-item class="fanItem" lines="none">
<ion-label style="width:80px">B区喷水时间</ion-label> <ion-label style="width:80px">B区喷水时间</ion-label>
<ion-input style="width:50px;" [(ngModel)]="cfg.B" (ionFocus)="tempHaveFouch()" (ionBlur)="updateCowshed()"></ion-input> <ion-input style="width:50px;" [(ngModel)]="cfg.B" (ionFocus)="tempHaveTouch()" (ionBlur)="updateCowshed()"></ion-input>
<ion-label></ion-label> <ion-label></ion-label>
</ion-item> </ion-item>
</ion-col> </ion-col>
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
<ion-col size="auto" style="font-size: 13px;"> <ion-col size="auto" style="font-size: 13px;">
<ion-item style="font-size: 13px;--padding-start: 0px" lines="none"> <ion-item style="font-size: 13px;--padding-start: 0px" lines="none">
<ion-label style="width:80px">模式名</ion-label> <ion-label style="width:80px">模式名</ion-label>
<ion-input style="width:50px;" [(ngModel)]="cfg.name" (ionFocus)="tempHaveFouch()" (ionBlur)="updateCowshed()"></ion-input> <ion-input style="width:50px;" [(ngModel)]="cfg.name" (ionFocus)="tempHaveTouch()" (ionBlur)="updateCowshed()"></ion-input>
</ion-item> </ion-item>
</ion-col> </ion-col>
</ion-row> </ion-row>
...@@ -164,14 +164,14 @@ ...@@ -164,14 +164,14 @@
<ion-col size="auto" style="font-size: 13px;"> <ion-col size="auto" style="font-size: 13px;">
<ion-item class="timepickerItem" lines="none"> <ion-item class="timepickerItem" lines="none">
<ion-label style="width:80px">日期范围</ion-label> <ion-label style="width:80px">日期范围</ion-label>
<!--<ion-input placeholder={{cfg.startTime}} (ionFocus)="tempHaveFouch()" style="width:50px;"></ion-input>--> <!--<ion-input placeholder={{cfg.startTime}} (ionFocus)="tempHaveTouch()" style="width:50px;"></ion-input>-->
<ion-datetime [(ngModel)]="cfg.startDate" displayFormat="MM-DD" class="timepicker" (blur)="updateCowshed()"></ion-datetime> <ion-datetime [(ngModel)]="cfg.startDate" displayFormat="MM-DD" class="timepicker" (blur)="updateCowshed()"></ion-datetime>
</ion-item> </ion-item>
</ion-col> </ion-col>
<ion-col size="auto" style="font-size: 13px;"> <ion-col size="auto" style="font-size: 13px;">
<ion-item class="timepickerItem" lines="none"> <ion-item class="timepickerItem" lines="none">
<ion-label style="width:80px">~</ion-label> <ion-label style="width:80px">~</ion-label>
<!--<ion-input placeholder={{cfg.endTime}} (ionFocus)="tempHaveFouch()" style="width:50px;"></ion-input>--> <!--<ion-input placeholder={{cfg.endTime}} (ionFocus)="tempHaveTouch()" style="width:50px;"></ion-input>-->
<ion-datetime [(ngModel)]="cfg.stopDate" displayFormat="MM-DD" class="timepicker" (blur)="updateCowshed()"></ion-datetime> <ion-datetime [(ngModel)]="cfg.stopDate" displayFormat="MM-DD" class="timepicker" (blur)="updateCowshed()"></ion-datetime>
</ion-item> </ion-item>
</ion-col> </ion-col>
...@@ -180,13 +180,13 @@ ...@@ -180,13 +180,13 @@
<ion-col size="auto" style="font-size: 13px;"> <ion-col size="auto" style="font-size: 13px;">
<ion-item style="font-size: 13px;--padding-start: 0px" lines="none"> <ion-item style="font-size: 13px;--padding-start: 0px" lines="none">
<ion-label style="width:80px">开灯时间</ion-label> <ion-label style="width:80px">开灯时间</ion-label>
<ion-input style="width:50px;" [(ngModel)]="cfg.on" (ionFocus)="tempHaveFouch()" (onBlur)="updateCowshed()"></ion-input> <ion-input style="width:50px;" [(ngModel)]="cfg.on" (ionFocus)="tempHaveTouch()" (onBlur)="updateCowshed()"></ion-input>
</ion-item> </ion-item>
</ion-col> </ion-col>
<ion-col size="auto" style="font-size: 13px;"> <ion-col size="auto" style="font-size: 13px;">
<ion-item style="font-size: 13px;--padding-start: 0px" lines="none"> <ion-item style="font-size: 13px;--padding-start: 0px" lines="none">
<ion-label style="width:80px">关灯时间</ion-label> <ion-label style="width:80px">关灯时间</ion-label>
<ion-input style="width:50px;" [(ngModel)]="cfg.off" (ionFocus)="tempHaveFouch()" (onBlur)="updateCowshed()"></ion-input> <ion-input style="width:50px;" [(ngModel)]="cfg.off" (ionFocus)="tempHaveTouch()" (onBlur)="updateCowshed()"></ion-input>
</ion-item> </ion-item>
</ion-col> </ion-col>
</ion-row> </ion-row>
...@@ -212,14 +212,14 @@ ...@@ -212,14 +212,14 @@
<ion-col size="auto" style="font-size: 13px;"> <ion-col size="auto" style="font-size: 13px;">
<ion-item class="timepickerItem" lines="none"> <ion-item class="timepickerItem" lines="none">
<ion-label style="width:80px">日期范围</ion-label> <ion-label style="width:80px">日期范围</ion-label>
<!--<ion-input placeholder={{cfg.startTime}} (ionFocus)="tempHaveFouch()" style="width:50px;"></ion-input>--> <!--<ion-input placeholder={{cfg.startTime}} (ionFocus)="tempHaveTouch()" style="width:50px;"></ion-input>-->
<ion-datetime [(ngModel)]="shuiCao.controlConfig.startDate" displayFormat="MM-DD" class="timepicker" (change)="updateCowshed()"></ion-datetime> <ion-datetime [(ngModel)]="shuiCao.controlConfig.startDate" displayFormat="MM-DD" class="timepicker" (change)="updateCowshed()"></ion-datetime>
</ion-item> </ion-item>
</ion-col> </ion-col>
<ion-col size="auto" style="font-size: 13px;"> <ion-col size="auto" style="font-size: 13px;">
<ion-item class="timepickerItem" lines="none"> <ion-item class="timepickerItem" lines="none">
<ion-label style="width:80px">~</ion-label> <ion-label style="width:80px">~</ion-label>
<!--<ion-input placeholder={{cfg.endTime}} (ionFocus)="tempHaveFouch()" style="width:50px;"></ion-input>--> <!--<ion-input placeholder={{cfg.endTime}} (ionFocus)="tempHaveTouch()" style="width:50px;"></ion-input>-->
<ion-datetime [(ngModel)]="shuiCao.controlConfig.stopDate" displayFormat="MM-DD" class="timepicker" (change)="updateCowshed()"></ion-datetime> <ion-datetime [(ngModel)]="shuiCao.controlConfig.stopDate" displayFormat="MM-DD" class="timepicker" (change)="updateCowshed()"></ion-datetime>
</ion-item> </ion-item>
</ion-col> </ion-col>
......
...@@ -227,8 +227,7 @@ export class EnvCfgPage implements OnInit { ...@@ -227,8 +227,7 @@ export class EnvCfgPage implements OnInit {
await picker.present(); await picker.present();
} }
tempHaveFouch() { tempHaveTouch() {
console.log('fanTempHaveFouch');
if (this.fanMode.selecting === false) { if (this.fanMode.selecting === false) {
this.fanMode.selecting = true; this.fanMode.selecting = true;
this.openPicker(10, 50); this.openPicker(10, 50);
...@@ -236,7 +235,6 @@ export class EnvCfgPage implements OnInit { ...@@ -236,7 +235,6 @@ export class EnvCfgPage implements OnInit {
} }
humHaveFouch() { humHaveFouch() {
console.log('fanTempHaveFouch');
if (this.fanMode.selecting === false) { if (this.fanMode.selecting === false) {
this.fanMode.selecting = true; this.fanMode.selecting = true;
this.openPicker(0, 100); this.openPicker(0, 100);
......
...@@ -54,7 +54,7 @@ export class EnvLightPage implements OnInit { ...@@ -54,7 +54,7 @@ export class EnvLightPage implements OnInit {
} }
getData(time) { getData(time) {
this.curDate = +new Date().getMonth(); this.curDate = +new Date().getMonth() + 1;
if (time) { if (time) {
this.load.toLoad('加载中...', false); this.load.toLoad('加载中...', false);
} }
......
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