From 7cacbc5938897458ee26ad7aac097c857f4bc3c7 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 05 十二月 2018 17:49:07 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index b17e1e2..76bb5ab 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -683,6 +683,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); // 娣诲姞姣斾緥灏哄埌鍦板浘
@@ -1727,6 +1728,30 @@
// 鏅�氭満鎴挎弿杩�
function mapImgDescNormal(iconExplain) {
+ // 鎺夌珯鏈烘埧
+ 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>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-down">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-poff" checked="checked">');
+ var icon = $('<img src="'+mapImages.powercut+'">');
+ var span = $('<span>鍋滅數鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-powercut">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">');
@@ -1752,17 +1777,7 @@
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-down" checked="checked">');
- var icon = $('<img src="'+mapImages.timeout+'">');
- var span = $('<span>鎺夌珯鏈烘埧</span>');
- var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-down">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>');
@@ -1773,18 +1788,6 @@
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>');
- var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-powercut">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>');
@@ -3311,6 +3314,7 @@
var rs = new Object();
rs.normal = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_normal}"; // 鏅�氭満鎴垮浘鏍�
rs.behind = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_behind}"; // 钀藉悗鍥炬爣
+ //rs.diaozhan = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_diaozhan}"; // 寤舵椂鏈烘埧鍥炬爣
rs.timeout = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_timeout}"; // 寤舵椂鏈烘埧鍥炬爣
rs.warn = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_warn}"; // 鍛婅鏈烘埧鍥炬爣
rs.nuclear = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_nuclear_cap}"; // 鏍稿鏀剧數
@@ -3518,6 +3522,9 @@
break;
case 'item-behind': // 钀藉悗
rs = imgs.behind;
+ break;
+ case 'item-diaozhan':
+ rs = imgs.timeout; // 鎺夌珯
break;
case 'item-timeout': // 寤舵椂
rs = imgs.timeout;
@@ -4096,5 +4103,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