From e22fd0bac62d20d94e58409ea15049c67f6ff1eb Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 10:33:35 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/index.jsp | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index d0fa11c..892f835 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -94,6 +94,11 @@
body .layui-layer-dialog {
min-width:400px;
}
+ .add-panel .addr {
+ width: 210px;
+ height: 22px;
+ border: 1px solid #ccc;
+ }
</style>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/echarts.js"></script>
@@ -683,6 +688,7 @@
//map.setMapStyle({style: 'grayscale'}); // 璁剧疆鍦板浘鐨勯鏍�
// 娣诲姞鍦板浘绫诲瀷鎺т欢
map.addControl(new BMap.MapTypeControl());
+ add_control();
// 缁欏湴鍥炬坊鍔犲伐鍏锋潯(鍦板浘-鍗槦-涓夌淮)鍜屾瘮渚嬪昂鎺т欢
var bottom_left_control = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
map.addControl(bottom_left_control); // 娣诲姞姣斾緥灏哄埌鍦板浘
@@ -1750,7 +1756,19 @@
iconList.append(icon);
iconList.append(badge);
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-xuhang" checked="checked">');
+ var icon = $('<img src="'+mapImages.xuhang+'">');
+ var span = $('<span>缁埅涓嶈冻鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-xuhang">0</a>');
+ iconList.append(input);
+ iconList.append(span);
+ iconList.append(icon);
+ iconList.append(badge);
+ 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-behind" checked="checked">');
@@ -1821,7 +1839,7 @@
var down = mapImgDesc.find('.badge-down'); // 鎺夌珯鏈烘埧
var powercut = mapImgDesc.find('.badge-powercut'); // 鍋滅數鏈烘埧
var normal = mapImgDesc.find('.badge-normal'); // 姝ｅ父鏈烘埧
- var weak = mapImgDesc.find('.badge-weak'); // 缁埅涓嶈冻3灏忔椂鏈烘埧
+ var weak = mapImgDesc.find('.badge-xuhang'); // 缁埅涓嶈冻3灏忔椂鏈烘埧
console.log(warn.length);
// 璇锋眰鍚庡彴鏁版嵁
$.ajax({
@@ -1832,12 +1850,12 @@
,dataType: 'json'
,success:function(res) {
var rs = JSON.parse(res.result);
- //console.log(rs);
+ console.log(rs);
powercut.text(rs.sum); // 鍋滅數鏁�
down.text(rs.code); // 鎺夌珯鏁�
behind.text(rs.msgN); // 钀藉悗鏈烘埧
warn.text(rs.msg); // 鍛婅鏈烘埧
-
+ weak.text(rs.msgT); // 缁埅涓嶈冻3灏忔椂
/* var normalNum = Number(rs.newsum) - (Number(rs.sum)+Number(rs.code)+Number(rs.msgN)+Number(rs.msg));
normal.text(normalNum); */ // 姝ｅ父鏈烘埧
}
@@ -2283,10 +2301,10 @@
var content = '<div class="add-panel">'+
'<div style="padding: 6px 4px"><span>鍦板潃锛�</span>'+
- '<span class="addr">'+addComp.province+'-'+addComp.city+'-'+addComp.district+'-'+addComp.street+'</span></div>'+
+ '<input type="text" class="addr" value="'+addComp.province+'-'+addComp.city+'-'+addComp.district+'-'+addComp.street+'"></div>'+
'<div style="padding: 6px 4px">缁忓害锛�<span class="lng">'+rs.point.lng+'</span>锛岀含搴︼細<span class="lat">'+rs.point.lat+'</span></div>'+
- '<div style="padding: 6px 4px"><span>璁剧疆绔欑偣鍚嶏細</span>'+'<select style="border: 1px solid #ccc; width: 180px">'+options+'</select></div>'+
- '<div style="padding: 6px 4px; margin-top: 20px">'+
+ '<div style="padding: 6px 4px"><span>璁剧疆绔欑偣鍚嶏細</span>'+'<select style="border: 1px solid #ccc; width: 180px;height: 22px;">'+options+'</select></div>'+
+ '<div style="padding: 6px 4px; margin-top: 15px">'+
'<a href="javascript:getAddHomeInfo();" class="map-panel-btn">纭畾</a></div>'
+'</div>';
@@ -2304,7 +2322,7 @@
var lat = $('.add-panel .lat').text(); // 鑾峰彇绾害
var wgsPoint = GPS.bd2wgs(lat, lng); // 鐧惧害鍦板浘鍧愭爣杞寲涓篏PS
- var addr = $('.add-panel .addr').text(); // 鑾峰彇鍦板潃
+ var addr = $('.add-panel .addr').val(); // 鑾峰彇鍦板潃
var homeName = $('.add-panel select option:selected').text(); // 鏈烘埧鍚嶇О
var homeId = $('.add-panel select option:selected').val(); // 鏈烘埧ID
if(homeId !=0 && confirm("纭灏�"+homeName+"鏈烘埧璁剧疆鍒拌浣嶇疆鍚楋紵")){
@@ -3322,6 +3340,7 @@
rs.float = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_online_charge}"; // 娴厖
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}";
+ rs.xuhang = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:Chart_xuhang}";
return rs;
}
@@ -3542,6 +3561,9 @@
break;
case 'item-pre_charge': // 61850棰勫厖鐢�
rs = imgs.precharge;
+ break;
+ case 'item-xuhang': // 缁埅涓嶈冻
+ rs = imgs.xuhang;
break;
default:
rs = imgs.defaults;
@@ -4102,5 +4124,11 @@
$( "#mapToolSearch" ).autocomplete('option', 'source', homeSource);
}
+
+ // 娣诲姞鍦板浘鎺т欢
+ function add_control(){
+ var bottom_left_navigation = new BMap.NavigationControl({anchor: BMAP_ANCHOR_BOTTOM_LEFT});
+ map.addControl(bottom_left_navigation);
+ }
</script>
</html>
--
Gitblit v1.9.1