Merge branch 'master' of http://8.140.50.127:3000/JSY/jsy-app
This commit is contained in:
commit
86c384b1e1
@ -122,6 +122,7 @@
|
||||
}
|
||||
this.dataList = [];
|
||||
getLandWaterOutletPermissionList(this.query).then(res => {
|
||||
console.log(res.data)
|
||||
this.dataList = res.data;
|
||||
this.$refs.paging.complete(this.dataList);
|
||||
});
|
||||
@ -169,21 +170,21 @@
|
||||
permissions[property] = e.includes(property) ? 0 : 1;
|
||||
console.log(property + permissions[property])
|
||||
console.log(permissions.deviceTypeKey)
|
||||
if (permissions.deviceTypeKey == "valve" ) {
|
||||
console.log(permissions.deviceTypeKey)
|
||||
if (permissions.valveOneOpen == 0 || permissions.valveTwoOpen == 0) {
|
||||
permissions.valveClose = 0;
|
||||
}
|
||||
if (permissions.valveOneOpen == 0 && permissions.valveTwoOpen == 0) {
|
||||
permissions.valveOpen = 0;
|
||||
}
|
||||
if(permissions.valveOneOpen == 1 || permissions.valveTwoOpen == 1){
|
||||
permissions.valveOpen = 1;
|
||||
}
|
||||
if(permissions.valveOneOpen == 1 && permissions.valveTwoOpen == 1){
|
||||
permissions.valveClose = 1;
|
||||
}
|
||||
}
|
||||
// if (permissions.deviceTypeKey == "valve" ) {
|
||||
// console.log(permissions.deviceTypeKey)
|
||||
// if (permissions.valveOneOpen == 0 || permissions.valveTwoOpen == 0) {
|
||||
// permissions.valveClose = 0;
|
||||
// }
|
||||
// if (permissions.valveOneOpen == 0 && permissions.valveTwoOpen == 0) {
|
||||
// permissions.valveOpen = 0;
|
||||
// }
|
||||
// if(permissions.valveOneOpen == 1 || permissions.valveTwoOpen == 1){
|
||||
// permissions.valveOpen = 1;
|
||||
// }
|
||||
// if(permissions.valveOneOpen == 1 && permissions.valveTwoOpen == 1){
|
||||
// permissions.valveClose = 1;
|
||||
// }
|
||||
// }
|
||||
});
|
||||
console.log(permissions)
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user