Commit 6995bbe6 authored by van.chen's avatar van.chen

ts => 十位

parent ab03aa09
<div class="mainCon"> <div class="mainCon">
<Navbar [leftContent]="icon" <Navbar [leftContent]="icon"
(onLeftClick)="onLeftClick()" (onLeftClick)="onLeftClick()"
style="background-color: #28c9bd" style="background-color: #28c9bd;position: fixed;top: 0;width: 100%;"
>报警信息</Navbar> >报警信息
</Navbar>
<SegmentedControl class="nav-title" [values]="['今日报警信息', '近一周报警信息']" <SegmentedControl class="nav-title" [values]="['今日报警信息', '近一周报警信息']"
(onChange)="choose($event)" (onChange)="choose($event)"
...@@ -11,9 +12,10 @@ ...@@ -11,9 +12,10 @@
<div class="alarmCon"> <div class="alarmCon">
<div class="alarmItemBefore" *ngIf="itemExit;else other_content"> <div class="alarmItemBefore" *ngIf="itemExit;else other_content">
<div class="alarmItem" *ngFor="let one of data"> <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-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-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-rili"></i><span
class="title">发生时间 : </span><span>{{one.time | date: 'yyyy-MM-dd HH:mm:ss'}}</span><br>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -24,6 +24,10 @@ ...@@ -24,6 +24,10 @@
padding: 5px 0; padding: 5px 0;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
border-radius: 0; border-radius: 0;
position: fixed;
top: 45px;
width: 100%;
background-color: #fff;
} }
.empty-content{ .empty-content{
...@@ -37,3 +41,9 @@ ...@@ -37,3 +41,9 @@
font-size: 32px; font-size: 32px;
} }
} }
.alarmCon {
padding-top: 88px;
height: 100%;
overflow-y: auto;
}
...@@ -61,7 +61,7 @@ export class AlarmPage implements OnInit { ...@@ -61,7 +61,7 @@ export class AlarmPage implements OnInit {
getAlarmOneDay() { getAlarmOneDay() {
this.req.endTime = new Date().getTime(); 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 = { const req = {
endTime: this.req.endTime, endTime: this.req.endTime,
......
...@@ -79,7 +79,7 @@ export class EastPage implements OnInit { ...@@ -79,7 +79,7 @@ export class EastPage implements OnInit {
const req = { const req = {
fieldDeviceNo: a.fieldDeviceNo, fieldDeviceNo: a.fieldDeviceNo,
op: a.value ? 0 : 1, op: a.value ? 0 : 1,
ts: new Date().getTime() ts: parseInt((new Date().getTime() / 1000).toString(), 10)
}; };
this.load.toLoad('指令已发送, 等待处理结果', true); this.load.toLoad('指令已发送, 等待处理结果', true);
this.api.control.controlSwitch([req, (data) => { this.api.control.controlSwitch([req, (data) => {
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</div> </div>
<div class="content"> <div class="content">
<div class="left"> <div class="left">
<img [src]="'../../assets/icon/' + item.img"> <img [src]="'../../assets/img/' + item.img">
</div> </div>
<div class="rightCon"> <div class="rightCon">
<div class="block1">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div> <div class="block1">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div>
......
...@@ -58,7 +58,7 @@ export class OtherPage implements OnInit { ...@@ -58,7 +58,7 @@ export class OtherPage implements OnInit {
const req = { const req = {
fieldDeviceNo: a.fieldDeviceNo, fieldDeviceNo: a.fieldDeviceNo,
op: a.value ? 0 : 1, op: a.value ? 0 : 1,
ts: new Date().getTime() ts: parseInt((new Date().getTime() / 1000).toString(), 10)
}; };
this.load.toLoad('指令已发送, 等待处理结果', true); this.load.toLoad('指令已发送, 等待处理结果', true);
this.api.control.controlSwitch([req, (data) => { this.api.control.controlSwitch([req, (data) => {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</div> </div>
<div class="content"> <div class="content">
<div class="left"> <div class="left">
<img [src]="'../../assets/icon/' + item.img"> <img [src]="'../../assets/img/' + item.img">
</div> </div>
<div class="rightCon"> <div class="rightCon">
<div class="block1">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div> <div class="block1">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div>
......
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