Skip to content

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

微调

parent 4aa16b6f
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 47 deletions
src/app/app.module.ts
View file @ 6e8680c6
......@@ -68,7 +68,6 @@ import {DatePipe} from '@angular/common';
AlarmBarComponent,
SearchHistoryComponent,
RefreshComponent,
LoadingBumpComponent,
HomePage,
EastPage,
LoginPage,
......
src/app/components/wt/wt.module.ts
View file @ 6e8680c6
......@@ -3,10 +3,13 @@ import { CommonModule } from '@angular/common';
import {KanbanComponent} from '../kanban/kanban.component';
import {IonicModule} from '@ionic/angular';
import {SwitchComponent} from '../switch/switch.component';
import {LoadingBumpComponent} from '../loading-bump/loading-bump.component';
@NgModule({
declarations: [KanbanComponent,
SwitchComponent],
declarations: [
KanbanComponent,
SwitchComponent,
LoadingBumpComponent],
imports: [
CommonModule,
IonicModule,
......@@ -14,6 +17,7 @@ import {SwitchComponent} from '../switch/switch.component';
exports: [
KanbanComponent,
SwitchComponent,
LoadingBumpComponent
]
})
export class WtModule { }
src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.html
View file @ 6e8680c6
......@@ -20,11 +20,13 @@
</ion-segment>
<ion-item lines="full" class="ionItem" color="gray">
<ion-select interface="popover" placeholder="状态" [(ngModel)]="disposeState" (ionChange)="reflush()">
<ion-select interface="popover" placeholder="状态" [(ngModel)]="disposeState" (ionChange)="refresh()">
<ion-select-option value="全部" class="popLabel">全部</ion-select-option>
<ion-select-option value="0" class="popLabel">待修复</ion-select-option>
<ion-select-option value="1" class="popLabel">已修复</ion-select-option>
</ion-select>
<ion-select interface="popover" placeholder="类型" [(ngModel)]="fieldDeviceType" (ionChange)="reflush()">
<ion-select interface="popover" placeholder="类型" [(ngModel)]="fieldDeviceType" (ionChange)="refresh()">
<ion-select-option value="全部" class="popLabel">全部</ion-select-option>
<ion-select-option value="环境" class="popLabel">环境</ion-select-option>
<ion-select-option value="风机" class="popLabel">风机</ion-select-option>
<ion-select-option value="喷淋" class="popLabel">喷淋</ion-select-option>
......@@ -35,13 +37,13 @@
<ion-item lines="full" class="ionItem" style="height: 45px;">
<div style="width: 28%">
<ion-datetime style="position: relative;" displayFormat="YYYY/MM" cancelText="取消" doneText="确认" [(ngModel)]="startTime" (ionChange)="reflush()"></ion-datetime>
<ion-datetime style="position: relative;" displayFormat="YYYY/MM" cancelText="取消" doneText="确认" [(ngModel)]="startTime" (ionChange)="refresh()"></ion-datetime>
</div>
<div style="width: 2%">
<span>~</span>
</div>
<div style="width: 30%">
<ion-datetime style="position: relative;" 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)="refresh()"></ion-datetime>
</div>
<div style="width: 40%">
<div class="note" style="margin-bottom: 5px;">
......@@ -69,12 +71,12 @@
<h3 style="margin-bottom: 5px;">{{item.description}}</h3>
<div>
<div style="width:65%; float: left">
<div *ngIf="item.data !== null && item.data.temp" class="warnContent">温度: {{item.data.temp}} ℃</div>
<div *ngIf="item.data !== null && item.data.humi" class="warnContent">湿度: {{item.data.humi}} %</div>
<div *ngIf="item.data !== null && item.data.heatStressLevel" class="warnContent">热应激等级: {{item.data.heatStressLevel}}</div>
<div *ngIf="item.data !== null && item.data.liquidPump" class="warnContent">供液泵压力: {{item.data.liquidPump}} MPa</div>
<div *ngIf="item.data !== null && item.data.press" class="warnContent">电磁阀压力: {{item.data.press}} MPa</div>
<div *ngIf="item.data !== null && item.data.NH3" class="warnContent">氨气: {{item.data.NH3}} ppm</div>
<div *ngIf="item.data !== null && item.data.temp !== undefined && item.data.temp !== null && item.data.temp !== ''" class="warnContent">温度: {{item.data.temp}} ℃</div>
<div *ngIf="item.data !== null && item.data.humi !== undefined && item.data.humi !== null && item.data.humi !== ''" class="warnContent">湿度: {{item.data.humi}} %</div>
<div *ngIf="item.data !== null && item.data.heatStressLevel !== undefined && item.data.heatStressLevel !== null && item.data.heatStressLevel !== ''" class="warnContent">热应激等级: {{item.data.heatStressLevel}}</div>
<div *ngIf="item.data !== null && item.data.liquidPump !== undefined && item.data.liquidPump !== null && item.data.liquidPump !== ''" class="warnContent">供液泵压力: {{item.data.liquidPump}} MPa</div>
<div *ngIf="item.data !== null && item.data.press !== undefined && item.data.press !== null && item.data.press !== ''" class="warnContent">电磁阀压力: {{item.data.press}} MPa</div>
<div *ngIf="item.data !== null && item.data.NH3 !== undefined && item.data.NH3 !== null && item.data.NH3 !== ''" class="warnContent">氨气: {{item.data.NH3}} ppm</div>
</div>
<div style="width:35%; float: left">
<div *ngIf="displayArea === 'trouble' && item.disposeState === 0" >
......
src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.ts
View file @ 6e8680c6
......@@ -86,10 +86,10 @@ export class EnvAlarmDetailPage implements OnInit {
disposeState: '',
fieldDeviceType: ''
};
if (this.disposeState) {
if (this.disposeState !== null && this.disposeState !== '' && this.disposeState !== '全部') {
req.disposeState = this.disposeState;
}
if (this.fieldDeviceType) {
if (this.fieldDeviceType !== null && this.fieldDeviceType !== '' && this.fieldDeviceType !== '全部') {
req.fieldDeviceType = this.fieldDeviceType;
}
this.api.troubleLog.getByTerm([req, (data) => {
......@@ -115,10 +115,10 @@ export class EnvAlarmDetailPage implements OnInit {
disposeState: '',
fieldDeviceType: ''
};
if (this.disposeState) {
if (this.disposeState !== null && this.disposeState !== '' && this.disposeState !== '全部') {
req.disposeState = this.disposeState;
}
if (this.fieldDeviceType) {
if (this.fieldDeviceType !== null && this.fieldDeviceType !== '' && this.fieldDeviceType !== '全部') {
req.fieldDeviceType = this.fieldDeviceType;
}
this.api.alarm.getCowshedAlarm([req, (data) => {
......@@ -147,6 +147,8 @@ export class EnvAlarmDetailPage implements OnInit {
}
segmentChanged(ev: any) {
this.disposeState = '';
this.fieldDeviceType = '';
if (ev.target.value === 'alarm') {
this.displayArea = 'alarm';
this.getAlarmList();
......@@ -195,14 +197,13 @@ export class EnvAlarmDetailPage implements OnInit {
disposeState: 1,
isReal: real === 1 ? 1 : 0
};
this.api.troubleLog.processingFailure([req, (data) => {
if (data && data.code === 1) {
this.api.presentMsgToast(data.message);
} else {
this.api.presentMsgToast('获取数据失败');
this.api.presentMsgToast(data.message);
}
this.reflush();
this.refresh();
}]);
}
......@@ -227,7 +228,7 @@ export class EnvAlarmDetailPage implements OnInit {
return updateTime;
}
reflush() {
refresh() {
this.getTroubleList();
this.getAlarmList();
}
......
src/app/envCtrl/env-cfg/env-cfg.page.html
View file @ 6e8680c6
......@@ -232,18 +232,17 @@
<ion-grid>
<ion-row style="width: 100%">
<ion-col size="auto" style="font-size: 13px;">
<ion-item class="timepickerItem" lines="none">
<ion-item class="fanItem" lines="none">
<ion-label style="width:80px">日期范围</ion-label>
<!--<ion-input placeholder={{cfg.startTime}} (ionFocus)="tempHaveTouch()" style="width:50px;"></ion-input>-->
<ion-datetime class="inputDateTime timepicker" [(ngModel)]="waterChannel.controlConfig.config.startDate"
[displayFormat]="'MM-DD'" cancelText="取消" doneText="确认"></ion-datetime>
<ion-datetime class="inputDateTime timepicker" [(ngModel)]="waterChannel.controlConfig.config.startDate" displayFormat="MM-DD" cancelText="取消" doneText="确认"></ion-datetime>
</ion-item>
</ion-col>
<ion-col size="auto" style="font-size: 13px;">
<ion-item class="timepickerItem" lines="none">
<ion-item class="fanItem" lines="none">
<ion-label style="width:60px">~</ion-label>
<!--<ion-input placeholder={{cfg.endTime}} (ionFocus)="tempHaveTouch()" style="width:50px;"></ion-input>-->
<ion-datetime class="inputDateTime timepicker" [(ngModel)]="waterChannel.controlConfig.config.stopDate" [displayFormat]="'MM-DD'" cancelText="取消" doneText="确认"></ion-datetime>
<ion-datetime class="inputDateTime timepicker" [(ngModel)]="waterChannel.controlConfig.config.stopDate" displayFormat="MM-DD" cancelText="取消" doneText="确认"></ion-datetime>
</ion-item>
</ion-col>
</ion-row>
......@@ -364,5 +363,5 @@
</ion-item>
</div>
<!--<v-loading-bump style="z-index: 9999; color: red" [remain]="comm.remain" *ngIf="comm.isLoading"></v-loading-bump>-->
<v-loading-bump style="z-index: 9999; color: red" [remain]="comm.remain" *ngIf="comm.isLoading"></v-loading-bump>
</ion-content>
src/app/envCtrl/env-cfg/env-cfg.page.ts
View file @ 6e8680c6
......@@ -7,6 +7,7 @@ import {Transfer} from '../../service/transfer';
import {ActivatedRoute} from '@angular/router';
import {DatePipe} from '@angular/common';
import {Constants} from '../../service/constants';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
@Component({
selector: 'v-env-cfg',
......@@ -84,6 +85,11 @@ export class EnvCfgPage implements OnInit {
private $ionicPopup: any;
// ionic的生命周期函数
ionViewWillEnter() {
this.init();
}
ngOnInit() {
// this.pickerController = document.querySelector('ion-picker-controller');
this.comm.remain = 0;
......@@ -105,6 +111,8 @@ export class EnvCfgPage implements OnInit {
ionViewWillLeave() {
clearInterval(this.commTmr);
this.curFieldRegionNo = '';
this.curCowshed.fieldRegionName = null;
}
init() {
......@@ -143,6 +151,12 @@ export class EnvCfgPage implements OnInit {
if (data.resultIndexDataListForAppVos && data.resultIndexDataListForAppVos.constructor === Array) {
this.isError = false;
this.cowshedList = data.resultIndexDataListForAppVos;
if (this.curFieldRegionNo === null || this.curFieldRegionNo === '') {
if (this.cowshedList.length > 0) {
this.curFieldRegionNo = this.cowshedList[0].fieldRegionNo;
this.selectCowshed();
}
}
} else {
this.api.presentMsgToast('获取数据失败');
this.isError = true;
......@@ -235,9 +249,9 @@ export class EnvCfgPage implements OnInit {
}
}
async openPicker(numColumns = 1, numOptions = 5, columnOptions = this.defaultColumnOptions, event) {
async openPicker(numColumns = 1, numOptions = 5, columnOptions = this.defaultColumnOptions, event, selectedId) {
const picker = await this.pickerController.create({
columns: this.getColumns(numColumns, numOptions, columnOptions),
columns: this.getColumns(numColumns, numOptions, columnOptions, selectedId),
buttons: [
{
text: '取消',
......@@ -259,11 +273,12 @@ export class EnvCfgPage implements OnInit {
await picker.present();
}
getColumns(numColumns, numOptions, columnOptions) {
getColumns(numColumns, numOptions, columnOptions, selectedId) {
const columns = [];
for (let i = 0; i < numColumns; i++) {
columns.push({
name: `col${i}`,
selectedIndex: selectedId,
options: this.getColumnOptions(i, numOptions, columnOptions)
});
}
......@@ -282,23 +297,25 @@ export class EnvCfgPage implements OnInit {
}
tempHaveTouch(event) {
const selectedId = event.target.value - 10; // 温度: 10~
for (let i = 10; i <= 50; i++) {
this.defaultColumnOptions[0][i - 10] = i.toString();
}
if (this.fanMode.selecting === false) {
this.fanMode.selecting = true;
this.openPicker(1, 41, this.defaultColumnOptions, event);
this.openPicker(1, 41, this.defaultColumnOptions, event, selectedId);
}
}
humHaveTouch(event) {
const selectedId = event.target.value; // 湿度: 0~
for (let i = 0; i <= 100; i++) {
this.defaultColumnOptions[0][i] = i.toString();
}
if (this.fanMode.selecting === false) {
this.fanMode.selecting = true;
this.openPicker(1, 101, this.defaultColumnOptions, event);
this.openPicker(1, 101, this.defaultColumnOptions, event, selectedId);
}
}
......@@ -368,7 +385,7 @@ export class EnvCfgPage implements OnInit {
if (this.validate()) {
this.updateModels();
// this.load.toLoad('加载中...', false);
this.comm.remain = 120;
this.comm.remain = 150;
this.curCowshed.isWisdomModel = this.curCowshed.isWisdomModelChecked ? 1 : 0;
this.api.config.updateConfig([this.curCowshed, (data) => {
if (data && data.code !== 0) {
......@@ -385,8 +402,8 @@ export class EnvCfgPage implements OnInit {
updateDateFormat() {
this.light.controlConfig.forEach( allCfg => {
allCfg.startDate = this.formatDate(allCfg.config.startDate);
allCfg.stopDate = this.formatDate(allCfg.config.stopDate);
allCfg.config.startDate = this.formatDate(allCfg.config.startDate);
allCfg.config.stopDate = this.formatDate(allCfg.config.stopDate);
});
this.waterChannel.controlConfig.config.startDate = this.formatDate(this.waterChannel.controlConfig.config.startDate);
......
src/app/envCtrl/env-fan/env-fan.page.ts
View file @ 6e8680c6
......@@ -4,6 +4,7 @@ import {ActivatedRoute} from '@angular/router';
import {Load} from '../../service/load';
import { AlertController } from '@ionic/angular';
import {Constants} from '../../service/constants';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
@Component({
selector: 'v-env-fan',
......@@ -193,15 +194,16 @@ export class EnvFanPage implements OnInit {
op: btn.op ? 0 : 1,
ts: new Date().valueOf()
};
this.comm.remain = 20;
this.comm.remain = 60;
this.api.control.controlCowedSwitch([req, (data) => {
if (data && data.code === 1) {
this.getData(1);
this.comm.remain = 0;
this.api.presentMsgToast(data.message);
} else {
this.getData(0);
this.comm.remain = 0;
this.api.presentMsgToast(data.message);
}
this.getData(1);
this.comm.remain = 0;
}]);
}
......
src/app/envCtrl/env-light/env-light.page.ts
View file @ 6e8680c6
......@@ -4,6 +4,7 @@ import {ActivatedRoute} from '@angular/router';
import {Load} from '../../service/load';
import {AlertController} from '@ionic/angular';
import {Constants} from '../../service/constants';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
@Component({
selector: 'v-env-light',
......@@ -254,20 +255,17 @@ export class EnvLightPage implements OnInit {
op: btn.op ? 0 : 1,
ts: parseInt((new Date().getTime() / 1000).toString(), 10)
};
this.comm.remain = 20;
this.comm.remain = 60;
this.api.control.controlCowedSwitch([req, (data) => {
if (data && data.code === 1) {
this.getData(1);
this.comm.remain = 0;
this.api.presentMsgToast(data.message);
} else {
this.getData(0);
this.comm.remain = 0;
this.api.presentMsgToast(data.message);
}
// this.getData(1);
// this.comm.remain = 0;
// this.api.presentMsgToast(data.message);
this.getData(1);
this.comm.remain = 0;
btn.loading = false;
}]);
}
......
src/app/envCtrl/env-shower/env-shower.page.ts
View file @ 6e8680c6
......@@ -153,17 +153,16 @@ export class EnvShowerPage implements OnInit {
op: btn.op ? 0 : 1,
ts: parseInt((new Date().getTime() / 1000).toString(), 10)
};
this.comm.remain = 20;
this.comm.remain = 60;
this.api.control.controlCowedSwitch([req, (data) => {
if (data && data.code === 1) {
this.getData(1);
this.comm.remain = 0;
this.api.presentMsgToast(data.message);
} else {
this.comm.remain = 0;
this.api.presentMsgToast(data.message);
}
// this.getData(0);
this.getData(1);
// this.comm.remain = 0;
// this.api.presentMsgToast(data.message);
btn.loading = false;
......
src/global.scss
View file @ 6e8680c6
......@@ -148,3 +148,26 @@ img {
text-align: center;
padding: 5px 0px 0px 0px;
}
.font-title {
font-size: 16px;
}
.font-subTitle {
font-size: 14px;
}
.font-content {
font-size: 13px;
color: #a5a5a5;
}
.font-note {
font-size: 13px;
color: #a5a5a5;
}
.font-ts {
font-size: 12px;
color: #a5a5a5;
}
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