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/js/base.js | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 7ff1c73..0b15d8c 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -19,14 +19,14 @@
function exitUser(){
$.post("LoginAction!exitUser",null,function(data){
//console.info(data);
- window.location.replace("login.jsp");
});
+ window.location.replace("login.jsp");
}
// 妫�鏌ュ綋鍓嶇敤鎴锋槸鍚﹀湪鍙︿竴涓绘満鐧婚檰
function checkUserlogin(){
- //console.info("check");
+ console.info("check***********************");
$.post("LoginAction_check",null,function(data){
data = eval("(" + data.result + ")");
user=data.uinf;
@@ -38,7 +38,7 @@
window.location.href="login.jsp";
}else{
clearInterval(timeID);
- timeID = setTimeout(checkUserlogin,5000);
+ timeID = setTimeout(checkUserlogin,100);
}
}).error(function(){
clearInterval(timeID);
@@ -570,7 +570,7 @@
return null;
}
-function createEleWarning(num){
+function createEleWarning(num, muted){
//娓呯悊鍛婅妗�
$('body').children('#eleWarning').remove();
var __divCon=$('<div id="eleWarning"></div>'); //鍛婅瀹瑰櫒
@@ -587,6 +587,10 @@
var __divContentCon=$('<div class="warning-content"></div>'); //鍛婅鍐呭瀹瑰櫒
/* 鍛婅鐨勯煶棰�*/
var __divAudio=$('<audio autoplay="autoplay"></audio>');
+ // 鍒ゆ柇鏄惁闈欓煶
+ if(muted) {
+ __divAudio=$('<audio autoplay="autoplay" muted></audio>');
+ }
var __divSourceWav=$('<source src="sound/warnings.wav" type="audio/wav" />');
var __divSourceMp3=$('<source src="sound/warnings.mp3" type="audio/mpeg" />');
__divAudio.append(__divSourceWav);
@@ -612,17 +616,28 @@
var totalAlm_num=Number.POSITIVE_INFINITY;
//鏌ヨ鍛婅鏁�
-function searchAlm(){
- //createEleWarning();
+function searchAlm(isShowVoice){
+ // 鍒ゆ柇鏄惁鏄剧ず鍙充笅瑙掔殑鍛婅鎻愮ず妗�
+ if(!isShowVoice) {
+ self.setTimeout("searchAlm()",10000);
+ return;
+ }
+ // 璇锋眰鍚庡彴鏌ヨ鏈�鏂板嚭鐜扮殑鍛婅涓暟
$.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);
+ var voiceStatus = checkPageVoiceStatus();
+ createEleWarning(model.sum-totalAlm_num, !voiceStatus);
}
totalAlm_num=model.sum;
+ // 5绉掑悗鍏抽棴闈㈡澘
+ setTimeout(function() {
+ $('body').children('#eleWarning').remove();
+ }, 5000);
+
self.setTimeout("searchAlm()",10000);
}
});
--
Gitblit v1.9.1