From 04bc2d9b97c61ea79017d05f81053e719742f82f Mon Sep 17 00:00:00 2001 From: whyclj <1525436766@qq.com> Date: 星期三, 19 十二月 2018 15:41:01 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/Top.jsp | 128 +++++++++++++++++++++++++++++++++++------- 1 files changed, 105 insertions(+), 23 deletions(-) diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp index ed8a59f..51ebf9e 100644 --- a/gx_tieta/WebRoot/Top.jsp +++ b/gx_tieta/WebRoot/Top.jsp @@ -64,27 +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"><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">缁埅涓嶈冻鏈烘埧鏁�:<a href="batt-life-manage.jsp?is_stand=1" 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="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="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> - <c:forEach var="cust" items="${sessionScope.custompages}"> - <c:if test="${cust.submenu eq 'Discharge_plan_manage' && cust.subflag eq 1}"> - <div class="list"> - <div class="list-contain"><s:text name="Unfinished"/><s:text name="Discharge_plan"/><s:text name="Num"/>:<a href="dischargeplan.jsp?discharge-state=0" class="badge default" id="discharge_plan_num">0</a></div> <!-- 鏈畬鎴愭斁鐢佃鍒掓暟 --> - </div> - </c:if> - </c:forEach> + <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"><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> @@ -132,6 +129,9 @@ </div> <div class="cell-list control"> <img src="image/webStatus/control_normal.gif" alt="绾跨▼鐩戞帶绋嬪簭" title="绾跨▼鐩戞帶绋嬪簭杩愯锛氭甯�"> + </div> + <div class="cell-list server-time" style="white-space: nowrap"> + 2018-11-26 00:00:00 </div> </div> <div class="international"> @@ -216,12 +216,12 @@ }); } }); - searchAlm(); //鏌ヨ鐢垫睜鍛婅鎬绘暟 + searchAlm(); //鏌ヨ鐢垫睜鍛婅鎬绘暟(鎴戝湪base.js閲�) searchlowmon(); //鏌ヨ钀藉悗鍗曚綋鎬绘暟 searchpoweroff(); //鏌ヨ鏈烘埧鍋滅數鎬绘暟 searchdevalarm(); //鏌ヨ璁惧瀹炴椂鍛婅鎬绘暟 searchnotcomplan(); //鏌ヨ鏈斁鐢电殑璁″垝鎬绘暟 - + searchWeakHome(); //鏌ヨ鏈烘埧缁埅涓嶈冻鐨勪釜鏁� /* setInterval(function(){ searchlowmon(); //鏌ヨ钀藉悗鍗曚綋鎬绘暟 searchpoweroff(); //鏌ヨ鏈烘埧鍋滅數鎬绘暟 @@ -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() { @@ -333,7 +333,65 @@ }); } + // 鏈烘埧缁埅涓嶈冻涓暟 + function searchWeakHome() { + $.ajax({ + type: 'post' + ,async: true + ,url: 'Batt_enduranceAction!serchxuhangNotInThree' + ,data: null + ,dataType: 'json' + ,success: function(res) { + var rs = JSON.parse(res.result); + $('#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); + } + }); + } $(function(){ @@ -363,7 +421,6 @@ // 娣诲姞澶╂皵鎻掍欢鍜岀數姹犱俊鎭暱搴︽帶鍒� $(function() { limitWidth(); - //addWeather(); }); // 闄愬埗鏄剧ず涓暟 @@ -528,6 +585,31 @@ warnAlarmData = temp; } + seachServerTime(); + //鑾峰彇鏈嶅姟鍣ㄤ笂鐨勬椂闂� + function seachServerTime(){ + $.ajax({ + type:"post", + url: "User_infAction!searchServerTime", + async:true, + dataType:'text', + data:null, + success: function(data){ + data = eval('('+data+')'); + var model = eval('('+data.result+')'); + if(model.code == 1){ + $('.server-time').text(model.msg); + }else{ + + } + setTimeout(seachServerTime, 1000); + }, + error:function() { + setTimeout(seachServerTime, 2000); + } + }); + } + // 鐩戞祴褰撳墠鐨勫憡璀︿俊鎭槸鍚︿负鏈�鏂扮殑鍛婅 function checkWarnDataIsNew(warnData) { var rs = 0; @@ -558,7 +640,7 @@ //鏌ヨ鐢垫睜鍛婅淇℃伅 function searchBattAlarm(data){ - console.info(data); + //console.info(data); $.ajax({ type:"post", url: "Battalarm_dataAction!serchBatt_alarm", @@ -734,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); @@ -742,7 +824,7 @@ isNew=false; } }else { - $('#nuclear_test').text(0); + $('#nuclear_test .num').text(0); createFullTbl(eleTh, eleTd, arrTh, []); } }, @@ -848,7 +930,7 @@ }else{ linkNum++; // 鏈嶅姟鍣ㄨ繛鎺ヤ笉姝e父 - if(linkNum == 3) { + if(linkNum == 2) { console.info('鍑虹幇绗�'+linkNum+"娆℃祴璇曟湇鍔″櫒杩炴帴澶辫触锛佽烦杞埌鐧婚檰"); // 缃戠粶姝e父浣嗘湇鍔″櫒杩炵画澶氭妫�娴嬩笉姝e父璺宠浆鍒扮櫥闄嗛〉闈� alert('缃戠粶杩炴帴寮傚父锛岃妫�鏌ョ綉缁滆繛鎺ユ槸鍚︽甯革紒'); -- Gitblit v1.9.1