diff --git a/api/commonRequest.js b/api/commonRequest.js index 0826769..a540c42 100644 --- a/api/commonRequest.js +++ b/api/commonRequest.js @@ -1,7 +1,7 @@ let aqEnnable = true // 参数加密开关 //后端路径 -const commonUrl = "http://27.50.49.56:8000/zhgd/"; -const URL_IP="http://27.50.49.56:8000/zhgd-web" +const commonUrl = "http://11.158.16.194:21624/zhgd/"; +const URL_IP="http://11.158.16.194:21624/zhgd-web" //前端 // const URL_IP="http://127.0.0.1:63343/ah_jjzhgd_webscreen" // const commonUrl = "http://127.0.0.1:18080/zhgd/"; diff --git a/js/pages/home/navigation.js b/js/pages/home/navigation.js index a83486e..6f3ba45 100644 --- a/js/pages/home/navigation.js +++ b/js/pages/home/navigation.js @@ -22,7 +22,7 @@ layui.use(['layer', 'element'], function () { $('#nav-left button').removeAttr('style') } else if (result.code === 500) { layer.msg(result.msg, { icon: 2 }, function () { - window.location.href = login_sc_index; + window.location.href = login_sc_page; }); } else if (result.code === 401) { layer.msg(result.msg, { icon: 2 }, function () { diff --git a/js/publics/public.js b/js/publics/public.js index ee6ac36..0c6c9cc 100644 --- a/js/publics/public.js +++ b/js/publics/public.js @@ -76,11 +76,13 @@ function loginout(type) { sessionStorage.removeItem("zhgd_us"); sessionStorage.removeItem("zhgd_type"); let iscId=localStorage.getItem("iscKey"); - // if (zhgd_type === "2") { - // window.location.href = 'http://iscssotest.ah.sgcc.com.cn/isc_sso/logout?iscUserId='+iscId+'&service=http://27.50.49.56:8000/zhgd-web/sg_login.html'; - // } else if (zhgd_type === "1") { - // window.location.href = 'http://iscssotest.ah.sgcc.com.cn/isc_sso/logout?iscUserId='+iscId+'&service=http://27.50.49.56:8000/zhgd-web/sc_login.html'; - // } + if (zhgd_type === "2") { + window.location.href = login_sg_page; + // window.location.href = 'http://iscssotest.ah.sgcc.com.cn/isc_sso/logout?iscUserId='+iscId+'&service=http://27.50.49.56:8000/zhgd-web/sg_login.html'; + } else if (zhgd_type === "1") { + window.location.href = login_sc_page; + // window.location.href = 'http://iscssotest.ah.sgcc.com.cn/isc_sso/logout?iscUserId='+iscId+'&service=http://27.50.49.56:8000/zhgd-web/sc_login.html'; + } }); } else if (result.code === 500) { layer.msg("登出失败", { icon: 2 }); @@ -106,17 +108,17 @@ function errorFn(xhr, status, error) { /* 返回登录页 */ function backLoginPage() { let iscId=localStorage.getItem("iscKey"); + if (zhgd_type === "2") { + window.location.href = login_sg_page; + // window.location.href = 'http://iscssotest.ah.sgcc.com.cn/isc_sso/logout?iscUserId='+iscId+'&service=http://27.50.49.56:8000/zhgd-web/sg_login.html'; - - // if (zhgd_type === "2") { - // window.location.href = 'http://iscssotest.ah.sgcc.com.cn/isc_sso/logout?iscUserId='+iscId+'&service=http://27.50.49.56:8000/zhgd-web/sg_login.html'; - // - // } else if (zhgd_type === "1") { - // window.location.href = 'http://iscssotest.ah.sgcc.com.cn/isc_sso/logout?iscUserId='+iscId+'&service=http://27.50.49.56:8000/zhgd-web/sc_login.html'; - // - // }else { - // window.location.href = 'http://iscssotest.ah.sgcc.com.cn/isc_sso/logout?iscUserId='+iscId+'&service=http://27.50.49.56:8000/zhgd-web/sc_login.html'; - // } + } else if (zhgd_type === "1") { + window.location.href = login_sc_page; + // window.location.href = 'http://iscssotest.ah.sgcc.com.cn/isc_sso/logout?iscUserId='+iscId+'&service=http://27.50.49.56:8000/zhgd-web/sc_login.html'; + }else { + window.location.href = login_sc_page; + // window.location.href = 'http://iscssotest.ah.sgcc.com.cn/isc_sso/logout?iscUserId='+iscId+'&service=http://27.50.49.56:8000/zhgd-web/sc_login.html'; + } } //判断字符是否为空的方法 function isEmpty(obj) { diff --git a/pages/web/views/main.html b/pages/web/views/main.html index 408275c..2b1fa74 100644 --- a/pages/web/views/main.html +++ b/pages/web/views/main.html @@ -19,7 +19,7 @@ - + 首页