s412146/angular-develop-client
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

merge #9

Merged
s412146 merged 1 commits from developer into master 2019-01-20 12:30:06 +01:00
Conversation 0 Commits 1 Files Changed 5 +4 -3
5 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/.client.zip.icloud vendored
View File

Binary file not shown.

BIN
dist/client.zip vendored Normal file
View File

Binary file not shown.

BIN
dist/client/.vendor.js.map.icloud vendored
View File

Binary file not shown.

1
dist/client/vendor.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

6
src/app/status-list/status-list.component.ts
View File

@ -32,7 +32,7 @@ export class StatusListComponent implements OnInit {
this.devices = data; this.devices = data;
this.onChangeDevice(this.activeID); this.onChangeDevice(this.activeID);
}); });
}, 5000); }, 1000);
this.showChart(); this.showChart();
} }
@ -59,12 +59,12 @@ export class StatusListComponent implements OnInit {
this.time = time / 1000; this.time = time / 1000;
if ( if (
this.activeDevice.lastStatus == "0" && this.activeDevice.lastStatus == "0" &&
this.time < 10 && this.time < 10000 &&
newStatus[1].value == "1" newStatus[1].value == "1"
) { ) {
this.activeDevice.lastStatus = "1"; this.activeDevice.lastStatus = "1";
} }
console.log(this.time); //console.log(this.time);
}); });
}; };