From 517998a0db5028588ecf6a33a06b006cd360d996 Mon Sep 17 00:00:00 2001 From: fengerli <528575642@qq.com> Date: Fri, 19 Sep 2025 17:24:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +-- src/assets/index/IMG.png | Bin 0 -> 1202 bytes src/utils/mqtt.ts | 6 ++-- .../equipmentManagement/devices/index.vue | 13 ++++---- src/views/equipmentManagement/log/index.vue | 30 ------------------ 5 files changed, 13 insertions(+), 40 deletions(-) create mode 100644 src/assets/index/IMG.png diff --git a/.env.development b/.env.development index 24e61f8..27b9b6a 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,8 @@ VITE_APP_TITLE = 云平台管理系统 VITE_APP_ENV = 'development' # 开发环境 - #VITE_APP_BASE_API = 'https://fuyuanshen.com/backend' - VITE_APP_BASE_API = 'http://192.168.2.34:8000' + VITE_APP_BASE_API = 'https://fuyuanshen.com/backend' + #VITE_APP_BASE_API = 'http://192.168.2.23:8000' #代永飞接口 #VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689' diff --git a/src/assets/index/IMG.png b/src/assets/index/IMG.png new file mode 100644 index 0000000000000000000000000000000000000000..0d59558a5cd729c722a98e6f7ca80fd18c84cfaa GIT binary patch literal 1202 zcmV;j1Wo&iP)Luu4aS6An0XlS@wUtj+Xo3OC8qphK_v2lfhkYNCEvT%5K_(f)BX7$9x#0H!eU{+3R z5m!1sKHh=$3*`OD4@5;FrJL9?EESUzhDH%?BeR%@oRva~TL~I z1N4Y!cp?cDP=Su*ljw8WKnVS!BL=_MI(~`r(FQ_5FBUabR#rZU>XbkSZ6KS?wn|5b z*XzyK@k^ACHV{)OkB`5F(S)#suZ-rC$n)Ajh?s-e!yLmVzIbQhQytb}22Pj(5;-ou zIh>LSw%Xd-wL?QgUBUH{%DU&69W4x0tB$`}AnEf0P?xYGxnG!u``LrIZnxXpx#&`H zh_hAkxNzp?<~r#AUbMbr0g^s<^Xm)?#eFVvmJ!@aIo_#{zIX5-KQ0|R9FDQU!NIN6 zJ(O}dixntbfAOk+&gMrUuTeQp9fB-qh6x+!?)2E6I&J(%sO!w{7zrm&?O8^1lL)BhDj&RgUB_$g>pX@oCb)hY^>~JAO?a@CZZe-s2>;^*_KEbFD)%? zMR)-|r?9)&EzApO9#M_Bv4US*Q&=DbcG~Usd?M4Pb47%A5UoR)JR}_)-GIK=X&X;KSni<=pyb_4zHz#Z)2Wp?4?~4W_5(?Vid*ux zQ^Ht7RAkFF;#QKhNwU2}>p3*!qkSJofBFLe0RR7(rAwax000I_L_t&o07jrznY35n Q-2eap07*qoM6N<$f@1MC$^ZZW literal 0 HcmV?d00001 diff --git a/src/utils/mqtt.ts b/src/utils/mqtt.ts index cfac351..13febdd 100644 --- a/src/utils/mqtt.ts +++ b/src/utils/mqtt.ts @@ -17,8 +17,10 @@ export interface SubscribeOptions { // 根据当前页面协议自动选择MQTT配置 const getMqttConfig = () => { // 检测当前页面协议（http: 或 https:） - const isHttps = window.location.protocol === 'https:'; - console.log(isHttps,'检测环境'); + //const isHttps = window.location.protocol === 'https:'; + + const isHttps = import.meta.env.VITE_APP_ENV === 'production' || window.location.protocol === 'https:'; + console.log(isHttps,'检测环境'); return { // 自动切换协议：https页面用wss，http页面用ws diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue index 3077778..584cfd6 100644 --- a/src/views/equipmentManagement/devices/index.vue +++ b/src/views/equipmentManagement/devices/index.vue @@ -87,9 +87,10 @@