From cf1988431866170deb7d53524f728ba47c7e0d03 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Tue, 3 Feb 2026 10:27:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/views/bm/aqList.jsp        |  2 +-
 WebContent/WEB-INF/views/bm/aqPlanList.jsp    |  2 +-
 WebContent/WEB-INF/views/bm/carList.jsp       |  2 +-
 .../WEB-INF/views/rm/UnFinishContentList.jsp  |  7 +++---
 .../views/rm/unFinishWorkList-mobile.jsp      |  8 ++++---
 .../views/rm/unFinishWorkListDetails.jsp      |  3 ++-
 WebContent/static/js/bm/aqList.js             |  4 ++--
 WebContent/static/js/bm/aqPlanList.js         |  4 ++--
 WebContent/static/js/bm/carList.js            | 11 +++-------
 WebContent/static/js/bm/ip_utils.js           | 22 +++++++++++++++++++
 WebContent/static/js/bm/publicJumpIp.js       |  9 --------
 11 files changed, 43 insertions(+), 31 deletions(-)
 create mode 100644 WebContent/static/js/bm/ip_utils.js
 delete mode 100644 WebContent/static/js/bm/publicJumpIp.js
diff --git a/WebContent/WEB-INF/views/bm/aqList.jsp b/WebContent/WEB-INF/views/bm/aqList.jsp
index 1b83155..4c67cab 100644
--- a/WebContent/WEB-INF/views/bm/aqList.jsp
+++ b/WebContent/WEB-INF/views/bm/aqList.jsp
@@ -26,7 +26,7 @@
 </head>
 <body>
 
-<script src="${bonuspath}/static/js/bm/publicJumpIp.js"></script>		
+<script src="${bonuspath}/static/js/bm/ip_utils.js?v=1"></script>		
 <script src="${bonuspath}/static/js/bm/aqList.js?v=1"></script>		
 </body>
 </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/views/bm/aqPlanList.jsp b/WebContent/WEB-INF/views/bm/aqPlanList.jsp
index 0b8e90a..56fa370 100644
--- a/WebContent/WEB-INF/views/bm/aqPlanList.jsp
+++ b/WebContent/WEB-INF/views/bm/aqPlanList.jsp
@@ -26,7 +26,7 @@
 </head>
 <body>
 
-<script src="${bonuspath}/static/js/bm/publicJumpIp.js"></script>	
+<script src="${bonuspath}/static/js/bm/ip_utils.js"></script>	
 <script src="${bonuspath}/static/js/bm/aqPlanList.js?v=1"></script>		
 </body>
 </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/views/bm/carList.jsp b/WebContent/WEB-INF/views/bm/carList.jsp
index ac02bad..5c18077 100644
--- a/WebContent/WEB-INF/views/bm/carList.jsp
+++ b/WebContent/WEB-INF/views/bm/carList.jsp
@@ -26,7 +26,7 @@
 </head>
 <body>
 
-<script src="${bonuspath}/static/js/bm/publicJumpIp.js"></script>	
+<script src="${bonuspath}/static/js/bm/ip_utils.js?v=1"></script>		
 <script src="${bonuspath}/static/js/bm/carList.js?v=1"></script>		
 </body>
 </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp b/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp
index c667cfe..66282e1 100644
--- a/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp
+++ b/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp
@@ -206,13 +206,14 @@
 		<tr><td colspan='7' class='center'>没有相关数据</td></tr>
 	</c:otherwise>
 </c:choose>
+<script src="${pageContext.request.contextPath}/static/js/bm/ip_utils.js?v=1"></script>
 <script type="text/javascript">
 	var  uname = localStorage.getItem("uname");
 	var  pwd = localStorage.getItem("pwd");
 	function topage(id,processName,isFinish) {
 		$.ajax({
 			type: "post",
-			url: "http://10.1.0.142:1999/gz_car/login/userLogin",
+			url: CAR_IP+"/gz-car/login/userLogin",
 			data: {
 				username: uname,
 				password: pwd
@@ -224,9 +225,9 @@
 					localStorage.setItem("name", name);
 					//window.open("http://192.168.0.14:21625/gz-gqj/index.html")
 					if(processName === '派车计划'){
-						window.open("http://10.1.0.142:1999/gz-car/page/car_demand_plan/child/dispatch_car_detail.html?id="+id +"&token="+data.token +"&isFinish="+isFinish)
+						window.open(CAR_HTML_IP+"page/car_demand_plan/child/dispatch_car_detail.html?id="+id +"&token="+data.token +"&isFinish="+isFinish)
 					}else if(processName === '用车计划'){
-						window.open("http://10.1.0.142:1999/gz-car/page/car_demand_plan/child/apply_plan_detail.html?id="+id +"&token="+data.token +"&isFinish="+isFinish)
+						window.open(CAR_HTML_IP+"page/car_demand_plan/child/apply_plan_detail.html?id="+id +"&token="+data.token +"&isFinish="+isFinish)
 					}
 				} else {
 					alert("没有权限！");
diff --git a/WebContent/WEB-INF/views/rm/unFinishWorkList-mobile.jsp b/WebContent/WEB-INF/views/rm/unFinishWorkList-mobile.jsp
index 0ec1205..8526c22 100644
--- a/WebContent/WEB-INF/views/rm/unFinishWorkList-mobile.jsp
+++ b/WebContent/WEB-INF/views/rm/unFinishWorkList-mobile.jsp
@@ -6,7 +6,9 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <title>待办任务 - 移动端</title>
+    <script src="${pageContext.request.contextPath}/static/js/bm/ip_utils.js"></script>
     <script src="${pageContext.request.contextPath}/static/js/jquery/jquery-2.0.3.min.js"></script>
+    
     <style>
         * {
             margin: 0;
@@ -546,7 +548,7 @@
             
             $.ajax({
                 type: "post",
-                url: "http://10.1.0.142:1999/gz_car/login/userLogin",
+                url: CAR_IP+"/gz-car/login/userLogin",
                 data: {
                     username: uname,
                     password: pwd
@@ -560,9 +562,9 @@
                         // 根据流程类型跳转到对应页面
                         var targetUrl = "";
                         if (processName === '派车计划') {
-                            targetUrl = "http://10.1.0.142:1999/gz-car/page/car_demand_plan/child/dispatch_car_detail.html?id=" + id + "&token=" + data.token;
+                            targetUrl = CAR_HTML_IP+ "page/car_demand_plan/child/dispatch_car_detail.html?id=" + id + "&token=" + data.token;
                         } else if (processName === '用车计划') {
-                            targetUrl = "http://10.1.0.142:1999/gz-car/page/car_demand_plan/child/apply_plan_detail.html?id=" + id + "&token=" + data.token;
+                            targetUrl =CAR_HTML_IP+ "/page/car_demand_plan/child/apply_plan_detail.html?id=" + id + "&token=" + data.token;
                         } else {
                             isNavigatingToDetail = false; // 重置标志
                             showAlert('暂不支持该类型任务的详情查看: ' + processName);
diff --git a/WebContent/WEB-INF/views/rm/unFinishWorkListDetails.jsp b/WebContent/WEB-INF/views/rm/unFinishWorkListDetails.jsp
index 12dd53c..85eb26a 100644
--- a/WebContent/WEB-INF/views/rm/unFinishWorkListDetails.jsp
+++ b/WebContent/WEB-INF/views/rm/unFinishWorkListDetails.jsp
@@ -50,9 +50,10 @@
 			</table>
 		</form>
 </div>
+<script src="${pageContext.request.contextPath}/static/js/bm/ip_utils.js?v=1"></script>
 <script type="text/javascript">
 function topage() {
 	alert('1');
-	window.open("http://10.1.0.142:1999/gz-car/index.html")
+	window.open(CAR_HTML_IP+"index.html")
 }
 </script>
\ No newline at end of file
diff --git a/WebContent/static/js/bm/aqList.js b/WebContent/static/js/bm/aqList.js
index 781bd29..42586ed 100644
--- a/WebContent/static/js/bm/aqList.js
+++ b/WebContent/static/js/bm/aqList.js
@@ -13,7 +13,7 @@ $(function() {
 function checkLogin(){
 	$.ajax({
 		type: "post",
-		url: "http://10.1.0.142:1999/gz-aqgqj/login/userLogin",
+		url: AQGQJ_IP+"/gz-aqgqj/login/userLogin",
 		data: {
 			username: uname,
 			password: pwd
@@ -24,7 +24,7 @@ function checkLogin(){
 				localStorage.setItem("token", data.token);
 				localStorage.setItem("name", name);
 				//window.open("http://192.168.0.14:21625/gz-gqj/index.html")
-				window.open("http://10.1.0.142:1999/gz-aqgqj/index.html?token="+token+'&isPlanAdd=1')
+				window.open( AQGQJ_HTML_IP+"index.html?token="+data.token+'&isPlanAdd=1')
 
 			} else {
 				alert("没有权限！");
diff --git a/WebContent/static/js/bm/aqPlanList.js b/WebContent/static/js/bm/aqPlanList.js
index 4c52d9a..4fe4f38 100644
--- a/WebContent/static/js/bm/aqPlanList.js
+++ b/WebContent/static/js/bm/aqPlanList.js
@@ -8,7 +8,7 @@ function checkLogin(){
       
 	$.ajax({
 		type: "post",
-		url: "http://10.1.0.142:1999/gz_aqgqj/login/userLogin",
+		url: AQGQJ_IP+"/gz_aqgqj/login/userLogin",
 		data: {
 			username: uname,
 			password: pwd
@@ -21,7 +21,7 @@ function checkLogin(){
 				localStorage.setItem("name", name);
 				localStorage.setItem("isPlanAdd", "1");
 				//window.open("http://192.168.0.14:21625/gz-gqj/index.html")
-				window.open("http://10.1.0.142:1999/gz-aqgqj/index.html?token="+token+'&isPlanAdd=1')
+				window.open(AQGQJ_HTML_IP+"index.html?token="+data.token+'&isPlanAdd=1')
 			} else {
 				alert("没有权限！");
 			}
diff --git a/WebContent/static/js/bm/carList.js b/WebContent/static/js/bm/carList.js
index f3bf57f..639d028 100644
--- a/WebContent/static/js/bm/carList.js
+++ b/WebContent/static/js/bm/carList.js
@@ -3,29 +3,24 @@
 var  uname = localStorage.getItem("uname");
 var  pwd = localStorage.getItem("pwd");
 $(function() {
-    
-	
 	checkLogin();
-	
-	
 });
 
 function checkLogin(){
 	$.ajax({
 		type: "post",
-		url: "http://10.1.0.142:1999/gz-car/login/userLogin",
+		url: CAR_IP+"/gz-car/login/userLogin",
 		data: {
 			username: uname,
 			password: pwd
 		},
 		success: function(data) {
-		    
 			if(data.code == "200") {
 				localStorage.setItem("token", data.token);
 				localStorage.setItem("name", name);
 				//window.open("http://192.168.0.14:21625/gz-gqj/index.html")
-				window.open("http://10.1.0.142:1999/gz-car/index.html?token="+token)
-
+				window.open(CAR_HTML_IP+"index.html?token="+data.token)
+				//window.open("http://10.1.0.142:1999/gz-car/index.html?token="+token)
 			} else {
 				alert("没有权限！");
 				
diff --git a/WebContent/static/js/bm/ip_utils.js b/WebContent/static/js/bm/ip_utils.js
new file mode 100644
index 0000000..8481178
--- /dev/null
+++ b/WebContent/static/js/bm/ip_utils.js
@@ -0,0 +1,22 @@
+//local -本地
+
+//安全工器具 后端请求ip
+let AQGQJ_IP='http://10.1.0.142:1999';
+//安全工器具 -跳转页面地址
+let AQGQJ_HTML_IP='http://10.1.0.142:1999/gz-aqgqj/';
+
+//车辆 后端请求IP
+let CAR_IP='http://192.168.0.38:21522';
+//车辆 跳转页面IP
+let CAR_HTML_IP='http://192.168.0.38:8848/gz_car_ui/';
+
+
+// dev -生产
+/*let AQGQJ_IP='http://10.1.0.142:1999';
+//安全工器具 -跳转页面地址
+let AQGQJ_HTML_IP='http://10.1.0.142:1999/gz-aqgqj/';
+
+//车辆 后端请求IP
+let CAR_IP='http://10.1.0.142:1999';
+//车辆 跳转页面IP
+let CAR_HTML_IP='http://10.1.0.142:1999/gz-car/'*/
\ No newline at end of file
diff --git a/WebContent/static/js/bm/publicJumpIp.js b/WebContent/static/js/bm/publicJumpIp.js
deleted file mode 100644
index ac44cf8..0000000
--- a/WebContent/static/js/bm/publicJumpIp.js
+++ /dev/null
@@ -1,9 +0,0 @@
-//安全工器具 后端请求ip
-let AQGQJ_IP='http://10.1.0.142:1999';
-//安全工器具 -跳转页面地址
-let AQGQJ_HTML_IP='http://10.1.0.142:1999/gz-aqgqj/index.html';
-
-//车辆 后端请求IP
-let CAR_IP='http://192.168.0.38:21522';
-//车辆 跳转页面IP
-let CAR_HTML_IP='http://192.168.0.38:8848/gz_car_ui/index.html';
\ No newline at end of file
