|
@@ -132,12 +132,20 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
onShow() {
|
|
|
- console.log("onShow")
|
|
|
+ console.log(this.$store.state.vuex_workStatus,"onShow")
|
|
|
+ this.status = this.$store.state.vuex_workStatus
|
|
|
// 更新进度条
|
|
|
if(this.$store.state.vuex_workStatus == 'working'){
|
|
|
this.step = this.$store.state.vuex_workStep
|
|
|
this.loading()
|
|
|
}
|
|
|
+ // 如果是复位状态
|
|
|
+ if(this.$store.state.vuex_workStatus == 'rest'){
|
|
|
+ this.showReset()
|
|
|
+ }
|
|
|
+ if(this.$store.state.vuex_workStatus == 'starting'){
|
|
|
+ this.starting()
|
|
|
+ }
|
|
|
},
|
|
|
onLoad(options) {
|
|
|
console.log("onLoad")
|
|
@@ -250,7 +258,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
// 进度消息
|
|
|
- if(e.data.level == 'C'&&this.status!="reseting"){
|
|
|
+ if(e.data.level == 'C'&&this.status!="rest"){
|
|
|
this.curWorkStutesText= e.data.msgCodeInfo
|
|
|
if(e.data.msgCodeInfo != '开始洗车'){
|
|
|
// 启动成功
|
|
@@ -266,7 +274,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
// 错误消息
|
|
|
- if(e.data.level == 'F'&&this.status!="reseting"){
|
|
|
+ if(e.data.level == 'F'&&this.status!="rest"){
|
|
|
this.curWorkStutesText= e.data.msgCodeInfo
|
|
|
// 启动成功
|
|
|
this.startWashCarSuccess()
|