diff --git a/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp b/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp index 66282e1..d429d28 100644 --- a/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp +++ b/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp @@ -213,7 +213,7 @@ function topage(id,processName,isFinish) { $.ajax({ type: "post", - url: CAR_IP+"/gz-car/login/userLogin", + url: CAR_IP+"/login/userLogin", data: { username: uname, password: pwd diff --git a/WebContent/WEB-INF/views/rm/unFinishWorkList-mobile.jsp b/WebContent/WEB-INF/views/rm/unFinishWorkList-mobile.jsp index 0acbcef..1b1cf3f 100644 --- a/WebContent/WEB-INF/views/rm/unFinishWorkList-mobile.jsp +++ b/WebContent/WEB-INF/views/rm/unFinishWorkList-mobile.jsp @@ -461,7 +461,7 @@ var pwd = localStorage.getItem("pwd"); $.ajax({ type: "post", - url: CAR_IP+"/gz-car/login/userLogin", + url: CAR_IP+"/login/userLogin", data: { username: uname, password: pwd @@ -595,7 +595,7 @@ $.ajax({ type: "post", - url: CAR_IP+"/gz-car/login/userLogin", + url: CAR_IP+"/login/userLogin", data: { username: uname, password: pwd @@ -611,7 +611,7 @@ if (processName === '派车计划') { targetUrl = CAR_HTML_IP+ "page/car_demand_plan/child/dispatch_car_detail.html?id=" + id + "&token=" + data.token; } else if (processName === '用车计划') { - targetUrl =CAR_HTML_IP+ "/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/unFinishWorkList.jsp b/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp index 8b03261..f57ad6a 100644 --- a/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp +++ b/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp @@ -158,7 +158,7 @@ var pwd = localStorage.getItem("pwd"); $.ajax({ type: "post", - url: CAR_IP+"/gz-car/login/userLogin", + url: CAR_IP+"/login/userLogin", data: { username: uname, password: pwd diff --git a/WebContent/static/js/bm/aqList.js b/WebContent/static/js/bm/aqList.js index 42586ed..e03ccee 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: AQGQJ_IP+"/gz-aqgqj/login/userLogin", + url: AQGQJ_IP+"/login/userLogin", data: { username: uname, password: pwd diff --git a/WebContent/static/js/bm/aqPlanList.js b/WebContent/static/js/bm/aqPlanList.js index 4fe4f38..49388a4 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: AQGQJ_IP+"/gz_aqgqj/login/userLogin", + url: AQGQJ_IP+"/login/userLogin", data: { username: uname, password: pwd diff --git a/WebContent/static/js/bm/carList.js b/WebContent/static/js/bm/carList.js index 639d028..98fd605 100644 --- a/WebContent/static/js/bm/carList.js +++ b/WebContent/static/js/bm/carList.js @@ -9,7 +9,7 @@ $(function() { function checkLogin(){ $.ajax({ type: "post", - url: CAR_IP+"/gz-car/login/userLogin", + url: CAR_IP+"/login/userLogin", data: { username: uname, password: pwd diff --git a/WebContent/static/js/bm/ip_utils.js b/WebContent/static/js/bm/ip_utils.js index e16271e..4616420 100644 --- a/WebContent/static/js/bm/ip_utils.js +++ b/WebContent/static/js/bm/ip_utils.js @@ -1,5 +1,6 @@ //local -本地 - +/** + * //安全工器具 后端请求ip let AQGQJ_IP='http://192.168.0.14:1999'; //安全工器具 -跳转页面地址 @@ -9,14 +10,14 @@ let AQGQJ_HTML_IP='http://192.168.0.14:1999/gz-aqgqj/'; let CAR_IP='http://192.168.0.14:1999'; //车辆 跳转页面IP let CAR_HTML_IP='http://192.168.0.14:1999/gz-web/gz-car/'; - - +* +*/ // dev -生产 -/*let AQGQJ_IP='http://10.1.0.142:1999'; +let AQGQJ_IP='http://10.1.0.142:1999/gz_aqgqj'; //安全工器具 -跳转页面地址 let AQGQJ_HTML_IP='http://10.1.0.142:1999/gz-aqgqj/'; //车辆 后端请求IP -let CAR_IP='http://10.1.0.142:1999'; +let CAR_IP='http://10.1.0.142:1999/gz_car'; //车辆 跳转页面IP -let CAR_HTML_IP='http://10.1.0.142:1999/gz-car/'*/ \ No newline at end of file +let CAR_HTML_IP='http://10.1.0.142:1999/gz-car/' \ No newline at end of file