Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
muChangApp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
WitCloud
muChangApp
Commits
b6d31174
Commit
b6d31174
authored
Aug 21, 2019
by
aymen.du
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去掉time临时时间戳
parent
e214a495
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
67 additions
and
68 deletions
+67
-68
package-lock.json
package-lock.json
+47
-47
env-detail.page.ts
src/app/envCtrl/env-detail/env-detail.page.ts
+3
-3
env-home.page.html
src/app/envCtrl/env-home/env-home.page.html
+7
-9
env-home.page.ts
src/app/envCtrl/env-home/env-home.page.ts
+9
-8
tabs.page.ts
src/app/envCtrl/tabs/tabs.page.ts
+1
-1
No files found.
package-lock.json
View file @
b6d31174
This diff is collapsed.
Click to expand it.
src/app/envCtrl/env-detail/env-detail.page.ts
View file @
b6d31174
...
...
@@ -36,11 +36,11 @@ export class EnvDetailPage implements OnInit {
};
ngOnInit
()
{
console
.
log
(
'+ogOnInit'
);
//
console.log('+ogOnInit');
this
.
comm
.
isLoading
=
false
;
this
.
comm
.
remain
=
0
;
this
.
ac
.
queryParams
.
subscribe
((
data
)
=>
{
console
.
log
(
data
);
//
console.log(data);
if
(
data
.
no
)
{
this
.
fieldRegionNo
=
data
.
no
;
...
...
@@ -48,7 +48,7 @@ export class EnvDetailPage implements OnInit {
this
.
fieldRegionGroup
=
data
.
group
;
}
});
console
.
log
(
'-ogOnInit'
);
//
console.log('-ogOnInit');
}
}
src/app/envCtrl/env-home/env-home.page.html
View file @
b6d31174
...
...
@@ -12,14 +12,12 @@
<ion-button
slot=
"start"
size =
"small"
color=
"light"
(
click
)="
goTo
()"
>
Home
</ion-button>
<ion-searchbar></ion-searchbar>
</ion-toolbar>
<ion-slides
mode=
"ios"
style=
"width: 100%;height: 125px;"
[
options
]="
lunbo
"
(
ionSlideTouchEnd
)="
slideDidChange
()"
>
<ion-slide
class=
"slideCon"
*
ngFor=
"let one of imgs"
>
<div>
<img
[
src
]="'../../../
assets
/
lunbo
/'
+
one
"
>
</div>
</ion-slide>
</ion-slides>
<!--<ion-slides mode="ios"-->
<!--[options]="lunbo" (ionSlideTouchEnd)="slideDidChange()">-->
<!--<ion-slide class="slideCon" *ngFor="let one of imgs">-->
<!--<img [src]="'../../../assets/lunbo/' + one">-->
<!--</ion-slide>-->
<!--</ion-slides>-->
</ion-header>
<ion-content
color=
'light'
>
...
...
@@ -60,7 +58,7 @@
<!--<div class="block1" *ngIf="item.yewei || item.yewei === 0">池体液位: {{item.yewei}} m</div>-->
<!--<div class="block2" *ngIf="item.temp || item.temp === 0">液体温度: {{item.temp}} ℃</div>-->
<!--<div class="block2">运行状态: {{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>
</ion-item>
...
...
src/app/envCtrl/env-home/env-home.page.ts
View file @
b6d31174
...
...
@@ -78,7 +78,7 @@ export class EnvHomePage implements OnInit {
temp
:
'23.5'
,
humi
:
'82'
,
thi
:
'轻'
,
time
:
'
2019-08-05 23:44
'
,
time
:
'
1566378129
'
,
online
:
true
,
remoteMode
:
true
,
//true 平控 false 现控
wokeMode
:
1
,
//0 手控 1 自控 2 智控
...
...
@@ -90,7 +90,7 @@ export class EnvHomePage implements OnInit {
temp
:
'23.5'
,
humi
:
'82'
,
thi
:
'轻'
,
time
:
'
2019-08-05 23:44
'
,
time
:
'
1566378129
'
,
online
:
true
,
remoteMode
:
true
,
//true 平控 false 现控
wokeMode
:
1
,
//0 手控 1 自控 2 智控
...
...
@@ -102,7 +102,7 @@ export class EnvHomePage implements OnInit {
temp
:
'23.5'
,
humi
:
'82'
,
thi
:
'轻'
,
time
:
'2019-08-05 23:44'
,
time
:
'2019-08-05 23:44
:21
'
,
online
:
true
,
remoteMode
:
true
,
//true 平控 false 现控
wokeMode
:
1
,
//0 手控 1 自控 2 智控
...
...
@@ -114,7 +114,7 @@ export class EnvHomePage implements OnInit {
temp
:
'23.5'
,
humi
:
'82'
,
thi
:
'轻'
,
time
:
'
2019-08-05 23:44
'
,
time
:
'
1566378129
'
,
online
:
true
,
remoteMode
:
true
,
//true 平控 false 现控
wokeMode
:
1
,
//0 手控 1 自控 2 智控
...
...
@@ -178,13 +178,14 @@ export class EnvHomePage implements OnInit {
// }
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({
// url: '/' + one.url,
// query: query,
// hash: ''
// });
console
.
log
(
query
);
// console.log(query);
const
query
=
'/env-detail?name=1213'
;
this
.
nav
.
navigateForward
(
query
);
//this.nav.navigateRoot(one.url + query);
}
...
...
@@ -204,10 +205,10 @@ export class EnvHomePage implements OnInit {
}
goTo
(){
console
.
log
(
'+goTo'
);
//
console.log('+goTo');
const
query
=
'/index'
;
this
.
nav
.
navigateRoot
(
query
);
console
.
log
(
'-goTo'
);
//
console.log('-goTo');
}
}
src/app/envCtrl/tabs/tabs.page.ts
View file @
b6d31174
...
...
@@ -16,7 +16,7 @@ export class TabsPage implements OnInit {
ngOnInit
()
{
this
.
router
.
events
.
subscribe
(
e
=>
{
if
(
e
instanceof
ActivationStart
&&
e
.
snapshot
.
outlet
===
"administration"
)
if
(
e
instanceof
ActivationStart
&&
e
.
snapshot
.
outlet
===
'tabs'
)
console
.
log
(
'DDEDEDEEEEEEEEEDDDDDDDDDDDDDDDDD'
);
this
.
outlet
.
deactivate
();
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment