From bf1eb3ecbb0c491ec5aeba1545d2c0b915158e96 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Fri, 19 Sep 2025 10:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E4=BC=A0file=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/mqtt.ts                               | 11 ++++++++++-
 src/views/equipmentManagement/devices/index.vue |  9 +++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/utils/mqtt.ts b/src/utils/mqtt.ts
index 6d0d528..cfac351 100644
--- a/src/utils/mqtt.ts
+++ b/src/utils/mqtt.ts
@@ -18,6 +18,8 @@ export interface SubscribeOptions {
 const getMqttConfig = () => {
   // 检测当前页面协议（http: 或 https:）
   const isHttps = window.location.protocol === 'https:';
+  console.log(isHttps,'检测环境');
+  
   return {
     // 自动切换协议：https页面用wss，http页面用ws
     protocol: isHttps ? 'wss' : 'ws',
@@ -57,8 +59,15 @@ export function useMqtt() {
     error.value = null;
 
     try {
+      // 打印当前使用的配置（方便调试）
+      console.log('当前MQTT连接配置:', {
+        protocol: MQTT_CONFIG.protocol,
+        host: MQTT_CONFIG.host,
+        port: MQTT_CONFIG.port,
+        clientId: MQTT_CONFIG.clientId
+      });
       client = new Paho.Client(
-        MQTT_CONFIG.host, 
+        MQTT_CONFIG.host,
         MQTT_CONFIG.port,
         MQTT_CONFIG.clientId
       );
diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue
index 859fa42..3077778 100644
--- a/src/views/equipmentManagement/devices/index.vue
+++ b/src/views/equipmentManagement/devices/index.vue
@@ -737,11 +737,12 @@ const submitForm = async () => {
     // 处理图片字段
     if (form.value.image instanceof File) {
       formData.append('file', form.value.image);
-    } else if (form.value.image && typeof form.value.image === 'string') {
-      // 如果是URL且需要转换为二进制
-      const blob = await urlToBlob(form.value.image);
-      formData.append('file', blob, 'image.jpg'); // 添加文件名
     }
+    //  else if (form.value.image && typeof form.value.image === 'string') {
+    //   // 如果是URL且需要转换为二进制
+    //   const blob = await urlToBlob(form.value.image);
+    //   formData.append('file', blob, 'image.jpg'); // 添加文件名
+    // }
     // 添加其他必要字段
     const fields = ['id', 'deviceName', 'deviceType', 'remark'];
     fields.forEach((key) => {