From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/index.jsp | 106 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 88 insertions(+), 18 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 4fbf7be..45bb7c7 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>
@@ -121,7 +126,7 @@
<div class="map-info-detail">
<div class="layui-collapse" lay-filter="test" lay-accordion="">
<div class="layui-colla-item">
- <h2 class="layui-colla-title">鎼滅储鏈烘埧</h2>
+ <h2 class="layui-colla-title">绛涢�夋満鎴�</h2>
<div class="layui-colla-content layui-show">
<table>
<tbody>
@@ -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); // 娣诲姞姣斾緥灏哄埌鍦板浘
@@ -795,12 +801,14 @@
}
//闇�瑕佸疄鏃舵煡璇㈢殑鏂规硶
- function Repeatoperation(){
- searchBattmaintrecords();
- searchUserTask();
- searchAnnounceall();
- searchTestsCale();
-
+ function Repeatoperation(){
+ // 鍒ゆ柇椤甸潰鏄惁姝ｅ湪琚闂�
+ if(pageIsVisit) {
+ searchBattmaintrecords();
+ searchUserTask();
+ searchAnnounceall();
+ searchTestsCale();
+ }
setTimeout(Repeatoperation,10000);
}
@@ -934,6 +942,13 @@
if($('#content .warn-pie').length==0){
return;
}
+
+ // 鍒ゆ柇椤甸潰鏄惁琚闂�
+ if(!pageIsVisit) {
+ setTimeout(searchalarm_data, 10000);
+ return;
+ }
+
//鐢熸垚鐢垫睜鍛婅鐜囬ゼ鐘跺浘
var $warn=$('#content .pie-con .warn-pie'); //鑾峰彇鍛婅瀹瑰櫒鐨刯query瀵硅薄
if($warn.length!=0){
@@ -1045,6 +1060,12 @@
return;
}
+ // 鍒ゆ柇椤甸潰鏄惁琚闂�
+ if(!pageIsVisit) {
+ setTimeout(searchmaintByMap, 10000);
+ return;
+ }
+
// 鍒ゆ柇鏄惁涓篍charts瀵硅薄
var isEcharts = isObject(brdnPie)?true:false;
@@ -1117,6 +1138,13 @@
if($('#content .repair-pie').length==0){
return;
}
+
+ // 鍒ゆ柇椤甸潰鏄惁琚闂�
+ if(!pageIsVisit) {
+ setTimeout(searchBatt_maint_inf, 10000);
+ return;
+ }
+
// 鍒ゆ柇鏄惁涓篍charts瀵硅薄
var isEcharts = isObject(repairPie)?true:false;
if(!isEcharts) {
@@ -1172,6 +1200,13 @@
if($('#content .health-pie').length==0){
return;
}
+
+ // 鍒ゆ柇椤甸潰鏄惁琚闂�
+ if(!pageIsVisit) {
+ setTimeout(searchGood, 10000);
+ return;
+ }
+
//鐢熸垚鐢垫睜鍋ュ悍鐜�
var $health=$('#content .pie-con .health-pie'); //鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
if($health.length!=0){
@@ -1222,6 +1257,12 @@
var endurPie;
function searchEndurHome() {
if($('#content .endur-pie').length==0){
+ return;
+ }
+
+ // 鍒ゆ柇椤甸潰鏄惁琚闂�
+ if(!pageIsVisit) {
+ setTimeout(searchEndurHome, 10000);
return;
}
@@ -1699,7 +1740,7 @@
// 鐢熸垚鍥炬爣鐨勮鏄�
function createIconExplain(mapEle) {
var iconExplain = $('<div id="mapImgDesc" style="position:absolute;background-color: #fff; border: 1px solid #ccc; right: 10px; bottom: 10px; z-index: 99999"></div>'); // 鍦板浘鍥炬爣璇存槑瀹瑰櫒
- var iconExplainHt = $('<div class="explain-header" style="padding:4px 8px; border-bottom:1px solid #ccc; background-color: #CDDCFA">鍦板浘鍥炬爣璇存槑<img src="image/explain-down.gif" style="float:right;"/></div>');
+ var iconExplainHt = $('<div class="explain-header" style="padding:4px 8px; border-bottom:1px solid #ccc; background-color: #CDDCFA">鍥炬爣鏄剧ず涓庨�夋嫨<img src="image/explain-down.gif" style="float:right;"/></div>');
iconExplain.append(iconExplainHt);
changeMapImgDesc(iconExplain, 'normal');
@@ -1750,7 +1791,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,8 +1874,8 @@
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灏忔椂鏈烘埧
- console.log(warn.length);
+ var weak = mapImgDesc.find('.badge-xuhang'); // 缁埅涓嶈冻3灏忔椂鏈烘埧
+ // console.log(warn.length);
// 璇锋眰鍚庡彴鏁版嵁
$.ajax({
type: 'post'
@@ -1832,12 +1885,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 +2336,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 +2357,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+"鏈烘埧璁剧疆鍒拌浣嶇疆鍚楋紵")){
@@ -2614,6 +2667,13 @@
var bmap = GLOBAL.BMap; // BMap鐨勫懡鍚嶇┖闂�
var updateStationData = [];
+ // 鍒ゆ柇鏄惁琚闂�
+ if(!pageIsVisit) {
+ // 鍏抽棴骞舵坊鍔犲欢鏃舵墽琛�
+ clearInterval(updateTimeout);
+ updateTimeout = setTimeout(updateStation, 4000);
+ }
+
if(isLoad) {
updateLoad = layer.load(1);
}
@@ -2637,7 +2697,7 @@
bmap.updateDots(_list);
}
}
- console.log(updateStationData);
+ //console.log(updateStationData);
updateMapDotIcon(map, updateStationData, true);
// 鏇存柊鍒嗛〉淇℃伅
mapPages.pageCurr++;
@@ -3322,6 +3382,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 +3603,9 @@
break;
case 'item-pre_charge': // 61850棰勫厖鐢�
rs = imgs.precharge;
+ break;
+ case 'item-xuhang': // 缁埅涓嶈冻
+ rs = imgs.xuhang;
break;
default:
rs = imgs.defaults;
@@ -4102,5 +4166,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