From f8cb1fc3fce89569bd3a6e7fec7b7b39be362d61 Mon Sep 17 00:00:00 2001 From: 81041 <81041@192.168.10.33> Date: 星期五, 02 十一月 2018 17:02:56 +0800 Subject: [PATCH] 问题反馈添加修改 --- gx_tieta/WebRoot/index.jsp | 40 ++++++++++++++++++++++++++++++++-------- 1 files changed, 32 insertions(+), 8 deletions(-) diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp index 2ea6ec1..0ec2bf7 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> @@ -627,7 +628,7 @@ centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣 map.enableScrollWheelZoom(); map.disableDoubleClickZoom(); - map.setMapStyle({style: 'grayscale'}); // 璁剧疆鍦板浘鐨勯鏍� + //map.setMapStyle({style: 'grayscale'}); // 璁剧疆鍦板浘鐨勯鏍� // 娣诲姞鍦板浘绫诲瀷鎺т欢 map.addControl(new BMap.MapTypeControl()); // 缁欏湴鍥炬坊鍔犲伐鍏锋潯(鍦板浘-鍗槦-涓夌淮)鍜屾瘮渚嬪昂鎺т欢 @@ -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; @@ -2971,7 +2991,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 +3283,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