Merge branch 'main' of http://47.109.205.240:3000/Web/digital-agriculture-admin

.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'

.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'

.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

src/views/iot/device/components/BugLamp/BlDetail.vue

@@ -53,7 +53,7 @@
         </div>
         <div class="flex">
           <div class="hbm345 w40 flex aic jcc">
-            <img :src="$baseUrl + device.imgUrl.split(',')[0]" class="w100" />
+            <img :src="device.imgUrl.split(',')[0]" class="w100" />
           </div>
           <div class="hbm345 w60">
             <el-form :model="form" ref="form" label-width="120px" :inline="false" size="normal" class="h95 flex fdc jcsa margin-top-20">