Compare commits

..

No commits in common. "f045c2e14f19202568945dd18d44fb21b0c8e03b" and "f68728c7897cdc0e8b77d263da106d032d10cdf8" have entirely different histories.

3 changed files with 13 additions and 23 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

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

View File

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