Merge branch 'developer' of s412146/angular-develop-client into master

This commit is contained in:
Dawid Kubicki 2019-01-20 11:30:06 +00:00 committed by Gogs
commit edab64e28c
5 changed files with 4 additions and 3 deletions

Binary file not shown.

BIN
dist/client.zip vendored Normal file

Binary file not shown.

Binary file not shown.

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

File diff suppressed because one or more lines are too long

View File

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