From d489aed2de688a18d6aaf76ae3630b24d56c8ee4 Mon Sep 17 00:00:00 2001 From: 81041 <81041@192.168.10.27> Date: 星期二, 06 十一月 2018 16:06:01 +0800 Subject: [PATCH] gprs使用REPLACE --- gx_tieta/WebRoot/index.jsp | 80 ++++++++++++++++++++++++++++++++------- 1 files changed, 65 insertions(+), 15 deletions(-) diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp index 7d2e767..a21aa51 100644 --- a/gx_tieta/WebRoot/index.jsp +++ b/gx_tieta/WebRoot/index.jsp @@ -369,6 +369,7 @@ <script type="text/javascript" src="pages/js/common.js"></script> <script type="text/javascript" src="pages/js/pages/siderbar.js"></script> <script type="text/javascript" src="pages/js/pages/index-common.js"></script> + <script type="text/javascript" src="pages/js/GPS.js"></script> <script type="text/javascript" src="js/panel.js"></script> <script type="text/javascript" src="js/search.js"></script> <script type="text/javascript" src="js/changePinYin.js"></script> @@ -1553,11 +1554,23 @@ iconList.append('<div class="clear"></div>'); iconExplain.append(iconList); + + // 鏈烘埧寤舵椂 var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>'); var input = $('<input type="checkbox" data-img="item-timeout" checked="checked">'); var icon = $('<img src="'+mapImages.timeout+'">'); var span = $('<span>鐢垫睜缁勬斁鐢靛欢鏃舵満鎴�</span>'); + iconList.append(input); + iconList.append(span); + iconList.append(icon); + iconExplain.append(iconList); + + // 鍋滅數鏈烘埧 + var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>'); + var input = $('<input type="checkbox" data-img="item-poff" checked="checked">'); + var icon = $('<img src="'+mapImages.powercut+'">'); + var span = $('<span>鍋滅數鏈烘埧</span>'); iconList.append(input); iconList.append(span); iconList.append(icon); @@ -1986,6 +1999,8 @@ function getAddHomeInfo() { var lng = $('.add-panel .lng').text(); // 鑾峰彇缁忓害 var lat = $('.add-panel .lat').text(); // 鑾峰彇绾害 + var wgsPoint = GPS.bd2wgs(lat, lng); // 鐧惧害鍦板浘鍧愭爣杞寲涓篏PS + var addr = $('.add-panel .addr').text(); // 鑾峰彇鍦板潃 var homeName = $('.add-panel select option:selected').text(); // 鏈烘埧鍚嶇О var homeId = $('.add-panel select option:selected').val(); // 鏈烘埧ID @@ -1994,8 +2009,8 @@ StationId:homeId, //鏈烘埧缂栧彿 StationName:homeName, //鏈烘埧鍚嶇О Address:addr, //鏈烘埧鐗╃悊淇℃伅 - longitude:lng, // 缁忓害 - latitude:lat, // 绾害 + longitude: wgsPoint.lon, // 缁忓害 + latitude: wgsPoint.lat, // 绾害 information:"", //澶囨敞 }; var json = JSON.stringify(temp); @@ -2265,9 +2280,11 @@ // 鏍煎紡鍖栨煡璇㈢粨鏋� function formatAllStation(list) { var obj = new Object(); + // GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍� + var point = GPS.wgs2bd(list.latitude, list.longitude); // 鏋勯�犵粨鏋滈泦 - obj.lng = list.longitude; - obj.lat = list.latitude; + obj.lng = point.lon; + obj.lat = point.lat; obj.title = list.StationName; obj.sId = list.StationId; obj.fbsId = list.FBSDeviceId; @@ -2326,9 +2343,12 @@ function formatUpdateStation(list) { var obj = {}; var data = list.data; + //console.log(list); + // GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍� + var point = GPS.wgs2bd(data.latitude, data.longitude); // 鏋勯�犵粨鏋滈泦 - obj.lng = data.longitude; - obj.lat = data.latitude; + obj.lng = point.lon; + obj.lat = point.lat; obj.title = data.StationName; obj.sId = data.StationId; obj.fbsId = data.FBSDeviceId; @@ -2381,6 +2401,7 @@ '<div style="padding:6px;"><span>鍦板潃锛�</span>'+data.data.Address+'</div>'+ '<input type="hidden" class="ipt-hide home" value="'+data.data.StationName+'">'+ '<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+ + '<input type="hidden" class="ipt-hide county" value="'+data.data.stationName5+'">'+ '<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">'; var list = { @@ -2522,7 +2543,10 @@ var home = $('.ipt-hide.home').val(); var province = $('.ipt-hide.province').val(); var city = $('.ipt-hide.city').val(); - window.open('control.jsp?province='+province+'&city='+city+'&home='+home); + var county = $('.ipt-hide.county').val(); + var url = skipUrl('control.jsp',province,city,county,home); + window.open(url); + //window.open('control.jsp?province='+province+'&city='+city+'&home='+home); } // 瀹氫綅鍒板巻鍙叉暟鎹〉闈� @@ -2530,27 +2554,49 @@ var home = $('.ipt-hide.home').val(); var province = $('.ipt-hide.province').val(); var city = $('.ipt-hide.city').val(); - window.open('charge-test.jsp?province='+province+'&city='+city+'&home='+home); + var county = $('.ipt-hide.county').val(); + var url = skipUrl('charge-test.jsp',province,city,county,home); + window.open(url); + //window.open('charge-test.jsp?province='+province+'&city='+city+'&home='+home); } //瀹氫綅鍒板憡璀﹂〉闈� function loadToWarnPage() { + var home = $('.ipt-hide.home').val(); + var province = $('.ipt-hide.province').val(); + var city = $('.ipt-hide.city').val(); + var county = $('.ipt-hide.county').val(); + var url = skipUrl('elewarn.jsp',province,city,county,home); + window.open(url); // console.info($('.ipt-hide').val()); - var stationId = $('.ipt-hide').eq(1).val(); - window.open('elewarn.jsp?stationId='+stationId); + //var stationId = $('.ipt-hide').eq(1).val(); + //window.open('elewarn.jsp?stationId='+stationId); } // 瀹氫綅鍒拌惤鍚庡崟浣撻〉闈� function loadToBehindPage() { + var home = $('.ipt-hide.home').val(); + var province = $('.ipt-hide.province').val(); + var city = $('.ipt-hide.city').val(); + var county = $('.ipt-hide.county').val(); + var url = skipUrl('taskplan.jsp',province,city,county,home); + window.open(url); // console.info($('.ipt-hide').val()); - var stationId = $('.ipt-hide').eq(1).val(); - window.open('taskplan.jsp?stationId='+stationId); + //var stationId = $('.ipt-hide').eq(1).val(); + //window.open('taskplan.jsp?stationId='+stationId); } // 瀹氫綅鍒版斁鐢靛欢鏃堕〉闈� function loadToDischargeDelay() { - var stationId = $('.ipt-hide').eq(1).val(); - window.open('dischargeplan.jsp?stationId='+stationId); + var home = $('.ipt-hide.home').val(); + var province = $('.ipt-hide.province').val(); + var city = $('.ipt-hide.city').val(); + var county = $('.ipt-hide.county').val(); + var url = skipUrl('dischargeplan.jsp',province,city,county,home); + window.open(url); + + //var stationId = $('.ipt-hide').eq(1).val(); + //window.open('dischargeplan.jsp?stationId='+stationId); } // 瀹氫綅鍒版満鎴胯缁嗕俊鎭〉闈� @@ -2971,7 +3017,8 @@ rs.devalarm = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_dev_alarm}"; // 璁惧鍛婅 rs.precharge = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_pre_charge}"; // 棰勫厖鐢� rs.float = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_online_charge}"; // 娴厖 - rs.defaults = mapDefults; + rs.powercut = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_poff}"; + rs.defaults = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_install}"; return rs; } /* $(function(){ @@ -3262,6 +3309,9 @@ case 'item-timeout': // 寤舵椂 rs = imgs.timeout; break; + case 'item-poff': // 鍋滅數 + rs = imgs.powercut; + break; case 'item-dev_alarm': // 61850鍛婅 rs = imgs.devalarm; break; -- Gitblit v1.9.1