From 9dc32795c75ee417f45ef3b5b42a005ada0411bf Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 10 四月 2026 12:55:17 +0800
Subject: [PATCH] 合并分支
---
WebTM/layuiadmin/Scripts/webConfig.js | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index f3f9ceb..212369d 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,20 +3,15 @@
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ // var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ // var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+>>>>>>> e389db19bb5626403e880d3d93b2e1b205b86280
// var WEBURL = "http://localhost:81/API/"; //闄堥晲鍝叉湰鍦伴厤缃�
- // var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- var WEBURL = "http://localhost:81/API/"; //闄堥晲鍝叉湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
- //var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
@@ -35,7 +30,7 @@
//var WEBURL = "http://121.36.199.126:8181/API/"; //涓夊崌
//var WEBURL = "http://36.134.2.30:200/WEBS-API/"; //閲戝竻
//var WEBURL = "http://172.16.1.85/API/"; //杩﹀崡
- // var WEBURL = "http://61.164.64.222:8082/API_WW/"
+ var WEBURL = "http://61.164.64.222:8082/API_WW/"
return WEBURL;
}
@@ -165,4 +160,25 @@
});
}
});
+}
+
+
+// 鍙栨秷鎵�鏈� pending 璇锋眰鐨勫嚱鏁�
+function abortAllPendingRequests(pendingArray) {
+ if (!pendingArray || pendingArray.length === 0) return;
+
+ // 閬嶅巻鎵�鏈夋湭瀹屾垚鐨勮姹傦紝鎵ц abort
+ for (var i = 0; i < pendingArray.length; i++) {
+ try {
+ // jQuery 鐨� jqxhr 瀵硅薄鏀寔 abort() 鏂规硶
+ if (pendingArray[i] && typeof pendingArray[i].abort === 'function') {
+ pendingArray[i].abort();
+ }
+ } catch (e) {
+ // 闃叉 abort 鏃舵姤閿欏鑷翠唬鐮佸崱浣�
+ console.warn('璇锋眰鍙栨秷澶辫触', e);
+ }
+ }
+ // 娓呯┖鏁扮粍
+ pendingArray.length = 0;
}
\ No newline at end of file
--
Gitblit v1.9.1