Commit 98b96e79 authored by yating.lin's avatar yating.lin

对应BUG

parent aed2f0f4
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="com.witium.muchang.test" version="2.9.6.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="com.witium.muchang.test" version="2.9.6.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>牧场云</name> <name>牧场云</name>
<description>test</description> <description>test</description>
<author email="frank.feng@witium.com" href="http://muchang.witium.com/">Van.chen - frank.feng</author> <author email="frank.feng@witium.com" href="http://muchang.witium.com/">Van.chen - frank.feng</author>
......
...@@ -43,13 +43,13 @@ ...@@ -43,13 +43,13 @@
<ion-item lines="full" class="ionItem" color="gray" style="height: 45px; --inner-padding-end: 0px;"> <ion-item lines="full" class="ionItem" color="gray" style="height: 45px; --inner-padding-end: 0px;">
<div style="width: 26%"> <div style="width: 26%">
<ion-datetime class="content-text-color" style="position: relative;" displayFormat="YYYY/MM" cancelText="取消" doneText="确认" [(ngModel)]="startTime" (click)="refresh()" id="selectStartTime"></ion-datetime> <ion-datetime class="content-text-color" style="position: relative;" displayFormat="YYYY/MM" cancelText="取消" doneText="确认" [(ngModel)]="startTime" (ionChange)="refresh()" id="selectStartTime"></ion-datetime>
</div> </div>
<div style="width: 4%"> <div style="width: 4%">
<span class="font-content">~</span> <span class="font-content">~</span>
</div> </div>
<div style="width: 28%"> <div style="width: 28%">
<ion-datetime class="content-text-color" style="position: relative;" displayFormat="YYYY/MM" cancelText="取消" doneText="确认" [(ngModel)]="stopTime" style="margin-left: 3px;" (click)="refresh()" id="selectStopTime"></ion-datetime> <ion-datetime class="content-text-color" style="position: relative;" displayFormat="YYYY/MM" cancelText="取消" doneText="确认" [(ngModel)]="stopTime" style="margin-left: 3px;" (ionChange)="refresh()" id="selectStopTime"></ion-datetime>
</div> </div>
<div style="width: 40%; padding-right: 15px;"> <div style="width: 40%; padding-right: 15px;">
<div class="note" style="margin-bottom: 5px;"> <div class="note" style="margin-bottom: 5px;">
......
...@@ -171,6 +171,8 @@ export class EnvAlarmDetailPage implements OnInit { ...@@ -171,6 +171,8 @@ export class EnvAlarmDetailPage implements OnInit {
item.data = JSON.parse(item.data); item.data = JSON.parse(item.data);
item.troubleTime = this.api.formatTime('yyyy-MM-dd hh:mm:ss', new Date(item.troubleTime)); item.troubleTime = this.api.formatTime('yyyy-MM-dd hh:mm:ss', new Date(item.troubleTime));
}); });
} else if (data.code === 0) {
this.api.presentMsgToast(data.message);
} }
// if (isInit) { // if (isInit) {
// this.detailInfo = data; // this.detailInfo = data;
...@@ -204,6 +206,8 @@ export class EnvAlarmDetailPage implements OnInit { ...@@ -204,6 +206,8 @@ export class EnvAlarmDetailPage implements OnInit {
item.data = JSON.parse(item.data); item.data = JSON.parse(item.data);
item.troubleTime = this.api.formatTime('yyyy-MM-dd hh:mm:ss', new Date(item.alarmTime)); item.troubleTime = this.api.formatTime('yyyy-MM-dd hh:mm:ss', new Date(item.alarmTime));
}); });
} else if (data.code === 0) {
this.api.presentMsgToast(data.message);
} }
// if (isInit) { // if (isInit) {
// this.detailInfo = data; // this.detailInfo = data;
...@@ -375,7 +379,7 @@ export class EnvAlarmDetailPage implements OnInit { ...@@ -375,7 +379,7 @@ export class EnvAlarmDetailPage implements OnInit {
cssClass: 'main-color', cssClass: 'main-color',
mode: 'ios', mode: 'ios',
message: '', message: '',
duration: 1500 duration: 1000
}); });
await loading.present(); await loading.present();
......
...@@ -73,9 +73,9 @@ export class EnvFanPage implements OnInit { ...@@ -73,9 +73,9 @@ export class EnvFanPage implements OnInit {
this.init(); this.init();
} }
// ionViewWillEnter() { ionViewWillEnter() {
// this.init();
// } }
ionViewWillLeave() { ionViewWillLeave() {
clearInterval(this.commTmr); clearInterval(this.commTmr);
......
...@@ -80,10 +80,10 @@ export class EnvLightPage implements OnInit { ...@@ -80,10 +80,10 @@ export class EnvLightPage implements OnInit {
this.init(); this.init();
} }
// ionViewWillEnter() { ionViewWillEnter() {
// console.log('ionViewWillEnter_shower'); console.log('ionViewWillEnter_light');
// this.init(); this.init();
// } }
init() { init() {
this.route.paramMap.subscribe(params => { this.route.paramMap.subscribe(params => {
......
...@@ -98,10 +98,11 @@ export class EnvShowerPage implements OnInit { ...@@ -98,10 +98,11 @@ export class EnvShowerPage implements OnInit {
this.init(); this.init();
} }
// ionViewWillEnter() { ionViewWillEnter() {
// console.log('ionViewWillEnter_shower'); console.log('ionViewWillEnter_shower');
// this.init(); this.init();
// } }
ionViewWillLeave() { ionViewWillLeave() {
clearInterval(this.commTmr); clearInterval(this.commTmr);
} }
......
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