From 1947a678274731a431ffc9232a899451316feee0 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Sat, 6 Aug 2022 00:30:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/views/iot/device/device-edit.vue    |  3 ++-
 vue/src/views/iot/device/running-status.vue | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/vue/src/views/iot/device/device-edit.vue b/vue/src/views/iot/device/device-edit.vue
index 4dca6ad6..6d404a66 100644
--- a/vue/src/views/iot/device/device-edit.vue
+++ b/vue/src/views/iot/device/device-edit.vue
@@ -444,7 +444,8 @@ export default {
                     } else {
                         addDevice(this.form).then(response => {
                             this.form = response.data;
-                            this.oldDeviceStatus = this.from.status;
+                            console.log(response);
+                            this.oldDeviceStatus = this.form.status;
                             if (this.form.deviceId == null || this.form.deviceId == 0) {
                                 this.$modal.alertError("设备编号已经存在，添加设备失败");
                             } else {
diff --git a/vue/src/views/iot/device/running-status.vue b/vue/src/views/iot/device/running-status.vue
index 368209c6..a2cbc1ca 100644
--- a/vue/src/views/iot/device/running-status.vue
+++ b/vue/src/views/iot/device/running-status.vue
@@ -217,6 +217,7 @@ export default {
                         this.MonitorChart();
                     });
                 });
+                this.connectMqtt();
             }
         }
     },
@@ -259,10 +260,16 @@ export default {
         }
     },
     created() {
-        // 回调处理
-        this.mqttCallback();
+
     },
     methods: {
+        /* 连接Mqtt消息服务器 */
+		async connectMqtt() {
+			if (this.$mqttTool.client == null) {
+				await this.$mqttTool.connect(this.vuex_token);
+			}
+			this.mqttCallback();
+		},
         /* Mqtt回调处理 */
         mqttCallback() {
             this.$mqttTool.client.on('message', (topic, message, buffer) => {