From 412bc8e5d0cdc4251831f37a03837ed067395ea5 Mon Sep 17 00:00:00 2001 From: kerwincui <164770707@qq.com> Date: Fri, 22 Apr 2022 01:27:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/views/iot/device/mqtt-client.vue | 8 +- vue/src/views/iot/emqx/client.vue | 858 ++++------ vue/src/views/iot/emqx/resource.vue | 1958 +++++++++------------- vue/src/views/iot/emqx/rule.vue | 1713 +++++++++---------- vue/vue.config.js | 2 +- 5 files changed, 1917 insertions(+), 2622 deletions(-) diff --git a/vue/src/views/iot/device/mqtt-client.vue b/vue/src/views/iot/device/mqtt-client.vue index 3b3dad70..9c00eba9 100644 --- a/vue/src/views/iot/device/mqtt-client.vue +++ b/vue/src/views/iot/device/mqtt-client.vue @@ -31,8 +31,6 @@ export default { }, data() { return { - // 设备信息 - deviceInfo: {}, }; }, created() { @@ -47,11 +45,11 @@ export default { cleanSession: false, keepAlive: 30, clientId: 'web-' + Math.random().toString(16).substr(2), - connectTimeout: 60000 + connectTimeout: 10000 } // 配置Mqtt地址 - //let url = "wss://iot.wumei.live/mqtt" - let url = "ws://" + window.location.hostname + ":8083/mqtt"; + let url = "wss://iot.wumei.live/mqtt" + // let url = "ws://" + window.location.hostname + ":8083/mqtt"; console.log("mqtt地址:", url); this.client = mqtt.connect(url, options); this.client.on("connect", (e) => { diff --git a/vue/src/views/iot/emqx/client.vue b/vue/src/views/iot/emqx/client.vue index 5ae8473e..8baa3a1b 100644 --- a/vue/src/views/iot/emqx/client.vue +++ b/vue/src/views/iot/emqx/client.vue @@ -1,552 +1,354 @@ diff --git a/vue/src/views/iot/emqx/resource.vue b/vue/src/views/iot/emqx/resource.vue index b86dc846..fd971900 100644 --- a/vue/src/views/iot/emqx/resource.vue +++ b/vue/src/views/iot/emqx/resource.vue @@ -1,1157 +1,867 @@ diff --git a/vue/src/views/iot/emqx/rule.vue b/vue/src/views/iot/emqx/rule.vue index 52b59061..99e378a0 100644 --- a/vue/src/views/iot/emqx/rule.vue +++ b/vue/src/views/iot/emqx/rule.vue @@ -1,1025 +1,810 @@ + \ No newline at end of file + diff --git a/vue/vue.config.js b/vue/vue.config.js index 90d3199b..70d3a19f 100644 --- a/vue/vue.config.js +++ b/vue/vue.config.js @@ -40,7 +40,7 @@ module.exports = { } }, ['/api/v4']: { - target: `http://localhost:18083`, + target: `http://wumei.live:8081`, changeOrigin: true, // logLevel: 'debug', },