From 2ca81db7219eddf6b6c67790718c45cf431af82f Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期五, 02 十一月 2018 16:12:05 +0800
Subject: [PATCH] 提交
---
gx_tieta/WebRoot/Top.jsp | 60 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index b733db6..2e5de0f 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="batt-state-manage.jsp" 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?station_state=2" 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> <!-- 鐢垫睜鍛婅鏁� -->
@@ -620,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锛�', '璁惧鍛婅', '宸叉祴鏃堕棿'];
@@ -689,34 +718,7 @@
- //鏌ヨ鏈�杩�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 createTblByModel(model) {
--
Gitblit v1.9.1