From 68eafbfba0801cd758362b2a1d9ed985b6e5cb1f Mon Sep 17 00:00:00 2001 From: wangzenghua <1048523306@qq.com> Date: Fri, 18 Apr 2025 02:55:54 +0100 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9Biot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.js | 2 +- src/views/iot/device/components/BugLamp/BlDetail.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 5269ffe..c9ab67e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -48,7 +48,7 @@ module.exports = { 'camelcase': [0, { 'properties': 'always' }], - 'comma-dangle': [0, 'always'], + 'comma-dangle': [1, 'off'], 'comma-spacing': [2, { 'before': false, 'after': true diff --git a/src/views/iot/device/components/BugLamp/BlDetail.vue b/src/views/iot/device/components/BugLamp/BlDetail.vue index 6094450..e60046a 100644 --- a/src/views/iot/device/components/BugLamp/BlDetail.vue +++ b/src/views/iot/device/components/BugLamp/BlDetail.vue @@ -53,7 +53,7 @@
- +
From 3f829832d30f7e4f6ca0d56d75b8a0ae75b50527 Mon Sep 17 00:00:00 2001 From: wangzenghua <1048523306@qq.com> Date: Fri, 18 Apr 2025 04:17:46 +0100 Subject: [PATCH 2/2] fix:matt --- .env.development | 2 +- .env.production | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 121d4c0..a0f4bb6 100644 --- a/.env.development +++ b/.env.development @@ -22,7 +22,7 @@ VUE_APP_EMQX_API_USER_NAME = 'admin' VUE_APP_EMQX_API_PASSWORD = 'sznyb@2025' # EMQX消息服务器连接地址 -VUE_APP_EMQX_SERVER_URL = 'ws://localhost:8083/mqtt' +VUE_APP_EMQX_SERVER_URL = 'ws://47.109.205.240:8083/mqtt' # 高德地图参数 VUE_APP_GAO_DE_SECURITYJSCODE = '77ef0c4c95553799630ad60dd9b692d7' diff --git a/.env.production b/.env.production index d2805b4..96e9a83 100644 --- a/.env.production +++ b/.env.production @@ -9,7 +9,7 @@ VUE_APP_BASE_API = '/prod-api' # EMQX接口账号(后端地址和EMQX接口地址部署时,通过nginx配置代理) VUE_APP_EMQX_API_USER_NAME = 'admin' -VUE_APP_EMQX_API_PASSWORD = 'public' +VUE_APP_EMQX_API_PASSWORD = 'sznyb@2025' # EMQX消息服务器连接地址,使用空字符串则会自动获取服务器地址 VUE_APP_EMQX_SERVER_URL = 'ws://47.117.148.147:8083/mqtt'