From d55a20bca83c456949f14cd340e40fe2c6a3bf85 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期三, 02 一月 2019 15:53:43 +0800
Subject: [PATCH] 拓扑图延时问题修复

---
 gx_tieta/WebRoot/control.jsp |   43 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index cc6607f..8ccb32c 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1026,7 +1026,7 @@
 						</tr>
 						<tr>
 							<th>鍗曚綋鏁版嵁鏉ユ簮绫诲瀷</th>
-							<th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺锛�1~2锛�</th>
+							<th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺锛�0~2锛�</th>
 						</tr>
 						<tr>
 							<td>
@@ -1046,7 +1046,7 @@
 							<td><input type="text" id="sysSet_startLimit" value=""></td>
 						</tr>
 						<tr>
-							<th>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙凤紙1~2锛�</th>
+							<th>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙凤紙0~2锛�</th>
 							<th>鑳屽厜鏃堕暱锛�0~999鍒嗛挓锛�</th>
 						</tr>
 						<tr>
@@ -1811,7 +1811,6 @@
 					$('.fir:first').next().children().eq(i).children().eq(0).css('display','none');
 				}
 			}
-			
 			//alert(BattGroupId);
 			clearInterval(time);
 			searchBattAlarmParam();				//鏌ヨ鐢垫睜鍛婅鍙傛暟
@@ -1934,11 +1933,13 @@
 		//鏌ヨ鐢垫睜缁勭殑瀹炴椂鐘舵�佷俊鎭�
 		function showtable(){
 			//searbattrealInfomation();
-			searchDevStatusByDev_id();
 			findrtstate();
 			findrtdata();
 			//鏌ヨ璁惧鐨刣cdc鐘舵��
 			searchDevDcDcState();
+			
+			// 鏇存柊鎷撴墤鍥剧姸鎬�
+			searchDevStatusByDev_id();
 		}
 		
 		//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
@@ -2290,6 +2291,7 @@
 					table_index = 0;
 					createAllTbl(tbHd, tbBd, thVol, mon_vol_table_list);
 					title.setAvg(parseFloat(sum/array.length).toFixed(3));
+					title.setSum(sum);
 					getBattAlarmTitle(batt,"Voltage",title);
 					//title.alow = temp.alow;				//璁剧疆鐢靛帇鍛婅浣庡��	
 					//title.ahight = temp.ahight;			//璁剧疆鐢靛帇鍛婅楂樺��			
@@ -4563,6 +4565,7 @@
 					
 					getBattStr();
 					searchBattAlarmParam();				//鏌ヨ鐢垫睜鍛婅鍙傛暟
+					searchDevSDState();
 					clearInterval(time);
 					mygraph.graphtype = 4;
 					showtable();
@@ -4606,6 +4609,7 @@
 			// 鐢佃矾鎷撴墤鍥惧彸閿彍鍗�
 			var menuItems = [
 				{txt: '鍩虹珯鏈哄巻鍗�', cla: 'home-info-card'},
+				{txt: '鏈烘埧闂璁板綍', cla: 'target', data:{target: 'batt-fault-manage.jsp'}},
 				{txt: '鏈烘埧瀹炴椂鐘舵�佹煡璇�', cla: 'target', data:{target: 'batt-state-manage.jsp'}},
 				{txt: '璁惧娴侀噺缁熻鏌ヨ', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},
 				{txt: '鏈烘埧缁埅鑳藉姏鏌ヨ', cla: 'target', data: {target: 'batt-life-manage.jsp'}},
@@ -5319,6 +5323,37 @@
 	            }
 	        });
 		}
+		
+		
+		//鏌ヨ璁惧鐨凷D鍗$姸鎬�
+		function searchDevSDState(){
+			var obj= getBatt();	
+			var status = GLOBAL.circleStatus.status;	
+			$.ajax({
+	            type: "post",
+	            url: "Bts_station_stateAction_action_serchSDCard",
+	            async: true,
+	            dataType: 'json',
+	            data: "json = " + JSON.stringify(obj),
+	            success: function(result) {
+	                var rs = JSON.parse(result.result);
+	                //console.info(rs);
+	                var sdStatus = (rs.data == 0)?'姝e父': '<span style="color: #FF0000">鏁呴殰</span>';
+	                //console.log(sdStatus);
+	                status.setText('sdCard', "SD鍗$姸鎬侊細"+sdStatus);
+	                clearTimeout(searchDevSDState.timeout);
+	                searchDevSDState.timeout = setTimeout(function() {
+	                	searchDevSDState();
+	                }, 2000);
+	            },
+	            error: function() {
+	            	clearTimeout(searchDevSDState.timeout);
+	                searchDevSDState.timeout = setTimeout(function() {
+	                	searchDevSDState();
+	                }, 5000);
+	            }
+	        });
+		}
 	</script>
 	<script type="text/javascript" src="js/Title.js"></script>
 	<script type="text/javascript" src="js/control.js"></script>

--
Gitblit v1.9.1