Compare commits

..

No commits in common. "3103c0fbc317ba99025d214198b5783a5062e294" and "ae1e8725ea961b7eef026e5865abe04f0529bec5" have entirely different histories.

5 changed files with 6 additions and 20 deletions

View File

@ -126,7 +126,6 @@ export default {
} }
}) })
setTimeout(() => { setTimeout(() => {
if(this.topList.length)
this.getData(this.topList[0]) this.getData(this.topList[0])
}, 0); }, 0);
} }

View File

@ -108,7 +108,6 @@ export default {
} }
}) })
setTimeout(() => { setTimeout(() => {
if(this.topList.length)
this.getData(this.topList[0]) this.getData(this.topList[0])
}, 0); }, 0);
} }

View File

@ -112,7 +112,6 @@ export default {
} }
}) })
setTimeout(() => { setTimeout(() => {
if(this.topList.length)
this.getData(this.topList[0]) this.getData(this.topList[0])
}, 0); }, 0);
} }

View File

@ -228,8 +228,7 @@ export default {
deviceSel: [{ label: '控制器', value: 10, }, deviceSel: [{ label: '控制器', value: 10, },
{ label: '施肥机', value: 1, }, { label: '施肥机', value: 1, },
{ label: '气象站', value:30, }, { label: '气象站', value:30, },
{ label: '智能灌溉控制器', value:20, }, { label: '智能灌溉控制器', value:20, }],
{ label: '数据采集器', value:40, }],
} }
}, },
mounted() { this.dataInit() }, mounted() { this.dataInit() },
@ -299,9 +298,7 @@ export default {
return '气象站' return '气象站'
} else if (e == '20') { } else if (e == '20') {
return '智能灌溉控制器' return '智能灌溉控制器'
} else if (e == '40') { } else {
return '数据采集器'
}else {
return '' return ''
} }
}, },
@ -394,8 +391,6 @@ export default {
return 30 return 30
}else if(e == '智能灌溉控制器'){ }else if(e == '智能灌溉控制器'){
return 20 return 20
}else if(e == '数据采集器'){
return 40
} }
}, },
handleCommand1(e) { handleCommand1(e) {
@ -418,23 +413,17 @@ export default {
}) })
}, },
openaddDeviceModel(){ openaddDeviceModel(){
this.addDeviceModel = true
this.deviceType=''
this.openData={} this.openData={}
this.addDeviceModel = true
this.$forceUpdate()
}, },
openModel(item, type) { openModel(item, type) {
if (type == 0) { if (type == 0) {
this.modelName = '添加' this.modelName = '添加'
this.addModel = true
this.nowData = { this.nowData = {
equipments: [], equipments: [],
} }
this.role = '' this.role = ''
this.addModel = true
this.$forceUpdate()
} else { } else {
this.modelName = '编辑' this.modelName = '编辑'
this.addModel = true this.addModel = true

View File

@ -288,12 +288,12 @@ export default {
const that = this; const that = this;
if (localStorage.getItem('token')) { if (localStorage.getItem('token')) {
that.getEqbyid(); that.getEqbyid();
that.getReg()
setTimeout(() => { setTimeout(() => {
that.pageTimer && clearInterval(that.pageTimer) that.pageTimer && clearInterval(that.pageTimer)
that.pageTimer = setInterval(() => { that.pageTimer = setInterval(() => {
that.getEqbyid(); that.getEqbyid();
that.getReg()
}, 5000); }, 5000);
}, 0); }, 0);
} else { } else {