From 94c3b603ae4fd3f26e23a33e3eabc781d9c08846 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 26 十二月 2018 11:33: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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 3a8d23d..ee1c917 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -26,7 +26,7 @@
// 妫�鏌ュ綋鍓嶇敤鎴锋槸鍚﹀湪鍙︿竴涓绘満鐧婚檰
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);
@@ -412,7 +412,7 @@
//console.info(data);
document.getElementById("FBSDeviceIp").innerHTML=data.FbsDeviceIp; //璁惧Ip
document.getElementById("GroupIndexInFBSDevice").innerHTML=data.GroupIndexInFBSDevice; //Bindex
-
+ document.getElementById("installUser").innerHTML= data.install_user; // 瀹夎浜哄憳
//鏄剧ず鐢垫睜缁勬満鍘嗗崱
$('#card_infor').show();
@@ -424,7 +424,7 @@
//鏍规嵁stationid鏌ヨ鍩虹珯鐨勪俊鎭�
function findStationInfoByStation(temp){
- console.info(JSON.stringify(temp));
+ //console.info(JSON.stringify(temp));
$.ajax({
type:"post",
url: "Battinf_exAction!serchByCondition",
@@ -433,7 +433,7 @@
data:"json="+JSON.stringify(temp),
success: function(data){
var model = eval('('+data.result+')');
- console.log(model);
+ //console.log(model);
if(model.code == 1 && model.data.length>0){
var station = model.data[0];
//console.info(station);
@@ -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