Commit b6d31174 authored by aymen.du's avatar aymen.du

去掉time临时时间戳

parent e214a495
This diff is collapsed.
...@@ -36,11 +36,11 @@ export class EnvDetailPage implements OnInit { ...@@ -36,11 +36,11 @@ export class EnvDetailPage implements OnInit {
}; };
ngOnInit() { ngOnInit() {
console.log('+ogOnInit'); // console.log('+ogOnInit');
this.comm.isLoading = false; this.comm.isLoading = false;
this.comm.remain = 0; this.comm.remain = 0;
this.ac.queryParams.subscribe((data) => { this.ac.queryParams.subscribe((data) => {
console.log(data); // console.log(data);
if(data.no) if(data.no)
{ {
this.fieldRegionNo = data.no; this.fieldRegionNo = data.no;
...@@ -48,7 +48,7 @@ export class EnvDetailPage implements OnInit { ...@@ -48,7 +48,7 @@ export class EnvDetailPage implements OnInit {
this.fieldRegionGroup = data.group; this.fieldRegionGroup = data.group;
} }
}); });
console.log('-ogOnInit'); // console.log('-ogOnInit');
} }
} }
...@@ -12,14 +12,12 @@ ...@@ -12,14 +12,12 @@
<ion-button slot="start" size ="small" color="light" (click)="goTo()">Home</ion-button> <ion-button slot="start" size ="small" color="light" (click)="goTo()">Home</ion-button>
<ion-searchbar></ion-searchbar> <ion-searchbar></ion-searchbar>
</ion-toolbar> </ion-toolbar>
<ion-slides mode="ios" style="width: 100%;height: 125px;" <!--<ion-slides mode="ios"-->
[options]="lunbo" (ionSlideTouchEnd)="slideDidChange()"> <!--[options]="lunbo" (ionSlideTouchEnd)="slideDidChange()">-->
<ion-slide class="slideCon" *ngFor="let one of imgs"> <!--<ion-slide class="slideCon" *ngFor="let one of imgs">-->
<div> <!--<img [src]="'../../../assets/lunbo/' + one">-->
<img [src]="'../../../assets/lunbo/' + one"> <!--</ion-slide>-->
</div> <!--</ion-slides>-->
</ion-slide>
</ion-slides>
</ion-header> </ion-header>
<ion-content color='light'> <ion-content color='light'>
...@@ -60,7 +58,7 @@ ...@@ -60,7 +58,7 @@
<!--<div class="block1" *ngIf="item.yewei || item.yewei === 0">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div>--> <!--<div class="block1" *ngIf="item.yewei || item.yewei === 0">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div>-->
<!--<div class="block2" *ngIf="item.temp || item.temp === 0">液体温度: &nbsp;&nbsp;{{item.temp}} ℃</div>--> <!--<div class="block2" *ngIf="item.temp || item.temp === 0">液体温度: &nbsp;&nbsp;{{item.temp}} ℃</div>-->
<!--<div class="block2">运行状态: &nbsp;&nbsp;{{item.state ? '工作中' : '未运行'}} </div>--> <!--<div class="block2">运行状态: &nbsp;&nbsp;{{item.state ? '工作中' : '未运行'}} </div>-->
<span class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</span> <!--<span class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</span>-->
</div> </div>
</div> </div>
</ion-item> </ion-item>
......
...@@ -78,7 +78,7 @@ export class EnvHomePage implements OnInit { ...@@ -78,7 +78,7 @@ export class EnvHomePage implements OnInit {
temp : '23.5', temp : '23.5',
humi : '82', humi : '82',
thi: '轻', thi: '轻',
time : '2019-08-05 23:44', time : '1566378129',
online : true, online : true,
remoteMode: true, //true 平控 false 现控 remoteMode: true, //true 平控 false 现控
wokeMode: 1, //0 手控 1 自控 2 智控 wokeMode: 1, //0 手控 1 自控 2 智控
...@@ -90,7 +90,7 @@ export class EnvHomePage implements OnInit { ...@@ -90,7 +90,7 @@ export class EnvHomePage implements OnInit {
temp : '23.5', temp : '23.5',
humi : '82', humi : '82',
thi: '轻', thi: '轻',
time : '2019-08-05 23:44', time : '1566378129',
online : true, online : true,
remoteMode: true, //true 平控 false 现控 remoteMode: true, //true 平控 false 现控
wokeMode: 1, //0 手控 1 自控 2 智控 wokeMode: 1, //0 手控 1 自控 2 智控
...@@ -102,7 +102,7 @@ export class EnvHomePage implements OnInit { ...@@ -102,7 +102,7 @@ export class EnvHomePage implements OnInit {
temp : '23.5', temp : '23.5',
humi : '82', humi : '82',
thi: '轻', thi: '轻',
time : '2019-08-05 23:44', time : '2019-08-05 23:44:21',
online : true, online : true,
remoteMode: true, //true 平控 false 现控 remoteMode: true, //true 平控 false 现控
wokeMode: 1, //0 手控 1 自控 2 智控 wokeMode: 1, //0 手控 1 自控 2 智控
...@@ -114,7 +114,7 @@ export class EnvHomePage implements OnInit { ...@@ -114,7 +114,7 @@ export class EnvHomePage implements OnInit {
temp : '23.5', temp : '23.5',
humi : '82', humi : '82',
thi: '轻', thi: '轻',
time : '2019-08-05 23:44', time : '1566378129',
online : true, online : true,
remoteMode: true, //true 平控 false 现控 remoteMode: true, //true 平控 false 现控
wokeMode: 1, //0 手控 1 自控 2 智控 wokeMode: 1, //0 手控 1 自控 2 智控
...@@ -178,13 +178,14 @@ export class EnvHomePage implements OnInit { ...@@ -178,13 +178,14 @@ export class EnvHomePage implements OnInit {
// } // }
toControl(one) { toControl(one) {
const query = '/env-detail?name=' + one.name + '&no=' + one.no + '&group=' + one.group; // const query = '/env-detail?name=' + one.name + '&no=' + one.no + '&group=' + one.group;
// this.tf.transfer({ // this.tf.transfer({
// url: '/' + one.url, // url: '/' + one.url,
// query: query, // query: query,
// hash: '' // hash: ''
// }); // });
console.log(query); // console.log(query);
const query = '/env-detail?name=1213';
this.nav.navigateForward(query); this.nav.navigateForward(query);
//this.nav.navigateRoot(one.url + query); //this.nav.navigateRoot(one.url + query);
} }
...@@ -204,10 +205,10 @@ export class EnvHomePage implements OnInit { ...@@ -204,10 +205,10 @@ export class EnvHomePage implements OnInit {
} }
goTo(){ goTo(){
console.log('+goTo'); // console.log('+goTo');
const query = '/index'; const query = '/index';
this.nav.navigateRoot(query); this.nav.navigateRoot(query);
console.log('-goTo'); // console.log('-goTo');
} }
} }
...@@ -16,7 +16,7 @@ export class TabsPage implements OnInit { ...@@ -16,7 +16,7 @@ export class TabsPage implements OnInit {
ngOnInit() { ngOnInit() {
this.router.events.subscribe(e => { this.router.events.subscribe(e => {
if (e instanceof ActivationStart && e.snapshot.outlet === "administration") if (e instanceof ActivationStart && e.snapshot.outlet === 'tabs')
console.log('DDEDEDEEEEEEEEEDDDDDDDDDDDDDDDDD'); console.log('DDEDEDEEEEEEEEEDDDDDDDDDDDDDDDDD');
this.outlet.deactivate(); this.outlet.deactivate();
}); });
......
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