Skip to content

M
muChangApp
Commit cd6645c6 authored by zhuangzhuang's avatar zhuangzhuang
Browse files
Options

牛舍配置页微调

parent 531ae561
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 55 deletions
src/app/envCtrl/env-cfg/env-cfg.page.html
View file @ cd6645c6
......@@ -14,7 +14,7 @@
<div *ngIf="curCowshed.fieldRegionName">
<ion-item lines="full">
<ion-label>智慧模式选择</ion-label>
<ion-toggle slot="end" color="secondary" style="width:50px" [checked]="curCowshed.isWisdomModel"></ion-toggle>
<ion-toggle slot="end" color="secondary" style="width:50px" [checked]="curCowshed.isWisdomModel" (change)="updateCowshed()"></ion-toggle>
</ion-item>
<ion-label text-wrap color="danger" style="margin-left: 20px">选择智慧模式时，风机/喷淋/照明的控制将强制进入有环境条件影响的自控模式</ion-label>
<ion-item-divider>
......@@ -26,14 +26,14 @@
<ion-col>
<ion-item class="fanItem">
<ion-label position="fixed">偏差温度</ion-label>
<ion-input [(ngModel)]="curCowshed.propertyConfig.toft"></ion-input>
<ion-input [(ngModel)]="curCowshed.propertyConfig.toft" (ionBlur)="updateCowshed()"></ion-input>
<ion-label position="fixed">℃</ion-label>
</ion-item>
</ion-col>
<ion-col>
<ion-item class="fanItem">
<ion-label position="fixed">偏差湿度</ion-label>
<ion-input [(ngModel)]="curCowshed.propertyConfig.hoft"></ion-input>
<ion-input [(ngModel)]="curCowshed.propertyConfig.hoft" (ionBlur)="updateCowshed()"></ion-input>
<ion-label position="fixed">%</ion-label>
</ion-item>
</ion-col>
......@@ -54,14 +54,14 @@
<ion-col>
<ion-item class="fanItem">
<ion-label position="fixed">开启温度</ion-label>
<ion-input (ionFocus)="fanTempHaveFouch()" [(ngModel)]="fengJi.controlConfig.TU"></ion-input>
<ion-input (ionFocus)="fanTempHaveFouch()" [(ngModel)]="fengJi.controlConfig.TU" (ionBlur)="updateCowshed()"></ion-input>
<ion-label position="fixed">℃</ion-label>
</ion-item>
</ion-col>
<ion-col>
<ion-item class="fanItem">
<ion-label position="fixed">关闭温度</ion-label>
<ion-input (ionFocus)="fanTempHaveFouch()" [(ngModel)]="fengJi.controlConfig.TL"></ion-input>
<ion-input (ionFocus)="fanTempHaveFouch()" [(ngModel)]="fengJi.controlConfig.TL" (ionBlur)="updateCowshed()"></ion-input>
<ion-label position="fixed">℃</ion-label>
</ion-item>
</ion-col>
......@@ -84,13 +84,13 @@
<ion-col size="auto" style="font-size: 13px;">
<ion-item class="fanItem" lines="none">
<ion-label style="width:80px">模式名</ion-label>
<ion-input [(ngModel)]="cfg.name" (ionFocus)="fanTempHaveFouch()" style="width:80px;"></ion-input>
<ion-input [(ngModel)]="cfg.name" (ionFocus)="fanTempHaveFouch()" style="width:80px;" (ionBlur)="updateCowshed()"></ion-input>
</ion-item>
</ion-col>
<ion-col size="auto" style="font-size: 13px;">
<ion-item class="timepickerItem" lines="none">
<ion-label style="width:80px">间隔时间</ion-label>
<ion-input [(ngModel)]="cfg.intverval" (ionFocus)="fanTempHaveFouch()" style="width:50px;"></ion-input>
<ion-input style="width:50px;" [(ngModel)]="cfg.intverval" (ionFocus)="fanTempHaveFouch()" (ionBlur)="updateCowshed()"></ion-input>
<ion-label>秒</ion-label>
</ion-item>
</ion-col>
......@@ -99,7 +99,7 @@
<ion-col size="auto" style="font-size: 13px;">
<ion-item class="fanItem" lines="none">
<ion-label style="width:80px">设置温度</ion-label>
<ion-input [(ngModel)]="cfg.T" (ionFocus)="fanTempHaveFouch()" style="width:50px;"></ion-input>
<ion-input style="width:50px;" [(ngModel)]="cfg.T" (ionFocus)="fanTempHaveFouch()" (ionBlur)="updateCowshed()"></ion-input>
<ion-label>℃</ion-label>
</ion-item>
</ion-col>
......@@ -114,14 +114,14 @@
<ion-col size="auto" style="font-size: 13px;">
<ion-item class="fanItem" lines="none">
<ion-label style="width:80px">A区喷水时间</ion-label>
<ion-input [(ngModel)]="cfg.A" (ionFocus)="fanTempHaveFouch()" style="width:50px;"></ion-input>
<ion-input style="width:50px;" [(ngModel)]="cfg.A" (ionFocus)="fanTempHaveFouch()" (ionBlur)="updateCowshed()"></ion-input>
<ion-label>秒</ion-label>
</ion-item>
</ion-col>
<ion-col size="auto" style="font-size: 13px;">
<ion-item class="fanItem" lines="none">
<ion-label style="width:80px">B区喷水时间</ion-label>
<ion-input [(ngModel)]="cfg.B" (ionFocus)="fanTempHaveFouch()" style="width:50px;"></ion-input>
<ion-input style="width:50px;" [(ngModel)]="cfg.B" (ionFocus)="fanTempHaveFouch()" (ionBlur)="updateCowshed()"></ion-input>
<ion-label>秒</ion-label>
</ion-item>
</ion-col>
......@@ -132,6 +132,9 @@
<ion-button color='danger' expand="full" style="width:15%;height:90%" >删除</ion-button>
</ion-item-options>
</ion-item-sliding>
<ion-item width="100%" lines="none">
<ion-button color="secondary" class="addBtn" round (click)="addModel()">添加模式</ion-button>
</ion-item>
</div>
<div *ngIf="zhaoMing">
......@@ -149,7 +152,7 @@
<ion-col size="auto" style="font-size: 13px;">
<ion-item style="font-size: 13px;--padding-start: 0px" lines="none">
<ion-label style="width:80px">模式名</ion-label>
<ion-input [(ngModel)]="cfg.name" (ionFocus)="fanTempHaveFouch()" style="width:50px;"></ion-input>
<ion-input style="width:50px;" [(ngModel)]="cfg.name" (ionFocus)="fanTempHaveFouch()" (ionBlur)="updateCowshed()"></ion-input>
</ion-item>
</ion-col>
</ion-row>
......@@ -158,14 +161,14 @@
<ion-item class="timepickerItem" lines="none">
<ion-label style="width:80px">日期范围</ion-label>
<!--<ion-input placeholder={{cfg.startTime}} (ionFocus)="fanTempHaveFouch()" style="width:50px;"></ion-input>-->
<ion-datetime [(ngModel)]="cfg.startDate" displayFormat="MM-DD" class="timepicker"></ion-datetime>
<ion-datetime [(ngModel)]="cfg.startDate" displayFormat="MM-DD" class="timepicker" (blur)="updateCowshed()"></ion-datetime>
</ion-item>
</ion-col>
<ion-col size="auto" style="font-size: 13px;">
<ion-item class="timepickerItem" lines="none">
<ion-label style="width:80px">~</ion-label>
<!--<ion-input placeholder={{cfg.endTime}} (ionFocus)="fanTempHaveFouch()" style="width:50px;"></ion-input>-->
<ion-datetime [(ngModel)]="cfg.stopDate" displayFormat="MM-DD" class="timepicker"></ion-datetime>
<ion-datetime [(ngModel)]="cfg.stopDate" displayFormat="MM-DD" class="timepicker" (blur)="updateCowshed()"></ion-datetime>
</ion-item>
</ion-col>
</ion-row>
......@@ -173,13 +176,13 @@
<ion-col size="auto" style="font-size: 13px;">
<ion-item style="font-size: 13px;--padding-start: 0px" lines="none">
<ion-label style="width:80px">开灯时间</ion-label>
<ion-input [(ngModel)]="cfg.on" (ionFocus)="fanTempHaveFouch()" style="width:50px;"></ion-input>
<ion-input style="width:50px;" [(ngModel)]="cfg.on" (ionFocus)="fanTempHaveFouch()" (onBlur)="updateCowshed()"></ion-input>
</ion-item>
</ion-col>
<ion-col size="auto" style="font-size: 13px;">
<ion-item style="font-size: 13px;--padding-start: 0px" lines="none">
<ion-label style="width:80px">关灯时间</ion-label>
<ion-input [(ngModel)]="cfg.off" (ionFocus)="fanTempHaveFouch()" style="width:50px;"></ion-input>
<ion-input style="width:50px;" [(ngModel)]="cfg.off" (ionFocus)="fanTempHaveFouch()" (onBlur)="updateCowshed()"></ion-input>
</ion-item>
</ion-col>
</ion-row>
......@@ -189,6 +192,9 @@
<ion-button color='danger' expand="full" style="width:15%;height:90%" >删除</ion-button>
</ion-item-options>
</ion-item-sliding>
<ion-item width="100%" lines="none">
<ion-button color="secondary" class="addBtn" round (click)="changeModel()">替换模式</ion-button>
</ion-item>
</div>
<div *ngIf="shuiCao">
......@@ -203,14 +209,14 @@
<ion-item class="timepickerItem" lines="none">
<ion-label style="width:80px">日期范围</ion-label>
<!--<ion-input placeholder={{cfg.startTime}} (ionFocus)="fanTempHaveFouch()" style="width:50px;"></ion-input>-->
<ion-datetime [(ngModel)]="shuiCao.controlConfig.startDate" displayFormat="MM-DD" class="timepicker"></ion-datetime>
<ion-datetime [(ngModel)]="shuiCao.controlConfig.startDate" displayFormat="MM-DD" class="timepicker" (change)="updateCowshed()"></ion-datetime>
</ion-item>
</ion-col>
<ion-col size="auto" style="font-size: 13px;">
<ion-item class="timepickerItem" lines="none">
<ion-label style="width:80px">~</ion-label>
<!--<ion-input placeholder={{cfg.endTime}} (ionFocus)="fanTempHaveFouch()" style="width:50px;"></ion-input>-->
<ion-datetime [(ngModel)]="shuiCao.controlConfig.stopDate" displayFormat="MM-DD" class="timepicker"></ion-datetime>
<ion-datetime [(ngModel)]="shuiCao.controlConfig.stopDate" displayFormat="MM-DD" class="timepicker" (change)="updateCowshed()"></ion-datetime>
</ion-item>
</ion-col>
</ion-row>
......@@ -258,17 +264,17 @@
<ion-row>
<ion-col>
<ion-item lines="none" class="cow"><ion-label>风机</ion-label>
<ion-checkbox color="primary" class="cowCheckBox" slot="start"></ion-checkbox>
<ion-checkbox color="primary" class="cowCheckBox" slot="start" (click)="updateCowshed()"></ion-checkbox>
</ion-item>
</ion-col>
<ion-col>
<ion-item lines="none" class="cow"><ion-label>喷淋</ion-label>
<ion-checkbox color="primary" class="cowCheckBox" slot="start"></ion-checkbox>
<ion-checkbox color="primary" class="cowCheckBox" slot="start" (click)="updateCowshed()"></ion-checkbox>
</ion-item>
</ion-col>
<ion-col>
<ion-item lines="none" class="cow"><ion-label>照明</ion-label>
<ion-checkbox color="primary" class="cowCheckBox" slot="start"></ion-checkbox>
<ion-checkbox color="primary" class="cowCheckBox" slot="start" (click)="updateCowshed()"></ion-checkbox>
</ion-item>
</ion-col>
</ion-row>
......@@ -278,17 +284,17 @@
<ion-row>
<ion-col>
<ion-item lines="none" class="cow"><ion-label>风机</ion-label>
<ion-checkbox color="primary" class="cowCheckBox" slot="start"></ion-checkbox>
<ion-checkbox color="primary" class="cowCheckBox" slot="start" (click)="updateCowshed()"></ion-checkbox>
</ion-item>
</ion-col>
<ion-col>
<ion-item lines="none" class="cow"><ion-label>喷淋</ion-label>
<ion-checkbox color="primary" class="cowCheckBox" slot="start"></ion-checkbox>
<ion-checkbox color="primary" class="cowCheckBox" slot="start" (click)="updateCowshed()"></ion-checkbox>
</ion-item>
</ion-col>
<ion-col>
<ion-item lines="none" class="cow"><ion-label>照明</ion-label>
<ion-checkbox color="primary" class="cowCheckBox" slot="start"></ion-checkbox>
<ion-checkbox color="primary" class="cowCheckBox" slot="start" (click)="updateCowshed()"></ion-checkbox>
</ion-item>
</ion-col>
</ion-row>
......@@ -301,14 +307,14 @@
<ion-item class="fanItem">
<ion-grid>
<div>
<ngx-datatable class='material' [rows]="environmentConfig" [columnMode]="'force'" [scrollbarH]="true" style="white-space: nowrap; text-align: center">
<ngx-datatable-column name="" prop="tittle" width="10">
<ngx-datatable class='material' [rows]="environmentConfig" [columnMode]="'force'" style="white-space: nowrap; text-align: center">
<ngx-datatable-column name="" prop="tittle" width="50px;">
</ngx-datatable-column>
<ngx-datatable-column name="上限" prop="top" width="10">
<ngx-datatable-column name="上限" prop="top" width="20px;">
</ngx-datatable-column>
<ngx-datatable-column name="下限" prop="lower" width="10">
<ngx-datatable-column name="下限" prop="lower" width="20px;">
</ngx-datatable-column>
<ngx-datatable-column name="" prop="symbol" width="10">
<ngx-datatable-column name="" prop="symbol" width="5px;" style="margin-left: 0px">
</ngx-datatable-column>
</ngx-datatable>
</div>
......
src/app/envCtrl/env-cfg/env-cfg.page.scss
View file @ cd6645c6
......@@ -41,3 +41,7 @@
text-align: center;
padding-left: 0px
}
.addBtn {
width: 100%;
}
src/app/envCtrl/env-cfg/env-cfg.page.ts
View file @ cd6645c6
......@@ -11,13 +11,6 @@ import {NgxDatatableModule} from '@swimlane/ngx-datatable';
})
export class EnvCfgPage implements OnInit {
// 工作模式
workModeSetting = {
'workMode': '1',
'DeviceNo': '',
'workModeOld': '1'
};
defaultColumnOptions = [];
fanMode = {
......@@ -54,6 +47,7 @@ export class EnvCfgPage implements OnInit {
shuiCao: any = {};
// 环境参数预警配置
environmentConfig = [];
private $ionicPopup: any;
async openPicker(numColumns = 1, numOptions = 5, columnOptions = this.defaultColumnOptions) {
const picker = await this.pickerController.create({
......@@ -208,26 +202,8 @@ export class EnvCfgPage implements OnInit {
}
workModeEvent(item) {
// if ( this.workModeSetting.workModeOld === this.workModeSetting.workMode ) {
// return;
// }
//
// const opt = {fieldDeviceNo : this.workModeSetting.DeviceNo ,
// op : this.workModeSetting.workMode ,
// startTime: parseInt((new Date().getTime() / 1000).toString(), 10),
// ts: parseInt((new Date().getTime() / 1000).toString(), 10)
// };
//
// opt.startTime = opt.ts;
//
// this.api.control.controlSwitch([opt, (data) => {
// if (data && data.code === 1) {
// this.getData(1);
// this.api.presentMsgToast(data.message);
// } else {
// this.api.presentMsgToast(data.message);
// }
// }]);
console.log('更新牛舍配置信息');
this.updateCowshed();
}
async openCalendarPicker(numColumns = 1, numOptions = 5, columnOptions = this.defaultColumnOptions) {
......@@ -379,4 +355,62 @@ export class EnvCfgPage implements OnInit {
this.environmentConfig.push(temperatureCfg, humidityCfg);
}
}
// 修改牛舍配置
updateCowshed() {
this.api.config.updateCowshedConfig([this.curCowshed, (data) => {
if (data) {
console.log('更新成功');
} else {
this.api.presentMsgToast('获取数据失败');
this.isError = true;
}
this.load.offLoad();
}]);
}
addModel() {
this.popupModelSelect(1, '照明');
// this.popup($scope, $ionicPopup, $timeout);
}
changeModel() {
this.popupModelSelect(0, '喷淋');
}
// 模式组选择 1：添加 0：替换
popupModelSelect(option, model) {
// const popup = this.$ionicPopup.show({
// templateUrl: 'www/templates/popUp/authenticationPop.html',
// title: model + '常用模式选择',
// scope: $scope,
// buttons: [
// { text: '取消',type:'button-small' },
// { text: '确定',
// type: 'button-small',
// onTap: function() {
// console.log("认证值______________",$scope.choice);
// var prompt=$ionicPopup.show({
// template:'<i class="icon ion-ios-checkmark"></i>',
// title:'提示',
// subTitle:'申请认证已提交，正等待审核',
// scope:$scope,
// });
// prompt.then(function(){
//
// });
// $timeout(function(){
// prompt.close();
// },3000);
// }
// },
// ]
// });
// popup.then(function(res) {
// console.log('Tapped!', res);
// });
}
}
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