diff --git a/pages/control/index.vue b/pages/control/index.vue index d6ea0c6..9e9c783 100644 --- a/pages/control/index.vue +++ b/pages/control/index.vue @@ -522,7 +522,7 @@ export default { success: (res) => { if (res.confirm) { // 组装消息 - this.message = JSON.stringify({[type]: status}) + this.message = JSON.stringify({[`${type}1}`]: status}) // 控制设备 this.publishMessage(); // 设备回执 @@ -599,8 +599,11 @@ export default { this.deviceType = ''; // ========== 修改:自动停止指令不弹窗 ========== - this.$modal.msgSuccess("设备操作成功!"); - + if (ackData.clientId && (ackData.clientId===mqttUtil.getMqttState().clientId)) { + this.$modal[isSuccess ? 'msgSuccess' : 'msgError']( + `设备操作${isSuccess ? "成功" : "失败"}!` + ); + } console.log(`指令[${commandField}=${commandValue}]执行${isSuccess ? "成功" : "失败"}`); },