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
6995bbe6
Commit
6995bbe6
authored
Jun 20, 2019
by
van.chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ts => 十位
parent
ab03aa09
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
22 additions
and
10 deletions
+22
-10
alarm.page.html
src/app/alarm/alarm.page.html
+7
-5
alarm.page.scss
src/app/alarm/alarm.page.scss
+10
-0
alarm.page.ts
src/app/alarm/alarm.page.ts
+1
-1
east.page.ts
src/app/east/east.page.ts
+1
-1
home.page.html
src/app/home/home.page.html
+1
-1
other.page.ts
src/app/other/other.page.ts
+1
-1
search.page.html
src/app/search/search.page.html
+1
-1
chensha.jpg
src/assets/img/chensha.jpg
+0
-0
chuliao.jpg
src/assets/img/chuliao.jpg
+0
-0
cow.png
src/assets/img/cow.png
+0
-0
e.jpg
src/assets/img/e.jpg
+0
-0
fajiao.jpg
src/assets/img/fajiao.jpg
+0
-0
fenli.jpg
src/assets/img/fenli.jpg
+0
-0
nb.png
src/assets/img/nb.png
+0
-0
none.png
src/assets/img/none.png
+0
-0
w.jpg
src/assets/img/w.jpg
+0
-0
yunjiang.jpg
src/assets/img/yunjiang.jpg
+0
-0
yunxing.png
src/assets/img/yunxing.png
+0
-0
No files found.
src/app/alarm/alarm.page.html
View file @
6995bbe6
<div
class=
"mainCon"
>
<Navbar
[
leftContent
]="
icon
"
(
onLeftClick
)="
onLeftClick
()"
style=
"background-color: #28c9bd"
>
报警信息
</Navbar>
style=
"background-color: #28c9bd;position: fixed;top: 0;width: 100%;"
>
报警信息
</Navbar>
<SegmentedControl
class=
"nav-title"
[
values
]="['今日报警信息',
'近一周报警信息']"
(
onChange
)="
choose
($
event
)"
...
...
@@ -11,9 +12,10 @@
<div
class=
"alarmCon"
>
<div
class=
"alarmItemBefore"
*
ngIf=
"itemExit;else other_content"
>
<div
class=
"alarmItem"
*
ngFor=
"let one of data"
>
<i
class=
"vo v-shebeiguanli1"
></i><span
class =
"title"
>
设备名称 :
</span><span>
{{one.name}}
</span><br>
<i
class=
"vo v-guzhang"
></i><span
class =
"title"
>
故障内容 :
</span><span>
{{one.con}}
</span><br>
<i
class=
"vo v-rili"
></i><span
class =
"title"
>
发生时间 :
</span><span>
{{one.time | date: 'yyyy-MM-dd HH:mm:ss'}}
</span><br>
<i
class=
"vo v-shebeiguanli1"
></i><span
class=
"title"
>
设备名称 :
</span><span>
{{one.name}}
</span><br>
<i
class=
"vo v-guzhang"
></i><span
class=
"title"
>
故障内容 :
</span><span>
{{one.con}}
</span><br>
<i
class=
"vo v-rili"
></i><span
class=
"title"
>
发生时间 :
</span><span>
{{one.time | date: 'yyyy-MM-dd HH:mm:ss'}}
</span><br>
</div>
</div>
</div>
...
...
src/app/alarm/alarm.page.scss
View file @
6995bbe6
...
...
@@ -24,6 +24,10 @@
padding
:
5px
0
;
border-bottom
:
1px
solid
#ccc
;
border-radius
:
0
;
position
:
fixed
;
top
:
45px
;
width
:
100%
;
background-color
:
#fff
;
}
.empty-content
{
...
...
@@ -37,3 +41,9 @@
font-size
:
32px
;
}
}
.alarmCon
{
padding-top
:
88px
;
height
:
100%
;
overflow-y
:
auto
;
}
src/app/alarm/alarm.page.ts
View file @
6995bbe6
...
...
@@ -61,7 +61,7 @@ export class AlarmPage implements OnInit {
getAlarmOneDay
()
{
this
.
req
.
endTime
=
new
Date
().
getTime
();
this
.
req
.
startTime
=
new
Date
().
getTime
()
-
24
*
3600
*
1000
;
this
.
req
.
startTime
=
Math
.
floor
(
new
Date
().
getTime
()
/
(
24
*
3600
*
1000
))
*
24
*
3600
*
1000
-
8
*
3600
*
1000
;
const
req
=
{
endTime
:
this
.
req
.
endTime
,
...
...
src/app/east/east.page.ts
View file @
6995bbe6
...
...
@@ -79,7 +79,7 @@ export class EastPage implements OnInit {
const
req
=
{
fieldDeviceNo
:
a
.
fieldDeviceNo
,
op
:
a
.
value
?
0
:
1
,
ts
:
new
Date
().
getTime
(
)
ts
:
parseInt
((
new
Date
().
getTime
()
/
1000
).
toString
(),
10
)
};
this
.
load
.
toLoad
(
'指令已发送, 等待处理结果'
,
true
);
this
.
api
.
control
.
controlSwitch
([
req
,
(
data
)
=>
{
...
...
src/app/home/home.page.html
View file @
6995bbe6
...
...
@@ -37,7 +37,7 @@
</div>
<div
class=
"content"
>
<div
class=
"left"
>
<img
[
src
]="'../../
assets
/
i
con
/'
+
item
.
img
"
>
<img
[
src
]="'../../
assets
/
i
mg
/'
+
item
.
img
"
>
</div>
<div
class=
"rightCon"
>
<div
class=
"block1"
>
池体液位:
{{item.yewei}} m
</div>
...
...
src/app/other/other.page.ts
View file @
6995bbe6
...
...
@@ -58,7 +58,7 @@ export class OtherPage implements OnInit {
const
req
=
{
fieldDeviceNo
:
a
.
fieldDeviceNo
,
op
:
a
.
value
?
0
:
1
,
ts
:
new
Date
().
getTime
(
)
ts
:
parseInt
((
new
Date
().
getTime
()
/
1000
).
toString
(),
10
)
};
this
.
load
.
toLoad
(
'指令已发送, 等待处理结果'
,
true
);
this
.
api
.
control
.
controlSwitch
([
req
,
(
data
)
=>
{
...
...
src/app/search/search.page.html
View file @
6995bbe6
...
...
@@ -8,7 +8,7 @@
</div>
<div
class=
"content"
>
<div
class=
"left"
>
<img
[
src
]="'../../
assets
/
i
con
/'
+
item
.
img
"
>
<img
[
src
]="'../../
assets
/
i
mg
/'
+
item
.
img
"
>
</div>
<div
class=
"rightCon"
>
<div
class=
"block1"
>
池体液位:
{{item.yewei}} m
</div>
...
...
src/assets/i
con
/chensha.jpg
→
src/assets/i
mg
/chensha.jpg
View file @
6995bbe6
File moved
src/assets/i
con
/chuliao.jpg
→
src/assets/i
mg
/chuliao.jpg
View file @
6995bbe6
File moved
src/assets/i
con
/cow.png
→
src/assets/i
mg
/cow.png
View file @
6995bbe6
File moved
src/assets/i
con
/e.jpg
→
src/assets/i
mg
/e.jpg
View file @
6995bbe6
File moved
src/assets/i
con
/fajiao.jpg
→
src/assets/i
mg
/fajiao.jpg
View file @
6995bbe6
File moved
src/assets/i
con
/fenli.jpg
→
src/assets/i
mg
/fenli.jpg
View file @
6995bbe6
File moved
src/assets/img/nb.png
0 → 100644
View file @
6995bbe6
3.16 KB
src/assets/img/none.png
0 → 100644
View file @
6995bbe6
3.8 KB
src/assets/i
con
/w.jpg
→
src/assets/i
mg
/w.jpg
View file @
6995bbe6
File moved
src/assets/i
con
/yunjiang.jpg
→
src/assets/i
mg
/yunjiang.jpg
View file @
6995bbe6
File moved
src/assets/img/yunxing.png
0 → 100644
View file @
6995bbe6
3.08 KB
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