From 90c69565afd02dba9e79aff9de30b4ca322e5fb8 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 08 一月 2019 14:47:28 +0800
Subject: [PATCH] 线程启动

---
 gx_tieta/WebRoot/batch-set-curr.jsp |   95 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index aecdb7c..3f3015e 100644
--- a/gx_tieta/WebRoot/batch-set-curr.jsp
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -673,7 +673,7 @@
         						var _data = data[i];
         						tOptions.data.push(_data);
         					}
-        					// console.log(tOptions.data);
+        					//console.log(tOptions.data);
        						// 鐢熸垚琛ㄦ牸鏁版嵁
        						if(data.length != 0) {
        							table.render(tOptions);
@@ -813,9 +813,11 @@
 	            				}
 	            				
 	            				var trIndex = getSetCurrIndex(data, tOptions.data);
+	            				//console.log(trIndex);
 	            				// 琚缃弬鏁扮殑鏈烘埧
 	            				for(var i=0; i<trIndex.length; i++) {
 	            					var _data = data[i];
+	            					console.log(_data);
 	            					var _trIndex = trIndex[i];
 	            					var _temp = {'doThings':''};
 	            					if(_data.num==1) {
@@ -1059,12 +1061,14 @@
 					for(var i=0; i<setData.length; i++) {
 						var _setData = setData[i];
 						var setDevId = _setData.dev_id;
+						//console.log(setDevId);
 						// 閬嶅巻allData
 						for(var k=0; k<allData.length; k++) {
-							var _allData = allData[i];
+							var _allData = allData[k];
 							var allDevId = _allData.FBSDeviceId;
 							if(setDevId == allDevId) {
 								rs.push(k);
+								break;
 							}
 						}
 						
@@ -1077,8 +1081,10 @@
 				var BTS9100 = GLOBAL.BTS9100;
 				var workStates = BTS9100.workstates;
 				var alarmStates = BTS9100.alarmstates;
-				function updateDevStatus() {
+				function updateDevStatus1() {
 					var battlist = tOptions.data;
+					var battIdList = updateDevStatusRq();
+					console.log(battIdList);
 					clearInterval(updateDevStatus.timer);
 					if(battlist.length > 0){
 						$.ajax({ 	
@@ -1128,6 +1134,89 @@
 							},					
 						});
 					}
+				}
+				
+				
+				// 鑾峰彇璁惧瀹炴椂鐘舵�佺殑鍙傛暟
+				function updateDevStatus() {
+					var battIdList = updateDevStatusRq();		// 鑾峰彇鐢垫睜id鍒楄〃
+					// 鍒ゆ柇濡傛灉battIdList闀垮害涓�0涓嶆墽琛岃姹傚悗鍙�
+					if(battIdList.length == 0) {
+						return;
+					}
+					clearInterval(updateDevStatus.timer);
+					// 璇锋眰鍚庡彴
+					$.ajax({
+						type: 'post'
+						,async:true
+						,url: 'Fbs9100_stateAction_action_freshenDischarge'
+						,data: 'json='+JSON.stringify(battIdList)
+						,dataType: 'json'
+						,success: function(res) {
+							var rs = JSON.parse(res.result);
+							//console.log(rs);
+							// 濡傛灉鏈夋煡璇㈢粨鏋�
+							if(rs.code == 1) {
+								var data = rs.data;
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									_data = _data[0];
+									var str = '';		// 璁惧宸ヤ綔鐘舵��
+									var index = _data.dev_workstate; // 璁惧鐘舵��
+									
+									// 鍐呴樆娴嬭瘯(宸ヤ綔鐘舵�佷负0, 鍐呴樆娴嬭瘯涓嶄负0)
+									if(_data.dev_workstate ==0 && _data.dev_res_test_state != 0) {
+										index = 3;
+									}
+									// 璁剧疆璁惧鐘舵�佸瓧绗︿覆
+									str = "鐘舵��:"	+ workStates[index]+
+										  ",鍛婅:"+alarmStates[_data.dev_alarmstate]+
+										  ",缁勭鐢靛帇(V):"+_data.dev_captest_groupvol+
+										  ",鐢垫祦(A):"+_data.dev_captest_curr+
+										  ",瀹归噺(AH):"+_data.dev_captest_cap;
+									// 璁剧疆璁惧鍐呴樆娴嬭瘯鐨勫瓧绗︿覆
+									if(index == 3){
+								 		str = "鐘舵��:"+workStates[index]+
+								 			  ",缁勫彿:"+_data.dev_testgroupnum+
+								 			  ",褰撳墠鍗曚綋缂栧彿:"+(_data.dev_restest_monindex+1)+
+								 			  ",琚祴鍗曚綋鎬绘暟:"+_data.dev_restest_moncount;
+								 	}
+									// 鏋勯�犳洿鏂拌〃鏍兼暟鎹璞�
+									var temp = {
+								 		devStatus: str			// 璁惧鐘舵��
+								 		,testTime: formatSeconds(_data.dev_captest_timelong)		// 娴嬭瘯鏃堕暱
+								 		,signalNum: _data.dev_commcount
+								 	}
+								 	
+								 	// 鏇存柊琛ㄦ牸
+								 	layuiTbl.updateTr(i, temp);
+								}
+							}
+						}
+						,complete: function() {
+							// 杞鏌ョ湅鍐呭
+							updateDevStatus.timer = setTimeout(updateDevStatus, 4000);
+						}
+					});
+					
+					
+				}
+				
+				// 鏋勯�犳煡璇㈣澶囧疄鏃剁姸鎬佺殑鍙傛暟
+				function updateDevStatusRq() {
+					var data = tOptions.data;
+					var rs = [];
+					// 閬嶅巻data鐨勫�兼瀯閫犲璞�
+					for(var i=0; i<data.length; i++) {
+						var _data = data[i];
+						var tmp = {
+							BattGroupId: _data.BattGroupId
+						};
+						
+						rs.push(tmp);
+					}
+					
+					return rs;
 				}				
 				
         	});

--
Gitblit v1.9.1