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
98b96e79
Commit
98b96e79
authored
Nov 29, 2019
by
yating.lin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
对应BUG
parent
aed2f0f4
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
15 deletions
+20
-15
config.xml
config.xml
+1
-1
env-alarm-detail.page.html
src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.html
+2
-2
env-alarm-detail.page.ts
src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.ts
+5
-1
env-fan.page.ts
src/app/envCtrl/env-fan/env-fan.page.ts
+3
-3
env-light.page.ts
src/app/envCtrl/env-light/env-light.page.ts
+4
-4
env-shower.page.ts
src/app/envCtrl/env-shower/env-shower.page.ts
+5
-4
No files found.
config.xml
View file @
98b96e79
<?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>
<description>
test
</description>
<author
email=
"frank.feng@witium.com"
href=
"http://muchang.witium.com/"
>
Van.chen - frank.feng
</author>
...
...
src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.html
View file @
98b96e79
...
...
@@ -43,13 +43,13 @@
<ion-item
lines=
"full"
class=
"ionItem"
color=
"gray"
style=
"height: 45px; --inner-padding-end: 0px;"
>
<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
style=
"width: 4%"
>
<span
class=
"font-content"
>
~
</span>
</div>
<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
style=
"width: 40%; padding-right: 15px;"
>
<div
class=
"note"
style=
"margin-bottom: 5px;"
>
...
...
src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.ts
View file @
98b96e79
...
...
@@ -171,6 +171,8 @@ export class EnvAlarmDetailPage implements OnInit {
item
.
data
=
JSON
.
parse
(
item
.
data
);
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) {
// this.detailInfo = data;
...
...
@@ -204,6 +206,8 @@ export class EnvAlarmDetailPage implements OnInit {
item
.
data
=
JSON
.
parse
(
item
.
data
);
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) {
// this.detailInfo = data;
...
...
@@ -375,7 +379,7 @@ export class EnvAlarmDetailPage implements OnInit {
cssClass
:
'main-color'
,
mode
:
'ios'
,
message
:
''
,
duration
:
1
5
00
duration
:
1
0
00
});
await
loading
.
present
();
...
...
src/app/envCtrl/env-fan/env-fan.page.ts
View file @
98b96e79
...
...
@@ -73,9 +73,9 @@ export class EnvFanPage implements OnInit {
this
.
init
();
}
//
ionViewWillEnter() {
//
//
}
ionViewWillEnter
()
{
this
.
init
();
}
ionViewWillLeave
()
{
clearInterval
(
this
.
commTmr
);
...
...
src/app/envCtrl/env-light/env-light.page.ts
View file @
98b96e79
...
...
@@ -80,10 +80,10 @@ export class EnvLightPage implements OnInit {
this
.
init
();
}
//
ionViewWillEnter() {
// console.log('ionViewWillEnter_shower
');
//
this.init();
//
}
ionViewWillEnter
()
{
console
.
log
(
'ionViewWillEnter_light
'
);
this
.
init
();
}
init
()
{
this
.
route
.
paramMap
.
subscribe
(
params
=>
{
...
...
src/app/envCtrl/env-shower/env-shower.page.ts
View file @
98b96e79
...
...
@@ -98,10 +98,11 @@ export class EnvShowerPage implements OnInit {
this
.
init
();
}
// ionViewWillEnter() {
// console.log('ionViewWillEnter_shower');
// this.init();
// }
ionViewWillEnter
()
{
console
.
log
(
'ionViewWillEnter_shower'
);
this
.
init
();
}
ionViewWillLeave
()
{
clearInterval
(
this
.
commTmr
);
}
...
...
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