From 175cc78c4190b874a6abe2c6a208aaecb432f63c Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.20>
Date: 星期四, 29 十一月 2018 09:08:37 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/base.js | 2
gx_tieta/WebRoot/index.jsp | 7 +++
gx_tieta/WebRoot/Top.jsp | 73 +++++++++++++++++++++++++++++-------
3 files changed, 65 insertions(+), 17 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index c712864..e7add71 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -64,24 +64,24 @@
<div class="batt-state">
<div class="list">
- <div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num">0</a></div> <!-- 鏈烘埧鍋滅數鏁� -->
+ <div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num"><span class="num">0</span>/<span class="dev-num">0</span></a></div> <!-- 鏈烘埧鍋滅數鏁� -->
</div>
<div class="list">
- <div class="list-contain">缁埅涓嶈冻鏈烘埧鏁�:<a href="javascript:;" class="badge default" id="weak_home">0</a></div> <!-- 鏈烘埧缁埅涓嶈冻鏁� -->
+ <div class="list-contain">缁埅涓嶈冻鏈烘埧鏁�:<a href="javascript:;" class="badge default" id="weak_home"><span class="num">0</span>/<span class="dev-num">0</span></a></div> <!-- 鏈烘埧缁埅涓嶈冻鏁� -->
</div>
<div class="list">
- <div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num">0</a></div> <!-- 鐢垫睜鍛婅鏁� -->
+ <div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num"><span class="num">0</span>/<span class="batt-num">0</span></a></div> <!-- 鐢垫睜鍛婅鏁� -->
</div>
<div class="list">
- <div class="list-contain"><s:text name="Capacity"/><s:text name="Behind_number_monomer"/>:<a href="taskplan.jsp" class="badge default" id="batt_low_num">0</a></div> <!-- 钀藉悗鍗曚綋鏁� -->
+ <div class="list-contain"><s:text name="Capacity"/><s:text name="Behind_number_monomer"/>:<a href="taskplan.jsp" class="badge default" id="batt_low_num"><span class="num">0</span>/<span class="batt-num">0</span></a></div> <!-- 钀藉悗鍗曚綋鏁� -->
</div>
<div class="list">
- <div class="list-contain"><s:text name="Equipment"/><s:text name="Alarm"/><s:text name="Num"/> :<a href="equipWarn1.jsp" class="badge danger" id="dev_alarm_num">0</a></div> <!-- 璁惧鍛婅鏁� -->
+ <div class="list-contain"><s:text name="Equipment"/><s:text name="Alarm"/><s:text name="Num"/> :<a href="equipWarn1.jsp" class="badge danger" id="dev_alarm_num"><span class="num">0</span>/<span class="dev-num">0</span></a></div> <!-- 璁惧鍛婅鏁� -->
</div>
<div class="list">
<div class="list-contain">
- 鏍稿娴嬭瘯璁惧鏁�:<a href="javascript:void(0);" class="badge default" id="nuclear_test">0</a>
+ 鏍稿娴嬭瘯璁惧鏁�:<a href="javascript:void(0);" class="badge default" id="nuclear_test"><span class="num">0</span>/<span class="dev-num">0</span></a>
</div>
</div>
</div>
@@ -216,7 +216,7 @@
});
}
});
- searchAlm(); //鏌ヨ鐢垫睜鍛婅鎬绘暟
+ searchAlm(); //鏌ヨ鐢垫睜鍛婅鎬绘暟(鎴戝湪base.js閲�)
searchlowmon(); //鏌ヨ钀藉悗鍗曚綋鎬绘暟
searchpoweroff(); //鏌ヨ鏈烘埧鍋滅數鎬绘暟
searchdevalarm(); //鏌ヨ璁惧瀹炴椂鍛婅鎬绘暟
@@ -244,7 +244,7 @@
success: function(data){
data = eval("("+data+")");
var model = eval("("+data.result+")");
- $('#batt_low_num').text(model.sum);
+ $('#batt_low_num .num').text(model.sum);
setTimeout(searchlowmon, 5000);
},
error:function() {
@@ -264,7 +264,7 @@
success: function(data){
data = eval("("+data+")");
var model = eval("("+data.result+")");
- $('#poweroff_num').text(model.sum);
+ $('#poweroff_num .num').text(model.sum);
setTimeout(searchpoweroff, 5000);
},
error:function() {
@@ -284,7 +284,7 @@
success: function(data){
var model = eval("("+data.result+")");
//console.info(model);
- $('#poweroff_num').text(model.newsum);
+ $('#poweroff_num .num').text(model.newsum);
setTimeout(searchpoweroff, 5000);
},
error:function() {
@@ -304,7 +304,7 @@
success: function(data){
data = eval("("+data+")");
var model = eval("("+data.result+")");
- $('#dev_alarm_num').text(model.sum);
+ $('#dev_alarm_num .num').text(model.sum);
setTimeout(searchdevalarm, 5000);
},
error:function() {
@@ -343,9 +343,52 @@
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
- $('#weak_home').text(rs.sum);
+ $('#weak_home .num').text(rs.sum);
setTimeout(searchWeakHome, 5000);
+ }
+ });
+ }
+
+ // 鏌ヨ鎵�鏈夌殑璁惧鏁�
+ searchAllDevNum();
+ function searchAllDevNum() {
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'BattInfAction!serchByDeviceId'
+ ,data: null
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ if(rs.code == 1) {
+ var sum = rs.sum;
+ $('.batt-state .dev-num').text(sum);
+ }
+
+ // 寤舵椂鎵ц
+ setTimeout(searchAllDevNum, 5000);
+ }
+ });
+ }
+
+ // 鏌ヨ鎵�鏈夌殑鐢垫睜缁勬暟
+ searchAllEleGroupNum();
+ function searchAllEleGroupNum() {
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'BattInfAction!serchByInstall_count'
+ ,data: null
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ if(rs.code == 1) {
+ var sum = rs.sum;
+ $('.batt-state .batt-num').text(sum);
+ }
+ // 寤舵椂鎵ц
+ setTimeout(searchAllEleGroupNum, 5000);
}
});
}
@@ -597,7 +640,7 @@
//鏌ヨ鐢垫睜鍛婅淇℃伅
function searchBattAlarm(data){
- console.info(data);
+ //console.info(data);
$.ajax({
type:"post",
url: "Battalarm_dataAction!serchBatt_alarm",
@@ -773,7 +816,7 @@
var model = eval('('+data.result+')');
//console.info(model);
if(model.code == 1){
- $('#nuclear_test').text(model.data.length);
+ $('#nuclear_test .num').text(model.data.length);
if(model.data.length != 0) {
if(!$('#navNuclearTest').hasClass('hide') || isNew) {
createTblByModel(model);
@@ -781,7 +824,7 @@
isNew=false;
}
}else {
- $('#nuclear_test').text(0);
+ $('#nuclear_test .num').text(0);
createFullTbl(eleTh, eleTd, arrTh, []);
}
},
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 351d3e4..9d0fc10 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -2543,7 +2543,7 @@
// 鏄剧ず鍖哄煙鐨勫浘鏍�
bmap.setDots(allStation);
bmap.queryInRect(map, createMapDot);
- updateStation(setRect);
+ updateStation();
// 鏇存柊灏忓伐鍏锋悳绱㈡満鎴垮姛鑳�
updateSearchSource(allStation);
@@ -3723,6 +3723,11 @@
type: 1
});
$(this).prop('checked', false);
+ }else if(num == 0) {
+ layerMsg = layer.msg("鑷冲皯閫夋嫨涓�涓紒", {
+ type: 1
+ });
+ $(this).prop('checked', true);
}
});
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 7ff1c73..924f582 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -617,7 +617,7 @@
$.post("Battalarm_dataAction!serchRealTime",null,function(data){
model=eval("("+data.result+")");
if(model.code==1){
- $('#batt_alarm_num').text(model.sum);
+ $('#batt_alarm_num .num').text(model.sum);
if(totalAlm_num<model.sum){
createEleWarning(model.sum-totalAlm_num);
}
--
Gitblit v1.9.1