From 5b277fa13069525adea1acae7899745e5796712d Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Sat, 16 Apr 2022 21:31:09 +0800
Subject: [PATCH] =?UTF-8?q?mqtt=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/views/iot/device/device-edit.vue    |  2 +-
 vue/src/views/iot/device/index.vue          | 18 +++++++++---------
 vue/src/views/iot/device/mqtt-client.vue    | 15 ++++++++-------
 vue/src/views/iot/device/running-status.vue | 12 ++++++------
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/vue/src/views/iot/device/device-edit.vue b/vue/src/views/iot/device/device-edit.vue
index b3255fcf..2112cf81 100644
--- a/vue/src/views/iot/device/device-edit.vue
+++ b/vue/src/views/iot/device/device-edit.vue
@@ -80,7 +80,7 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="8">
+                    <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
                         <div style="border:1px solid #dfe4ed;border-radius:5px;padding:5px;text-align:center;line-height:400px;">
                             <div id="map" style="height:435px;width:100%;">地图展示区域，新增后显示</div>
                         </div>
diff --git a/vue/src/views/iot/device/index.vue b/vue/src/views/iot/device/index.vue
index e761a238..1c303916 100644
--- a/vue/src/views/iot/device/index.vue
+++ b/vue/src/views/iot/device/index.vue
@@ -197,7 +197,9 @@ import {
 export default {
     name: "Device",
     dicts: ['iot_device_status', 'iot_is_enable'],
-    components: {mqttClient},
+    components: {
+        mqttClient
+    },
     data() {
         return {
             // 实时监测间隔
@@ -337,11 +339,9 @@ export default {
                 // 发布
                 this.publish = {
                     topic: topic,
-                    message: message
+                    message: message,
+                    name: model.name
                 };
-                if (model.name != "") {
-                    this.$modal.notifySuccess("[ " + model.name + " ] 指令发送成功");
-                }
             }
         },
         /** 接收到Mqtt回调 */
@@ -450,10 +450,10 @@ export default {
                 this.queryParams.params["beginActiveTime"] = this.daterangeActiveTime[0];
                 this.queryParams.params["endActiveTime"] = this.daterangeActiveTime[1];
             }
-          // 判断是否是admin角色
-          if (this.$store.state.user.roles.indexOf("admin") === -1){
-            this.queryParams.userName = this.$store.state.user.name
-          }
+            // 判断是否是admin角色
+            if (this.$store.state.user.roles.indexOf("admin") === -1) {
+                this.queryParams.userName = this.$store.state.user.name
+            }
             listDeviceShort(this.queryParams).then(response => {
                 this.deviceList = response.rows;
                 this.total = response.total;
diff --git a/vue/src/views/iot/device/mqtt-client.vue b/vue/src/views/iot/device/mqtt-client.vue
index 745e0e4a..99324ff8 100644
--- a/vue/src/views/iot/device/mqtt-client.vue
+++ b/vue/src/views/iot/device/mqtt-client.vue
@@ -4,9 +4,6 @@
 
 <script>
 import mqtt from 'mqtt'
-import {
-    cacheJsonThingsModel
-} from "@/api/iot/model";
 import {
     getToken
 } from "@/utils/auth";
@@ -26,7 +23,7 @@ export default {
     watch: {
         // 获取到父组件传递的值
         publish: function (val, oldVal) {
-            this.mqttPublish(val.topic, val.message);
+            this.mqttPublish(val.topic, val.message,val.name);
         },
         subscribes: function (val, oldVal) {
             this.connectMqtt(val);
@@ -80,9 +77,10 @@ export default {
         },
 
         /** 发布消息 */
-        mqttPublish(topic, message) {
+        mqttPublish(topic, message, name) {
             if (!this.client.connected) {
                 console.log('客户端未连接')
+                this.$modal.notifyError("Mqtt客户端未连接");
                 return
             }
             this.client.publish(topic, message, {
@@ -91,6 +89,7 @@ export default {
                 if (!err) {
                     console.log('成功发布主题：' + topic)
                     console.log('主题内容：' + message);
+                    this.$modal.notifySuccess("[ " + name + " ] 指令发送成功");
                 }
             })
         },
@@ -110,7 +109,8 @@ export default {
         mqttError() {
             this.client.on('error', (error) => {
                 console.log('连接失败：', error)
-                this.client.end()
+                this.$modal.notifyError("Mqtt客户端连接失败");
+                this.client.end();
             })
         },
         /** 取消订阅 */
@@ -123,7 +123,8 @@ export default {
         unconnectMqtt() {
             this.client.end()
             this.client = null
-            console.log('服务器已断开连接！')
+            console.log('服务器已断开连接！');
+            this.$modal.notifyError("Mqtt服务器已断开连接！");
         },
         /** 监听服务器重新连接 */
         reconnectMqtt() {
diff --git a/vue/src/views/iot/device/running-status.vue b/vue/src/views/iot/device/running-status.vue
index 42006661..1f1d8b66 100644
--- a/vue/src/views/iot/device/running-status.vue
+++ b/vue/src/views/iot/device/running-status.vue
@@ -109,7 +109,7 @@
                         <i class="el-icon-s-unfold"></i>
                         {{item.name}}
                     </template>
-                    <el-select v-model="item.value" placeholder="请选择" clearable size="mini" disabled >
+                    <el-select v-model="item.value" placeholder="请选择" clearable size="mini" disabled>
                         <el-option v-for="subItem in item.enumList" :key="subItem.value" :label="subItem.text" :value="subItem.value" />
                     </el-select>
                 </el-descriptions-item>
@@ -181,7 +181,9 @@ import mqttClient from './mqtt-client.vue'
 export default {
     name: "running-status",
     dicts: ['iot_yes_no'],
-    components: {mqttClient},
+    components: {
+        mqttClient
+    },
     props: {
         device: {
             type: Object,
@@ -302,10 +304,8 @@ export default {
                 // 发布
                 this.publish = {
                     topic: topic,
-                    message: message
-                }
-                if (model) {
-                    this.$modal.notifySuccess("[ " + model.name + " ] 指令发送成功");
+                    message: message,
+                    name: model.name
                 }
             }
         },