From caf7a2104e823d3402904006dee77dc7631eb480 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Thu, 9 Oct 2025 13:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bns/js/compreDisplay/child/newProList.js | 26 +-------- bns/js/compreDisplay/compreDisplayAjaxReq.js | 25 ++------- bns/js/compreDisplay/compreDisplayEcharts.js | 6 +-- .../compreDisplay/dutyHome/child/proList.js | 20 +------ bns/js/compreDisplay/dutyHome/dutyHomeAjax.js | 22 +------- bns/js/home/home.js | 2 +- bns/js/public/public.js | 6 +-- bns/js/system/IPUtils.js | 32 +---------- logins.html | 54 ------------------- 9 files changed, 13 insertions(+), 180 deletions(-) delete mode 100644 logins.html diff --git a/bns/js/compreDisplay/child/newProList.js b/bns/js/compreDisplay/child/newProList.js index 9805005..742804e 100644 --- a/bns/js/compreDisplay/child/newProList.js +++ b/bns/js/compreDisplay/child/newProList.js @@ -60,18 +60,6 @@ function pages(pageNum, pageSize, typeNum) { function laypages(total, page, limit) { console.log(page) - // if(isBd){ - // if(proStatusParam=='05'){ - // total=403; - // }else if(proStatusParam=='01'){ - // total=786; - // }else if(proStatusParam=='04'){ - // total=251; - // }else if(proStatusParam=='03'){ - // total=15; - // } - - // } laypage.render({ elem: 'voi-page', count: total, @@ -90,14 +78,6 @@ function laypages(total, page, limit) { } function initTable(dataList, limit, page) { - // if(isBd){ - // if(proStatusParam=='03'){ - // dataList=dataList.slice(-15); - // dataList.forEach(function(item) { - // item.proStatus='停工'; - // }); - // } - // } let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,}); table.render({ elem: "#proTable", @@ -155,11 +135,7 @@ function initTable(dataList, limit, page) { function getReqParams(page, limit, type) { let obj = {}; let proStatetus=proStatusParam; - // if(isBd){ - // if(proStatetus=='03'){ - // proStatetus='04' - // } - // } + if (!type) { obj = { page: page + "", diff --git a/bns/js/compreDisplay/compreDisplayAjaxReq.js b/bns/js/compreDisplay/compreDisplayAjaxReq.js index cc52948..63b2a76 100644 --- a/bns/js/compreDisplay/compreDisplayAjaxReq.js +++ b/bns/js/compreDisplay/compreDisplayAjaxReq.js @@ -38,19 +38,10 @@ function getWeekRiskNumAjax() { success: function (result) { if (result.code === 200) { if (result.data) { - console.log("周计划") - console.log(isBd) - // if(isBd){ - // let da1=['合肥', '马鞍山', '芜湖', '安庆', '淮南', '宣城', '阜阳', '铜陵', '蚌埠', - // '滁州', '六安', '淮北', '宿州', '池州', '黄山', '亳州', '建设分公司']; - // let da2=[81,5,11,70,26,49,3,4,3,16,14,12,12,37,157,48,195]; - // let da3=[50,0,2,0,6,0,0,0,0,3,0,2,5,1,0,0,21]; - // initEchartsTwo(da1, da2, da3); - // }else{ console.log("周计划") console.log(result.data) initEchartsTwo(result.data.data, result.data.data1, result.data.data2); - //} + @@ -405,14 +396,7 @@ function getProNumByType(proType, orgId, type) { $('#cityProNum3').html(result.data.tgNum); $('#cityProNum4').html(result.data.dkgNum); } - // if(isBd){ - // $('#buildNum').html(219); - // $('#buildNum2').html(403);//总数量 - // $('#consNum').html(15); - // $('#stopNum').html(251); - // $('#dkgNum').html(786); - - // } + } } else if (result.code === 500) { return layer.alert(result.msg, { icon: 2 }) @@ -478,10 +462,7 @@ function scrollEarlyData(data) { $('#earlyTotalNum').html(earlyTotalNum); $('#earlyDealNum').html(earlyDealNum); $('#earlyNoDealNum').html(earlyNoDealNum); - // if(isBd){ - // $('#earlyDealNum').html(earlyTotalNum-4); - // $('#earlyNoDealNum').html(4); - // } + 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 609e038..ad4843a 100644 --- a/bns/js/compreDisplay/compreDisplayEcharts.js +++ b/bns/js/compreDisplay/compreDisplayEcharts.js @@ -17,13 +17,9 @@ function initEchartsOne(listMap) { if (listMap != null && listMap.length > 0) { $.each(listMap, function (index, item) { nameList.push(item.cityName); - // if(isBd){ - // dataList.push(item.totalNum/2); - // dataList2.push(item.executedNum/2); - // }else{ + dataList.push(item.totalNum); dataList2.push(item.executedNum); - // } }); } // 基于准备好的dom,初始化echarts图表 diff --git a/bns/js/compreDisplay/dutyHome/child/proList.js b/bns/js/compreDisplay/dutyHome/child/proList.js index 38034c6..bd14468 100644 --- a/bns/js/compreDisplay/dutyHome/child/proList.js +++ b/bns/js/compreDisplay/dutyHome/child/proList.js @@ -47,17 +47,6 @@ function pages(pageNum, pageSize, typeNum) { } function laypages(total, page, limit) { - // if(isBd){ - // if(chooseTypeParam==1){ - // total=1440; - // }else if(chooseTypeParam==2){ - // total=228; - // }else if(chooseTypeParam==3){ - // total=158; - // }else if(chooseTypeParam==4){ - // total=15; - // } - // } laypage.render({ elem: 'voi-page', @@ -77,14 +66,7 @@ function laypages(total, page, limit) { } function initTable(dataList, limit, page) { - // if(isBd){ - // if(chooseTypeParam==4){ - // dataList=dataList.slice(-15); - // dataList.forEach(function(item) { - // item.proStatus='停工'; - // }); - // } - // } + let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,}); table.render({ elem: "#proTable", diff --git a/bns/js/compreDisplay/dutyHome/dutyHomeAjax.js b/bns/js/compreDisplay/dutyHome/dutyHomeAjax.js index 002c50f..ce4283c 100644 --- a/bns/js/compreDisplay/dutyHome/dutyHomeAjax.js +++ b/bns/js/compreDisplay/dutyHome/dutyHomeAjax.js @@ -32,19 +32,11 @@ function loadProNumAjax() { // 工程统计数量赋值 function setProNum(obj) { - // if(isBd){ - // $('#proTotalNum').html(1440); - // $('#workNum').html(228); - // $('#noWorkNum').html(158); - // $('#stopNum').html(15); - // initEchartsOne(1440, 228, 158,15); - // }else{ $('#proTotalNum').html(obj.allNum); $('#workNum').html(obj.sgNum); $('#noWorkNum').html(obj.wsgNum); $('#stopNum').html(obj.TgNum); initEchartsOne(obj.allNum, obj.sgNum, obj.wsgNum, obj.TgNum); - // } } } @@ -74,24 +66,12 @@ function loadWeekPlanAjax(type) { function setWeekPlan(obj) { if (type === '1') { let data = obj.data; - // if(isBd){ - // initEchartsFive(90, 742, 8075, 302); - // $('#weekPlanNum').html(9209); - // }else{ initEchartsFive(data[0], data[1], data[2], data[3]); $('#weekPlanNum').html(parseInt(data[0]) + parseInt(data[1]) + parseInt(data[2]) + parseInt(data[3])); - //} } else if (type === '2') { - // if(isBd){ - // let da1=['合肥', '马鞍山', '芜湖', '安庆', '淮南', '宣城', '阜阳', '铜陵', '蚌埠', - // '滁州', '六安', '淮北', '宿州', '池州', '黄山', '亳州', '建设分公司']; - // let da2=[81,5,11,70,26,49,3,4,3,16,14,12,12,37,157,48,195]; - // let da3=[50,0,2,0,6,0,0,0,0,3,0,2,5,1,0,0,21]; - // initEchartsThree(da1,da3, da2); - // }else{ + initEchartsThree(obj.times, obj.twoList, obj.threeList); - // } } } diff --git a/bns/js/home/home.js b/bns/js/home/home.js index 6bdd09a..b9569c1 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 5946db3..9092e07 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_new); + loginOutAjax(token, login_url); } 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_new; + top.location.href = login_url; } 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_new; + top.location.href = login_url; } else { top.location.href = login_url; } diff --git a/bns/js/system/IPUtils.js b/bns/js/system/IPUtils.js index ceff811..2c6a5bd 100644 --- a/bns/js/system/IPUtils.js +++ b/bns/js/system/IPUtils.js @@ -1,37 +1,9 @@ //测试环境 -// let dataUrl = "http://192.168.0.14:11122/basfs/"; -// let login_url="http://192.168.0.14:11122/ahsfs/login.html"; -//测试环境 -// let host=window.location.host; -// let dataUrl = "http://"+host+"/basfs/"; -// let login_url="http://"+host+"/ahsfs/login.html"; - -// let dataUrl = "http://192.168.0.7:17789/basfs/"; -// let login_url="http://192.168.0.7:17789/ahsfs/login.html"; -//只允许包含静态资源-不包含方法 //系统请求路径 - - - -// let login_url="http://sgwpdm.ah.sgcc.com.cn/ahsfs/login.html"; -// let dataUrl = "http://127.0.0.1:18080/basfs/"; -// let login_url="http://127.0.0.1:5501/login.html"; - - -//生产环境 -let dataUrl = "http://sgwpdm.ah.sgcc.com.cn/basfs/"; -let login_url="http://sgwpdm.ah.sgcc.com.cn/sgwpdm/#/weblogin"; +let dataUrl = "http://192.168.0.14:38080/gsbasfs/"; +let login_url="http://192.168.0.14:38080/gssfs/login.html"; -//let login_url="http://127.0.0.1:8848/jjsp_web/login.html"; -//重定向登录页面 -let login_url_new = "http://sgwpdm.ah.sgcc.com.cn/sgwpdm/#/weblogin"; -//分析决策中心 -let jj_jc_url = "http://sgwpdm.ah.sgcc.com.cn/ahsfs/youo/infrastructureControl/index.html";//决策中心系统 //文件映射路径 let photoUrl = dataUrl + "proteam/files/"; - - -//是否是本地 -let isBd=false; \ No newline at end of file diff --git a/logins.html b/logins.html deleted file mode 100644 index d423f2f..0000000 --- a/logins.html +++ /dev/null @@ -1,54 +0,0 @@ - - -
- -
-
-
-
-