From 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 18 一月 2019 09:01:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/control.jsp |  316 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 307 insertions(+), 9 deletions(-)

diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 796836d..41c33a3 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -252,7 +252,12 @@
 								<br>
 								<a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
 									<span class="whyc-btn-icon fa fa-stop-circle"></span>
-									<span class="whyc-btn-txt" id="stopTestBtn">鍋滄娴嬭瘯</span>
+									<span class="whyc-btn-txt">鍋滄娴嬭瘯</span>
+								</a>
+								<br>
+								<a href="javascript:void(0);" id="battInfoBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
+									<span class="whyc-btn-icon fa fa-battery-full"></span>
+									<span class="whyc-btn-txt">鐢垫睜鍙傛暟</span>
 								</a>
 								<br>
 								<a href="javascript:void(0);" id="sysSet" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
@@ -263,6 +268,11 @@
 								<a href="javascript:void(0);" id="signalBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
 									<span class="whyc-btn-icon fa fa-signal"></span>
 									<span class="whyc-btn-txt">淇″彿璐ㄩ噺</span>
+								</a>
+								<br>
+								<a href="javascript:void(0);" id="threadInfo" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
+									<span class="whyc-btn-icon fa fa-desktop"></span>
+									<span class="whyc-btn-txt">璁惧杩涚▼</span>
 								</a>
 					        </div>
 						</div>
@@ -1036,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>
@@ -1057,6 +1067,78 @@
 			<input type="button" name="" id="sysSet_restart" value="閲嶅惎璁惧" >
 			<input type="button" name="" id="sysSet_read" value="璇诲彇" >							
 			<input type="button" name="" id="sysSet_en" class="status-change-set " value="璁剧疆" >
+		</div>
+	</div>
+	<!-- 鐢垫睜鍙傛暟 -->
+	<div class="popup" id="battInfo_popup">
+		<div class="popup-title"><span>鐢垫睜鍙傛暟璁剧疆</span> <a href="javascript:;" class="close">X</a></div>
+		<div class="popup-content">
+			<div class="popup-tbl">
+				<input type="hidden" id="battInfo_dev_id" value="">		<!-- dev_id -->
+				<input type="hidden" id="battInfo_ip" value="">		<!-- IP鍦板潃 -->
+				<table>
+					<tbody>
+						<tr>
+							<th>璁惧ID</th>
+							<th>鏈烘埧鍚嶇О</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="battInfo_fbs_id"  readonly="readonly" value=""></td>
+							<td><input type="text" id="battInfo_home_name" readonly="readonly" value=""></td>
+						</tr>
+						<tr>
+							<th>鐢垫睜鏍囩О瀹归噺锛�1~6000.0AH锛�</th>
+							<th>鐢垫睜鏍囩О鍐呴樆锛�1~60000u惟锛�</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="battInfo_nom_cap" value=""></td>
+							<td><input type="text" id="battInfo_nom_res" value=""></td>
+						</tr>
+						<tr>
+							<th>鐢垫睜缁勬暟锛�1~2锛�</th>
+							<th>姣忕粍鐢垫睜鍗曚綋鏁伴噺锛�1~300 锛�</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="battInfo_batt_num" value=""></td>
+							<td><input type="text" id="battInfo_batt_mon_num" value=""></td>
+						</tr>
+						<tr>
+							<th>鍗曚綋鏍囩О鐢靛帇锛�0.1~20.0V锛�</th>
+							<th>鐢垫睜缁勭鏍囩О鐢靛帇锛�0.1~600.0V锛�</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="battInfo_batt_nom_vol" value=""></td>
+							<td><input type="text" id="battInfo_group_nom_vol" value=""></td>
+						</tr>
+						<tr>
+							<th>鐢垫睜鏍囩О娓╁害锛�0.1~60.0鈩冿級</th>
+							<th>鐢垫睜娴厖鐢靛帇闃�鍊硷紙0.1~60.0V锛�</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="battInfo_batt_nom_temp" value=""></td>
+							<td><input type="text" id="battInfo_batt_float_vol" value=""></td>
+						</tr>
+						<tr>
+							<th>鐢垫睜娴厖鐢垫祦闃�鍊硷紙0.1~30.0A锛�</th>
+							<th>鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙0.1~60.0V锛�</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="battInfo_batt_float_curr" value=""></td>
+							<td><input type="text" id="battInfo_online_low_vol" value=""></td>
+						</tr>
+						<tr>
+							<th>鐢垫睜缁勮繛鎺ョ被鍨�(0~1)</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="battInfo_batt_link_type" value=""></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+		<div class="popup-footer">
+			<input type="button" name="" id="battInfo_read" value="璇诲彇" >							
+			<input type="button" name="" id="battInfo_en" class="status-change-set whyc-btn-disabled" value="璁剧疆" >
 		</div>
 	</div>
 	
@@ -1167,6 +1249,7 @@
 	<script type="text/javascript" src="js/dischargetest/bts.js"></script>
 	<script type="text/javascript" src="js/dischargetest/4016.js"></script>
 	<script type="text/javascript" src="js/dischargetest/sysData.js"></script>
+	<script type="text/javascript" src="js/dischargetest/battData.js"></script>
 	<script type="text/javascript" src="pages/js/pages/control-common.js"></script>
 	<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
 	<script type="text/javascript" src="js/rightmenu.js"></script>
@@ -1255,6 +1338,7 @@
 		var equip4016_popup = new Popup($('#equip4016'));
 		var sysSet_popup = new Popup($('#sysSet_popup'));
 		var localNav = new Popup($('#localNav'));
+		var battInfo_popup = new Popup($('#battInfo_popup'));
 		// 鍏呮斁鐢靛脊鍑烘璁剧疆
 		$(function() {
 			// 鍒濆鍖朙D9鍏呮斁鐢靛脊鍑烘
@@ -1286,6 +1370,12 @@
 			$('#sysSet_popup').find('.close').bind('click', function() {
 				sysSet_popup.hidePopup();	// 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
 			});
+			
+			// 璁剧疆鐢垫睜鍙傛暟
+			$('#battInfo_popup').find('.close').bind('click', function() {
+				battInfo_popup.hidePopup();	// 闅愯棌battInfo_popup寮瑰嚭妗嗗拰閬僵灞�
+			});
+			
 			
 			// bts闈㈡澘鍏呯數鐢垫祦缂栬緫
 			$('#ChargeCurrSetLabel .fa-edit').click(function() {
@@ -1359,6 +1449,7 @@
 				equip4016_popup.hidePopup();	// 闅愯棌4016寮瑰嚭妗嗗拰閬僵灞�
 				localNav.hidePopup();
 				sysSet_popup.hidePopup();	// 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
+				battInfo_popup.hidePopup();	// 闅愯棌battInfo_popup寮瑰嚭妗嗗拰閬僵灞�
 			});
 		});
 		//鍒濆鍖栨煴鐘跺浘
@@ -1720,7 +1811,6 @@
 					$('.fir:first').next().children().eq(i).children().eq(0).css('display','none');
 				}
 			}
-			
 			//alert(BattGroupId);
 			clearInterval(time);
 			searchBattAlarmParam();				//鏌ヨ鐢垫睜鍛婅鍙傛暟
@@ -1843,11 +1933,13 @@
 		//鏌ヨ鐢垫睜缁勭殑瀹炴椂鐘舵�佷俊鎭�
 		function showtable(){
 			//searbattrealInfomation();
-			searchDevStatusByDev_id();
 			findrtstate();
 			findrtdata();
 			//鏌ヨ璁惧鐨刣cdc鐘舵��
 			searchDevDcDcState();
+			
+			// 鏇存柊鎷撴墤鍥剧姸鎬�
+			searchDevStatusByDev_id();
 		}
 		
 		//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
@@ -1890,8 +1982,7 @@
 						//console.info("涓婁竴娆℃牳瀹规祴璇曞仠姝㈠師鍥狅細"+lastStopReason);
 						//console.info("閫氫俊璁℃暟锛�"+_data.dev_commcount);
 						//console.info("閫氫俊涓㈠寘鐜囷細"+(_data.dev_commcount==0?0:(_data.dev_errcommcount*100/_data.dev_commcount)));						
-						
-						var nowTime = new Date().getTime();		//褰撳墠鏃堕棿
+						var nowTime = new Date(model.data[0].note).getTime();		//褰撳墠鏃堕棿
 						var record = new Date(model.data[0].record_datetime).getTime();
 						
 						//console.info(Math.abs(nowTime-record)/1000);
@@ -2199,6 +2290,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;			//璁剧疆鐢靛帇鍛婅楂樺��			
@@ -3643,6 +3735,9 @@
 				// 璁剧疆閫氫俊璁℃暟
 				status.setText('count', "閫氫俊璁℃暟锛�"+data.dev_commcount);
 				
+				// 璁剧疆璁惧鐗堟湰鍙�
+				status.setText('devVersion', '璁惧鐗堟湰鍙凤細'+data.dev_version);
+				
 				// 璁剧疆涓㈠寘鐜�
 				var errorCount = data.dev_errcommcount;
 				var allCount = data.dev_commcount+errorCount;
@@ -4472,6 +4567,7 @@
 					
 					getBattStr();
 					searchBattAlarmParam();				//鏌ヨ鐢垫睜鍛婅鍙傛暟
+					searchDevSDState();
 					clearInterval(time);
 					mygraph.graphtype = 4;
 					showtable();
@@ -4515,6 +4611,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'}},
@@ -4567,8 +4664,8 @@
 					homeid: batt.StationId,
 					battid: batt.BattGroupId
 				};
-				findBattinfByBattGroupId(batt.BattGroupId);
-				findStationInfoByStation(batt);
+				// 鏄剧ず鍩虹珯鏈哄巻鍗�
+				showHomeInfo(batt.StationId);
 				// 鏍规嵁鏁版嵁瀹氫綅
 				localSideBar(treeView, treeView.container, tmp);
 			});
@@ -4742,10 +4839,10 @@
 		                console.info(rs);
 		                if(rs.code == 1){
 		                	var data = rs.data[0];
-		                	setSysSetData(data);
 		                	// 绉婚櫎涓嶅彲鐐瑰嚮鐘舵��
 		                	initSysDataPopup();
 		                	$('#sysSet_en').removeClass('whyc-btn-disabled');
+		                	setSysSetData(data);
 		                	sysSet_popup.showPopup();
 		                	if(showSU) {
 		                		noContent.showNoContent('璇诲彇鎴愬姛', true);
@@ -4844,12 +4941,19 @@
 				$('#sysSet_secVol').val(data.MonomerOrder/10);			// 浜屾涓嬬數鐢靛帇
 				$('#sysSet_dcdc').val(data.LoaderCount);			// DCDC妯″潡鏁伴噺
 				$('#sysSet_sourceStyle').val(data.DtCardCount);		// 鍗曚綋鏁版嵁鏉ユ簮绫诲瀷
+				//var POF_BG_Boost_Cnt = data.POF_BG_Boost_Cnt?data.POF_BG_Boost_Cnt:1;
 				$('#sysSet_bleedNum').val(data.POF_BG_Boost_Cnt);		// 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺
 				$('#sysSet_stopLimit').val(data.POF_BG_Boost_VolStop);		// 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄�
 				$('#sysSet_startLimit').val(data.POF_BG_Boost_VolStart);		// 鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄�
+				//var majorBattGroupNum = data.MajorBattGroupNum?data.MajorBattGroupNum:1;
 				$('#sysSet_groupNum').val(data.MajorBattGroupNum);	// 鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙�
 				$('#sysSet_backLightTime').val(data.BackLightTime);					// 鑳屽厜鏃堕棿
 				$('#sysSet_powerBreakChargeCurr').val(data.PowerBreakChargeCurr);	//  鍋滅數鍏呯數鐢垫祦
+				
+				
+				GLOBAL.testVal.check($('#sysSet_bleedNum'), $('#sysSet_bleedNum').data('testVal'), checkSysData);
+				GLOBAL.testVal.check($('#sysSet_groupNum'), $('#sysSet_groupNum').data('testVal'), checkSysData);
+				
 			}
 			
 			// 鑾峰彇闈㈡澘淇℃伅鐨勫��
@@ -4969,6 +5073,169 @@
 				//console.info(rs);
 				return rs;
 			}
+			
+			// 璁惧杩涚▼鏄剧ず
+			var threadInfoSearch = {
+				num: gprs.threadinfo,
+				dev_id:910000001 
+			};
+			
+			// 鐐瑰嚮璁惧杩涚▼鎸夐挳
+			$('#threadInfo').click(function() {
+				// console.log(threadInfoSearch);
+				var batt = getBatt();
+				//console.log(batt);
+				threadInfoSearch.dev_id = batt.FBSDeviceId;
+				SendDeviceThreadInfo(threadInfoSearch,function(data){
+					searchDeviceThreadInfo({dev_id: threadInfoSearch.dev_id});
+				});
+			});
+			
+			//缁橤PRS鍙戦�佹寚瀹氱殑鍛戒护锛岃幏鍙朅T杩斿洖鍊�
+			var threadInfoLoad;
+			function SendDeviceThreadInfo(param,callback){
+				threadInfoLoad = layer.load(1);
+				$.ajax({ 	
+			        type:"post", 								
+			        url: "Bts_gprs_stateAction_action_update_bts_task_inf",						
+			        async:true,				
+			        dataType:'json',
+			        data:'json='+JSON.stringify(param),		
+			        success: function(data){ 
+						var model = eval('('+data.result+')');
+						console.info(model);
+						if(callback && typeof callback == 'function'){
+							callback(model);
+						}
+		        	},error:function(e){
+		        		var model = {
+		        			code:0,
+		        			data:e,
+		        			msg:'閫氫俊澶辫触'
+		        		};
+		        		if(callback && typeof callback == 'function'){
+							callback(model);
+						}
+		        	} 				
+				});
+			}
+			
+			//鏌ヨ璁惧鐨勮繘绋嬩俊鎭�
+			function searchDeviceThreadInfo(param,callback){
+				$.ajax({ 	
+			        type:"post", 								
+			        url: "Bts_gprs_stateAction_action_serchByCondition",						
+			        async:true,				
+			        dataType:'json',
+			        data:'json='+JSON.stringify(param),		
+			        success: function(data){
+			        	layer.close(threadInfoLoad); 
+						var model = eval('('+data.result+')');
+						if(model.code == 1) {
+							var btsTaskInf = model.data[0].bts_task_inf;
+							layer.open({
+								title: '璁惧杩涚▼',
+								width: 380,
+								height: 450,
+								content: '<pre>'+btsTaskInf+'</pre>'
+							});
+						}else {
+							layer.msg('鏌ヨ澶辫触');
+						}
+						
+						
+						if(callback && typeof callback == 'function'){
+							callback(model);
+						}
+		        	},error:function(e){
+		        		var model = {
+		        			code:0,
+		        			data:e,
+		        			msg:'閫氫俊澶辫触'
+		        		};
+		        		if(callback && typeof callback == 'function'){
+							callback(model);
+						}
+		        	} 				
+				});
+			}
+			
+			
+			// 鐢垫睜鍙傛暟
+			var battCMD = GLOBAL.CMD.batt;	// cmd鍛戒护
+			var battPopup = GLOBAL.battInfoPopup; // 鐢垫睜鍙傛暟妯″潡
+			battPopup.testVal();	// 璁剧疆闈㈡澘鐨勫彇鍊艰寖鍥�
+			$('#battInfoBtn').click(function() {
+				// 鑾峰彇鐢垫睜淇℃伅
+				var batt = getBatt();
+				var temp = {
+					dev_id: batt.FBSDeviceId
+				};
+				
+				// 鏌ヨ鐢垫睜鍙傛暟闈㈡澘淇℃伅
+				var load = layer.load(1);
+				battPopup.search(temp, batt, function(res, binf) {
+					layer.close(load);
+					battInfo_popup.showPopup();	// 鏄剧ずbattInfo_popup寮瑰嚭妗嗗拰閬僵灞�
+				});
+				
+			});
+			
+			// 鐐瑰嚮璁惧畾
+			$('#battInfo_en').click(function() {
+				if($(this).hasClass('whyc-btn-disabled')) {
+					return;
+				}
+				// 璁剧疆鐢垫睜鍙傛暟闈㈡澘淇℃伅
+				var load = layer.load(1);
+				battPopup.set(function(res) {
+					layer.close(load);
+					layer.msg(res.msg);
+				});
+			});
+			
+			// 鐐瑰嚮璇诲彇
+			$('#battInfo_read').click(function() {
+				var batt = getBatt();
+				var temp = {
+					dev_id: batt.FBSDeviceId
+				};
+				// 璁剧疆鐢垫睜鍙傛暟闈㈡澘淇℃伅
+				var load = layer.load(1);
+				battPopup.read(function(res) {
+					layer.close(load);
+					// console.log(res);
+					if(res.code == 1) {
+						battPopup.search(temp, batt, function(res, binf) {
+							layer.close(load);
+							layer.msg('鑾峰彇鍙傛暟鎴愬姛');
+						});
+					}else {
+						layer.msg('鑾峰彇鍙傛暟澶辫触');	
+					}
+					
+				});
+			});
+			
+			// 鏌ヨ鐢垫睜鍙傛暟鐨勫��
+			function searchBattInfo(temp, binf) {
+				var load = layer.load(1);
+				// 鏌ヨ鐢垫睜鍙傛暟
+				$.ajax({
+					type: 'post'
+					,async: true
+					,url:'Fbs9100_battparamAction_action_serchByCondition'
+					,data: 'json='+JSON.stringify(temp)
+					,dataType: 'json'
+					,success: function(res) {
+						var rs = JSON.parse(res.result);
+						//console.log(rs);
+					}
+					,complete: function() {
+						layer.close(load);
+					}
+				});
+			}
 		});
 		
 		// 鏈哄巻鍗℃ā鍧�
@@ -5058,6 +5325,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