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 | 59 +++++++----------------------------------------------------
1 files changed, 7 insertions(+), 52 deletions(-)
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 7598d6e..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(temp);
+ //console.info(JSON.stringify(temp));
$.ajax({
type:"post",
url: "Battinf_exAction!serchByCondition",
@@ -433,9 +433,10 @@
data:"json="+JSON.stringify(temp),
success: function(data){
var model = eval('('+data.result+')');
+ //console.log(model);
if(model.code == 1 && model.data.length>0){
var station = model.data[0];
- console.info(station);
+ //console.info(station);
$('#station_stationid_ex').text(temp.StationId_ex); //绔欑偣id
$('#station_stationname').text(station.stationName); //鏈烘埧鍚嶇О
$('#station_stationid').text(station.stationId); //鏈烘埧鍚嶇О
@@ -616,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);
}
@@ -1148,52 +1149,6 @@
return '鏍煎紡涓嶆纭�';
}
}
-
-/**
- 妫�娴嬫湇鍔″櫒杩炴帴鏄惁姝ｅ父
- 绋嬪簭鍔熻兘: 閫氳繃璇锋眰鍚庡彴绋嬪簭濡傛灉涓夋閮借姹傚け璐ヨ涓烘湇鍔″櫒鎸傛帀,璺宠浆鍒扮櫥闄嗛〉闈�
-*/
-;(function ($) {
- var url = window.location.href;
- var loginPatt = /\/login.jsp/;
-
- // 鍒ゆ柇褰撳墠椤甸潰涓嶆槸鐧婚檰椤甸潰寮�濮嬫墽琛屾娴嬫湇鍔″櫒鐘舵��
- if(!loginPatt.test(url)) {
- checkServer();
- }
-
- var linkNum = 0; // 娴嬭瘯鏈嶅姟鍣ㄨ繛鎺ヨ鏁� =3 璺宠浆鍒扮櫥闄嗛〉闈�
- function checkServer() {
- $.ajax({
- url:'User_infAction!checkService',
- type: 'post',
- async: true,
- success: function(rs) {
- linkNum = 0; // 鍒濆鍖栨祴璇曡繛鎺�
- setTimeout(checkServer, 200);
- },
- error:function() {
- // 缃戠粶杩炴帴涓嶆甯�
- if(!navigator.onLine) {
- linkNum = 0;
- setTimeout(checkServer, 200);
- }else{
- linkNum++;
- // 鏈嶅姟鍣ㄨ繛鎺ヤ笉姝ｅ父
- if(linkNum == 3) {
- console.info('鍑虹幇绗�'+linkNum+"娆℃祴璇曟湇鍔″櫒杩炴帴澶辫触锛佽烦杞埌鐧婚檰");
- // 缃戠粶姝ｅ父浣嗘湇鍔″櫒杩炵画澶氭妫�娴嬩笉姝ｅ父璺宠浆鍒扮櫥闄嗛〉闈�
- alert('缃戠粶杩炴帴寮傚父锛岃妫�鏌ョ綉缁滆繛鎺ユ槸鍚︽甯革紒');
- window.location.replace("login.jsp");
- }else {
- console.info('鍑虹幇绗�'+linkNum+"娆℃祴璇曟湇鍔″櫒杩炴帴澶辫触锛�");
- checkServer();
- }
- }
- }
- });
- }
-})(jQuery);
/*****************甯哥敤鍒ゆ柇鏁版嵁绫诲瀷*****************/
--
Gitblit v1.9.1