暂时提交
parent
1e16d4abce
commit
5d170cb580
|
|
@ -86,12 +86,7 @@
|
||||||
"selectedColor": "#000000",
|
"selectedColor": "#000000",
|
||||||
"borderStyle": "white",
|
"borderStyle": "white",
|
||||||
"backgroundColor": "#ffffff",
|
"backgroundColor": "#ffffff",
|
||||||
"list": [{
|
"list": [
|
||||||
"pagePath": "pages/index",
|
|
||||||
"iconPath": "static/images/tabbar/home.png",
|
|
||||||
"selectedIconPath": "static/images/tabbar/home_.png",
|
|
||||||
"text": "首页"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"pagePath": "pages/control/index",
|
"pagePath": "pages/control/index",
|
||||||
"iconPath": "static/images/tabbar/work.png",
|
"iconPath": "static/images/tabbar/work.png",
|
||||||
|
|
|
||||||
|
|
@ -557,13 +557,13 @@ export default {
|
||||||
this.message = JSON.stringify({[type]: status})
|
this.message = JSON.stringify({[type]: status})
|
||||||
console.info("指令:"+this.message+";大棚:"+this.publishTopic)
|
console.info("指令:"+this.message+";大棚:"+this.publishTopic)
|
||||||
// 控制设备
|
// 控制设备
|
||||||
// this.publishMessage();
|
this.publishMessage();
|
||||||
// // 设备回执
|
// 设备回执
|
||||||
// this.deviceType=type;
|
this.deviceType=type;
|
||||||
//todo
|
//todo
|
||||||
|
|
||||||
this.status[type] = this.status[type] === 0 ? 1 : 0;
|
// this.status[type] = this.status[type] === 0 ? 1 : 0;
|
||||||
this.show[type] = this.status[type] === 0 ? "运行" : "暂停";
|
// this.show[type] = this.status[type] === 0 ? "运行" : "暂停";
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@
|
||||||
onLoad() {
|
onLoad() {
|
||||||
//#ifdef H5
|
//#ifdef H5
|
||||||
if (getToken()) {
|
if (getToken()) {
|
||||||
this.$tab.reLaunch('/pages/index')
|
this.$tab.reLaunch('/pages/control/index')
|
||||||
}
|
}
|
||||||
//#endif
|
//#endif
|
||||||
},
|
},
|
||||||
|
|
@ -121,7 +121,7 @@
|
||||||
loginSuccess(result) {
|
loginSuccess(result) {
|
||||||
// 设置用户信息
|
// 设置用户信息
|
||||||
this.$store.dispatch('GetInfo').then(res => {
|
this.$store.dispatch('GetInfo').then(res => {
|
||||||
this.$tab.reLaunch('/pages/index')
|
this.$tab.reLaunch('/pages/control/index')
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
handleLogout() {
|
handleLogout() {
|
||||||
this.$modal.confirm('确定注销并退出系统吗?').then(() => {
|
this.$modal.confirm('确定注销并退出系统吗?').then(() => {
|
||||||
this.$store.dispatch('LogOut').then(() => {}).finally(()=>{
|
this.$store.dispatch('LogOut').then(() => {}).finally(()=>{
|
||||||
this.$tab.reLaunch('/pages/index')
|
this.$tab.reLaunch('/pages/control/index')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue