From fc28d01cfa022d0f91ec719490342d726db2e105 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 九月 2025 08:32:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/utils/webSocket.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/utils/webSocket.js b/north-glass-erp/northglass-erp/src/utils/webSocket.js
index bf9bf65..582771a 100644
--- a/north-glass-erp/northglass-erp/src/utils/webSocket.js
+++ b/north-glass-erp/northglass-erp/src/utils/webSocket.js
@@ -1,4 +1,4 @@
-import config from '../../config'
+
 var websock = null;
 var global_callback = null;
 let isConnect = false; //杩炴帴鏍囪瘑 閬垮厤閲嶅杩炴帴
@@ -7,7 +7,7 @@
 
 
 var serverPort = "/ws"; // webSocket杩炴帴绔彛
-var wsuri = `ws://${config.webSocketUrl}/ws`
+var wsuri = `ws://${window.ipConfig.webSocketUrl}/ws`
 
 function createWebSocket(callback) {
 

--
Gitblit v1.8.0