From def60f975af368a585a0132a7afa07b45448c031 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期六, 05 一月 2019 14:07:04 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/bat-set-test.jsp                        | 1047 +++++++++++++++++++++++++++
 gx_tieta/WebRoot/eleHistoryWarn.jsp                      |    4 
 gx_tieta/WebRoot/sys-set-test.jsp                        | 1064 ++++++++++++++++++++++++++++
 gx_tieta/src/global_zh_CN.properties                     |    1 
 gx_tieta/WebRoot/zzlogin1.jsp                            |    5 
 gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties |    1 
 gx_tieta/WebRoot/batch-set-curr.jsp                      |   89 ++
 gx_tieta/WebRoot/equip-stats-change.jsp                  |    4 
 gx_tieta/WebRoot/pages/js/mylayui.js                     |    6 
 9 files changed, 2,215 insertions(+), 6 deletions(-)

diff --git a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
index 26138e4..eb58994 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
+++ b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
@@ -1038,6 +1038,7 @@
 
 ##################   equip-stats-change.jsp ##################
 Device_status_records_query = \u8bbe\u5907\u72b6\u6001\u8bb0\u5f55\u67e5\u8be2
+Device_history_event_query = \u8bbe\u5907\u5386\u53f2\u4e8b\u4ef6\u67e5\u8be2
 
 ###################  batt-attention.jsp #######################
 Batt_attention_manage=\u7535\u6c60\u5173\u6ce8\u7ba1\u7406
diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
new file mode 100644
index 0000000..2537ab2
--- /dev/null
+++ b/gx_tieta/WebRoot/bat-set-test.jsp
@@ -0,0 +1,1047 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE HTML>
+<html>
+	<head>
+	    <base href="<%=basePath%>">
+	    <meta charset="UTF-8">
+	    <meta name="viewport" content="width=device-width, initial-scale=1">
+		<meta http-equiv="pragma" content="no-cache">
+		<meta http-equiv="cache-control" content="no-cache">
+		<meta http-equiv="expires" content="0">    
+		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+		<meta http-equiv="description" content="This is my page">
+	    <title>鐢垫睜鍙傛暟璁剧疆</title>
+		<link rel="stylesheet" type="text/css" href="pages/css/base.css">
+		<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
+	    <link rel="stylesheet" type="text/css" href="src/css/layui.css">
+	    <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css">
+	    <link rel="stylesheet" type="text/css" href="css/popup-tbl.css">
+	    <link rel="stylesheet" type="text/css" href="css/whyc-ui.css">
+	    <style>
+	    	.dataTypeCont {
+	    		width: 160px;
+	    		text-align: center;
+	    	}
+	    	.dataTypeCont .layui-form-switch {
+	    		min-width: 70px;
+	    		margin-top: 4px;
+	    	}
+	    	.error-img {
+				visibility: hidden;
+				font-size: 20px;
+				color: #FF0000;
+			}
+			.error-data {
+				visibility:visible !important;
+			}
+			input.error-data {
+				outline: none !important;
+				border: 1px solid #FF0000 !important;
+			}
+	    </style>
+	<script>"undefined"==typeof CODE_LIVE&&(!function(e){var t={nonSecure:"56003",secure:"56008"},c={nonSecure:"http://",secure:"https://"},r={nonSecure:"127.0.0.1",secure:"gapdebug.local.genuitec.com"},n="https:"===window.location.protocol?"secure":"nonSecure";script=e.createElement("script"),script.type="text/javascript",script.async=!0,script.src=c[n]+r[n]+":"+t[n]+"/codelive-assets/bundle.js",e.getElementsByTagName("head")[0].appendChild(script)}(document),CODE_LIVE=!0);</script></head>
+ 	<body data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-14" data-genuitec-path="/gx_tieta/WebRoot/batch-set-curr.jsp">
+ 		<!--澶撮儴鍐呭寮�濮�-->
+        <jsp:include page="Top.jsp" flush="true"/>
+        <!--澶撮儴鍐呭缁撴潫-->
+        <!--瀵艰埅寮�濮�-->
+        <jsp:include page="nav.jsp" flush="true"/>
+	    <!-- 涓讳綋鍐呭 -->
+        <div class="layui-page-container" data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-14" data-genuitec-path="/gx_tieta/WebRoot/batch-set-curr.jsp">
+        	<!-- 鏉′欢绛涢�� -->
+            <div class="layui-page-filter">
+                <div class="page-filter-header layui-page-filter-fweight">鐢垫睜鍙傛暟璁剧疆</div>
+                <div class="page-filter-content">
+                    <table>
+                        <tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
+                            <td>鐪�</td>						<!-- 鐪� -->
+                            <td>甯�</td>						<!-- 甯� -->
+                             <td>鍖�/鍘�</td>						<!-- 甯� -->
+                            <td><s:text name="Computer_name"/></td>							<!-- 鏈烘埧鍚嶇О -->
+                            <td>绯荤粺绫诲瀷</td>
+                           
+                        </tr>
+                        <tr>
+                            <td>
+                            	<div class="layui-form" lay-filter="provinceFilter">
+                            		<div class="layui-form-item">
+                            			<div class="layui-input-block">
+                            				<select name="province" id="province" lay-filter="province">
+												<option value="">璇烽�夋嫨鐪�</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                            <td>
+                            	<div class="layui-form" lay-filter="cityFilter">
+                            		<div class="layui-form-item">
+                            			<div class="layui-input-block">
+                            				<select name="city" id="city" lay-filter="city">
+												<option value="">璇烽�夋嫨甯�/鍖�</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                             <td>
+                            	<div class="layui-form" lay-filter="countyFilter">
+                            		<div class="layui-form-item">
+                            			<div class="layui-input-block">
+                            				<select name="county" id="county" lay-filter="county"  lay-search="">
+												<option value="">璇烽�夋嫨鍖�/鍘�</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                            
+                            <td>
+                            	<div class="layui-form" lay-filter="homeFilter">
+                            		<div class="layui-form-item">
+                            			<div class="layui-input-block">
+                            				<select name="home" id="home" lay-filter="home" lay-search="">
+												<option value="">璇烽�夋嫨鏈烘埧</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                            <td>
+	                           	<div class="layui-form" lay-filter="sysTypeFilter">
+	                           		<div class="layui-form-item">
+	                           			<div class="layui-input-block">
+	                           				<select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
+	                           					<option value="12">1U璁惧</option>
+												<option value="2">2U璁惧</option>
+											</select>
+	                           			</div>
+	                           		</div>
+	                           	</div>
+	                        </td>
+	                        <td style="display:none;">
+	                           	<div class="layui-form" lay-filter="battNumFilter">
+	                           		<div class="layui-form-item">
+	                           			<div class="layui-input-block">
+	                           				<select name="battNum" id="battNum" lay-filter="battNum" lay-search="">
+	                           					<option value="0">鐢垫睜缁�1</option>
+												<option value="1">鐢垫睜缁�2</option>
+											</select>
+	                           			</div>
+	                           		</div>
+	                           	</div>
+	                        </td>
+                            
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <!-- 椤甸潰涓婚鍐呭 -->
+            <div class="layui-page-content" style="position: relative;">
+            	<div class="layui-tbl-filter">
+            		<div class="layui-form layui-form-pane"  lay-filter="tblFilter">
+            			<div class="layui-inline">
+							<div class="layui-input-inline">
+								<div class="layui-form" lay-filter="addTypeFilter">
+									<select name="addType" id="addType" lay-filter="addType">
+										<option value="0">鍗曚釜鏈烘埧</option>
+										<option value="5">鍏ㄥ尯/鍘�</option>
+										<option value="2">鍏ㄥ競</option>
+										<option value="1">鍏ㄧ渷</option>
+									</select>
+								</div>
+							</div>
+						</div>
+						<button class="layui-btn layui-btn-sm mrl8" id="batchAdd"><i class="fa fa-plus mrr8"></i>娣诲姞璁惧</button>
+            			<button class="layui-btn layui-btn-sm" id="sysSet">鎵归噺璁剧疆鐢垫睜鍙傛暟</button>
+            			
+            		</div>
+            	</div>
+            	<!-- 琛ㄦ牸鍐呭 -->
+				<table id="pageTbl" lay-filter="pageTbl"></table>
+            </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>
+
+
+
+
+
+
+
+
+        
+        <!-- 瀛樺偍set-curr.html鐨勪俊鎭� -->
+	    <div id="setCurrIframe"></div>
+	    <div id="setCurrBtn"></div>
+	    <!-- 璁惧宸ヤ綔鐘舵�� -->
+	    <script type="text/html" id="devStatus">
+			{{# if(d.devStatus) { }}
+				{{d.devStatus}}
+			{{# }else{ }}
+				鐘舵��:锛燂紵锛�,鍛婅:锛燂紵锛�,缁勭鐢靛帇(V):锛燂紵锛�,鐢垫祦(A):锛燂紵锛�,瀹归噺(AH):锛燂紵锛�
+			{{# } }}
+		</script>
+		<!-- 宸叉祴鏃堕暱 -->
+		<script type="text/html" id="testTime">
+			{{# if(d.testTime) { }}
+				{{d.testTime}}
+			{{# }else{ }}
+				00:00:00
+			{{# } }}
+		</script>
+		<!-- 閫氫俊璁℃暟signalNum -->
+		<script type="text/html" id="signalNum">
+			{{# if(d.signalNum) { }}
+				{{d.signalNum}}
+			{{# }else{ }}
+				锛燂紵锛�
+			{{# } }}
+		</script>
+        <script type="text/html" id="setStatus">
+			{{# if(d.setCurr == 1){ }}
+				<button class="layui-btn layui-btn-sm">璁剧疆鎴愬姛</button>
+			{{# }else if(d.setCurr == 2){ }}
+				<button class="layui-btn layui-btn-sm layui-btn-danger">璁剧疆澶辫触</button>
+			{{# }else { }}
+				<button class="layui-btn layui-btn-sm layui-btn-normal">鏈缃�</button>
+			{{# } }}
+		</script>
+	    <script type="text/javascript" src="js/jquery-1.8.3.js"></script>
+	    <script type="text/javascript" src="js/echarts.js"></script>
+	    <script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
+	    <script type="text/javascript" src="js/popup.js"></script>
+        <script type="text/javascript" src="src/layui.js"></script>
+        <script type="text/javascript" src="pages/js/mylayui.js"></script>
+        <script type="text/javascript" src="js/whyc-jqueryui.js"></script>
+        <script type="text/javascript" src="pages/js/common.js"></script>
+        <script type="text/javascript">
+        	var BTS_popup = new Popup($('#battInfo_popup'));
+        	// 鍏呮斁鐢靛脊鍑烘璁剧疆
+			$(function() {
+				// 鍒濆鍖朾ts寮瑰嚭妗�
+				$('#battInfo_popup').find('.close').bind('click', function() {
+					BTS_popup.hidePopup();	// 闅愯棌bts寮瑰嚭妗嗗拰閬僵灞�
+				});
+				
+				// 绐楀彛澶у皬鏀瑰彉
+				$(window).resize(function() {
+					BTS_popup.hidePopup();	// 闅愯棌bts寮瑰嚭妗嗗拰閬僵灞�
+				});
+			});
+        
+        	layui.use(['form', 'table', 'layer', 'element', 'laytpl'], function() {
+        		var table = layui.table;		// 鑾峰彇琛ㄦ牸妯″潡
+        		var form = layui.form;			// 鑾峰彇琛ㄥ崟妯″潡
+        		var layer = layui.layer;		// 鑾峰彇寮瑰嚭妗嗘ā鍧�
+        		var element = layui.element;	// 鑾峰彇鍏冪礌鎿嶄綔妯″潡
+        		var laytpl = layui.laytpl;		// 鑾峰彇妯″潡鎿嶄綔
+        		
+        		var isNewLoad = true;
+				var pre_province = getQueryString('province');
+				// 鏌ヨ鐪佷笅鎷夋
+				searchProvince();
+				// 鏌ヨ鐪�
+				var filterLoad = layer.load();
+				function searchProvince() {
+					// 璇锋眰鍚庡彴鏌ヨ
+					$.ajax({
+						type:'post',
+						async:true,
+						url: 'User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup',
+						data: null,
+						dataType: 'json',
+						success:function(result) {
+							var rs = JSON.parse(result.result);
+							var list = [];				// option缁撴灉闆�
+							var ele = $('#province');	// 鐩爣select
+							if(rs.code == 1) {
+								var data = rs.data;
+								list.push(getLayuiSelect('璇烽�夋嫨鐪�/鐩磋緰甯�', '', {}, undefined));
+								// 閬嶅巻鏌ヨ缁撴灉
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									var _tmp = getLayuiSelect(_data, _data, {}, {});
+									if(pre_province == _data && isNewLoad){
+										_tmp = getLayuiSelect(_data, _data, {}, {},true);
+									}
+									list.push(_tmp);
+								}
+							}else {
+								list.push(getLayuiSelect('鏆傛棤鐪�/鐩磋緰甯�', '', {}, undefined));
+							}
+							
+							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+							createLayuiSelect(ele, list);
+							form.render('select', 'provinceFilter');
+							
+							// 鏌ヨ甯�
+							searchCity();
+						}
+					});
+				}
+				
+				// 鍒囨崲鐪�-甯�
+				form.on('select(province)', function(data) {
+					// 鏌ヨ甯�
+					searchCity(true);
+				});
+				
+				// 鏌ヨ甯�
+				function searchCity(isLoad) {
+					// 鏋勯�犳煡璇㈡潯浠�
+					var tmp = {
+						StationName1: $("#province").val()
+					};
+					var pre_city = getQueryString('city');
+					
+					// 鏄惁娣诲姞绛夊緟
+					if(isLoad) {
+						filterLoad = layer.load();
+					}
+					// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+					$.ajax({
+						type: 'post',
+						async: true,
+						url: 'BattInfAction!serchStationName2',
+						dataType: 'json',
+						data: "json = "+JSON.stringify(tmp),
+						success: function(result) {
+							var rs = JSON.parse(result.result);
+							var list = [];				// option缁撴灉闆�
+							var ele = $('#city');	// 鐩爣select
+							if(rs.code == 1) {
+								var data = rs.data;
+								list.push(getLayuiSelect('璇烽�夋嫨甯�/鍖�', '', {}, undefined));
+								// 閬嶅巻鏌ヨ缁撴灉
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									var _tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data);
+									if(pre_city == _data.StationName2 && isNewLoad){
+										_tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data,true);
+									}
+									list.push(_tmp);
+								}
+							}else {
+								list.push(getLayuiSelect('鏆傛棤甯�/鍖�', '', {}, undefined));
+							}
+							
+							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+							createLayuiSelect(ele, list);
+							form.render('select', 'cityFilter');
+							
+							// 鏌ヨ鍖哄幙
+							searchCounty();
+						}
+					});
+				}
+				
+				// 鍒囨崲甯�-鍖哄幙
+				form.on('select(city)', function(data) {
+					// 鏌ヨ鍖哄幙
+					searchCounty(true);
+				});
+				
+				
+				// 鏌ヨ鍖�/鍘�
+				function searchCounty(isLoad) {
+					// 鏋勯�犳煡璇㈡潯浠�
+					var tmp = {
+						StationName1: $("#province").val(),
+						StationName2: $("#city").val()
+					};
+					// 鏄惁娣诲姞绛夊緟
+					if(isLoad) {
+						filterLoad = layer.load();
+					}
+					var pre_county = getQueryString('county');
+					// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+					$.ajax({
+						type: 'post',
+						async: true,
+						url: 'BattInfAction!serchStationName5',
+						dataType: 'json',
+						data: "json = "+JSON.stringify(tmp),
+						success: function(result) {
+							var rs = JSON.parse(result.result);
+							//console.info(rs);
+							var list = [];				// option缁撴灉闆�
+							var ele = $('#county');	// 鐩爣select
+							if(rs.code == 1) {
+								var data = rs.data;
+								list.push(getLayuiSelect('璇烽�夋嫨鍖�/鍘�', '', {}, undefined));
+								// 閬嶅巻鏌ヨ缁撴灉
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									var _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data);
+									if(pre_county ==  _data.StationName5 && isNewLoad){
+										_tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data,true);
+									}
+									//console.info(_tmp);
+									list.push(_tmp);
+								}
+							}else {
+								list.push(getLayuiSelect('鏆傛棤鍖�/鍘�', '', {}, undefined));
+							}
+							
+							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+							createLayuiSelect(ele, list);
+							form.render('select', 'countyFilter');
+							
+							// 鏌ヨ鏈烘埧
+							searchHome();
+						}
+					});
+				}
+				
+				// 鍒囨崲甯�-鍖哄幙
+				form.on('select(county)', function(data) {
+					// 鏌ヨ鍖哄幙
+					searchHome(true);
+				});
+				
+				// 鏌ヨ鏈烘埧
+				function searchHome(isLoad) {
+					// 鏋勯�犳煡璇㈡潯浠�
+					var tmp = {
+						StationName1:$("#province").val(),
+						StationName2:$("#city").val(),
+						StationName5:$("#county").val(),
+					};
+					var pre_home = getQueryString('home');
+					var auto_seach = false;
+					// 鏄惁娣诲姞绛夊緟
+					if(isLoad) {
+						filterLoad = layer.load();
+					}
+					// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+					$.ajax({
+						type: 'post',
+						async: true,
+						url: 'BattInfAction!serchStationName3',
+						dataType: 'json',
+						data: "json = "+JSON.stringify(tmp),
+						success: function(result) {
+							var rs = JSON.parse(result.result);
+							var list = [];				// option缁撴灉闆�
+							var ele = $('#home');	// 鐩爣select
+							if(rs.code == 1) {
+								var data = rs.data;
+								list.push(getLayuiSelect('璇烽�夋嫨鏈烘埧', '', {StationId: '', dev_id: ''}, undefined));
+								// 閬嶅巻鏌ヨ缁撴灉
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									var _attr = {
+										StationId: _data.StationId,
+										dev_id: _data.FBSDeviceId
+									};
+									var _tmp = getLayuiSelect(_data.StationName, _data.StationName, _attr, _data);
+									if(pre_home == _data.StationName && isNewLoad){
+										_tmp = getLayuiSelect(_data.StationName, _data.StationName, _attr, _data,true);
+										auto_seach = true;
+									}
+									list.push(_tmp);
+								}
+							}else {
+								list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
+							}
+							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+							createLayuiSelect(ele, list);
+							form.render('select', 'homeFilter');
+							isNewLoad = false;
+							layer.close(filterLoad);
+						}
+					});
+				}
+        		
+        		// 鍒囨崲鏈烘埧
+				form.on('select(home)', function(data) {
+					
+				});
+				
+				// 琛ㄦ牸妯″潡
+				var tOptions = {
+					elem: '#pageTbl'
+					,toolbar: true
+					,defaultToolbar: []
+					,cellMinWidth: 80
+					,cols: [[
+						{type:'checkbox',fixed: 'left'}
+						,{field:'FBSDeviceId', title:'璁惧ID', align:'center', width: 160}
+						,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 470}
+						,{field:'BattGroupId', title:'鐢垫睜缁処D', align:'center', width: 160}
+						,{field:'BattGroupName', title:'鐢垫睜缁勫悕绉�', align:'center', width: 160}
+						,{field:'devStatus', title:'璁惧鐘舵��', templet: '#devStatus', align:'center', width: 600}
+						,{field:'testTime', title:'宸叉祴鏃堕暱', templet: '#testTime', align:'center', width: 140}
+						,{field:'signalNum', title:'閫氫俊璁℃暟', templet: '#signalNum', align:'center', width: 140}
+						,{field:'StationName9', title:'璁惧鐗堟湰鍙�', align:'center', width: 160}
+						,{field:'MonCount', title:'鍗曚綋鏁伴噺', align:'center', width: 100}
+						,{field:'MonCapStd', title:'鏍囩О瀹归噺', align:'center', width: 100}
+						,{field:'MonVolStd', title:'鏍囩О鍗曚綋鐢靛帇', align:'center', width: 140}
+						,{field:'MonVolStd', title:'鐢垫睜缁�1瀹归噺', align:'center', width: 140}
+						,{field:'MonVolStd', title:'鐢垫睜缁�2瀹归噺', align:'center', width: 140}
+						,{field:'doThings', fixed: 'right', title: '璁剧疆鐘舵��', toolbar: '#setStatus', align: 'center', width: 160} 
+
+				    ]]
+					,data:[]
+					,limit: 10000
+				    ,page: false
+				    ,height: 'full-252'
+				};
+				
+				// 鐢熸垚琛ㄦ牸鏁版嵁
+				table.render(tOptions);
+        		
+        		// 鏇存柊琛ㄦ牸鐨勫璞�
+        		var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
+        		
+        		// 鐐瑰嚮娣诲姞鐢垫睜缁�
+        		$('#setCurrIframe').data('setCurr', []);
+        		$('#batchAdd').click(function() {
+        			var structData = structAddData();
+					// 鍒ゆ柇鏄惁閫夋嫨瑕佹坊鍔犵殑鍐呭
+					if(structData.msg) {
+						layer.msg(structData.msg);
+						return;
+					}
+					$('#setCurrIframe').data('setCurr', []);
+					// 寮瑰嚭璁剧疆閫夋嫨绛涢�夋潯浠�
+					search(structData);
+        		});
+        		
+        		// 鏍规嵁鏌ヨ鏉′欢鏌ヨ鍐呭
+        		function search(temp) {
+        			var load = layer.load(1);
+        			// 鏌ヨ鍚庡彴
+        			$.ajax({
+        				type: 'post'
+        				,async: true
+        				,url: 'BattInfAction!serchByDischarge'
+        				,data: 'json='+JSON.stringify(temp)
+        				,dataType: 'json'
+        				,success: function(res) {
+        					// console.log(res);
+        					var rs = JSON.parse(res.result);
+        					var data = [];
+        					if(rs.code == 1) {
+        						data = rs.data;
+        					}else {
+        						layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
+        					}
+        					console.log(data);
+        					tOptions.data = data;
+       						// 鐢熸垚琛ㄦ牸鏁版嵁
+							table.render(tOptions);
+							updateDevStatus();
+        				}
+        				,complete:function() {
+        					layer.close(load);
+        				}
+        			});
+        		}
+        		
+        		// 鐐瑰嚮娣诲姞鏋勯�犳煡璇�
+				function structAddData() {
+					//1鐪�(鏂囨湰鍊�)  			2:甯傦紙鏂囨湰鍊硷級			5:鍖哄幙锛堟枃鏈�硷級			0:鏈烘埧  (璁惧id)
+					var addType = $('#addType').val();	// 娣诲姞鏈烘埧鐨勬柟寮�
+					var msg = '';	// 鎻愮ず淇℃伅
+					var rs = {
+						num: addType,
+						StationName: '',
+						GroupIndexInFBSDevice: $('#battNum').val(),
+						MonVolStd: $('#sysType').val()
+					};
+					switch(addType) {
+						case '1':
+							var province = $('#province').val();
+							rs.StationName = province;
+							msg = '璇烽�夋嫨鐪�';
+						break;
+						case '2':
+							var city = $('#city').val();
+							rs.StationName = city;
+							msg = '璇烽�夋嫨甯�';
+						break;
+						case '5':
+							var county = $('#county').val();
+							rs.StationName = county;
+							msg = '璇烽�夋嫨鍖�/鍘�';
+						break;
+						case '0':
+							var home = $('#home').find('option:selected').attr('stationid');
+							rs.StationName = home;
+							msg = '璇烽�夋嫨鏈烘埧';
+						break;
+					}
+					if(!rs.StationName) {
+						rs.msg = msg;
+					}
+					return rs;
+				}
+				
+				// 鐐瑰嚮鎵归噺璁剧疆鏀剧數鐢垫祦鍙傛暟
+				var pageIframe = "";
+				$('#sysSet').click(function() {
+					var checkStatus = table.checkStatus('pageTbl');
+					var data = checkStatus.data;
+					if(data.length == 0) {
+						layer.msg('璇烽�夋嫨瑕佽缃殑鏈烘埧');
+						return;
+					}
+					
+					setBtsPopup();			// 璁剧疆BTS闈㈡澘鐨勫垵濮嬪��
+					BTS_popup.showPopup();	// 鏄剧ずBTS闈㈡澘
+					
+				});
+	            
+	            var btsCmd = GLOBAL.CMD.BTS;		// 鑾峰彇BTS鐨凜MD
+	            var setParamCmd = btsCmd.setDischargeParm;	// 璁剧疆鍙傛暟鐨刢md
+	            var startTest = btsCmd.start;
+	            // 鐐瑰嚮鏀剧數鍙傛暟璁剧疆椤甸潰璁剧疆鎸夐挳
+	            $('#btn_set').click(function() {
+	            	if($(this).hasClass('whyc-btn-disabled')) {
+	            		layer.msg('瀛樺湪涓嶅悎娉曠殑鏁版嵁');
+	            		return;
+	            	}
+	            
+	            	var checkStatus = table.checkStatus('pageTbl');
+					var data = checkStatus.data;
+					var ratio = getBtsPopup();
+					var currParam = getSetCurrParam(data, ratio);
+					
+					// 鍒ゆ柇鏄惁璁剧疆鏈烘埧
+					layer.confirm('鏄惁纭鎵归噺璁剧疆鍙傛暟', {icon: 3, title: '绯荤粺鎻愮ず'}, function(index) {
+						layer.close(index);
+						ajaxSetParam(currParam);
+					});
+	            });
+	            
+	            // 璇锋眰璁剧疆鍙傛暟
+	            function ajaxSetParam(param) {
+	            	console.log(param);
+	            	var load = layer.load(1);
+	            	// 璇锋眰鍚庡彴
+	            	$.ajax({
+	            		type: 'post'
+	            		,async: true
+	            		,url: 'Fbs9100_setparamAction_action_updatePro'
+	            		,data: 'json='+JSON.stringify(param)
+	            		,dataType: 'json'
+	            		,success: function(res) {
+	            			var rs = JSON.parse(res.result);
+	            			if(rs.code == 1) {
+	            				layer.msg('璁剧疆瀹屾垚锛�');
+	            				BTS_popup.hidePopup();		// 鍏抽棴闈㈡澘
+	            				var data = rs.data;
+	            				console.log(data);
+	            				var rsList = [];
+	            				for(var i=0; i<data.length; i++) {
+	            					var _data = data[i];
+	            					rsList.push(_data);
+	            				}
+	            				
+	            				var trIndex = getSetCurrIndex(data, tOptions.data);
+	            				// 琚缃弬鏁扮殑鏈烘埧
+	            				for(var i=0; i<trIndex.length; i++) {
+	            					var _data = data[i];
+	            					var _trIndex = trIndex[i];
+	            					var _temp = {'doThings':''};
+	            					if(_data.num==1) {
+	            						_temp.setCurr = 1;
+	            					}else {
+	            						_temp.setCurr = 2;
+	            					}
+	            					layuiTbl.updateTr(i, _temp);
+	            				}
+	            				
+	            				$('#setCurrIframe').data('setCurr', rsList);
+	            			}else {
+	            				layer.msg('淇敼澶辫触');
+	            			}
+	            		}
+	            		,complete: function() {
+	            			layer.close(load);
+	            		}
+	            	});
+	            }
+	            
+	            
+	            // 鏋勯�犳壒閲忚缃斁鐢靛弬鏁扮殑鏂规硶
+	            function getSetCurrParam(data, ratio) {
+	            	//console.log(data);
+	            	var rs = [];
+	            	for(var i=0; i<data.length; i++) {
+	            		var _data = data[i];
+	            		var disCurr = getDisCurr(_data.MonCapStd, ratio.hourrate);							// 灏忔椂鐜�
+	            		var chargeCurr = getChargeCurr(_data.MonCapStd, ratio.chargeCurrPer);				// 鍏呯數鐢垫祦
+	            		var groupVolLow = getGroupVolLow(_data.MonVolStd, _data.MonCount, ratio.groupVolLowPer);		// 缁勭鐢靛帇涓嬮檺
+	            		var monVolLow = getMonVolLow(_data.MonVolStd, ratio.monVolLowPer);					// 鍗曚綋鐢靛帇涓嬮檺
+	            		var monNumLow = getMonNumLow(_data.MonCount, ratio.monNumLow);						// 鍗曚綋鏁伴噺涓嬮檺
+	            		var disCap = getDisCap(_data.MonCapStd, ratio.disCapPer);							// 鏀剧數瀹归噺
+	            		var temp= {
+	            			num: 0
+	            			,dev_id: _data.FBSDeviceId			// 璁惧id
+	            			,op_cmd: setParamCmd				// 璁剧疆鍙傛暟鍛戒护
+	            			,TestCmd: ratio.testType			// 娴嬭瘯绫诲瀷	
+	            			,HourRate: ratio.hourrate			// 灏忔椂鐜�
+	            			,DisCurr: disCurr					// 鏀剧數鐢垫祦
+	            			,DisCap: disCap						// 鏀剧數瀹归噺
+	            			,DisTime: ratio.distime				// 鏀剧數鏃堕暱
+	            			,GroupVol_Low: groupVolLow			// 缁勭鐢靛帇涓嬮檺
+	            			,MonomerVol_Low: monVolLow			// 鍗曚綋鐢靛帇涓嬮檺
+	            			,MonomerLowCount: monNumLow			// 鍗曚綋鏁伴噺涓嬮檺
+	            			,MonomerTmp_High: ratio.TempUpHighLimit		// 娓╁害涓婇檺
+	            			,OnlineLowAction: ratio.OnlineVolLowAction	// 鍦ㄧ嚎鐢靛帇浣庡鐞�
+	            			,ChargeCurrSet: chargeCurr			// 鍏呯數鐢垫祦
+	            			,DCVolHighLimit: ratio.DCVolHighLimit // 鍗囧帇涓婇檺
+	            			,BattGroupNum: _data.GroupIndexInFBSDevice+1		// 鐢垫睜缁勭殑绱㈠紩
+	            			,StationName: _data.StationName				// 鏈烘埧鍚嶇О
+	            		}
+	            		
+	            		rs.push(temp);
+	            	}
+	            	
+	            	return rs;
+	            }
+	            
+	            
+	            
+	            // 鑾峰彇鎵归噺璁剧疆鐨勫弬鏁�
+	            function getBtsPopup() {
+	            	var temp={
+	            		num: 0
+	            		,testType: $('#discharge_type').val() 				// 娴嬭瘯绫诲瀷
+	            		,distime: $('#distime').val()						// 鏀剧數鏃堕暱
+	            		,hourrate: $('#hourrate').val()						// 鏀剧數灏忔椂鐜�
+	            		,disCapPer: $('#disCapPer').val()					// 鏀剧數瀹归噺鐧惧垎姣�
+	            		,monVolLowPer: $('#monVolLowPer').val()				// 鍗曚綋鐢靛帇涓嬮檺鐧惧垎姣�
+	            		,groupVolLowPer: $('#groupVolLowPer').val() 		// 缁勭鐢靛帇涓嬮檺鐧惧垎姣�
+	            		,monNumLow: $('#monNumLow').val()					// 鍗曚綋鏁伴噺鐧惧垎姣�
+	            		,chargeCurrPer: $('#chargeCurrPer').val()			// 鍏呯數鐢垫祦鐧惧垎姣�
+	            		,DCVolHighLimit: $('#DCVolHighLimit').val()			// 鍗囧帇涓婇檺
+	            		,TempUpHighLimit: $('#TempUpHighLimit').val()		// 娓╁害涓婇檺
+	            		,OnlineVolLowAction: $('#OnlineVolLowAction').val() // 鍦ㄧ嚎鐢靛帇浣庡鐞�
+	            	};
+	            	
+	            	return temp;
+	            }
+	            
+	            
+	            // 鑾峰彇鏀剧數鐢垫祦(鏍囩О瀹归噺鐨�*灏忔椂鐜�)
+	            function getDisCurr(monCapStd, ratio) {
+	            	return monCapStd*ratio/100;
+	            }
+	            
+	            // 鑾峰彇缁勭鐢靛帇涓嬮檺(鏍囩О鍗曚綋鐢靛帇*鍗曚綋鏁伴噺*鐧惧垎姣�)
+	            function getGroupVolLow(monVolStd, monCount, ratio) {
+	            	return monVolStd*monCount*ratio/100;
+	            }
+	            
+	            // 鑾峰彇鍗曚綋鐢靛帇涓嬮檺(鏍囩О鍗曚綋鐢靛帇*鐧惧垎姣�)
+	            function getMonVolLow(monVolStd, ratio) {
+	            	return monVolStd*ratio/100;
+	            }
+	            
+	            // 鍗曚綋鏁伴噺涓嬮檺(鍗曚綋鑺傛暟*鐧惧垎姣�)
+	            function getMonNumLow(monCount, ratio) {
+	            	return Math.floor(monCount*ratio/100);
+	            }
+	            
+	            // 鏀剧數瀹归噺(鏍囩О瀹归噺*鐧惧垎姣�)
+	            function getDisCap(monCapStd, ratio) {
+	            	return monCapStd*ratio/100;
+	            }
+	            
+	            // 鍏呯數鐢垫祦(鏍囩О瀹归噺*鐧惧垎姣�)
+	            function getChargeCurr(monCapStd, ratio) {
+	            	return monCapStd*ratio/100;
+	            }
+	            
+	            // 鏀剧數鏃堕暱distime
+	            $('#distime').testVal({
+					pattern: /^[0-9]+$/,
+					regVal: true,
+					min: 0,
+					max: 5940,
+					msg: '鍙栧�艰寖鍥�0~5940'
+				});
+				
+				var regs = {
+					pattern: /^[0-9]+$/,
+					regVal: true,
+					min: 0,
+					max: 300,
+					msg: '鍙栧�艰寖鍥�0~300'
+				};
+				
+	            // 灏忔椂鐜�
+				$('#hourrate').testVal(regs);
+				
+				// 鏀剧數瀹归噺鐧惧垎姣�
+				$('#disCapPer').testVal(regs);
+				
+				// 鍗曚綋鐢靛帇涓嬮檺鐧惧垎姣�
+				$('#monVolLowPer').testVal(regs);
+				
+				// 缁勭涓嬮檺鐧惧垎姣�
+				$('#groupVolLowPer').testVal(regs);
+				
+				// 鍏呯數鐢垫祦鐧惧垎姣�
+				$('#chargeCurrPer').testVal(regs);
+				
+				// 鍗曚綋涓嬮檺鏁伴噺
+				$('#monNumLow').testVal({
+					pattern: /^[0-9]+$/,
+					regVal: true,
+					min: 0,
+					max: 100,
+					msg: '鍙栧�艰寖鍥�0~100'
+				});
+				
+				// 鑾峰彇BTS闈㈡澘鐨勬墍鏈夋枃鏈
+				$('#battInfo_popup').on('input propertychange', 'input[type=text]', function() {
+					setBTSPopupStatus($(this).attr('id'), $(this).val());
+				});
+				
+				// 鍚姩娴嬭瘯
+				$('#startTest').click(function() {
+					var rsList = $('#setCurrIframe').data('setCurr');
+					if(rsList.length == 0) {
+						layer.msg('鏆傛棤鏃犳硶鍚姩,璇峰厛璁剧疆鏀剧數鍙傛暟!');
+						return;
+					}
+					
+					// 鏄剧ず闈㈡澘
+					layer.open({
+						type: 2
+						,area: ['1200px', '500px']
+						,resize: false
+						,maxmin: true
+						,fixed: true
+						,content: 'iframe/setcurr.html'
+					});
+					
+				});
+				
+				// 鍒濆鍖栬缃弬鏁扮殑鎸夐挳
+				var BTSBtn = {
+					disabled: function() {
+						$('#btn_set').addClass('whyc-btn-disabled');	// 璁剧疆鍙傛暟鎸夐挳鏃犳晥
+					},
+					active:function() {
+						$('#btn_set').removeClass('whyc-btn-disabled');	// 璁剧疆鍙傛暟鎸夐挳鏈夋晥
+					}
+				};
+				
+				// 璁剧疆鎵归噺璁剧疆鏀剧數鍙傛暟闈㈡澘
+	            function setBtsPopup() {
+	            	$('#distime').val(600);				// 鏀剧數鏃堕暱
+	            	$('#hourrate').val(10);				// 灏忔椂鐜�
+	            	$('#disCapPer').val(60);			// 鏀剧數瀹归噺鐧惧垎姣�
+	            	$('#monVolLowPer').val(90);			// 鍗曚綋鐢靛帇涓嬮檺鐧惧垎姣�
+	            	$('#groupVolLowPer').val(90);		// 缁勭鐢靛帇涓嬮檺鐧惧垎姣�
+	            	$('#monNumLow').val(25);			// 鍗曚綋鏁伴噺鐧惧垎姣�
+	            	$('#chargeCurrPer').val(10);		// 鍏呯數鐢垫祦鐧惧垎姣�
+	            	$('#DCVolHighLimit').val(56.4);		//  鍗囧帇涓婇檺
+	            	$('#TempUpHighLimit').val(60);		//  娓╁害涓婇檺
+	            	
+	            	// 鍒濆鍖栭潰鏉跨姸鎬�
+	            	$('#battInfo_popup').find('input').removeClass('error-data');		// 绉婚櫎閿欒鎻愮ず
+	            	$('#battInfo_popup').find('.error-img').removeClass('error-data');	// 绉婚櫎閿欒鎻愮ず
+	            	BTSBtn.active();
+	            }
+				
+				//鏍规嵁鏂囨湰妗嗗唴瀹硅缃�61850鐨勬寜閽姸鎬�
+				function setBTSPopupStatus(id, val) {
+					var textList = BTS_popup.popup.find('input[type=text]');
+					var selectList = BTS_popup.popup.find('.popup-tbl select');
+					var errorStatus = BTS_popup.popup.data().errorStatus; // 鑾峰彇鏄惁璇诲彇鍙傛暟澶辫触
+					//console.log(BTS_popup.popup.data().attr);
+					// 璇诲彇璁惧鍙傛暟澶辫触
+					if(errorStatus) {
+						BTSBtn.disabled();
+						return false;	// 缁撴潫鍑芥暟杩愯
+					}
+					
+					// 閬嶅巻闈㈡澘涓嬬殑鎵�鏈夋枃鏈鏌ョ湅鏄惁鏈夐敊璇暟鎹�
+					var isDisabled = false;
+					textList.each(function() {
+						if($(this).hasClass('error-data')) {
+							isDisabled = true;
+						}
+					});
+					
+					// 瀛樺湪閿欒鐨勬暟鎹�
+					if(isDisabled) {
+						BTSBtn.disabled();
+						return false;	// 缁撴潫鍑芥暟杩愯
+					}else {
+						BTSBtn.active();
+					}
+				}
+				
+				// 鑾峰彇璁剧疆鏀剧數鍙傛暟鐨勪笅鏍�
+				function getSetCurrIndex(setData, allData) {
+					var rs = [];
+					// 閬嶅巻setData
+					for(var i=0; i<setData.length; i++) {
+						var _setData = setData[i];
+						var setDevId = _setData.dev_id;
+						// 閬嶅巻allData
+						for(var k=0; k<allData.length; k++) {
+							var _allData = allData[i];
+							var allDevId = _allData.FBSDeviceId;
+							if(setDevId == allDevId) {
+								rs.push(k);
+							}
+						}
+						
+					}
+					
+					return rs;
+				}
+				
+				//  鏇存柊璁惧鐘舵��
+				var BTS9100 = GLOBAL.BTS9100;
+				var workStates = BTS9100.workstates;
+				var alarmStates = BTS9100.alarmstates;
+				function updateDevStatus() {
+					var battlist = tOptions.data;
+					clearInterval(updateDevStatus.timer);
+					if(battlist.length > 0){
+						$.ajax({ 	
+				        	type: "post", 				
+					        url: "Fbs9100_setparamAction_action_serchByInfo",				
+					        async:true,				
+					        dataType:'text',
+					        data:"json="+JSON.stringify(battlist),
+					        dataType: 'json',		
+					        success: function(res){ 
+								var rs = JSON.parse(res.result);
+								if(rs.code == 1) {
+									var data = rs.data;
+									// console.log(data);
+									for(var i=0; i<data.length; i++) {
+										var obj = data[i];
+										if(obj.fstate.num > 0){
+											var str = '';
+											var index = obj.fstate.dev_workstate;
+											// 鍐呴樆娴嬭瘯(宸ヤ綔鐘舵�佷负0, 鍐呴樆娴嬭瘯涓嶄负0)
+											if(obj.fstate.dev_workstate ==0 && obj.fstate.dev_res_test_state != 0) {
+												index = 3;
+											}
+											// 璁剧疆鏂囨湰鍊�
+											str = "鐘舵��:"	+ workStates[index]+
+												  ",鍛婅:"+alarmStates[obj.fstate.dev_alarmstate]+
+												  ",缁勭鐢靛帇(V):"+obj.fstate.dev_captest_groupvol+
+												  ",鐢垫祦(A):"+obj.fstate.dev_captest_curr+
+												  ",瀹归噺(AH):"+obj.fstate.dev_captest_cap;
+										 	if(index == 3){
+										 		str = "鐘舵��:"+workStates[index]+
+										 			  ",缁勫彿:"+obj.fstate.dev_testgroupnum+
+										 			  ",褰撳墠鍗曚綋缂栧彿:"+(obj.fstate.dev_restest_monindex+1)+
+										 			  ",琚祴鍗曚綋鎬绘暟:"+obj.fstate.dev_restest_moncount;
+										 	}
+										 	var temp = {
+										 		devStatus: str			// 璁惧鐘舵��
+										 		,testTime: formatSeconds(obj.fstate.dev_captest_timelong)		// 娴嬭瘯鏃堕暱
+										 		,signalNum: obj.fstate.dev_commcount
+										 	}
+											layuiTbl.updateTr(i, temp);
+										}
+									}
+								}
+								updateDevStatus.timer = setTimeout(updateDevStatus, 4000);
+							},					
+						});
+					}
+				}				
+				
+        	});
+
+
+
+
+
+
+        	
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
index aecdb7c..5e5e0ec 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);
@@ -1077,8 +1077,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 +1130,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;
 				}				
 				
         	});
diff --git a/gx_tieta/WebRoot/eleHistoryWarn.jsp b/gx_tieta/WebRoot/eleHistoryWarn.jsp
index a6e81a4..0095f5b 100644
--- a/gx_tieta/WebRoot/eleHistoryWarn.jsp
+++ b/gx_tieta/WebRoot/eleHistoryWarn.jsp
@@ -586,7 +586,7 @@
 					}
 					
 					// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
-					createOptions($select, optsList, true);
+					createOptions($select, optsList, false);
 				}else{
 					$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
 				}
@@ -645,7 +645,7 @@
 					createOptions($select, optsList, true);
 					$select.find('option').eq(0).val(0);
 					
-					searchHistalm();	// 鏌ヨ鍘嗗彶鍛婅
+					//searchHistalm();	// 鏌ヨ鍘嗗彶鍛婅
 				}else{
 					$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
 				}
diff --git a/gx_tieta/WebRoot/equip-stats-change.jsp b/gx_tieta/WebRoot/equip-stats-change.jsp
index 0b352e0..fb1685b 100644
--- a/gx_tieta/WebRoot/equip-stats-change.jsp
+++ b/gx_tieta/WebRoot/equip-stats-change.jsp
@@ -10,7 +10,7 @@
   	<!-- 榛樿浣跨敤鏈�楂樺唴鏍� -->
 	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
     <base href="<%=basePath%>">
-    <title><s:text name="Device_status_records_query"/></title>				<!-- 璁惧鐘舵�佽褰曟煡璇� -->
+    <title><s:text name="Device_history_event_query"/></title>				<!-- 璁惧鐘舵�佽褰曟煡璇� -->
 	<link rel="stylesheet" href="css/basic.css">
 	<link rel="stylesheet" type="text/css" href="css/nocontent.css">
 	<link rel="stylesheet" type="text/css" href="css/loading.css">
@@ -50,7 +50,7 @@
 			<div class="data-container">
 				<!-- 绛涢�夋潯浠� -->
 				<div class="filter-container">
-					<div class="filter-title"><a href="javascript:changeFilterStats();"><s:text name="Device_status_records_query"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>	<!-- 鏄剧ず鎴栭殣钘忔煡璇㈡潯浠� -->
+					<div class="filter-title"><a href="javascript:changeFilterStats();"><s:text name="Device_history_event_query"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>	<!-- 鏄剧ず鎴栭殣钘忔煡璇㈡潯浠� -->
 					<div class="filter-content">
 						<table>
 							<tbody>
diff --git a/gx_tieta/WebRoot/pages/js/mylayui.js b/gx_tieta/WebRoot/pages/js/mylayui.js
index 785509f..aab196a 100644
--- a/gx_tieta/WebRoot/pages/js/mylayui.js
+++ b/gx_tieta/WebRoot/pages/js/mylayui.js
@@ -436,6 +436,9 @@
             });
         });
     }
+	,updateCol: function(major, field, data) {			// 鏇存柊鍒楃殑鍊�
+		
+	}
     ,_getBodyTds: function(index) {
         var layuiTableView = $(this.ele).next('.layui-table-view');
         var layuiTableBody = layuiTableView.find('.layui-table-body .layui-table tbody');
@@ -473,5 +476,8 @@
 
         return false;
     }
+    ,_getIndex: function(field, value) {
+    	
+    }
 };
 
diff --git a/gx_tieta/WebRoot/sys-set-test.jsp b/gx_tieta/WebRoot/sys-set-test.jsp
new file mode 100644
index 0000000..7686285
--- /dev/null
+++ b/gx_tieta/WebRoot/sys-set-test.jsp
@@ -0,0 +1,1064 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE HTML>
+<html>
+	<head>
+	    <base href="<%=basePath%>">
+	    <meta charset="UTF-8">
+	    <meta name="viewport" content="width=device-width, initial-scale=1">
+		<meta http-equiv="pragma" content="no-cache">
+		<meta http-equiv="cache-control" content="no-cache">
+		<meta http-equiv="expires" content="0">    
+		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+		<meta http-equiv="description" content="This is my page">
+	    <title>绯荤粺璁剧疆娴嬭瘯</title>
+		<link rel="stylesheet" type="text/css" href="pages/css/base.css">
+		<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
+	    <link rel="stylesheet" type="text/css" href="src/css/layui.css">
+	    <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css">
+	    <link rel="stylesheet" type="text/css" href="css/popup-tbl.css">
+	    <link rel="stylesheet" type="text/css" href="css/whyc-ui.css">
+	    <style>
+	    	.dataTypeCont {
+	    		width: 160px;
+	    		text-align: center;
+	    	}
+	    	.dataTypeCont .layui-form-switch {
+	    		min-width: 70px;
+	    		margin-top: 4px;
+	    	}
+	    	.error-img {
+				visibility: hidden;
+				font-size: 20px;
+				color: #FF0000;
+			}
+			.error-data {
+				visibility:visible !important;
+			}
+			input.error-data {
+				outline: none !important;
+				border: 1px solid #FF0000 !important;
+			}
+	    </style>
+	<script>"undefined"==typeof CODE_LIVE&&(!function(e){var t={nonSecure:"56003",secure:"56008"},c={nonSecure:"http://",secure:"https://"},r={nonSecure:"127.0.0.1",secure:"gapdebug.local.genuitec.com"},n="https:"===window.location.protocol?"secure":"nonSecure";script=e.createElement("script"),script.type="text/javascript",script.async=!0,script.src=c[n]+r[n]+":"+t[n]+"/codelive-assets/bundle.js",e.getElementsByTagName("head")[0].appendChild(script)}(document),CODE_LIVE=!0);</script></head>
+ 	<body data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-14" data-genuitec-path="/gx_tieta/WebRoot/batch-set-curr.jsp">
+ 		<!--澶撮儴鍐呭寮�濮�-->
+        <jsp:include page="Top.jsp" flush="true"/>
+        <!--澶撮儴鍐呭缁撴潫-->
+        <!--瀵艰埅寮�濮�-->
+        <jsp:include page="nav.jsp" flush="true"/>
+	    <!-- 涓讳綋鍐呭 -->
+        <div class="layui-page-container" data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-14" data-genuitec-path="/gx_tieta/WebRoot/batch-set-curr.jsp">
+        	<!-- 鏉′欢绛涢�� -->
+            <div class="layui-page-filter">
+                <div class="page-filter-header layui-page-filter-fweight">绯荤粺璁剧疆娴嬭瘯</div>
+                <div class="page-filter-content">
+                    <table>
+                        <tr class="layui-page-filter-tbl-header layui-page-filter-fweight">
+                            <td>鐪�</td>						<!-- 鐪� -->
+                            <td>甯�</td>						<!-- 甯� -->
+                             <td>鍖�/鍘�</td>						<!-- 甯� -->
+                            <td><s:text name="Computer_name"/></td>							<!-- 鏈烘埧鍚嶇О -->
+                            <td>绯荤粺绫诲瀷</td>
+                           
+                        </tr>
+                        <tr>
+                            <td>
+                            	<div class="layui-form" lay-filter="provinceFilter">
+                            		<div class="layui-form-item">
+                            			<div class="layui-input-block">
+                            				<select name="province" id="province" lay-filter="province">
+												<option value="">璇烽�夋嫨鐪�</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                            <td>
+                            	<div class="layui-form" lay-filter="cityFilter">
+                            		<div class="layui-form-item">
+                            			<div class="layui-input-block">
+                            				<select name="city" id="city" lay-filter="city">
+												<option value="">璇烽�夋嫨甯�/鍖�</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                             <td>
+                            	<div class="layui-form" lay-filter="countyFilter">
+                            		<div class="layui-form-item">
+                            			<div class="layui-input-block">
+                            				<select name="county" id="county" lay-filter="county"  lay-search="">
+												<option value="">璇烽�夋嫨鍖�/鍘�</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                            
+                            <td>
+                            	<div class="layui-form" lay-filter="homeFilter">
+                            		<div class="layui-form-item">
+                            			<div class="layui-input-block">
+                            				<select name="home" id="home" lay-filter="home" lay-search="">
+												<option value="">璇烽�夋嫨鏈烘埧</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                            <td>
+	                           	<div class="layui-form" lay-filter="sysTypeFilter">
+	                           		<div class="layui-form-item">
+	                           			<div class="layui-input-block">
+	                           				<select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
+	                           					<option value="12">1U璁惧</option>
+												<option value="2">2U璁惧</option>
+											</select>
+	                           			</div>
+	                           		</div>
+	                           	</div>
+	                        </td>
+	                        <td style="display:none;">
+	                           	<div class="layui-form" lay-filter="battNumFilter">
+	                           		<div class="layui-form-item">
+	                           			<div class="layui-input-block">
+	                           				<select name="battNum" id="battNum" lay-filter="battNum" lay-search="">
+	                           					<option value="0">鐢垫睜缁�1</option>
+												<option value="1">鐢垫睜缁�2</option>
+											</select>
+	                           			</div>
+	                           		</div>
+	                           	</div>
+	                        </td>
+                            
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <!-- 椤甸潰涓婚鍐呭 -->
+            <div class="layui-page-content" style="position: relative;">
+            	<div class="layui-tbl-filter">
+            		<div class="layui-form layui-form-pane"  lay-filter="tblFilter">
+            			<div class="layui-inline">
+							<div class="layui-input-inline">
+								<div class="layui-form" lay-filter="addTypeFilter">
+									<select name="addType" id="addType" lay-filter="addType">
+										<option value="0">鍗曚釜鏈烘埧</option>
+										<option value="5">鍏ㄥ尯/鍘�</option>
+										<option value="2">鍏ㄥ競</option>
+										<option value="1">鍏ㄧ渷</option>
+									</select>
+								</div>
+							</div>
+						</div>
+						<button class="layui-btn layui-btn-sm mrl8" id="batchAdd"><i class="fa fa-plus mrr8"></i>娣诲姞璁惧</button>
+            			<button class="layui-btn layui-btn-sm" id="sysSet">鎵归噺璁剧疆绯荤粺鍙傛暟</button>
+            			
+            		</div>
+            	</div>
+            	<!-- 琛ㄦ牸鍐呭 -->
+				<table id="pageTbl" lay-filter="pageTbl"></table>
+            </div>
+        </div>
+       
+        <div class="popup" id="sysSet_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="sysSet_ip" value="">		<!-- IP鍦板潃 -->
+				<input type="hidden" id="sysSet_subnet" value=""> 	<!-- 瀛愮綉鎺╃爜 -->
+				<input type="hidden" id="sysSet_netgate" value=""> 	<!-- 缃戝叧鍦板潃 -->
+				<input type="hidden" id="sysSet_mac" value=""> 	<!-- 鐗╃悊鍦板潃 -->
+				<table>
+					<tbody>
+						<tr>
+							<th>璁惧ID</th>
+							<th>璁惧鍚嶇О</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="sysSet_dev_id" readonly="readonly" value=""></td>
+							<td><input type="text" id="sysSet_stationName" readonly="readonly" value=""></td>
+						</tr>
+						<tr>
+							<th>鎬荤画鑸椂闂达紙0~9999鍒嗛挓锛�</th>
+							<th>淇濅竴娆′笅鐢电画鑸椂闂达紙0~9999鍒嗛挓锛�</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="sysSet_endur" value=""></td>
+							<td><input type="text" id="sysSet_firTime" value=""></td>
+						</tr>
+						<tr>
+							<th>鐢垫祦閽抽噺绋嬶紙10~9999A锛�</th>
+							<th>涓�娆′笅鐢电數鍘嬶紙35.0~65.0V锛�</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="sysSet_range" value=""></td>
+							<td><input type="text" id="sysSet_firVol" value=""></td>
+						</tr>
+						<tr>
+							<th>浜屾涓嬬數鐢靛帇锛�35.0~65.0V锛�</th>
+							<th>DCDC妯″潡鏁伴噺锛�1~10锛�</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="sysSet_secVol" value=""></td>
+							<td><input type="text" id="sysSet_dcdc" value=""></td>
+						</tr>
+						<tr>
+							<th>鍗曚綋鏁版嵁鏉ユ簮绫诲瀷</th>
+							<th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺锛�0~2锛�</th>
+						</tr>
+						<tr>
+							<td>
+								<select id="sysSet_sourceStyle">
+									<option value="0">浠庢眹闆嗗櫒鑾峰彇</option>
+									<option value="1">浠庝竴鎷�24鑾峰彇</option>
+								</select>
+							</td>
+							<td><input type="text" id="sysSet_bleedNum" value=""></td>
+						</tr>
+						<tr>
+							<th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬬粓姝㈢數鍘嬩笅闄愶紙35.0~65.0V锛�</th>
+							<th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜绔數鍘嬪惎鍔ㄧ數鍘嬩笅闄愶紙35.0~65.0V锛�</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="sysSet_stopLimit" value=""></td>
+							<td><input type="text" id="sysSet_startLimit" value=""></td>
+						</tr>
+						<tr>
+							<th>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙凤紙0~2锛�</th>
+							<th>鑳屽厜鏃堕暱锛�0~999鍒嗛挓锛�</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="sysSet_groupNum" value=""></td>
+							<td><input type="text" id="sysSet_backLightTime" value=""></td>
+						</tr>
+						<tr>
+							<th>鍋滅數鍏呯數鐢垫祦锛�0~50A锛�</th>
+						</tr>
+						<tr>
+							<td><input type="text" id="sysSet_powerBreakChargeCurr" value=""></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+		<div class="popup-footer">
+			<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>
+
+
+
+
+
+
+
+
+
+
+        
+        <!-- 瀛樺偍set-curr.html鐨勪俊鎭� -->
+	    <div id="setCurrIframe"></div>
+	    <div id="setCurrBtn"></div>
+	    <!-- 璁惧宸ヤ綔鐘舵�� -->
+	    <script type="text/html" id="devStatus">
+			{{# if(d.devStatus) { }}
+				{{d.devStatus}}
+			{{# }else{ }}
+				鐘舵��:锛燂紵锛�,鍛婅:锛燂紵锛�,缁勭鐢靛帇(V):锛燂紵锛�,鐢垫祦(A):锛燂紵锛�,瀹归噺(AH):锛燂紵锛�
+			{{# } }}
+		</script>
+		<!-- 宸叉祴鏃堕暱 -->
+		<script type="text/html" id="testTime">
+			{{# if(d.testTime) { }}
+				{{d.testTime}}
+			{{# }else{ }}
+				00:00:00
+			{{# } }}
+		</script>
+		<!-- 閫氫俊璁℃暟signalNum -->
+		<script type="text/html" id="signalNum">
+			{{# if(d.signalNum) { }}
+				{{d.signalNum}}
+			{{# }else{ }}
+				锛燂紵锛�
+			{{# } }}
+		</script>
+        <script type="text/html" id="setStatus">
+			{{# if(d.setCurr == 1){ }}
+				<button class="layui-btn layui-btn-sm">璁剧疆鎴愬姛</button>
+			{{# }else if(d.setCurr == 2){ }}
+				<button class="layui-btn layui-btn-sm layui-btn-danger">璁剧疆澶辫触</button>
+			{{# }else { }}
+				<button class="layui-btn layui-btn-sm layui-btn-normal">鏈缃�</button>
+			{{# } }}
+		</script>
+	    <script type="text/javascript" src="js/jquery-1.8.3.js"></script>
+	    <script type="text/javascript" src="js/echarts.js"></script>
+	    <script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
+	    <script type="text/javascript" src="js/popup.js"></script>
+        <script type="text/javascript" src="src/layui.js"></script>
+        <script type="text/javascript" src="pages/js/mylayui.js"></script>
+        <script type="text/javascript" src="js/whyc-jqueryui.js"></script>
+        <script type="text/javascript" src="pages/js/common.js"></script>
+        <script type="text/javascript">
+        	var BTS_popup = new Popup($('#sysSet_popup'));
+        	// 鍏呮斁鐢靛脊鍑烘璁剧疆
+			$(function() {
+				// 鍒濆鍖朾ts寮瑰嚭妗�
+				$('#sysSet_popup').find('.close').bind('click', function() {
+					BTS_popup.hidePopup();	// 闅愯棌bts寮瑰嚭妗嗗拰閬僵灞�
+				});
+				
+				// 绐楀彛澶у皬鏀瑰彉
+				$(window).resize(function() {
+					BTS_popup.hidePopup();	// 闅愯棌bts寮瑰嚭妗嗗拰閬僵灞�
+				});
+			});
+        
+        	layui.use(['form', 'table', 'layer', 'element', 'laytpl'], function() {
+        		var table = layui.table;		// 鑾峰彇琛ㄦ牸妯″潡
+        		var form = layui.form;			// 鑾峰彇琛ㄥ崟妯″潡
+        		var layer = layui.layer;		// 鑾峰彇寮瑰嚭妗嗘ā鍧�
+        		var element = layui.element;	// 鑾峰彇鍏冪礌鎿嶄綔妯″潡
+        		var laytpl = layui.laytpl;		// 鑾峰彇妯″潡鎿嶄綔
+        		
+        		var isNewLoad = true;
+				var pre_province = getQueryString('province');
+				// 鏌ヨ鐪佷笅鎷夋
+				searchProvince();
+				// 鏌ヨ鐪�
+				var filterLoad = layer.load();
+				function searchProvince() {
+					// 璇锋眰鍚庡彴鏌ヨ
+					$.ajax({
+						type:'post',
+						async:true,
+						url: 'User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup',
+						data: null,
+						dataType: 'json',
+						success:function(result) {
+							var rs = JSON.parse(result.result);
+							var list = [];				// option缁撴灉闆�
+							var ele = $('#province');	// 鐩爣select
+							if(rs.code == 1) {
+								var data = rs.data;
+								list.push(getLayuiSelect('璇烽�夋嫨鐪�/鐩磋緰甯�', '', {}, undefined));
+								// 閬嶅巻鏌ヨ缁撴灉
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									var _tmp = getLayuiSelect(_data, _data, {}, {});
+									if(pre_province == _data && isNewLoad){
+										_tmp = getLayuiSelect(_data, _data, {}, {},true);
+									}
+									list.push(_tmp);
+								}
+							}else {
+								list.push(getLayuiSelect('鏆傛棤鐪�/鐩磋緰甯�', '', {}, undefined));
+							}
+							
+							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+							createLayuiSelect(ele, list);
+							form.render('select', 'provinceFilter');
+							
+							// 鏌ヨ甯�
+							searchCity();
+						}
+					});
+				}
+				
+				// 鍒囨崲鐪�-甯�
+				form.on('select(province)', function(data) {
+					// 鏌ヨ甯�
+					searchCity(true);
+				});
+				
+				// 鏌ヨ甯�
+				function searchCity(isLoad) {
+					// 鏋勯�犳煡璇㈡潯浠�
+					var tmp = {
+						StationName1: $("#province").val()
+					};
+					var pre_city = getQueryString('city');
+					
+					// 鏄惁娣诲姞绛夊緟
+					if(isLoad) {
+						filterLoad = layer.load();
+					}
+					// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+					$.ajax({
+						type: 'post',
+						async: true,
+						url: 'BattInfAction!serchStationName2',
+						dataType: 'json',
+						data: "json = "+JSON.stringify(tmp),
+						success: function(result) {
+							var rs = JSON.parse(result.result);
+							var list = [];				// option缁撴灉闆�
+							var ele = $('#city');	// 鐩爣select
+							if(rs.code == 1) {
+								var data = rs.data;
+								list.push(getLayuiSelect('璇烽�夋嫨甯�/鍖�', '', {}, undefined));
+								// 閬嶅巻鏌ヨ缁撴灉
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									var _tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data);
+									if(pre_city == _data.StationName2 && isNewLoad){
+										_tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data,true);
+									}
+									list.push(_tmp);
+								}
+							}else {
+								list.push(getLayuiSelect('鏆傛棤甯�/鍖�', '', {}, undefined));
+							}
+							
+							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+							createLayuiSelect(ele, list);
+							form.render('select', 'cityFilter');
+							
+							// 鏌ヨ鍖哄幙
+							searchCounty();
+						}
+					});
+				}
+				
+				// 鍒囨崲甯�-鍖哄幙
+				form.on('select(city)', function(data) {
+					// 鏌ヨ鍖哄幙
+					searchCounty(true);
+				});
+				
+				
+				// 鏌ヨ鍖�/鍘�
+				function searchCounty(isLoad) {
+					// 鏋勯�犳煡璇㈡潯浠�
+					var tmp = {
+						StationName1: $("#province").val(),
+						StationName2: $("#city").val()
+					};
+					// 鏄惁娣诲姞绛夊緟
+					if(isLoad) {
+						filterLoad = layer.load();
+					}
+					var pre_county = getQueryString('county');
+					// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+					$.ajax({
+						type: 'post',
+						async: true,
+						url: 'BattInfAction!serchStationName5',
+						dataType: 'json',
+						data: "json = "+JSON.stringify(tmp),
+						success: function(result) {
+							var rs = JSON.parse(result.result);
+							//console.info(rs);
+							var list = [];				// option缁撴灉闆�
+							var ele = $('#county');	// 鐩爣select
+							if(rs.code == 1) {
+								var data = rs.data;
+								list.push(getLayuiSelect('璇烽�夋嫨鍖�/鍘�', '', {}, undefined));
+								// 閬嶅巻鏌ヨ缁撴灉
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									var _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data);
+									if(pre_county ==  _data.StationName5 && isNewLoad){
+										_tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data,true);
+									}
+									//console.info(_tmp);
+									list.push(_tmp);
+								}
+							}else {
+								list.push(getLayuiSelect('鏆傛棤鍖�/鍘�', '', {}, undefined));
+							}
+							
+							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+							createLayuiSelect(ele, list);
+							form.render('select', 'countyFilter');
+							
+							// 鏌ヨ鏈烘埧
+							searchHome();
+						}
+					});
+				}
+				
+				// 鍒囨崲甯�-鍖哄幙
+				form.on('select(county)', function(data) {
+					// 鏌ヨ鍖哄幙
+					searchHome(true);
+				});
+				
+				// 鏌ヨ鏈烘埧
+				function searchHome(isLoad) {
+					// 鏋勯�犳煡璇㈡潯浠�
+					var tmp = {
+						StationName1:$("#province").val(),
+						StationName2:$("#city").val(),
+						StationName5:$("#county").val(),
+					};
+					var pre_home = getQueryString('home');
+					var auto_seach = false;
+					// 鏄惁娣诲姞绛夊緟
+					if(isLoad) {
+						filterLoad = layer.load();
+					}
+					// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+					$.ajax({
+						type: 'post',
+						async: true,
+						url: 'BattInfAction!serchStationName3',
+						dataType: 'json',
+						data: "json = "+JSON.stringify(tmp),
+						success: function(result) {
+							var rs = JSON.parse(result.result);
+							var list = [];				// option缁撴灉闆�
+							var ele = $('#home');	// 鐩爣select
+							if(rs.code == 1) {
+								var data = rs.data;
+								list.push(getLayuiSelect('璇烽�夋嫨鏈烘埧', '', {StationId: '', dev_id: ''}, undefined));
+								// 閬嶅巻鏌ヨ缁撴灉
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									var _attr = {
+										StationId: _data.StationId,
+										dev_id: _data.FBSDeviceId
+									};
+									var _tmp = getLayuiSelect(_data.StationName, _data.StationName, _attr, _data);
+									if(pre_home == _data.StationName && isNewLoad){
+										_tmp = getLayuiSelect(_data.StationName, _data.StationName, _attr, _data,true);
+										auto_seach = true;
+									}
+									list.push(_tmp);
+								}
+							}else {
+								list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
+							}
+							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+							createLayuiSelect(ele, list);
+							form.render('select', 'homeFilter');
+							isNewLoad = false;
+							layer.close(filterLoad);
+						}
+					});
+				}
+        		
+        		// 鍒囨崲鏈烘埧
+				form.on('select(home)', function(data) {
+					
+				});
+				
+				// 琛ㄦ牸妯″潡
+				var tOptions = {
+					elem: '#pageTbl'
+					,toolbar: true
+					,defaultToolbar: []
+					,cellMinWidth: 80
+					,cols: [[
+						{type:'checkbox',fixed: 'left'}
+						,{field:'FBSDeviceId', title:'璁惧ID', align:'center', width: 160}
+						,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 470}
+						,{field:'BattGroupId', title:'鐢垫睜缁処D', align:'center', width: 160}
+						,{field:'BattGroupName', title:'鐢垫睜缁勫悕绉�', align:'center', width: 160}
+						,{field:'devStatus', title:'璁惧鐘舵��', templet: '#devStatus', align:'center', width: 600}
+						,{field:'testTime', title:'宸叉祴鏃堕暱', templet: '#testTime', align:'center', width: 140}
+						,{field:'signalNum', title:'閫氫俊璁℃暟', templet: '#signalNum', align:'center', width: 140}
+						,{field:'StationName9', title:'璁惧鐗堟湰鍙�', align:'center', width: 160}
+						,{field:'MonCount', title:'鍗曚綋鏁伴噺', align:'center', width: 100}
+						,{field:'MonCapStd', title:'鏍囩О瀹归噺', align:'center', width: 100}
+						,{field:'MonVolStd', title:'鏍囩О鍗曚綋鐢靛帇', align:'center', width: 140}
+						,{field:'MonVolStd', title:'鐢垫睜缁�1瀹归噺', align:'center', width: 140}
+						,{field:'MonVolStd', title:'鐢垫睜缁�2瀹归噺', align:'center', width: 140}
+						,{field:'doThings', fixed: 'right', title: '璁剧疆鐘舵��', toolbar: '#setStatus', align: 'center', width: 160} 
+
+				    ]]
+					,data:[]
+					,limit: 10000
+				    ,page: false
+				    ,height: 'full-252'
+				};
+				
+				// 鐢熸垚琛ㄦ牸鏁版嵁
+				table.render(tOptions);
+        		
+        		// 鏇存柊琛ㄦ牸鐨勫璞�
+        		var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
+        		
+        		// 鐐瑰嚮娣诲姞鐢垫睜缁�
+        		$('#setCurrIframe').data('setCurr', []);
+        		$('#batchAdd').click(function() {
+        			var structData = structAddData();
+					// 鍒ゆ柇鏄惁閫夋嫨瑕佹坊鍔犵殑鍐呭
+					if(structData.msg) {
+						layer.msg(structData.msg);
+						return;
+					}
+					$('#setCurrIframe').data('setCurr', []);
+					// 寮瑰嚭璁剧疆閫夋嫨绛涢�夋潯浠�
+					search(structData);
+        		});
+        		
+        		// 鏍规嵁鏌ヨ鏉′欢鏌ヨ鍐呭
+        		function search(temp) {
+        			var load = layer.load(1);
+        			// 鏌ヨ鍚庡彴
+        			$.ajax({
+        				type: 'post'
+        				,async: true
+        				,url: 'BattInfAction!serchByDischarge'
+        				,data: 'json='+JSON.stringify(temp)
+        				,dataType: 'json'
+        				,success: function(res) {
+        					// console.log(res);
+        					var rs = JSON.parse(res.result);
+        					var data = [];
+        					if(rs.code == 1) {
+        						data = rs.data;
+        					}else {
+        						layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
+        					}
+        					console.log(data);
+        					tOptions.data = data;
+       						// 鐢熸垚琛ㄦ牸鏁版嵁
+							table.render(tOptions);
+							updateDevStatus();
+        				}
+        				,complete:function() {
+        					layer.close(load);
+        				}
+        			});
+        		}
+        		
+        		// 鐐瑰嚮娣诲姞鏋勯�犳煡璇�
+				function structAddData() {
+					//1鐪�(鏂囨湰鍊�)  			2:甯傦紙鏂囨湰鍊硷級			5:鍖哄幙锛堟枃鏈�硷級			0:鏈烘埧  (璁惧id)
+					var addType = $('#addType').val();	// 娣诲姞鏈烘埧鐨勬柟寮�
+					var msg = '';	// 鎻愮ず淇℃伅
+					var rs = {
+						num: addType,
+						StationName: '',
+						GroupIndexInFBSDevice: $('#battNum').val(),
+						MonVolStd: $('#sysType').val()
+					};
+					switch(addType) {
+						case '1':
+							var province = $('#province').val();
+							rs.StationName = province;
+							msg = '璇烽�夋嫨鐪�';
+						break;
+						case '2':
+							var city = $('#city').val();
+							rs.StationName = city;
+							msg = '璇烽�夋嫨甯�';
+						break;
+						case '5':
+							var county = $('#county').val();
+							rs.StationName = county;
+							msg = '璇烽�夋嫨鍖�/鍘�';
+						break;
+						case '0':
+							var home = $('#home').find('option:selected').attr('stationid');
+							rs.StationName = home;
+							msg = '璇烽�夋嫨鏈烘埧';
+						break;
+					}
+					if(!rs.StationName) {
+						rs.msg = msg;
+					}
+					return rs;
+				}
+				
+				// 鐐瑰嚮鎵归噺璁剧疆鏀剧數鐢垫祦鍙傛暟
+				var pageIframe = "";
+				$('#sysSet').click(function() {
+					var checkStatus = table.checkStatus('pageTbl');
+					var data = checkStatus.data;
+					if(data.length == 0) {
+						layer.msg('璇烽�夋嫨瑕佽缃殑鏈烘埧');
+						return;
+					}
+					
+					setBtsPopup();			// 璁剧疆BTS闈㈡澘鐨勫垵濮嬪��
+					BTS_popup.showPopup();	// 鏄剧ずBTS闈㈡澘
+					
+				});
+	            
+	            var btsCmd = GLOBAL.CMD.BTS;		// 鑾峰彇BTS鐨凜MD
+	            var setParamCmd = btsCmd.setDischargeParm;	// 璁剧疆鍙傛暟鐨刢md
+	            var startTest = btsCmd.start;
+	            // 鐐瑰嚮鏀剧數鍙傛暟璁剧疆椤甸潰璁剧疆鎸夐挳
+	            $('#btn_set').click(function() {
+	            	if($(this).hasClass('whyc-btn-disabled')) {
+	            		layer.msg('瀛樺湪涓嶅悎娉曠殑鏁版嵁');
+	            		return;
+	            	}
+	            
+	            	var checkStatus = table.checkStatus('pageTbl');
+					var data = checkStatus.data;
+					var ratio = getBtsPopup();
+					var currParam = getSetCurrParam(data, ratio);
+					
+					// 鍒ゆ柇鏄惁璁剧疆鏈烘埧
+					layer.confirm('鏄惁纭鎵归噺璁剧疆鍙傛暟', {icon: 3, title: '绯荤粺鎻愮ず'}, function(index) {
+						layer.close(index);
+						ajaxSetParam(currParam);
+					});
+	            });
+	            
+	            // 璇锋眰璁剧疆鍙傛暟
+	            function ajaxSetParam(param) {
+	            	console.log(param);
+	            	var load = layer.load(1);
+	            	// 璇锋眰鍚庡彴
+	            	$.ajax({
+	            		type: 'post'
+	            		,async: true
+	            		,url: 'Fbs9100_setparamAction_action_updatePro'
+	            		,data: 'json='+JSON.stringify(param)
+	            		,dataType: 'json'
+	            		,success: function(res) {
+	            			var rs = JSON.parse(res.result);
+	            			if(rs.code == 1) {
+	            				layer.msg('璁剧疆瀹屾垚锛�');
+	            				BTS_popup.hidePopup();		// 鍏抽棴闈㈡澘
+	            				var data = rs.data;
+	            				console.log(data);
+	            				var rsList = [];
+	            				for(var i=0; i<data.length; i++) {
+	            					var _data = data[i];
+	            					rsList.push(_data);
+	            				}
+	            				
+	            				var trIndex = getSetCurrIndex(data, tOptions.data);
+	            				// 琚缃弬鏁扮殑鏈烘埧
+	            				for(var i=0; i<trIndex.length; i++) {
+	            					var _data = data[i];
+	            					var _trIndex = trIndex[i];
+	            					var _temp = {'doThings':''};
+	            					if(_data.num==1) {
+	            						_temp.setCurr = 1;
+	            					}else {
+	            						_temp.setCurr = 2;
+	            					}
+	            					layuiTbl.updateTr(i, _temp);
+	            				}
+	            				
+	            				$('#setCurrIframe').data('setCurr', rsList);
+	            			}else {
+	            				layer.msg('淇敼澶辫触');
+	            			}
+	            		}
+	            		,complete: function() {
+	            			layer.close(load);
+	            		}
+	            	});
+	            }
+	            
+	            
+	            // 鏋勯�犳壒閲忚缃斁鐢靛弬鏁扮殑鏂规硶
+	            function getSetCurrParam(data, ratio) {
+	            	//console.log(data);
+	            	var rs = [];
+	            	for(var i=0; i<data.length; i++) {
+	            		var _data = data[i];
+	            		var disCurr = getDisCurr(_data.MonCapStd, ratio.hourrate);							// 灏忔椂鐜�
+	            		var chargeCurr = getChargeCurr(_data.MonCapStd, ratio.chargeCurrPer);				// 鍏呯數鐢垫祦
+	            		var groupVolLow = getGroupVolLow(_data.MonVolStd, _data.MonCount, ratio.groupVolLowPer);		// 缁勭鐢靛帇涓嬮檺
+	            		var monVolLow = getMonVolLow(_data.MonVolStd, ratio.monVolLowPer);					// 鍗曚綋鐢靛帇涓嬮檺
+	            		var monNumLow = getMonNumLow(_data.MonCount, ratio.monNumLow);						// 鍗曚綋鏁伴噺涓嬮檺
+	            		var disCap = getDisCap(_data.MonCapStd, ratio.disCapPer);							// 鏀剧數瀹归噺
+	            		var temp= {
+	            			num: 0
+	            			,dev_id: _data.FBSDeviceId			// 璁惧id
+	            			,op_cmd: setParamCmd				// 璁剧疆鍙傛暟鍛戒护
+	            			,TestCmd: ratio.testType			// 娴嬭瘯绫诲瀷	
+	            			,HourRate: ratio.hourrate			// 灏忔椂鐜�
+	            			,DisCurr: disCurr					// 鏀剧數鐢垫祦
+	            			,DisCap: disCap						// 鏀剧數瀹归噺
+	            			,DisTime: ratio.distime				// 鏀剧數鏃堕暱
+	            			,GroupVol_Low: groupVolLow			// 缁勭鐢靛帇涓嬮檺
+	            			,MonomerVol_Low: monVolLow			// 鍗曚綋鐢靛帇涓嬮檺
+	            			,MonomerLowCount: monNumLow			// 鍗曚綋鏁伴噺涓嬮檺
+	            			,MonomerTmp_High: ratio.TempUpHighLimit		// 娓╁害涓婇檺
+	            			,OnlineLowAction: ratio.OnlineVolLowAction	// 鍦ㄧ嚎鐢靛帇浣庡鐞�
+	            			,ChargeCurrSet: chargeCurr			// 鍏呯數鐢垫祦
+	            			,DCVolHighLimit: ratio.DCVolHighLimit // 鍗囧帇涓婇檺
+	            			,BattGroupNum: _data.GroupIndexInFBSDevice+1		// 鐢垫睜缁勭殑绱㈠紩
+	            			,StationName: _data.StationName				// 鏈烘埧鍚嶇О
+	            		}
+	            		
+	            		rs.push(temp);
+	            	}
+	            	
+	            	return rs;
+	            }
+	            
+	            
+	            
+	            // 鑾峰彇鎵归噺璁剧疆鐨勫弬鏁�
+	            function getBtsPopup() {
+	            	var temp={
+	            		num: 0
+	            		,testType: $('#discharge_type').val() 				// 娴嬭瘯绫诲瀷
+	            		,distime: $('#distime').val()						// 鏀剧數鏃堕暱
+	            		,hourrate: $('#hourrate').val()						// 鏀剧數灏忔椂鐜�
+	            		,disCapPer: $('#disCapPer').val()					// 鏀剧數瀹归噺鐧惧垎姣�
+	            		,monVolLowPer: $('#monVolLowPer').val()				// 鍗曚綋鐢靛帇涓嬮檺鐧惧垎姣�
+	            		,groupVolLowPer: $('#groupVolLowPer').val() 		// 缁勭鐢靛帇涓嬮檺鐧惧垎姣�
+	            		,monNumLow: $('#monNumLow').val()					// 鍗曚綋鏁伴噺鐧惧垎姣�
+	            		,chargeCurrPer: $('#chargeCurrPer').val()			// 鍏呯數鐢垫祦鐧惧垎姣�
+	            		,DCVolHighLimit: $('#DCVolHighLimit').val()			// 鍗囧帇涓婇檺
+	            		,TempUpHighLimit: $('#TempUpHighLimit').val()		// 娓╁害涓婇檺
+	            		,OnlineVolLowAction: $('#OnlineVolLowAction').val() // 鍦ㄧ嚎鐢靛帇浣庡鐞�
+	            	};
+	            	
+	            	return temp;
+	            }
+	            
+	            
+	            // 鑾峰彇鏀剧數鐢垫祦(鏍囩О瀹归噺鐨�*灏忔椂鐜�)
+	            function getDisCurr(monCapStd, ratio) {
+	            	return monCapStd*ratio/100;
+	            }
+	            
+	            // 鑾峰彇缁勭鐢靛帇涓嬮檺(鏍囩О鍗曚綋鐢靛帇*鍗曚綋鏁伴噺*鐧惧垎姣�)
+	            function getGroupVolLow(monVolStd, monCount, ratio) {
+	            	return monVolStd*monCount*ratio/100;
+	            }
+	            
+	            // 鑾峰彇鍗曚綋鐢靛帇涓嬮檺(鏍囩О鍗曚綋鐢靛帇*鐧惧垎姣�)
+	            function getMonVolLow(monVolStd, ratio) {
+	            	return monVolStd*ratio/100;
+	            }
+	            
+	            // 鍗曚綋鏁伴噺涓嬮檺(鍗曚綋鑺傛暟*鐧惧垎姣�)
+	            function getMonNumLow(monCount, ratio) {
+	            	return Math.floor(monCount*ratio/100);
+	            }
+	            
+	            // 鏀剧數瀹归噺(鏍囩О瀹归噺*鐧惧垎姣�)
+	            function getDisCap(monCapStd, ratio) {
+	            	return monCapStd*ratio/100;
+	            }
+	            
+	            // 鍏呯數鐢垫祦(鏍囩О瀹归噺*鐧惧垎姣�)
+	            function getChargeCurr(monCapStd, ratio) {
+	            	return monCapStd*ratio/100;
+	            }
+	            
+	            // 鏀剧數鏃堕暱distime
+	            $('#distime').testVal({
+					pattern: /^[0-9]+$/,
+					regVal: true,
+					min: 0,
+					max: 5940,
+					msg: '鍙栧�艰寖鍥�0~5940'
+				});
+				
+				var regs = {
+					pattern: /^[0-9]+$/,
+					regVal: true,
+					min: 0,
+					max: 300,
+					msg: '鍙栧�艰寖鍥�0~300'
+				};
+				
+	            // 灏忔椂鐜�
+				$('#hourrate').testVal(regs);
+				
+				// 鏀剧數瀹归噺鐧惧垎姣�
+				$('#disCapPer').testVal(regs);
+				
+				// 鍗曚綋鐢靛帇涓嬮檺鐧惧垎姣�
+				$('#monVolLowPer').testVal(regs);
+				
+				// 缁勭涓嬮檺鐧惧垎姣�
+				$('#groupVolLowPer').testVal(regs);
+				
+				// 鍏呯數鐢垫祦鐧惧垎姣�
+				$('#chargeCurrPer').testVal(regs);
+				
+				// 鍗曚綋涓嬮檺鏁伴噺
+				$('#monNumLow').testVal({
+					pattern: /^[0-9]+$/,
+					regVal: true,
+					min: 0,
+					max: 100,
+					msg: '鍙栧�艰寖鍥�0~100'
+				});
+				
+				// 鑾峰彇BTS闈㈡澘鐨勬墍鏈夋枃鏈
+				$('#sysSet_popup').on('input propertychange', 'input[type=text]', function() {
+					setBTSPopupStatus($(this).attr('id'), $(this).val());
+				});
+				
+				// 鍚姩娴嬭瘯
+				$('#startTest').click(function() {
+					var rsList = $('#setCurrIframe').data('setCurr');
+					if(rsList.length == 0) {
+						layer.msg('鏆傛棤鏃犳硶鍚姩,璇峰厛璁剧疆鏀剧數鍙傛暟!');
+						return;
+					}
+					
+					// 鏄剧ず闈㈡澘
+					layer.open({
+						type: 2
+						,area: ['1200px', '500px']
+						,resize: false
+						,maxmin: true
+						,fixed: true
+						,content: 'iframe/setcurr.html'
+					});
+					
+				});
+				
+				// 鍒濆鍖栬缃弬鏁扮殑鎸夐挳
+				var BTSBtn = {
+					disabled: function() {
+						$('#btn_set').addClass('whyc-btn-disabled');	// 璁剧疆鍙傛暟鎸夐挳鏃犳晥
+					},
+					active:function() {
+						$('#btn_set').removeClass('whyc-btn-disabled');	// 璁剧疆鍙傛暟鎸夐挳鏈夋晥
+					}
+				};
+				
+				// 璁剧疆鎵归噺璁剧疆鏀剧數鍙傛暟闈㈡澘
+	            function setBtsPopup() {
+	            	$('#distime').val(600);				// 鏀剧數鏃堕暱
+	            	$('#hourrate').val(10);				// 灏忔椂鐜�
+	            	$('#disCapPer').val(60);			// 鏀剧數瀹归噺鐧惧垎姣�
+	            	$('#monVolLowPer').val(90);			// 鍗曚綋鐢靛帇涓嬮檺鐧惧垎姣�
+	            	$('#groupVolLowPer').val(90);		// 缁勭鐢靛帇涓嬮檺鐧惧垎姣�
+	            	$('#monNumLow').val(25);			// 鍗曚綋鏁伴噺鐧惧垎姣�
+	            	$('#chargeCurrPer').val(10);		// 鍏呯數鐢垫祦鐧惧垎姣�
+	            	$('#DCVolHighLimit').val(56.4);		//  鍗囧帇涓婇檺
+	            	$('#TempUpHighLimit').val(60);		//  娓╁害涓婇檺
+	            	
+	            	// 鍒濆鍖栭潰鏉跨姸鎬�
+	            	$('#sysSet_popup').find('input').removeClass('error-data');		// 绉婚櫎閿欒鎻愮ず
+	            	$('#sysSet_popup').find('.error-img').removeClass('error-data');	// 绉婚櫎閿欒鎻愮ず
+	            	BTSBtn.active();
+	            }
+				
+				//鏍规嵁鏂囨湰妗嗗唴瀹硅缃�61850鐨勬寜閽姸鎬�
+				function setBTSPopupStatus(id, val) {
+					var textList = BTS_popup.popup.find('input[type=text]');
+					var selectList = BTS_popup.popup.find('.popup-tbl select');
+					var errorStatus = BTS_popup.popup.data().errorStatus; // 鑾峰彇鏄惁璇诲彇鍙傛暟澶辫触
+					//console.log(BTS_popup.popup.data().attr);
+					// 璇诲彇璁惧鍙傛暟澶辫触
+					if(errorStatus) {
+						BTSBtn.disabled();
+						return false;	// 缁撴潫鍑芥暟杩愯
+					}
+					
+					// 閬嶅巻闈㈡澘涓嬬殑鎵�鏈夋枃鏈鏌ョ湅鏄惁鏈夐敊璇暟鎹�
+					var isDisabled = false;
+					textList.each(function() {
+						if($(this).hasClass('error-data')) {
+							isDisabled = true;
+						}
+					});
+					
+					// 瀛樺湪閿欒鐨勬暟鎹�
+					if(isDisabled) {
+						BTSBtn.disabled();
+						return false;	// 缁撴潫鍑芥暟杩愯
+					}else {
+						BTSBtn.active();
+					}
+				}
+				
+				// 鑾峰彇璁剧疆鏀剧數鍙傛暟鐨勪笅鏍�
+				function getSetCurrIndex(setData, allData) {
+					var rs = [];
+					// 閬嶅巻setData
+					for(var i=0; i<setData.length; i++) {
+						var _setData = setData[i];
+						var setDevId = _setData.dev_id;
+						// 閬嶅巻allData
+						for(var k=0; k<allData.length; k++) {
+							var _allData = allData[i];
+							var allDevId = _allData.FBSDeviceId;
+							if(setDevId == allDevId) {
+								rs.push(k);
+							}
+						}
+						
+					}
+					
+					return rs;
+				}
+				
+				//  鏇存柊璁惧鐘舵��
+				var BTS9100 = GLOBAL.BTS9100;
+				var workStates = BTS9100.workstates;
+				var alarmStates = BTS9100.alarmstates;
+				function updateDevStatus() {
+					var battlist = tOptions.data;
+					clearInterval(updateDevStatus.timer);
+					if(battlist.length > 0){
+						$.ajax({ 	
+				        	type: "post", 				
+					        url: "Fbs9100_setparamAction_action_serchByInfo",				
+					        async:true,				
+					        dataType:'text',
+					        data:"json="+JSON.stringify(battlist),
+					        dataType: 'json',		
+					        success: function(res){ 
+								var rs = JSON.parse(res.result);
+								if(rs.code == 1) {
+									var data = rs.data;
+									// console.log(data);
+									for(var i=0; i<data.length; i++) {
+										var obj = data[i];
+										if(obj.fstate.num > 0){
+											var str = '';
+											var index = obj.fstate.dev_workstate;
+											// 鍐呴樆娴嬭瘯(宸ヤ綔鐘舵�佷负0, 鍐呴樆娴嬭瘯涓嶄负0)
+											if(obj.fstate.dev_workstate ==0 && obj.fstate.dev_res_test_state != 0) {
+												index = 3;
+											}
+											// 璁剧疆鏂囨湰鍊�
+											str = "鐘舵��:"	+ workStates[index]+
+												  ",鍛婅:"+alarmStates[obj.fstate.dev_alarmstate]+
+												  ",缁勭鐢靛帇(V):"+obj.fstate.dev_captest_groupvol+
+												  ",鐢垫祦(A):"+obj.fstate.dev_captest_curr+
+												  ",瀹归噺(AH):"+obj.fstate.dev_captest_cap;
+										 	if(index == 3){
+										 		str = "鐘舵��:"+workStates[index]+
+										 			  ",缁勫彿:"+obj.fstate.dev_testgroupnum+
+										 			  ",褰撳墠鍗曚綋缂栧彿:"+(obj.fstate.dev_restest_monindex+1)+
+										 			  ",琚祴鍗曚綋鎬绘暟:"+obj.fstate.dev_restest_moncount;
+										 	}
+										 	var temp = {
+										 		devStatus: str			// 璁惧鐘舵��
+										 		,testTime: formatSeconds(obj.fstate.dev_captest_timelong)		// 娴嬭瘯鏃堕暱
+										 		,signalNum: obj.fstate.dev_commcount
+										 	}
+											layuiTbl.updateTr(i, temp);
+										}
+									}
+								}
+								updateDevStatus.timer = setTimeout(updateDevStatus, 4000);
+							},					
+						});
+					}
+				}				
+				
+        	});
+
+
+
+
+
+
+        	
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/zzlogin1.jsp b/gx_tieta/WebRoot/zzlogin1.jsp
index e06c62f..3572c01 100644
--- a/gx_tieta/WebRoot/zzlogin1.jsp
+++ b/gx_tieta/WebRoot/zzlogin1.jsp
@@ -5,6 +5,11 @@
 %>
 <%@ taglib uri="/struts-tags" prefix="s" %>
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%
+		ServletContext context = getServletContext();
+        String serverInfo = context.getServerInfo();
+        System.out.println(serverInfo);
+ %>
 <!DOCTYPE HTML123>
 <html>
   <head>
diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index 26138e4..eb58994 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1038,6 +1038,7 @@
 
 ##################   equip-stats-change.jsp ##################
 Device_status_records_query = \u8bbe\u5907\u72b6\u6001\u8bb0\u5f55\u67e5\u8be2
+Device_history_event_query = \u8bbe\u5907\u5386\u53f2\u4e8b\u4ef6\u67e5\u8be2
 
 ###################  batt-attention.jsp #######################
 Batt_attention_manage=\u7535\u6c60\u5173\u6ce8\u7ba1\u7406

--
Gitblit v1.9.1