From 89cc717e3ccd49d49539b25d7a8554126504b51f Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 08:53:20 +0800
Subject: [PATCH] 电池配组记录区/县添加
---
gx_tieta/WebRoot/Top.jsp | 65 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index f3deaff..22a3b2e 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -64,7 +64,7 @@
<div class="batt-state">
<div class="list">
- <div class="list-contain"><s:text name='Computer_room'/><s:text name='Power_cut'/><s:text name='Num'/>:<a href="powercut.jsp?power_state=0" class="badge default" id="poweroff_num">0</a></div> <!-- 鏈烘埧鍋滅數鏁� -->
+ <div class="list-contain"><s:text name='Computer_room'/><s:text name='Power_cut'/><s:text name='Num'/>:<a href="batt-state-manage.jsp" class="badge default" id="poweroff_num">0</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> <!-- 鐢垫睜鍛婅鏁� -->
@@ -193,9 +193,12 @@
<script src="js/dev.js"></script>
<script src="js/createTab.js"></script>
<script type="text/javascript" src="js/scrollBar.js"></script>
+ <script type="text/javascript" src="js/VoiceUtil.js"></script>
<script type="text/javascript">
$(document).ready(function(){
- setUserName();
+ setUserName(); //璁剧疆鐢ㄦ埛鍚嶇О
+
+ searchRecentlyAlarm(); //鏌ヨ鏈�杩�30绉掔殑璁惧鍜岀數姹犲憡璀�
var lanuage=$('#top_cont .international .inter_action').attr('value');
$('#top_cont .international a').click(function() {
@@ -250,7 +253,7 @@
}
//鏌ヨ鏈烘埧鍋滅數鎬绘暟
- function searchpoweroff(){
+ function searchpoweroffOld(){
$.ajax({
type: "post",
url: "BattPower_offAction!serchPowerOff",
@@ -261,6 +264,26 @@
data = eval("("+data+")");
var model = eval("("+data.result+")");
$('#poweroff_num').text(model.sum);
+ setTimeout(searchpoweroff, 5000);
+ },
+ error:function() {
+ setTimeout(searchpoweroff, 5000);
+ }
+ });
+ }
+
+ //鏌ヨ鏈烘埧鍋滅數鎬绘暟
+ function searchpoweroff(){
+ $.ajax({
+ type: "post",
+ url: "Bts_station_stateAction_action_serchByState",
+ async:true,
+ dataType:'json',
+ data:null,
+ success: function(data){
+ var model = eval("("+data.result+")");
+ //console.info(model);
+ $('#poweroff_num').text(model.newsum);
setTimeout(searchpoweroff, 5000);
},
error:function() {
@@ -308,6 +331,9 @@
}
});
}
+
+
+
$(function(){
$.ajax({
@@ -594,6 +620,35 @@
});
}
+ //鏌ヨ鏈�杩�30鍐呯殑璁惧鍜岀數姹犲憡璀﹀苟鎾姤璇煶
+ function searchRecentlyAlarm(){
+ $.ajax({
+ type: "post",
+ url: "Battalarm_dataAction!serchIn30",
+ async:true,
+ dataType:'json',
+ data:null,
+ success: function(data){
+ //console.info(data);
+ var model = eval("("+data.result+")");
+ //console.info(model);
+ if(model.code == 1){
+ var alarm_str = "";
+ for(var i=0;i<model.data.length;i++){
+ var obj = model.data[i];
+ alarm_str += obj.note+";";
+ }
+ voice.play(alarm_str,searchRecentlyAlarm);
+ }else{
+ setTimeout(searchRecentlyAlarm, 5000);
+ }
+ },
+ error:function() {
+ setTimeout(searchRecentlyAlarm, 5000);
+ }
+ });
+ }
+
// 鏍稿娴嬭瘯妯″潡
$(function() {
var arrTh = ['鏈烘埧鍚嶇О', '璁惧ID', '璁惧鍚嶇О','璁惧鐘舵��', '鍦ㄧ嚎鐢靛帇锛圴锛�', '缁勭鐢靛帇锛圴锛�', '缁勭鐢垫祦锛坢A锛�','璁惧娓╁害锛堚剝锛�', '宸叉祴瀹归噺锛圓H锛�', '璁惧鍛婅', '宸叉祴鏃堕棿'];
@@ -661,6 +716,10 @@
});
}
+
+
+
+
// 鏍规嵁鏁版嵁鐢熸垚琛ㄦ牸
function createTblByModel(model) {
//console.log(model);
--
Gitblit v1.9.1