From a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期一, 26 十一月 2018 11:54:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 0264804..e7640d6 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1582,28 +1582,42 @@
// 鏅�氭満鎴挎弿杩�
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-behind" checked="checked">');
+ var span = $('<span>鐢垫睜钀藉悗鏈烘埧</span>');
var icon = $('<img src="'+mapImages.behind+'">');
- var span = $('<span>鐢垫睜缁勮惤鍚庢満鎴�</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-behind">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-warn" checked="checked">');
+ var span = $('<span>鐢垫睜鍛婅鏈烘埧</span>');
var icon = $('<img src="'+mapImages.warn+'">');
- var span = $('<span>鐢垫睜缁勫憡璀︽満鎴�</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-warn">0</a>');
iconList.append(input);
iconList.append(span);
iconList.append(icon);
+ iconList.append(badge);
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>');
@@ -1613,16 +1627,18 @@
iconList.append(input);
iconList.append(span);
iconList.append(icon);
- iconExplain.append(iconList);
+ //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);
// 姝ｅ父鏈烘埧
@@ -1630,12 +1646,40 @@
var input = $('<input type="checkbox" data-img="item-normal" checked="checked">');
var icon = $('<img src="'+mapImages.normal+'">');
var span = $('<span>姝ｅ父鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-normal">0</a>');
iconList.append(input);
iconList.append(span);
iconList.append(icon);
+ iconList.append(badge);
iconExplain.append(iconList);
+
+ // 缁埅涓嶈冻3灏忔椂鏈烘埧
+ 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-weak" checked="checked">');
+ var icon = $('<img src="'+mapImages.normal+'">');
+ var span = $('<span>缁埅涓嶈冻3灏忔椂鏈烘埧</span>');
+ var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-weak">0</a>');
+ iconList.append(input);
+ iconList.append(span);
+ iconList.append(icon);
+ iconList.append(badge);
+ //iconExplain.append(iconList);
+
+
}
+ // 鏇存柊鍦板浘鍥炬爣badge鐨勫��
+ function updateMapIconBadge() {
+ var mapImgDesc = $('#mapImgDesc');
+ var behind = mapImgDesc.find('.badge-behind'); // 鐢垫睜钀藉悗鏈烘埧
+ var warn = mapImgDesc.find('.badge-warn'); // 鐢垫睜鍛婅鏈烘埧
+ 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灏忔椂鏈烘埧
+ }
+
+
// 61850鎻忚堪
function mapImgDesc61850(iconExplain) {
// 鏍稿/鍋滅數鏀剧數
--
Gitblit v1.9.1