From 94e5b0bddf2b83e1591de425d3e30030fcbb1d23 Mon Sep 17 00:00:00 2001
From: CJJ <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:50:53 +0800
Subject: [PATCH] 新建修改到APPLY

---
 gx_tieta/WebRoot/js/base.js |   54 ++++--------------------------------------------------
 1 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 99c3c01..924f582 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -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);
 			}
@@ -1149,52 +1149,6 @@
 		return '鏍煎紡涓嶆纭�';
 	}
 }
-
-/**
-  妫�娴嬫湇鍔″櫒杩炴帴鏄惁姝e父
-  绋嬪簭鍔熻兘: 閫氳繃璇锋眰鍚庡彴绋嬪簭濡傛灉涓夋閮借姹傚け璐ヨ涓烘湇鍔″櫒鎸傛帀,璺宠浆鍒扮櫥闄嗛〉闈�
-*/
-;(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++;
-	                 // 鏈嶅姟鍣ㄨ繛鎺ヤ笉姝e父
-	                 if(linkNum == 3) {
-	                	 console.info('鍑虹幇绗�'+linkNum+"娆℃祴璇曟湇鍔″櫒杩炴帴澶辫触锛佽烦杞埌鐧婚檰");
-	                	 // 缃戠粶姝e父浣嗘湇鍔″櫒杩炵画澶氭妫�娴嬩笉姝e父璺宠浆鍒扮櫥闄嗛〉闈�
-		            	 alert('缃戠粶杩炴帴寮傚父锛岃妫�鏌ョ綉缁滆繛鎺ユ槸鍚︽甯革紒');
-		                 window.location.replace("login.jsp");
-	                 }else {
-	                	 console.info('鍑虹幇绗�'+linkNum+"娆℃祴璇曟湇鍔″櫒杩炴帴澶辫触锛�");
-	                	 checkServer();
-	                 }
-	            }
-	        }
-	    });
-	}
-})(jQuery);
 
 /*****************甯哥敤鍒ゆ柇鏁版嵁绫诲瀷*****************/
 

--
Gitblit v1.9.1