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
7055323f
Commit
7055323f
authored
Nov 15, 2019
by
yating.lin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口调试
parent
b1f15e75
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
5 deletions
+12
-5
env-alarm-detail.page.ts
src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.ts
+12
-5
氨气传感器.png
src/assets/img/氨气传感器.png
+0
-0
温度传感器.png
src/assets/img/温度传感器.png
+0
-0
湿度传感器.png
src/assets/img/湿度传感器.png
+0
-0
No files found.
src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.ts
View file @
7055323f
...
...
@@ -98,8 +98,7 @@ export class EnvAlarmDetailPage implements OnInit {
data
.
trouble
.
forEach
((
value
)
=>
{
value
.
troubleTime
=
this
.
api
.
formatTime
(
'yyyy-MM-dd hh:mm:ss'
,
new
Date
(
value
.
troubleTime
));
});
this
.
detailInfo
.
trouble
=
data
.
trouble
;
this
.
detailInfoLength
=
data
.
trouble
.
length
();
this
.
setTrouble
(
data
);
}
}]);
}
...
...
@@ -128,14 +127,22 @@ export class EnvAlarmDetailPage implements OnInit {
data
.
trouble
.
forEach
((
value
)
=>
{
value
.
troubleTime
=
this
.
api
.
formatTime
(
'yyyy-MM-dd hh:mm:ss'
,
new
Date
(
value
.
alarmTime
));
});
this
.
detailInfo
.
trouble
=
data
.
trouble
;
this
.
detailInfoLength
=
data
.
trouble
.
length
();
this
.
setTrouble
(
data
);
}
}]);
}
}
ionViewWillLeave
()
{
setTrouble
(
data
)
{
if
(
data
&&
data
.
trouble
&&
data
.
trouble
.
constructor
===
Array
)
{
data
.
trouble
.
forEach
(
item
=>
{
item
.
data
=
JSON
.
parse
(
item
.
data
);
});
}
this
.
detailInfo
.
trouble
=
data
.
trouble
;
this
.
detailInfoLength
=
data
.
trouble
.
length
;
}
ionViewWillLeave
()
{
// clearInterval(this.commTmr);
}
...
...
src/assets/img/氨气.png
→
src/assets/img/氨气
传感器
.png
View file @
7055323f
File moved
src/assets/img/温度.png
→
src/assets/img/温度
传感器
.png
View file @
7055323f
File moved
src/assets/img/湿度.png
→
src/assets/img/湿度
传感器
.png
View file @
7055323f
File moved
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