Merge remote-tracking branch 'origin/test'

This commit is contained in:
fan 2019-10-16 17:04:58 +08:00
commit 8ba89a8735

View File

@ -421,7 +421,7 @@ export default {
this.userId = this.$store.state.user.id; this.userId = this.$store.state.user.id;
this.getRoomInfo(); // info this.getRoomInfo(); // info
this.getUserList(); // this.getUserList(); //
this.checkPlcGateway(); //PLC // this.checkPlcGateway(); //PLC
this.timeDemon = setInterval(() => { this.timeDemon = setInterval(() => {
checkLoginLine(); checkLoginLine();
}, 5000 * 60); }, 5000 * 60);
@ -620,7 +620,7 @@ export default {
this.stationList = resp.data; this.stationList = resp.data;
this.computePermissionRest(); this.computePermissionRest();
// //
this.handleDoorList(res.data.mapId, resp.data); // this.handleDoorList(res.data.mapId, resp.data);
}, },
// list Admin Instructor Dispatcher Attendant Audience Driver Repair IBP IBP // list Admin Instructor Dispatcher Attendant Audience Driver Repair IBP IBP
async getUserList() { async getUserList() {