diff --git a/bns/js/compreDisplay/child/newProList.js b/bns/js/compreDisplay/child/newProList.js index 742804e..160302f 100644 --- a/bns/js/compreDisplay/child/newProList.js +++ b/bns/js/compreDisplay/child/newProList.js @@ -78,6 +78,7 @@ function laypages(total, page, limit) { } function initTable(dataList, limit, page) { + let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,}); table.render({ elem: "#proTable", @@ -135,7 +136,6 @@ function initTable(dataList, limit, page) { function getReqParams(page, limit, type) { let obj = {}; let proStatetus=proStatusParam; - if (!type) { obj = { page: page + "", diff --git a/bns/js/compreDisplay/compreDisplayAjaxReq.js b/bns/js/compreDisplay/compreDisplayAjaxReq.js index 63b2a76..b5203ad 100644 --- a/bns/js/compreDisplay/compreDisplayAjaxReq.js +++ b/bns/js/compreDisplay/compreDisplayAjaxReq.js @@ -43,8 +43,6 @@ function getWeekRiskNumAjax() { initEchartsTwo(result.data.data, result.data.data1, result.data.data2); - - } } else { initEchartsTwo([], [], [], []); @@ -396,7 +394,6 @@ function getProNumByType(proType, orgId, type) { $('#cityProNum3').html(result.data.tgNum); $('#cityProNum4').html(result.data.dkgNum); } - } } else if (result.code === 500) { return layer.alert(result.msg, { icon: 2 }) @@ -462,7 +459,6 @@ function scrollEarlyData(data) { $('#earlyTotalNum').html(earlyTotalNum); $('#earlyDealNum').html(earlyDealNum); $('#earlyNoDealNum').html(earlyNoDealNum); - let box = document.getElementById("early-info-ul"); box.scrollTop = scrollTopValue; diff --git a/bns/js/compreDisplay/compreDisplayEcharts.js b/bns/js/compreDisplay/compreDisplayEcharts.js index ad4843a..52bb7bb 100644 --- a/bns/js/compreDisplay/compreDisplayEcharts.js +++ b/bns/js/compreDisplay/compreDisplayEcharts.js @@ -17,7 +17,6 @@ function initEchartsOne(listMap) { if (listMap != null && listMap.length > 0) { $.each(listMap, function (index, item) { nameList.push(item.cityName); - dataList.push(item.totalNum); dataList2.push(item.executedNum); }); diff --git a/bns/js/compreDisplay/dutyHome/child/proList.js b/bns/js/compreDisplay/dutyHome/child/proList.js index bd14468..4ed94d8 100644 --- a/bns/js/compreDisplay/dutyHome/child/proList.js +++ b/bns/js/compreDisplay/dutyHome/child/proList.js @@ -47,7 +47,6 @@ function pages(pageNum, pageSize, typeNum) { } function laypages(total, page, limit) { - laypage.render({ elem: 'voi-page', count: total, @@ -66,7 +65,6 @@ function laypages(total, page, limit) { } function initTable(dataList, limit, page) { - let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,}); table.render({ elem: "#proTable", diff --git a/bns/js/home/home.js b/bns/js/home/home.js index b9569c1..6bdd09a 100644 --- a/bns/js/home/home.js +++ b/bns/js/home/home.js @@ -424,7 +424,7 @@ function showTime() { //url function gotofx() { - // window.open(jj_jc_url); + window.open(jj_jc_url); } function getIsBg(orgId) { diff --git a/bns/js/public/public.js b/bns/js/public/public.js index 9092e07..5946db3 100644 --- a/bns/js/public/public.js +++ b/bns/js/public/public.js @@ -126,7 +126,7 @@ function logout(type) { if (html_type === '1') { loginOutAjax(token, login_url); } else if (html_type === '2') { - loginOutAjax(token, login_url); + loginOutAjax(token, login_url_new); } else { loginOutAjax(token, login_url); } @@ -225,7 +225,7 @@ function loginExpire(html_type) { if (html_type === '1') { top.location.href = login_url; } else if (html_type === '2') { - top.location.href = login_url; + top.location.href = login_url_new; } else { top.location.href = login_url; } @@ -238,7 +238,7 @@ $(function () { if (html_type === '1') { top.location.href = login_url; } else if (html_type === '2') { - top.location.href = login_url; + top.location.href = login_url_new; } else { top.location.href = login_url; } diff --git a/bns/js/system/IPUtils.js b/bns/js/system/IPUtils.js index 2c6a5bd..422c7ac 100644 --- a/bns/js/system/IPUtils.js +++ b/bns/js/system/IPUtils.js @@ -1,9 +1,15 @@ //测试环境 -let dataUrl = "http://192.168.0.14:38080/gsbasfs/"; -let login_url="http://192.168.0.14:38080/gssfs/login.html"; - +let http="http://"; +let ip_port=window.location.host; + +//自动获取浏览器地址 +// let dataUrl=http+ip_port+"/gsbasfs/"; +// let login_url=http+ip_port+"/gssfs/login.html" +//本地环境 +let dataUrl = "http://192.168.0.14:1999/gsbasfs/"; +let login_url="http://192.168.0.14:1999/gsjjsp/login.html"; //文件映射路径 let photoUrl = dataUrl + "proteam/files/";