Merge pull request 'pc-master' (#57) from pc-master into portal

Reviewed-on: #57
pull/69/head^2
xiaomeng 2023-11-24 08:16:36 +00:00
commit f045c2e14f
3 changed files with 23 additions and 13 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -54,6 +54,8 @@
},
methods:{
login(){
var store=this.$store.state
// "username": "xiaomeng",
// "password": "lihe12345"
if(!this.username){
@ -86,6 +88,7 @@
message: '登陆成功',
type: "success",
});
store.equipmentIndex=1
localStorage.setItem('token',res.data.data.token)
localStorage.setItem('userInfo',JSON.stringify(res.data.data))
this.$router.push({ name: 'index' })

View File

@ -249,7 +249,7 @@ export default {
deviceName: 1,
controlList: [],
statusInterval: null,//statusInterval
statusTime: 3,//status
statusTime: 2,//status
}
},
watch: {
@ -551,6 +551,7 @@ export default {
});
this.api.getControlRtDatastation(formData).then(res => {
this.controlList = []
if (res.data.code == 200) {
res.data.data.forEach((el, index) => {
list.forEach((el1, index1) => {
if (el.formula == el1.value) {
@ -564,6 +565,7 @@ export default {
}
})
})
}
// console.log(this.controlList);
})
@ -638,6 +640,11 @@ export default {
}, 10);
} else {
this.statusList = []
this.fanStatus = {
name: '风机', open: 0, status: []
}
this.$forceUpdate();
// this.$message.error(res.data.msg);
}
})