From 693f41074a184767ec7377603653fa4fcd2ce9ec Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 05 十二月 2018 17:38:40 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/elegroup-batt-add.html  |  498 ++++++++++
 gx_tieta/WebRoot/mobil/elegroup-list-user.html |  150 +++
 gx_tieta/WebRoot/mobil/elegroup-list.html      |  143 ++
 gx_tieta/WebRoot/ele-param1.jsp                |  773 ++++++++++++++++
 gx_tieta/WebRoot/mobil/elegroup-batt.html      |  197 ++++
 gx_tieta/WebRoot/iframe/batt-info-edit.html    |  507 ++++++++++
 gx_tieta/WebRoot/mobil/js/battNav.js           |    4 
 gx_tieta/WebRoot/iframe/batt-info-add.html     |  558 +++++++++++
 8 files changed, 2,830 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
new file mode 100644
index 0000000..c5523e4
--- /dev/null
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -0,0 +1,773 @@
+<%@ 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">
+	    <style>
+	    	.dataTypeCont {
+	    		width: 160px;
+	    		text-align: center;
+	    	}
+	    	.dataTypeCont .layui-form-switch {
+	    		min-width: 70px;
+	    		margin-top: 4px;
+	    	}
+	    </style>
+	</head>
+ 	<body>
+ 		<!--澶撮儴鍐呭寮�濮�-->
+        <jsp:include page="Top.jsp" flush="true"/>
+        <!--澶撮儴鍐呭缁撴潫-->
+        <!--瀵艰埅寮�濮�-->
+        <jsp:include page="nav.jsp" flush="true"/>
+	    <!-- 涓讳綋鍐呭 -->
+        <div class="layui-page-container">
+        	<!-- 鏉′欢绛涢�� -->
+            <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>							<!-- 鏈烘埧鍚嶇О -->
+                        </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">
+												<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">
+												<option value="">璇烽�夋嫨鏈烘埧</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <!-- 椤甸潰涓婚鍐呭 -->
+            <div class="layui-page-content" style="position: relative;">
+            	<!-- 琛ㄦ牸鍐呭 -->
+				<table id="pageTbl" lay-filter="pageTbl"></table>
+            </div>
+            <div class="data-footer">
+				<!-- 鍒嗛〉鍐呭 -->
+				<div id="paging">
+					<a href="javascript:" class="search"><s:text name="Search"/></a>		<!-- 鏌ヨ -->
+					<a href="javascript:" id="export_table"><s:text name="Export"/></a>		<!-- 瀵煎嚭 -->
+					<span id="current">1/1</span>
+					<span><s:text name="Each_page"/><input type="text" id="number" value="10"/><s:text name="Item"/></span>
+					<s:text name="Total_data"/><!-- 鏁版嵁鎬婚噺 --><span id="total">0</span>&nbsp;
+					<a href="javascript:" id="page_home"><s:text name="HomePage"/></a> 
+					<a href="javascript:" id="page_pre"><s:text name="Page_Up"/></a>
+					<a href="javascript:" id="page_next_p"><s:text name="Page_Down"/></a>
+					<a href="javascript:" id="page_last"><s:text name="End_Page"/></a>
+					<span id="cont">
+						<s:text name="Goto"/><input type="text" id="page_num" value="1"/>
+						<a href="javascript:" id="page_go"><s:text name="Jump"/></a>
+					</span>
+					<a href="javascript:;" class="new-item"><s:text name="Newly_build"/><!-- 鏂板缓 --></a>
+					<a href="javascript:;" class="reflush"><s:text name="Refresh"/><!-- 鍒锋柊 --></a>
+				</div>
+			</div>
+        </div>
+        <!-- 瀛樺偍iframe -->
+        <div id="iframeEdit"></div>
+        <!-- 鍏抽棴椤甸潰涓璱frame寮瑰嚭灞� -->
+        <div id="iframeClose"></div>
+		<script type="text/html" id="battGrouptools">
+			<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>
+			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+		</script>
+		<script type="text/html" id="produceTime">
+			{{= d.BattProductDate.substr(0,10)}}
+		</script>
+		<script type="text/html" id="useTime">
+			{{= d.BattInUseDate.substr(0,10)}}
+		</script>
+		<script type="text/html" id="isInstall">
+			{{# if(d.Station_install) { }}
+				<button class="layui-btn layui-btn-normal layui-btn-xs">宸插畨瑁�</button>
+			{{# }else { }}
+				<button class="layui-btn layui-btn-disabled layui-btn-xs">鏈畨瑁�</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="src/layui.js"></script>
+        <script type="text/javascript" src="pages/js/mylayui.js"></script>
+        <script type="text/javascript">
+        	layui.use(['form', 'table', 'layer', 'element'], function() {
+        		var table = layui.table;		// 鑾峰彇琛ㄦ牸妯″潡
+        		var form = layui.form;			// 鑾峰彇琛ㄥ崟妯″潡
+        		var layer = layui.layer;		// 鑾峰彇寮瑰嚭妗嗘ā鍧�
+        		var element = layui.element;	// 鑾峰彇鍏冪礌鎿嶄綔妯″潡
+        		
+        		var iframePopup;			// 椤甸潰涓璱frame鐨勫脊鍑哄眰
+        		$('#iframeClose').click(function() {
+        			layer.close(iframePopup);
+        		});
+        		
+        		var Page = new TblPage();
+				Page.set(1, 0, 20);		// 璁剧疆鍒嗛〉鍒濆閰嶇疆椤�
+				setPageVal(Page);
+        		
+        		// 璁剧疆妫�娴嬫枃浠跺悕寮瑰嚭妗嗙殑content
+        		var addGroupContent = '<div style="width:300px; height: 40px;"><div style="margin-top: 20px;margin-left: 8px; margin-right: 8px; text-algin: center;">'+
+										'<span>鏂板缓&nbsp;</span>'+
+										'<select id="addGroupnum" style="width: 190px;height: 26px; border: 1px solid #ccc">'+
+											'<option value="1">1</option>'+
+											'<option value="2">2</option>'+
+											'<option value="3">3</option>'+
+											'<option value="4">4</option>'+
+										'</select>涓數姹犵粍'+
+										'<br><br>'+
+									'</div></div>';
+        		
+        		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);
+							
+							// 鍒濆鍖栧垎椤典俊鎭�
+							Page.setCurr(1);
+							
+							// 鏌ヨ鍚庡彴鏁版嵁
+							search(createSearchParam(), true);
+						}
+					});
+				}
+        		
+        		// 鍒囨崲鏈烘埧
+				form.on('select(home)', function(data) {
+					// 鍒濆鍖栧垎椤典俊鎭�
+					Page.setCurr(1);
+					// 鏌ヨ鍚庡彴鏁版嵁
+					search(createSearchParam(), true);
+				});
+        		
+        		
+        		// 琛ㄦ牸妯″潡
+				var tOptions = {
+					elem: '#pageTbl'
+					,toolbar: false
+					,cellMinWidth: 80
+					,cols: [[
+						{field:'StationId', title:'鏈烘埧缂栧彿', align:'center', width: 120}
+						,{field:'StationName1', title:'鐪�', align:'center', width: 100}
+						,{field:'StationName2', title:'甯�', align:'center', width: 100}
+						,{field:'StationName5', title:'鍖哄幙', align:'center', width: 100}
+						,{field:'StationName3', title:'鏈烘埧鍚嶇О', align:'center', width: 360}
+						,{field:'StationName4', title:'璁惧鍚嶇О', align:'center', width: 150}
+						,{field:'StationIp', title:'鏈烘埧ip', align:'center', width: 160}
+						,{field: 'FBSDeviceId', title: 'FBS璁惧ID锛堥噸瑕侊級', align: 'center', width: 160}
+						,{field:'FbsDeviceIp', title:'FBS璁惧IP锛堥噸瑕侊級', align:'center', width: 160}
+						,{field:'FbsDeviceIp_YM', title:'瀛愮綉鎺╃爜', align:'center', width: 160}
+						,{field:'FbsDeviceIp_WG', title:'缃戝叧', align:'center', width: 160}
+						,{field:'FBSDeviceName', title:'FBS璁惧鍚嶇О', align:'center', width: 160}
+						,{field:'GroupIndexInFBSDevice', title:'FBS璁惧绱㈠紩', align:'center', width: 160}
+						,{field:'BattGroupId', title:'鐢垫睜缁処D', align:'center', width: 160}
+						,{field:'BattGroupNum', title:'鏈烘埧鍐呯數姹犵粍缂栧彿', align:'center', width: 160}
+						,{field:'BattGroupName', title:'鐢垫睜缁勫悕绉�', align:'center', width: 160}
+						,{field:'FloatVolLevel', title:'娴厖鐢靛帇闃�鍊�', align:'center', width: 160}
+						,{field:'OfflineVolLevel', title:'绂荤嚎鐢靛帇闃�鍊�', align:'center', width: 160}
+						,{field:'BattFloatCurrent', title:'娴厖闃�鍊�', align:'center', width: 100}
+						,{field:'MonCount', title:'鍗曚綋鏁伴噺', align:'center', width: 100}
+						,{field:'MonCapStd', title:'鏍囩О瀹归噺', align:'center', width: 100}
+						,{field:'MonVolStd', title:'鏍囩О鍗曚綋鐢靛帇', align:'center', width: 140}
+						,{field:'MonResStd', title:'鏍囩О鍗曚綋鍐呴樆', align:'center', width: 140}
+						,{field:'MonSerStd', title:'鏍囩О鍗曚綋鐢靛', align:'center', width: 140}
+						,{field:'MonVolLowToAvg', title:'鍗曚綋鐢靛帇娆′綆鍋忕Щ閲�', align:'center', width: 140}
+						,{field:'Load_curr', title:'璐熻浇鐢垫祦', align:'center', width: 140}
+						,{field:'DisCurrMax', title:'鏈�澶ф牳瀹圭數娴�', align:'center', width: 140}
+						,{field:'station_phone', title:'鍩虹珯鎵嬫満鍙风爜', align:'center', width: 140}
+						,{field:'BattProducer', title:'鐢垫睜鍝佺墝', align:'center', width: 140}
+						,{field:'BattModel', title:'鐢垫睜鍨嬪彿', align:'center', width: 260}
+						,{field:'productDate', title:'鐢垫睜鐢熶骇鏃ユ湡', templet: '#produceTime', align:'center', width: 140}
+						,{field:'useDate', title:'鎶曞叆浣跨敤鏃ユ湡', templet: '#useTime', align:'center', width: 140}
+						,{field:'isInstall', title:'瀹夎鐘舵��', templet: '#isInstall', align:'center', width: 140}
+						,{field:'install_user', title:'璁惧瀹夎浜哄憳', align:'center', width: 260}
+				    	,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#battGrouptools', width:150}
+				    ]]
+					,data:[]
+					,limit: 10000
+				    ,page: false
+				    ,height: 'full-290'
+				};
+				
+				// 鐢熸垚琛ㄦ牸鏁版嵁
+				table.render(tOptions);
+				
+				// 鐐瑰嚮琛ㄦ牸涓殑宸ュ叿鎸夐挳
+				table.on('tool(pageTbl)', function(obj){
+					//console.log(obj);
+					switch(obj.event) {
+						case 'edit':
+							editBattGroup(obj);
+						break;
+						case 'del':
+							delBattGroup(obj);
+						break;
+						default:
+							layer.msg('鍔熻兘寮�鍙戜腑...');
+						break;
+					};
+				});
+				
+				// 缂栬緫鐢垫睜缁勪俊鎭�
+				function editBattGroup(obj) {
+					$('#iframeEdit').data('data', obj.data);
+					iframePopup = layer.open({
+						type: 2
+						,area:['1200px', '520px']
+						,resize: false
+						,content: 'iframe/batt-info-edit.html'
+					});
+				}
+				
+				// 鍒犻櫎鐢垫睜缁�
+				function delBattGroup(obj) {
+					//console.log(obj);
+					var data = obj.data;
+					var content = '鏄惁纭鍒犻櫎<span style="font-weight: bold; color: #FF5722">'+data.StationName3+'</span>'
+					layer.confirm(content,{
+						icon: 2
+						,title: '鎻愮ず'
+					}, function(index) {
+						// 鍏抽棴纭妗�
+						layer.close(index);
+						var province = data.StationName1;		// 鐪�
+						var city = data.StationName2;			// 甯�
+						var home = data.StationName3;			// 鏈烘埧鍚嶇О
+						var bts = data.StationName4;			// 璁惧鍚嶇О
+						data.StationName = province+'-'+city+'-'+home+'-'+bts;
+						var temp = [data];
+						delBatt(temp);
+					});
+				}
+				
+				//鍒犻櫎澶氫釜鐢垫睜缁�
+				function delBatt(temp){
+					var load = layer.load(1);
+					$.ajax({
+						type: "post", 				
+				        url: "BattInfAction!delete",				
+				        async:true,				
+				        dataType:'text',
+				        data:"json="+JSON.stringify(temp),	
+				        success: function(data){							        	
+							data = eval('('+data+')');
+							var model = eval('('+data.result+')');
+							//console.info(model);
+							if(model.code ==1){
+								layer.msg('鍒犻櫎鎴愬姛锛�');
+								$('#paging .search').click();
+							}else{
+								layer.msg('鍒犻櫎澶辫触锛�');
+							}
+			        	},
+			        	error:function(){
+			        		layer.msg('鍒犻櫎澶辫触锛�');
+			        	},
+			        	complete: function() {
+			        		layer.close(load);
+			        	}
+			        });
+				}
+				
+				var defaultData = {
+	                StationId: '4011100'
+	                ,StationName1: '婀栧寳鐪�'
+	                ,StationName2: '姝︽眽'
+	                ,StationName5: '涓滆タ婀栧尯'
+	                ,StationName3: '瀹為獙瀹ゆ満鎴�'
+	                ,StationName4: 'BTS璁惧'
+	                ,StationIp: '127.0.0.1'
+	                ,FBSDeviceId: '960000001'
+	                ,FbsDeviceIp: '127.0.0.1'
+	                ,FbsDeviceIp_YM: '255.255.255.0'
+	                ,FbsDeviceIp_WG: '127.0.0.1'
+	                ,FBSDeviceName: '璁惧鍚嶇О'
+	                ,GroupIndexInFBSDevice: 1 
+	                ,BattGroupId: 1000005
+	                ,BattGroupNum: 2
+	                ,BattGroupName: '鐢垫睜缁�1'
+	                ,FloatVolLevel: 54
+	                ,OfflineVolLevel: 42.9 
+	                ,BattFloatCurrent: 10
+	                ,MonCount: 24
+	                ,MonCapStd: 300
+	                ,MonVolStd: 2
+	                ,MonResStd: 0.2
+	                ,MonSerStd: 5000
+	                ,MonVolLowToAvg: 0.05 
+	                ,Load_curr: 15
+	                ,DisCurrMax: '0'
+	                ,station_phone: 12345678912
+	                ,BattProducer: ''
+	                ,BattModel: ''
+	                ,productDate: '2018-09-18 00:00:00'
+	                ,useDate: '2018-09-18 00:00:00'
+	                ,install_user: ''
+	            };
+				
+				// 鐐瑰嚮鏂板缓鎸夐挳
+				$('#paging .new-item').click(function() {
+					var len = tOptions.data.length;
+					var _rsData = defaultData;
+					if(len) {
+						_rsData = tOptions.data[len-1];
+					}
+					 
+					// 鎵撳紑闈㈡澘璁剧疆鏂板缓鐢垫睜缁勪釜鏁�
+					layer.open({
+						type: 1
+						,title: '閫夋嫨鏂板缓鐢垫睜缁勪釜鏁�'
+						,content: addGroupContent
+						,fixed: true
+						,resize: false
+						,btn:['纭畾', '鍙栨秷']
+						,yes: function(index) {
+							var groupNum = $('#addGroupnum').val();
+							layer.close(index);
+							// 鐢熸垚鏁扮粍
+							var _arr = [];
+							for(var i=0; i<groupNum; i++) {
+								_arr.push(i+1);
+							}
+							
+							_rsData.addGroupNum = _arr;
+							$('#iframeEdit').data('data', _rsData);
+							
+							iframePopup = layer.open({
+								type: 2
+								,area:['1200px', '520px']
+								,resize: false
+								,content: 'iframe/batt-info-add.html'
+							});
+						}
+					});
+				});
+				
+				
+				// 鏌ヨ鐢垫睜缁勪俊鎭�
+				function search(temp, newLoad) {
+					var load;
+					if(newLoad) {
+						load = layer.load(1)
+					}
+					//console.log(temp);
+					$.ajax({
+						type: "post", 				
+				        url: "BattInfAction!searchInform",				
+				        async:true,				
+				        dataType:'text',
+				        data:"json="+JSON.stringify(temp),	
+				        success: function(res){							        	
+							var rs = eval('('+res+')');
+							var model = eval('('+rs.result+')');
+							if(model.code ==1){
+								var data = model.data;
+								tOptions.data = data;
+								for(var i=0; i<data.length; i++) {
+									Page.setAll(data[i].num);
+								}
+								
+								// 鐢熸垚琛ㄦ牸鏁版嵁
+								table.render(tOptions);
+							}else{
+								layer.msg("鏈煡璇㈠埌鏁版嵁");
+								Page.setAll(0);
+								Page.setCurr(1);
+							}
+							
+							// 璁剧疆鍒嗛〉淇℃伅
+							setPageVal(Page);
+			        	},
+			        	error:function(){
+			        		layer.msg("鏌ヨ澶辫触");
+			        		layer.close(load);
+			        	},
+			        	complete: function() {
+			        		layer.close(load);
+			        	} 
+					});
+				}
+				
+				// 鏋勯�犳煡璇㈡潯浠�
+				function createSearchParam() {
+					var homename = $('#home').val()?$('#home').val(): '';
+					var temp = {
+						binf:{
+							StationName1:$('#province').val(),		// 鐪�
+							StationName2:$('#city').val(),			// 甯�
+							StationName5:$('#county').val(),		// 鍖�/鍘�
+							StationName: homename					// 鏈烘埧鍚嶇О
+						}
+						,page: Page.getPage()
+					};
+					
+					return temp;
+					
+					
+				}
+				
+				// 鐐瑰嚮鏌ヨ
+				$('#paging .search').click(function() {
+					search(createSearchParam(), true);
+				});
+				
+				// 鐐瑰嚮鍒锋柊
+				$('#paging .reflush').click(function() {
+					search(createSearchParam(), true);
+				});
+				
+				
+				//棣栭〉
+				$('#page_home').click(function(){
+					alert(123);
+					if(Page != undefined){
+						if(Page.curr != 1){
+							Page.setCurr(1);
+							search(createSearchParam(), true);
+						}
+					}		
+				});
+				
+				//鐐瑰嚮涓婁竴椤�
+				$("#page_pre").click(function(){
+					if(Page != undefined){
+						if(Page.curr > 1){
+							Page.setCurr(Page.curr-1);
+							search(createSearchParam(), true);
+						}
+					}
+				});
+				
+				//鐐瑰嚮涓嬩竴椤�
+				$("#page_next_p").click(function(){				
+					if(Page != undefined){
+						if(Page.num > Page.curr){
+							Page.setCurr(Page.curr+1);
+							search(createSearchParam(), true);
+						}
+					}
+				});
+				
+				//灏鹃〉
+				$('#page_last').click(function(){
+					if(Page != undefined){
+						if(Page.pageCurr < Page.num){
+							Page.setCurr(Page.num);
+							search(createSearchParam(), true);
+						}
+					}
+				});
+				
+				//璁剧疆姣忛〉琛屾暟
+				$('#number').blur(function(){
+					var value=$('#number').val();
+					//褰撹緭鍏ョ殑鏁板ぇ浜�0鏃�
+					if(value>0){
+						if(value != Page.pageSize){
+							Page.setSize(parseInt(value));
+							Page.setCurr(1);
+						}
+					}else{
+						//褰撹緭鍏ラ潪娉曟暟瀛楁椂
+						alert("璇疯緭鍏ュ悎娉曠殑鏁板瓧");						/* 璇疯緭鍏ュ悎娉曠殑鏁存暟 */
+						$('#number').val(Page.size);					
+					}
+				});
+				
+				//鐐瑰嚮璺宠浆
+				$('#page_go').click(function(){
+					var tarpage=$('#page_num').attr('value');
+					if(tarpage > Page.num){
+						Page.setCurr(Page.num);
+						search(createSearchParam(), true);
+					}else if(tarpage > 0 && tarpage!= Page.curr){
+						Page.setCurr(parseInt(tarpage));
+						search(createSearchParam(), true);
+					}
+					
+				});
+				
+				// 璁剧疆椤甸潰Page
+				function setPageVal(page) {
+					$('#current').text(page.curr+'/'+page.num);
+					$('#total').text(page.all);
+					$('#number').val(page.size);
+				}
+				
+        	});
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
new file mode 100644
index 0000000..ac7051a
--- /dev/null
+++ b/gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -0,0 +1,558 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>淇敼鐢垫睜淇℃伅</title>
+    <link rel="stylesheet" href="../src/css/layui.css">
+    <style>
+    	.layui-form-pane .layui-form-label {
+    		width: 130px;
+    	}
+    	.layui-form-pane .layui-input-block {
+    		margin-left: 130px;
+    	}
+    	.red {
+    		font-size: 20px;
+    		color: #FF5722;
+    	}
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div style="height: 8px;"></div>
+        <div class="layui-form layui-form-pane" lay-filter="battInfoFilter">
+            <div class="layui-form-item">
+                <div class="layui-row layui-col-space8" id="battInfo"></div>
+                <div style="height: 8px;"></div>
+                <div class="layui-row">
+                    <div class="layui-col-xs3 layui-col-xs-offset9 layui-col-sm3 layui-col-sm-offset9 layui-col-md2 layui-col-md-offset10 layui-col-lg2 layui-col-lg-offset10">
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="" lay-filter="enAdd">纭娣诲姞</button>
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" id="closePage">鍏抽棴闈㈡澘</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="battInfoTpl">
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鏈烘埧缂栧彿</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationId" lay-verify="required|number" id="homenum" autocomplete="off" class="layui-input" value="{{= d.StationId }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐪�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationName1" lay-verify="required" id="province" autocomplete="off" class="layui-input" value="{{= d.StationName1 }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">甯�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationName2" lay-verify="required" id="StationName2" autocomplete="off" class="layui-input" value="{{= d.StationName2 }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鍖�/鍘�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationName5" lay-verify="required" id="county" autocomplete="off" class="layui-input" value="{{= d.StationName5 }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg6">
+            <div class="layui-block">
+                <label class="layui-form-label">鏈烘埧鍚嶇О</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationName3" lay-verify="required" id="homename" autocomplete="off" class="layui-input" value="{{= d.StationName3 }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">璁惧鍚嶇О</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationName4" lay-verify="required" id="homename" autocomplete="off" class="layui-input" value="{{= d.StationName4 }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鏈烘埧ip</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationIp" lay-verify="required" id="homeip" autocomplete="off" class="layui-input" value="{{= d.StationIp }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">璁惧ID<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="FBSDeviceId" lay-verify="devid" id="devid" autocomplete="off" class="layui-input" value="{{= d.FBSDeviceId }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">璁惧IP</label>
+                <div class="layui-input-block">
+                    <input type="text" name="FbsDeviceIp" disabled="" id="fbsip" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.FbsDeviceIp }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">瀛愮綉鎺╃爜</label>
+                <div class="layui-input-block">
+                    <input type="text" name="FbsDeviceIp_YM" id="ym" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.FbsDeviceIp_YM }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">缃戝叧</label>
+                <div class="layui-input-block">
+                    <input type="text" name="FbsDeviceIp_WG" id="wg" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.FbsDeviceIp_WG }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">璁惧鍚嶇О</label>
+                <div class="layui-input-block">
+                    <input type="text" name="FBSDeviceName" lay-verify="required" id="devname" autocomplete="off" class="layui-input" value="{{= d.FBSDeviceName }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐢垫睜缁処D</label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattGroupId" lay-verify="required|number" id="groupid" disabled="" autocomplete="off" class="layui-input  layui-bg-gray" value="{{= d.BattGroupId }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐢垫睜缁勭紪鍙�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattGroupNum" lay-verify="required|number" id="groupnum" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.BattGroupNum }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">娴厖鐢靛帇闃�鍊�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="FloatVolLevel" lay-verify="required|number" id="floatVolLevel" autocomplete="off" class="layui-input" value="{{= d.FloatVolLevel }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">绂荤嚎鐢靛帇闃�鍊�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="OfflineVolLevel" lay-verify="required|number" id="offlineVolLevel" autocomplete="off" class="layui-input" value="{{= d.OfflineVolLevel }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">娴厖鐢垫祦闃�鍊�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattFloatCurrent" lay-verify="required|number" id="floatCurrLevel" autocomplete="off" class="layui-input" value="{{= d.BattFloatCurrent }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鍗曚綋鏁伴噺<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="MonCount" lay-verify="required|number" id="moncount" autocomplete="off" class="layui-input" value="{{= d.MonCount }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鏍囩О瀹归噺<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="MonCapStd" lay-verify="required|number" id="moncap" autocomplete="off" class="layui-input" value="{{= d.MonCapStd }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鍗曚綋鐢靛帇<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="MonVolStd" lay-verify="required|number" id="monvol" autocomplete="off" class="layui-input" value="{{= d.MonVolStd }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鍗曚綋鍐呴樆</label>
+                <div class="layui-input-block">
+                    <input type="text" name="MonResStd" lay-verify="required|number" id="monres" autocomplete="off" class="layui-input" value="{{= d.MonResStd }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鍗曚綋鐢靛</label>
+                <div class="layui-input-block">
+                    <input type="text" name="MonSerStd" lay-verify="required|number" id="monser" autocomplete="off" class="layui-input" value="{{= d.MonSerStd }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">娆′綆鍋忕Щ閲�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="MonVolLowToAvg" lay-verify="required|number" id="monVolLowToAvg" autocomplete="off" class="layui-input" value="{{= d.MonVolLowToAvg }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">璐熻浇鐢垫祦<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="Load_curr" lay-verify="required|number" id="loadcurr" autocomplete="off" class="layui-input" value="{{= d.Load_curr }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鏍稿鐢垫祦</label>
+                <div class="layui-input-block">
+                    <input type="text" name="DisCurrMax" lay-verify="required|number" id="discurrmax" autocomplete="off" class="layui-input" value="{{ d.DisCurrMax }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鍩虹珯鎵嬫満鍙风爜<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="station_phone" lay-verify="required|phone" id="stationphone" autocomplete="off" class="layui-input" value="{{= d.station_phone }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐢垫睜鍝佺墝<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattProducer" lay-verify="required" id="producer" autocomplete="off" class="layui-input" value="{{= d.BattProducer }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐢垫睜鍨嬪彿<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattModel" lay-verify="required" id="battmodel" autocomplete="off" class="layui-input" value="{{= d.BattModel }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐢熶骇鏃ユ湡</label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattProductDate" id="productdate" autocomplete="off" class="layui-input" value="{{= d.BattProductDate }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">浣跨敤鏃ユ湡</label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattInUseDate" id="usedate" autocomplete="off" class="layui-input" value="{{= d.BattInUseDate }}">
+                </div>
+            </div>
+        </div>
+		<div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">瀹夎鐘舵��</label>
+                <div class="layui-input-block">
+					<select name="Station_install" id="isInstall">
+					{{# 
+						var isInstall = function(value) {
+							var rs = '鏈畨瑁�';
+							if(value) {
+								rs = '宸插畨瑁�';
+							}
+							return rs;
+						};
+					}}
+                    {{# layui.each([0,1], function(index) { }}
+						{{# if(index == d.Station_install) { }}
+								<option value="{{ index }}" selected>{{= isInstall(index) }}</option>
+						{{# }else{ }}
+                            	<option value="{{ index }}">{{= isInstall(index) }}</option>
+                        {{# } }}
+					{{# }); }}
+					</select>
+                </div>
+            </div>
+        </div>
+		<div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+             <div class="layui-block">
+                <label class="layui-form-label">瀹夎浜哄憳<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="install_user" id="insperson" autocomplete="off" class="layui-input" value="{{= d.install_user }}">
+                </div>
+             </div>
+        </div>
+		<div class="layui-row layui-col-space8">
+		{{# layui.each(d.addGroupNum, function(index, item) { }}
+			<div class="layui-col-lg6">
+				<div class="layui-card">
+					<div class="layui-card-header layui-bg-gray">鐢垫睜缁剓{= item}}</div>
+					<div class="layui-card-body">
+						<div class="layui-row layui-col-space8">
+							<div class="layui-col-lg6">
+								<div class="layui-block">
+                					<label class="layui-form-label">璁惧绱㈠紩<span class="red">*</span></label>
+                					<div class="layui-input-block">
+										<select name="group{{= item}}.index">
+											{{# layui.each([0,1,2,3], function(k) { }}
+                            					{{# if(index == k) { }}
+                                					<option value="{{ k }}" selected>{{ k }}</option>
+                            					{{# }else{ }}
+                                					<option value="{{ k }}">{{ k }}</option>
+                            					{{# } }}
+                        					{{# });  }}
+										</select>
+                					</div>
+             					</div>
+							</div>
+							<div class="layui-col-lg6">
+								<div class="layui-block">
+                					<label class="layui-form-label">鐢垫睜缁勫悕绉�</label>
+                					<div class="layui-input-block">
+                    					<input type="text" name="group{{= item}}.name" lay-verify="required" autocomplete="off" class="layui-input" value="鐢垫睜缁剓{= item}}">
+                					</div>
+             					</div>
+							</div>
+						</div>
+					</div>
+				</div>
+        	</div>
+		{{# }); }}
+		</div>
+    </script>
+    <script type="text/javascript" src="../src/layui.js"></script>
+    <script  type="text/javascript">
+        layui.use(['form', 'laytpl', 'jquery', 'element', 'laydate'], function() {
+            var form = layui.form;
+            var laytpl = layui.laytpl;
+            var $ = layui.jquery;
+            var element = layui.element;
+            var laydate = layui.laydate;
+
+            var battInfoTpl = $('#battInfoTpl').html();
+			var editInfo = parent.$('#iframeEdit').data('data');
+			//console.log(editInfo);
+            var data = {
+                StationId: '4011100'
+                ,StationName1: '骞胯タ鐪�'
+                ,StationName2: '鐧借壊甯�'
+                ,StationName5: '涔愪笟鍘�'
+                ,StationName3: 'GX鐧捐壊涔愪笟鍘跨珛鏂板皬鍖篧F'
+                ,StationName4: 'BTS璁惧'
+                ,StationIp: '192.168.0.1'
+                ,FBSDeviceId: '960000111'
+                ,FbsDeviceIp: '127.0.0.1'
+                ,FbsDeviceIp_YM: '255.255.255.0'
+                ,FbsDeviceIp_WG: '127.0.0.1'
+                ,FBSDeviceName: '璁惧鍚嶇О'
+                ,GroupIndexInFBSDevice: 1 
+                ,BattGroupId: 1000005
+                ,BattGroupNum: 2
+                ,BattGroupName: '鐢垫睜缁�1'
+                ,FloatVolLevel: 54
+                ,OfflineVolLevel: 42.9 
+                ,BattFloatCurrent: 10
+                ,MonCount: 24
+                ,MonCapStd: 300
+                ,MonVolStd: 2
+                ,MonResStd: 0.2
+                ,MonSerStd: 5000
+                ,MonVolLowToAvg: 0.05 
+                ,Load_curr: 15
+                ,DisCurrMax: '0'
+                ,station_phone: 12345678912
+                ,BattProducer: '鍗囬槼'
+                ,BattModel: ''
+                ,productDate: '2018-09-18 00:00:00'
+                ,useDate: '2018-09-18 00:00:00'
+                ,install_user: '鍛靛懙'
+            };
+            
+            // 娓叉煋鍐呭
+            laytpl(battInfoTpl).render(editInfo, function(html) {
+                $('#battInfo').html(html);
+                form.render();
+
+                // 鐢熶骇鏃ユ湡娓叉煋
+                laydate.render({
+                    elem: '#productdate'
+                    ,format: 'yyyy-MM-dd HH:mm:ss'
+                });
+
+                // 鎶曞叆浣跨敤鏃ユ湡娓叉煋
+                laydate.render({
+                    elem: '#usedate'
+                    ,format: 'yyyy-MM-dd HH:mm:ss'
+                });
+                
+                
+            });
+            
+            // 楠岃瘉淇℃伅
+            form.verify({
+            	string: function(value) {
+            		var _value = value.trim();
+            		if(_value.length == 0){
+				    	return '涓嶈兘涓虹┖';
+				    }
+            	}
+            	,ip: function(value) {
+            		//var ptn = /^1$/;
+            	}
+            	,devid: function(value) {
+            		var ptn = /^91([0-9]{7})$/;
+            		if(!ptn.test(value)) {
+            			return '璁惧id鐨勬牸寮忎笉姝g‘!浠�91寮�澶寸殑11浣嶆暟瀛�';
+            		}
+            	}
+            });
+            
+            // 鏇存敼璁惧ID
+            $('#battInfo').on('input propertychange', '#devid', function() {
+            	var val = $(this).val();
+            	
+            	$('#fbsip').val(getDevIp(val));
+            });
+            
+            // 鎻愪氦鍐呭
+            form.on('submit(enAdd)', function(data) {
+            	// console.log(data);
+            	layer.confirm('鏄惁纭娣诲姞', {icon: 3, title:'鎻愮ず'}, function(index){
+            		 var _data = data.field;
+            		 var province = _data.StationName1;		// 鐪�
+            		 var city = _data.StationName2;			// 甯�
+            		 var home = _data.StationName3;			// 鏈烘埧鍚嶇О
+            		 var bts = _data.StationName4;			// 璁惧鍚嶇О
+            		 _data.StationName = province+'-'+city+'-'+home+'-'+bts;
+            		 //console.log(_data);
+            		 var temp = analysisData(editInfo.addGroupNum, _data);
+            		 //console.log(temp);
+            		 // 娣诲姞鐢垫睜淇℃伅
+            		 addBatt(temp);
+            	});
+            	return false;
+            });
+            
+            // 鍏抽棴闈㈡澘
+            $('#closePage').click(function() {
+            	parent.$('#iframeClose').click();
+            });
+            // 鏍规嵁璁惧id璁$畻璁惧ip
+            function getDevIp(dev_id) {
+            	var ptn = /^91([0-9]{7})$/;
+            	var ip = '';
+            	if(ptn.test(dev_id)) {
+            		var value = Number(RegExp.$1);
+            		// console.log(value);
+            		var intNum = prefixInteger(Math.floor(value/256), 3);
+            		var resNum = prefixInteger(value%256, 3);
+            		ip = '127.000.'+intNum+'.'+resNum;
+            	}else {
+            		ip = '璁惧ID鏍煎紡涓嶆纭�';
+            	}
+            	
+            	return ip;
+            }
+            
+        	// 鑾峰彇001绫讳技鏁版嵁
+        	function prefixInteger(num, length) {
+ 				return (Array(length).join('0') + num).slice(-length);
+			}
+			
+			
+			// 瑙f瀽娣诲姞鐨勬暟鎹�
+			function analysisData(arr, data) {
+				//console.log(arr);
+				var rs = [];
+				for(var i=0; i<arr.length; i++) {
+					var temp = {};
+					var _arr = arr[i];
+					var _index = 'group'+_arr+'.index';
+					var _name = 'group'+_arr+'.name';
+					Object.keys(data).forEach(function(key) {
+						if(checkKeyNotVal(key)) {
+							if(key == _index) {
+								temp.GroupIndexInFBSDevice = data[key];
+							}else if(key == _name){
+								temp.BattGroupName = data[key];
+							}
+						}else {
+							temp[key] = data[key];	
+						}
+					});
+					
+					rs.push(temp);
+				}
+				
+				return rs;
+			}
+			//console.log(checkKeyNotVal('group1index'));
+			// 妫�娴嬪綋鍓嶅睘鎬ф槸鍚︿负搴熷睘鎬�
+			function checkKeyNotVal(key) {
+				var patt = /^group[0-9]{1}\./;
+				
+				return patt.test(key);
+			}
+			
+			//娣诲姞澶氫釜鐢垫睜缁�
+			function addBatt(temp){
+				var load = layer.load(1);
+				$.ajax({
+					type: "post", 				
+			        url: "BattInfAction!add",				
+			        async:true,				
+			        dataType:'text',
+			        data:"json="+JSON.stringify(temp),	
+			        success: function(data){							        	
+						data = eval('('+data+')');
+						var model = eval('('+data.result+')');
+						//console.info(model);
+						if(model.code ==1){
+							layer.msg('娣诲姞鎴愬姛锛�3绉掑悗闈㈡澘鑷姩鍏抽棴');
+							setTimeout(function() {
+								parent.$('#iframeClose').click();
+							}, 3000);
+						}else{
+							layer.msg('娣诲姞澶辫触锛�');
+						}
+						loading.hideLoading($('#main'));			
+		        	},
+		        	error:function(){
+		        		layer.msg('娣诲姞澶辫触锛�');
+		        	},
+		        	complete: function() {
+		        		layer.close(load);
+		        	}
+		        });
+			}
+        });
+    </script>
+</body>
+</html>
diff --git a/gx_tieta/WebRoot/iframe/batt-info-edit.html b/gx_tieta/WebRoot/iframe/batt-info-edit.html
new file mode 100644
index 0000000..dfd887e
--- /dev/null
+++ b/gx_tieta/WebRoot/iframe/batt-info-edit.html
@@ -0,0 +1,507 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>淇敼鐢垫睜淇℃伅</title>
+    <link rel="stylesheet" href="../src/css/layui.css">
+    <style>
+    	.layui-form-pane .layui-form-label {
+    		width: 130px;
+    	}
+    	.layui-form-pane .layui-input-block {
+    		margin-left: 130px;
+    	}
+    	.red {
+    		font-size: 20px;
+    		color: #FF5722;
+    	}
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div style="height: 8px;"></div>
+        <div class="layui-form layui-form-pane" lay-filter="battInfoFilter">
+            <div class="layui-form-item">
+                <div class="layui-row layui-col-space8" id="battInfo"></div>
+                <div style="height: 8px;"></div>
+                <div class="layui-row">
+                    <div class="layui-col-xs3 layui-col-xs-offset9 layui-col-sm3 layui-col-sm-offset9 layui-col-md2 layui-col-md-offset10 layui-col-lg2 layui-col-lg-offset10">
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="" lay-filter="enEidt">纭缂栬緫</button>
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" id="closePage">鍏抽棴闈㈡澘</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="battInfoTpl">
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鏈烘埧缂栧彿</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationId" lay-verify="required|number" id="homenum" autocomplete="off" class="layui-input" value="{{= d.StationId }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐪�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationName1" lay-verify="required" id="province" autocomplete="off" class="layui-input" value="{{= d.StationName1 }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">甯�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationName2" lay-verify="required" id="StationName2" autocomplete="off" class="layui-input" value="{{= d.StationName2 }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鍖�/鍘�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationName5" lay-verify="required" id="county" autocomplete="off" class="layui-input" value="{{= d.StationName5 }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg6">
+            <div class="layui-block">
+                <label class="layui-form-label">鏈烘埧鍚嶇О</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationName3" lay-verify="required" id="homename" autocomplete="off" class="layui-input" value="{{= d.StationName3 }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">璁惧鍚嶇О</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationName4" lay-verify="required" id="homename" autocomplete="off" class="layui-input" value="{{= d.StationName4 }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鏈烘埧ip</label>
+                <div class="layui-input-block">
+                    <input type="text" name="StationIp" lay-verify="required" id="homeip" autocomplete="off" class="layui-input" value="{{= d.StationIp }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">璁惧ID<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="FBSDeviceId" lay-verify="devid" id="devid" autocomplete="off" class="layui-input" value="{{= d.FBSDeviceId }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">璁惧IP</label>
+                <div class="layui-input-block">
+                    <input type="text" name="FbsDeviceIp" disabled="" id="fbsip" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.FbsDeviceIp }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">瀛愮綉鎺╃爜</label>
+                <div class="layui-input-block">
+                    <input type="text" name="FbsDeviceIp_YM" id="ym" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.FbsDeviceIp_YM }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">缃戝叧</label>
+                <div class="layui-input-block">
+                    <input type="text" name="FbsDeviceIp_WG" id="wg" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.FbsDeviceIp_WG }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">璁惧鍚嶇О</label>
+                <div class="layui-input-block">
+                    <input type="text" name="FBSDeviceName" lay-verify="required" id="devname" autocomplete="off" class="layui-input" value="{{= d.FBSDeviceName }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">璁惧绱㈠紩<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <select name="GroupIndexInFBSDevice" id="devindex">
+                        {{# layui.each([0,1,2,3], function(index) { }};
+                            {{# if(index == d.GroupIndexInFBSDevice) { }}
+                                <option value="{{ index }}" selected>{{ index }}</option>
+                            {{# }else{ }}
+                                <option value="{{ index }}">{{ index }}</option>
+                            {{# } }}
+                        {{# });  }}
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐢垫睜缁処D</label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattGroupId" lay-verify="required|number" id="groupid" disabled="" autocomplete="off" class="layui-input  layui-bg-gray" value="{{= d.BattGroupId }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐢垫睜缁勭紪鍙�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattGroupNum" lay-verify="required|number" id="groupnum" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.BattGroupNum }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐢垫睜缁勫悕绉�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattGroupName" lay-verify="required" id="groupname" autocomplete="off" class="layui-input" value="{{= d.BattGroupName }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">娴厖鐢靛帇闃�鍊�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="FloatVolLevel" lay-verify="required|number" id="floatVolLevel" autocomplete="off" class="layui-input" value="{{= d.FloatVolLevel }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">绂荤嚎鐢靛帇闃�鍊�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="OfflineVolLevel" lay-verify="required|number" id="offlineVolLevel" autocomplete="off" class="layui-input" value="{{= d.OfflineVolLevel }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">娴厖鐢垫祦闃�鍊�<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattFloatCurrent" lay-verify="required|number" id="floatCurrLevel" autocomplete="off" class="layui-input" value="{{= d.BattFloatCurrent }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鍗曚綋鏁伴噺<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="MonCount" lay-verify="required|number" id="moncount" autocomplete="off" class="layui-input" value="{{= d.MonCount }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鏍囩О瀹归噺<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="MonCapStd" lay-verify="required|number" id="moncap" autocomplete="off" class="layui-input" value="{{= d.MonCapStd }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鍗曚綋鐢靛帇<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="MonVolStd" lay-verify="required|number" id="monvol" autocomplete="off" class="layui-input" value="{{= d.MonVolStd }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鍗曚綋鍐呴樆</label>
+                <div class="layui-input-block">
+                    <input type="text" name="MonResStd" lay-verify="required|number" id="monres" autocomplete="off" class="layui-input" value="{{= d.MonResStd }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鍗曚綋鐢靛</label>
+                <div class="layui-input-block">
+                    <input type="text" name="MonSerStd" lay-verify="required|number" id="monser" autocomplete="off" class="layui-input" value="{{= d.MonSerStd }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">娆′綆鍋忕Щ閲�</label>
+                <div class="layui-input-block">
+                    <input type="text" name="MonVolLowToAvg" lay-verify="required|number" id="monVolLowToAvg" autocomplete="off" class="layui-input" value="{{= d.MonVolLowToAvg }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">璐熻浇鐢垫祦<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="Load_curr" lay-verify="required|number" id="loadcurr" autocomplete="off" class="layui-input" value="{{= d.Load_curr }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鏍稿鐢垫祦</label>
+                <div class="layui-input-block">
+                    <input type="text" name="DisCurrMax" lay-verify="required|number" id="discurrmax" autocomplete="off" class="layui-input" value="{{ d.DisCurrMax }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鍩虹珯鎵嬫満鍙风爜<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="station_phone" lay-verify="required|phone" id="stationphone" autocomplete="off" class="layui-input" value="{{= d.station_phone }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐢垫睜鍝佺墝<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattProducer" lay-verify="required" id="producer" autocomplete="off" class="layui-input" value="{{= d.BattProducer }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐢垫睜鍨嬪彿<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattModel" lay-verify="required" id="battmodel" autocomplete="off" class="layui-input" value="{{= d.BattModel }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">鐢熶骇鏃ユ湡</label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattProductDate" id="productdate" autocomplete="off" class="layui-input" value="{{= d.BattProductDate }}">
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">浣跨敤鏃ユ湡</label>
+                <div class="layui-input-block">
+                    <input type="text" name="BattInUseDate" id="usedate" autocomplete="off" class="layui-input" value="{{= d.BattInUseDate }}">
+                </div>
+            </div>
+        </div>
+		<div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+            <div class="layui-block">
+                <label class="layui-form-label">瀹夎鐘舵��</label>
+                <div class="layui-input-block">
+					<select name="Station_install" id="isInstall">
+					{{# 
+						var isInstall = function(value) {
+							var rs = '鏈畨瑁�';
+							if(value) {
+								rs = '宸插畨瑁�';
+							}
+							return rs;
+						};
+					}}
+                    {{# layui.each([0,1], function(index) { }}
+						{{# if(index == d.Station_install) { }}
+								<option value="{{ index }}" selected>{{= isInstall(index) }}</option>
+						{{# }else{ }}
+                            	<option value="{{ index }}">{{= isInstall(index) }}</option>
+                        {{# } }}
+					{{# }); }}
+					</select>
+                </div>
+            </div>
+        </div>
+        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
+             <div class="layui-block">
+                <label class="layui-form-label">瀹夎浜哄憳<span class="red">*</span></label>
+                <div class="layui-input-block">
+                    <input type="text" name="install_user" id="insperson" autocomplete="off" class="layui-input" value="{{= d.install_user }}">
+                </div>
+             </div>
+        </div>
+    </script>
+    <script type="text/javascript" src="../src/layui.js"></script>
+    <script  type="text/javascript">
+        layui.use(['form', 'laytpl', 'jquery', 'element', 'laydate'], function() {
+            var form = layui.form;
+            var laytpl = layui.laytpl;
+            var $ = layui.jquery;
+            var element = layui.element;
+            var laydate = layui.laydate;
+
+            var battInfoTpl = $('#battInfoTpl').html();
+			var editInfo = parent.$('#iframeEdit').data('data');
+			//console.log(editInfo);
+            var data = {
+                StationId: '4011100'
+                ,StationName1: '骞胯タ鐪�'
+                ,StationName2: '鐧借壊甯�'
+                ,StationName5: '涔愪笟鍘�'
+                ,StationName3: 'GX鐧捐壊涔愪笟鍘跨珛鏂板皬鍖篧F'
+                ,StationName4: 'BTS璁惧'
+                ,StationIp: '192.168.0.1'
+                ,FBSDeviceId: '960000111'
+                ,FbsDeviceIp: '127.0.0.1'
+                ,FbsDeviceIp_YM: '255.255.255.0'
+                ,FbsDeviceIp_WG: '127.0.0.1'
+                ,FBSDeviceName: '璁惧鍚嶇О'
+                ,GroupIndexInFBSDevice: 1 
+                ,BattGroupId: 1000005
+                ,BattGroupNum: 2
+                ,BattGroupName: '鐢垫睜缁�1'
+                ,FloatVolLevel: 54
+                ,OfflineVolLevel: 42.9 
+                ,BattFloatCurrent: 10
+                ,MonCount: 24
+                ,MonCapStd: 300
+                ,MonVolStd: 2
+                ,MonResStd: 0.2
+                ,MonSerStd: 5000
+                ,MonVolLowToAvg: 0.05 
+                ,Load_curr: 15
+                ,DisCurrMax: '0'
+                ,station_phone: 12345678912
+                ,BattProducer: '鍗囬槼'
+                ,BattModel: ''
+                ,productDate: '2018-09-18 00:00:00'
+                ,useDate: '2018-09-18 00:00:00'
+                ,install_user: '鍛靛懙'
+            };
+            
+            // 娓叉煋鍐呭
+            laytpl(battInfoTpl).render(editInfo, function(html) {
+                $('#battInfo').html(html);
+                form.render();
+
+                // 鐢熶骇鏃ユ湡娓叉煋
+                laydate.render({
+                    elem: '#productdate'
+                    ,format: 'yyyy-MM-dd HH:mm:ss'
+                });
+
+                // 鎶曞叆浣跨敤鏃ユ湡娓叉煋
+                laydate.render({
+                    elem: '#usedate'
+                    ,format: 'yyyy-MM-dd HH:mm:ss'
+                });
+                
+                
+            });
+            
+            // 楠岃瘉淇℃伅
+            form.verify({
+            	string: function(value) {
+            		var _value = value.trim();
+            		if(_value.length == 0){
+				    	return '涓嶈兘涓虹┖';
+				    }
+            	}
+            	,ip: function(value) {
+            		//var ptn = /^1$/;
+            	}
+            	,devid: function(value) {
+            		var ptn = /^91([0-9]{7})$/;
+            		if(!ptn.test(value)) {
+            			return '璁惧id鐨勬牸寮忎笉姝g‘!浠�91寮�澶寸殑11浣嶆暟瀛�';
+            		}
+            	}
+            });
+            
+            // 鏇存敼璁惧ID
+            $('#battInfo').on('input propertychange', '#devid', function() {
+            	var val = $(this).val();
+            	
+            	$('#fbsip').val(getDevIp(val));
+            });
+            
+            // 鎻愪氦鍐呭
+            form.on('submit(enEidt)', function(data) {
+            	layer.confirm('鏄惁纭淇敼', {icon: 3, title:'鎻愮ず'}, function(index){
+            		 var _data = data.field;
+            		 var province = _data.StationName1;		// 鐪�
+            		 var city = _data.StationName2;			// 甯�
+            		 var home = _data.StationName3;			// 鏈烘埧鍚嶇О
+            		 var bts = _data.StationName4;			// 璁惧鍚嶇О
+            		 _data.StationName = province+'-'+city+'-'+home+'-'+bts;
+            		 var temp = [_data];
+            		 //console.log(temp);
+            		 // 鏇存柊鏁版嵁
+            		 updBatt(temp);
+            	});
+            	return false;
+            });
+            
+            // 鍏抽棴闈㈡澘
+            $('#closePage').click(function() {
+            	parent.$('#iframeClose').click();
+            });
+            // 鏍规嵁璁惧id璁$畻璁惧ip
+            function getDevIp(dev_id) {
+            	var ptn = /^91([0-9]{7})$/;
+            	var ip = '';
+            	if(ptn.test(dev_id)) {
+            		var value = Number(RegExp.$1);
+            		// console.log(value);
+            		var intNum = prefixInteger(Math.floor(value/256), 3);
+            		var resNum = prefixInteger(value%256, 3);
+            		ip = '127.000.'+intNum+'.'+resNum;
+            	}else {
+            		ip = '璁惧ID鏍煎紡涓嶆纭�';
+            	}
+            	
+            	return ip;
+            }
+            
+        	// 鑾峰彇001绫讳技鏁版嵁
+        	function prefixInteger(num, length) {
+ 				return (Array(length).join('0') + num).slice(-length);
+			}
+			
+			//淇敼鐢垫睜缁勪俊鎭�
+			function updBatt(temp){
+				var load= layer.load(1);
+				$.ajax({
+					type: "post", 				
+			        url: "BattInfAction!update",				
+			        async:true,				
+			        dataType:'text',
+			        data:"json="+JSON.stringify(temp),	
+			        success: function(data){							        	
+						data = eval('('+data+')');
+						var model = eval('('+data.result+')');
+						//console.info(model);
+						if(model.code ==1){
+							layer.msg('淇敼鎴愬姛锛�3绉掑悗闈㈡澘鑷姩鍏抽棴');
+							setTimeout(function() {
+								parent.$('#iframeClose').click();
+							}, 3000);
+						}else{
+							layer.msg('淇敼澶辫触锛�');
+						}			
+		        	},
+		        	error:function(){
+		        		
+		        	},
+		        	complete: function() {
+		        		layer.close(load);
+		        	}
+		        });
+			}
+        });
+    </script>
+</body>
+</html>
diff --git a/gx_tieta/WebRoot/mobil/elegroup-batt-add.html b/gx_tieta/WebRoot/mobil/elegroup-batt-add.html
new file mode 100644
index 0000000..8d79ada
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/elegroup-batt-add.html
@@ -0,0 +1,498 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>娣诲姞鍖呮満鏈烘埧鎴栬澶�</title>
+	<meta name="viewport" content="width=device-width,initial-scale=1">
+	<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>	
+	<link rel="stylesheet" type="text/css" href="css/tbl.css">
+	<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+	<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+	<link rel="stylesheet" href="css/fgpanel.css">
+	<style type="text/css">
+	.tbl-container table{
+	   color:#e61212!important;
+	}
+	</style>   
+</head>
+<body>
+	<div data-role="page" id="pageone">
+		<!-- 闈㈡澘鍐呭 -->
+		<div class="fg-panel">
+			<form>
+				<div class="fg-panel-header">绛涢��</div>
+				<div class="fg-panel-content">
+					<fieldset data-role="controlgroup">
+		            	<p>鐪�</p>
+		            	<select id="mainteArea" data-mini="true">
+		              		<option value="">鍏ㄩ儴</option>
+		            	</select>
+		            	<p>甯�</p>
+			            <select id="city" data-mini="true">
+			            	<option value="">鍏ㄩ儴</option>
+			            </select>
+			            <p>鍖�/鍘�</p>
+			            <select id="country" data-mini="true">
+			            	<option value="">鍏ㄩ儴</option>
+			            </select>
+		             	<p>鏈烘埧绔欑偣</p>
+		            	<select id="homeName" data-mini="true">
+		            		<option value="">鍏ㄩ儴</option>
+		            	</select>
+		            	<p>钃勭數姹犵粍</p>
+		            	<select id="battgroup_name" data-mini="true">
+		            		<option value="0">鍏ㄩ儴</option>
+		            	</select>
+	        		</fieldset>
+				</div>
+				<div class="fg-panel-btn">
+					<a href="javascript:panel.hide(true);" data-role="button" id="submit" class="ui-btn ui-mini ui-btn-b ui-shadow">娣诲姞</a>
+				</div>
+			</form>
+		</div>
+		
+		<!-- 澶撮儴鍐呭 -->
+		<div data-role="header" data-position="fixed">
+			<a href="elegroup-batt.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+			<h1>娣诲姞鍖呮満鏈烘埧鎴栬澶�</h1>
+			<a href="javascript:panel.show();" class="ui-btn ui-corner-all ui-shadow ui-icon-grid ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;" id="screen">绛涢��</a>
+		</div>
+		<!-- 涓讳綋鍐呭 -->
+		<div data-role="main">
+			<div class="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">鍥炬爣</a></div>
+			<div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">鍥炬爣</a></div>	
+			<!-- 琛ㄦ牸瀹瑰櫒 -->
+			<div class="tbl-container"></div>
+			<table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+			</table>
+		</div>
+		<!-- 椤佃剼鍐呭 -->
+		<div data-role="footer" data-position="fixed" data-theme="a">    
+			<div data-role="navbar">
+				<ul>
+				  <li><a href="#yourPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">搴旂敤</a></li>
+				  <li><a href="elegroup-batt.html" id="cancel" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">鍙栨秷</a></li>
+				</ul>
+			</div>		
+		</div>   
+		<div data-role="popup" id="yourPopup" class="ui-content" data-overlay-theme="b">
+		<a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">鍏抽棴</a>
+        <a href="" data-rel="back" id="sure" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-check" >鎻愪氦搴旂敤</a>
+        <a href="" data-rel="back" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-delete" >鍙栨秷搴旂敤</a>
+    </div>        
+	</div>
+	
+</body>
+
+<script type="text/javascript" src="mobilJs/base.js"></script>
+<script type="text/javascript" src="js/tbl.js"></script>
+<script type="text/javascript" src="js/echarts.js"></script>
+<script type="text/javascript" src="js/eleAnalyse.js"></script>
+<script type="text/javascript" src="js/panel.js"></script>
+<script type="text/javascript">
+
+	var data = new Date;
+	var arrTh = ['鍖呮満鏈烘埧', '鍖呮満鐢垫睜缁�'];
+	var dataArr = new Array();
+	dataArr = [];
+	var newArrTd = [];
+	var tblCon = $('.tbl-container');
+    var battProducer = "";
+    var Page = {
+    	pageSize : 10,
+    	pageCurr : 1,
+    	pageAll : 0,  
+    };
+    
+    var startTime = "1980-01-01";
+    var endTime = new Date;
+ 
+    $(document).ready(function(){
+		$("#submit").click(function(){
+	    	 searchDisCharage();
+		});
+	 });
+  
+    
+     function searchDisCharage(){
+		loadshow();
+        arr=[];
+		for(i=0;i<100;i++){arr[i]=i*10}
+		createTbl(tblCon, arrTh, arr);
+		loadclose();
+	}
+		
+		
+	function judgepronextshow(){
+		var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+	 	console.info(Page.pageCurr);
+     	if (pageNum!==1){//鏈夊椤�
+        	if (Page.pageCurr==1){
+  				setPageTurning(false, true);              //褰撳墠椤典负1,闅愯棌宸﹁竟
+           	}
+          	else if (Page.pageCurr== pageNum)
+           	{
+            	setPageTurning(true, false);                  //褰撳墠椤典负鏈�鍚庝竴椤�,闅愯棌鍙宠竟
+           	}
+           	else
+          	{
+            	setPageTurning(true, true);                    //涓轰腑闂�,涓よ竟閮戒笉闅愯棌
+           	}
+		}else{
+			setPageTurning(false, false);
+		}                                                 //鍙湁涓�椤�,闅愯棌涓よ竟
+	}	
+		
+		
+    //鏋勯�犳煡璇㈡潯浠跺璞�
+	function createSearchForm(){
+		var temp={
+			page:{
+				pageCurr:Page.pageCurr,
+				pageSize:Page.pageSize,
+			},
+			binf:{
+				StationName1:$('#privince').val(),
+				StationName2:$('#city').val(),
+				StationName5: $('#country').val(),
+				StationName:$('#homeName').val(),
+				BattGroupId:$('#battgroup_name').val(),
+				BattProducer:battProducer,
+				MonVolStd:"0",
+				MonCapStd:$('#moncap_std2').val(),
+				BattGroupName1:"",
+				BattProductDate:startTime,
+				BattProductDate1:endTime,
+				BattInUseDate:startTime,
+				BattInUseDate1:endTime,
+			},
+			uinf:{
+				UId:"0",
+			},
+			tdata:{
+				test_type:"0",
+				record_time:startTime,
+				record_time1:endTime,
+				test_starttype:"0",
+			},
+			mainf:{
+			/*
+				remark:"100",
+				maint_done_time:startTime,
+				maint_done_time1:endTime,
+			*/
+			} 
+		};
+		return temp;
+	}
+	
+//椤甸潰鍔犺浇鏃舵煡璇㈢渷
+	$.post("BattInfAction_serchByStation",null,function(data){
+		data = data.result;
+	    data = eval("("+data+")");
+	    //console.info(data);
+	    //console.info(data.code);
+	    if(data.code==1&&data.data.length>0){
+	   		var $Ostation_name1=$("#mainteArea");
+	    	$Ostation_name1.text("");
+	    	var arr = new Array();
+	    	for(var i=0;i<=data.data.length;i++)
+	        {
+	           	if(i == 0){
+	           		arr.push({
+	           			val:"",
+	           			txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
+	           		});
+	           	}else{
+	           		arr.push({
+	           			val:data.data[i-1].StationName1,
+	           			txt:data.data[i-1].StationName1,
+	           		});
+	           	}
+	    	}
+	    	updataSel($Ostation_name1, arr);
+        }
+         findCity();
+    });
+
+  
+//褰撶渷鏀瑰彉鏃舵洿鏂板競
+	function findCity(){
+		var data = {
+			StationName1: $("#mainteArea").val()
+		};
+		//console.info(data);
+		// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName2",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#city");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName2,
+		           			txt:data.data[i-1].StationName2,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	         findCounty();
+	    }
+	    });
+    }
+	
+//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+	function findCounty(){
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+		};
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName5",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#country");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName5,
+		           			txt:data.data[i-1].StationName5,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	      findStationNamebyStationname1();   
+	    }
+	    });
+    }
+  
+ //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧  
+    function findStationNamebyStationname1(){
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+			StationName5:$("#country").val()
+		};
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName3",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#homeName");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			stationid:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName,
+		           			stationid:data.data[i-1].StationId,
+		           			txt:data.data[i-1].StationName3,
+		           		});
+		           	}
+		    	}
+		    	//console.info(111111111111111);
+		    	updataSelStation($Ostation_name1, arr);
+	        }
+	       
+	        findserchByBattGroupNamebystationname(); 
+	    }
+	    });
+    }
+ 
+ //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�   
+     function findserchByBattGroupNamebystationname(){
+		var stationid = $("#homeName").find('option:selected').attr('stationid')?$("#homeName").find('option:selected').attr('stationid'):'';
+
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+			StationName5:$("#country").val(),
+			StationName: $("#homeName").val(),
+			StationId: stationid
+		};
+		
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchBattByStation",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.warn();
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#battgroup_name");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:0,
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].BattGroupId,
+		           			txt:data.data[i-1].BattGroupName,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	         
+	    }
+	    });
+    }
+    
+   //褰撶渷鏀瑰彉鏃舵洿鏂板競
+   $('#mainteArea').change(function(){
+   		findCity();	
+   });
+   //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
+   $('#city').change(function(){
+   		findCounty();	
+   });
+   //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
+   $('#country').change(function(){
+   		findStationNamebyStationname1(); 	
+   });   	
+	//褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍	
+	$('#homeName').change(function(){
+		findserchByBattGroupNamebystationname();
+	});
+			
+	//鏌ヨ鐢垫睜瀹归噺
+	$.post("BattInfAction_serchByMonCapStd",null,function(data){
+		data=data.result;
+		data=eval("("+data+")");
+		if(data.code==1 && data.data.length>0){
+			var $Omoncap_std2=$("#moncap_std2");
+			$Omoncap_std2.text=("");
+			console.info(data.data[1].MonCapStd);
+			var arr = new Array();
+			for(var i=0;i <= data.data.length;i++){
+				if(i == 0){
+					arr.push({
+						val:0,
+						txt:"鍏ㄩ儴(鍏�"+data.sum+")绉�"
+					});
+				}else{
+					arr.push({
+						val:data.data[i-1].MonCapStd,
+						txt:data.data[i-1].MonCapStd
+					});
+				}
+			}
+			updataSel($('#moncap_std2'),arr);
+		};
+	});
+      
+				
+
+  	
+	$(function() {
+		$('.pre-page').on('click', 'a', function() {
+			var isShowPre = true;
+			Page.pageSize = 10;
+			var pageNum = Math.ceil(Page.pageAll/Page.pageSize)
+			if(Page.pageCurr>1){
+				Page.pageCurr = Page.pageCurr - 1;
+				searchDisCharage();
+			}else {				
+				searchDisCharage();	
+			}
+		});
+		
+		$('.next-page').on('click', 'a', function() {
+			var isShowNext = true;
+			Page.pageSize = 10;
+			console.info(Page.pageAll);
+			console.info(Page.pageSize);
+			var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+			if(Page.pageCurr<pageNum){
+				Page.pageCurr = Page.pageCurr + 1;
+				console.info(Page.pageCurr);
+				searchDisCharage()
+			}
+		});
+	});
+	
+	
+	// 鍒ゆ柇鏄惁鏄剧ず缈婚〉鎸夐挳
+	function setPageTurning(isShowPre, isShowNext) {
+		if(isShowPre) {	// 鍒ゆ柇鏄惁鏄剧ず鍚戜笂缈婚〉鎸夐挳
+			$('.pre-page').show();
+		}else {
+			$('.pre-page').hide();
+		}
+
+		if(isShowNext) {	// 鍒ゆ柇鏄惁鏄剧ず鍚戜笅缈婚〉鎸夐挳
+			$('.next-page').show();
+		}else {
+			$('.next-page').hide();
+		}
+	}					
+
+    $('document').ready(function(){
+    	panel.show();
+    });    
+   </script>
+</html>
+
+  
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/elegroup-batt.html b/gx_tieta/WebRoot/mobil/elegroup-batt.html
new file mode 100644
index 0000000..603302f
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/elegroup-batt.html
@@ -0,0 +1,197 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>宸叉坊鍔犲寘鏈烘満鎴�</title>
+	<meta name="viewport" content="width=device-width,initial-scale=1">
+	<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>	
+	<link rel="stylesheet" type="text/css" href="css/tbl.css">
+	<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+	<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+	
+</head>
+<body>
+	<div data-role="page" id="pageone">
+		
+		
+		<!-- 澶撮儴鍐呭 -->
+		<div data-role="header" data-position="fixed">
+			<a href="elegroup-list-user.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+			<h1>宸叉坊鍔犲寘鏈烘満鎴�</h1>
+			
+		</div>
+		<!-- 涓讳綋鍐呭 -->
+		<div data-role="main">
+			<div class="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">鍥炬爣</a></div>
+			<div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">鍥炬爣</a></div>	
+			<!-- 琛ㄦ牸瀹瑰櫒 -->
+			<div class="tbl-container"></div>
+			<table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+			</table>
+		</div>
+		<!-- 椤佃剼鍐呭 -->
+		<div data-role="footer" data-position="fixed" data-theme="a">    
+			<div data-role="navbar">
+				<ul>
+				  <li><a href="index.html" target="_top" data-role="button" data-icon="home" data-transition="slide">棣栭〉</a></li>
+				  <li><a href="elegroup-batt-add.html" target="_top" data-role="button" data-icon="plus" data-transition="slide">娣诲姞</a></li>
+				</ul>
+			</div>		
+		</div>   
+	</div>
+	
+</body>
+
+<script type="text/javascript" src="mobilJs/base.js"></script>
+<script type="text/javascript" src="js/tbl.js"></script>
+<script type="text/javascript" src="js/echarts.js"></script>
+<script type="text/javascript" src="js/eleAnalyse.js"></script>
+
+<script type="text/javascript">
+
+	var data = new Date;
+	var arrTh = ['鍖呮満鏈烘埧', '鍖呮満鐢垫睜缁�'];
+	var dataArr = new Array();
+	dataArr = [];
+	var newArrTd = [];
+	var tblCon = $('.tbl-container');
+    var battProducer = "";
+    var Page = {
+    	pageSize : 10,
+    	pageCurr : 1,
+    	pageAll : 0,  
+    };
+    
+    var startTime = "1980-01-01";
+    var endTime = new Date;
+ 
+    $(document).ready(function(){
+		
+	    	 searchDisCharage();
+		
+	 });
+  
+    
+     function searchDisCharage(){
+		loadshow();
+     
+		arr=[];
+		for(i=0;i<100;i++){arr[i]=i*10}
+		createTbl(tblCon, arrTh, arr);
+		loadclose();
+		
+	}
+		
+		
+	function judgepronextshow(){
+		var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+	 	console.info(Page.pageCurr);
+     	if (pageNum!==1){//鏈夊椤�
+        	if (Page.pageCurr==1){
+  				setPageTurning(false, true);              //褰撳墠椤典负1,闅愯棌宸﹁竟
+           	}
+          	else if (Page.pageCurr== pageNum)
+           	{
+            	setPageTurning(true, false);                  //褰撳墠椤典负鏈�鍚庝竴椤�,闅愯棌鍙宠竟
+           	}
+           	else
+          	{
+            	setPageTurning(true, true);                    //涓轰腑闂�,涓よ竟閮戒笉闅愯棌
+           	}
+		}else{
+			setPageTurning(false, false);
+		}                                                 //鍙湁涓�椤�,闅愯棌涓よ竟
+	}	
+		
+		
+    //鏋勯�犳煡璇㈡潯浠跺璞�
+	function createSearchForm(){
+		var temp={
+			page:{
+				pageCurr:Page.pageCurr,
+				pageSize:Page.pageSize,
+			},
+			binf:{
+				StationName1:$('#privince').val(),
+				StationName2:$('#city').val(),
+				StationName5: $('#country').val(),
+				StationName:$('#homeName').val(),
+				BattGroupId:$('#battgroup_name').val(),
+				BattProducer:battProducer,
+				MonVolStd:"0",
+				
+				BattGroupName1:"",
+				BattProductDate:startTime,
+				BattProductDate1:endTime,
+				BattInUseDate:startTime,
+				BattInUseDate1:endTime,
+			},
+			uinf:{
+				UId:"0",
+			},
+			tdata:{
+				test_type:"0",
+				record_time:startTime,
+				record_time1:endTime,
+				test_starttype:"0",
+			},
+			mainf:{
+			/*
+				remark:"100",
+				maint_done_time:startTime,
+				maint_done_time1:endTime,
+			*/
+			} 
+		};
+		return temp;
+	}
+
+  	
+	$(function() {
+		$('.pre-page').on('click', 'a', function() {
+			var isShowPre = true;
+			Page.pageSize = 10;
+			var pageNum = Math.ceil(Page.pageAll/Page.pageSize)
+			if(Page.pageCurr>1){
+				Page.pageCurr = Page.pageCurr - 1;
+				searchDisCharage();
+			}else {				
+				searchDisCharage();	
+			}
+		});
+		
+		$('.next-page').on('click', 'a', function() {
+			var isShowNext = true;
+			Page.pageSize = 10;
+			console.info(Page.pageAll);
+			console.info(Page.pageSize);
+			var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+			if(Page.pageCurr<pageNum){
+				Page.pageCurr = Page.pageCurr + 1;
+				console.info(Page.pageCurr);
+				searchDisCharage()
+			}
+		});
+	});
+	
+	
+	// 鍒ゆ柇鏄惁鏄剧ず缈婚〉鎸夐挳
+	function setPageTurning(isShowPre, isShowNext) {
+		if(isShowPre) {	// 鍒ゆ柇鏄惁鏄剧ず鍚戜笂缈婚〉鎸夐挳
+			$('.pre-page').show();
+		}else {
+			$('.pre-page').hide();
+		}
+
+		if(isShowNext) {	// 鍒ゆ柇鏄惁鏄剧ず鍚戜笅缈婚〉鎸夐挳
+			$('.next-page').show();
+		}else {
+			$('.next-page').hide();
+		}
+	}					
+
+   
+   </script>
+</html>
+
+  
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/elegroup-list-user.html b/gx_tieta/WebRoot/mobil/elegroup-list-user.html
new file mode 100644
index 0000000..1ae97b5
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/elegroup-list-user.html
@@ -0,0 +1,150 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>鍖呮満缁勭敤鎴峰垪琛�</title>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+<link rel="stylesheet" href="css/breadcrumb.css">
+<link rel="stylesheet" type="text/css" href="css/defined.popup.css"/>
+<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+</head>
+	<body>
+		<div data-role="page"  tabindex="0" id="page0">
+			<div data-role="header" data-position="fixed">
+				<a href="elegroup-list.html"  target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+				<h1>鍖呮満缁勭敤鎴峰垪琛�</h1>
+			</div>
+		
+			<div data-role="content">
+				<ul class="breadcrumb"></ul>
+				<div id="battList"></div>
+			</div>
+			<div data-role="popup" id="myPopup" class="defined-popup">
+					<div class="popup-container">
+						<div class="popup-title">鏌ヨ鏁版嵁澶辫触</div>
+						<div class="popup-footer">
+							<div class="footer-float footer-left">
+								<button type="button" id="right" data-mini="true" style="visibility: hidden;">纭畾</button>
+							</div>
+							<div class="footer-float footer-right">
+								<button type="button" id="hidePopup" data-mini="true">鍙栨秷</button>
+							</div>
+						</div>
+					</div>
+				</div>
+			<div data-role="footer" data-position="fixed">
+				<!-- <h1>绂忓厜鐢靛瓙鏈夐檺鍏徃</h1> -->
+			</div>
+		</div>
+	</body>
+	<script type="text/javascript" src="js/battNav.js"></script>
+	<script type="text/javascript">
+		var citylist = new Array();
+		
+		// 鍒濆鍖栭〉闈㈠唴瀹�
+		$(document).ready(function(){
+			setCookie("",null);
+			setCookie("",null);
+			seachAllCity();
+		});
+		
+		// 鐐瑰嚮鍩庡競浜嬩欢
+		$(function () {
+			var aLi = -1;
+			$('#battList').on('click', 'ul li', function () {
+				aLi = $(this).index();
+				city = getbatt(citylist,aLi);
+				
+				var json=window.JSON.stringify(city);
+				setCookie("",json);
+				window.location.href="elegroup-batt.html";
+			});
+				
+		});
+		
+		// 瀹氫箟闈㈠寘灞戝鑸潯
+		/* $(function(){
+			var data = [
+				{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
+				{url: 'javascript:JumpElegroupListPage();', txt: 鍖呮満缁勫垪琛�'},
+				{url: 'javascript:;', txt: '鍖呮満缁勭敤鎴峰垪琛�'}
+			];
+			addBreadCrumb($('.breadcrumb').eq(0),data);
+		}); */
+		var temp=getCookie("");
+		temp = JSON.parse(temp);
+		console.info(temp);		
+		//鏌ヨ鎵�鏈夋満鎴�
+		function seachAllCity(){
+			loadshow();
+			var data = {
+						StationName1: temp.StationName1
+					};
+					console.info(data);
+			$.ajax({ 	
+		        type: "post", 				
+		        url: "",				
+		        async:true,				
+		        dataType:'text',
+		        data:"json = "+JSON.stringify(data),	
+		        success: function(data){							        	
+					data = eval('('+data+')');
+					var model = eval('('+data.result+')');
+					console.info(model);
+					if(model.code == 1){
+						citylist = model.data;
+						createUl($('#battList'),model.data);
+					}else {
+						//alert(213);
+						$('#myPopup').popup('open');
+					}
+					loadclose();
+	        	},
+	        	error:function(){
+					loadclose();
+	        	} 				
+			});
+		}
+		
+		/*
+			澹版槑涓�涓嚱鏁癱reateUl,鐢ㄤ簬鐢熸垚ul鍜宭i
+			@param ulCon ul鐨勫鍣�
+			@param dataList  ul鐨勬暟鎹唴瀹�
+		*/
+		function createUl(ulCon, dataList) {
+			//console.info(index);
+			// 娓呯悊瀹瑰櫒涓嬬殑ul
+			ulCon.find('ul').remove();
+			
+			// 鍒涘缓ul
+			var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
+			
+			// 閬嶅巻dataList鐢熸垚li鍜宎
+			for (var i = 0; i < dataList.length; i++){
+				var _li = $('<li></li');
+				
+				var _a = $('<a href="#page1" value=""  data-transition="slide">'+dataList[i].StationName2+'</a>');
+								
+				// 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
+				_li.append(_a);
+				_ul.append(_li);
+			}
+			
+			// 灏哶ul娣诲姞鍒板鍣ㄤ腑
+			ulCon.append(_ul).trigger('create');			
+			loadclose();
+		}
+		
+		//鑾峰彇褰撳墠閫変腑鐨刢ity
+		function getbatt(arr,index){
+			if(arr.length>index){
+				return arr[index];
+			}
+			return undefined;
+		};
+	</script>
+	
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/elegroup-list.html b/gx_tieta/WebRoot/mobil/elegroup-list.html
new file mode 100644
index 0000000..6cc802f
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/elegroup-list.html
@@ -0,0 +1,143 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>鍖呮満缁勫垪琛�</title>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+<link rel="stylesheet" href="css/breadcrumb.css">
+<link rel="stylesheet" type="text/css" href="css/defined.popup.css"/>
+<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+</head>
+	<body>
+		<div data-role="page"  tabindex="0" id="page0">
+			<div data-role="header" data-position="fixed">
+				<a href="index.html"  target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+				<h1>鍖呮満缁勫垪琛�</h1>
+			</div>
+		
+			<div data-role="content">
+				<ul class="breadcrumb"></ul>
+				<div id="battList"></div>
+			</div>
+			<div data-role="popup" id="myPopup" class="defined-popup">
+					<div class="popup-container">
+						<div class="popup-title">鏌ヨ鏁版嵁澶辫触</div>
+						<div class="popup-footer">
+							<div class="footer-float footer-left">
+								<button type="button" id="right" data-mini="true" style="visibility: hidden;">纭畾</button>
+							</div>
+							<div class="footer-float footer-right">
+								<button type="button" id="hidePopup" data-mini="true">鍙栨秷</button>
+							</div>
+						</div>
+					</div>
+				</div>
+			<div data-role="footer" data-position="fixed">
+				<!-- <h1>绂忓厜鐢靛瓙鏈夐檺鍏徃</h1> -->
+			</div>
+		</div>
+	</body>
+	<script type="text/javascript" src="js/battNav.js"></script>
+	<script type="text/javascript">
+		var stationlist = new Array();
+		
+		// 鍒濆鍖栭〉闈㈠唴瀹�
+		$(document).ready(function(){
+			setCookie("",null);
+			setCookie("",null);
+			//seachAllStation();
+		});
+		
+		// 鐐瑰嚮鏈烘埧浜嬩欢
+		$(function () {
+			var aLi = -1;
+			$('#battList').on('click', 'ul li', function () {
+				aLi = $(this).index();
+				station = getbatt(stationlist,aLi);
+				
+				var json=window.JSON.stringify(station);
+				setCookie("",json);
+				window.location.href="elegroup-list-user.html";
+			});
+				
+		});
+		
+		// 瀹氫箟闈㈠寘灞戝鑸潯
+		/* $(function(){
+			var data = [
+				{url: 'javascript:JumpHomePage();', txt: '棣栭〉'},
+				{url: 'javascript:;', txt: '鍖呮満缁勫垪琛�'}
+			];
+			addBreadCrumb($('.breadcrumb').eq(0),data);
+		}); */
+				
+		//鏌ヨ鎵�鏈夊競
+		function seachAllStation(){
+			loadshow();
+			$.ajax({ 	
+		        type: "post", 				
+		        url: "",				
+		        async:true,				
+		        dataType:'text',
+		        data:null,	
+		        success: function(data){							        	
+					data = eval('('+data+')');
+					var model = eval('('+data.result+')');
+					console.info(model);
+					if(model.code == 1){
+						stationlist = model.data;
+						createUl($('#battList'),model.data);
+					}else {
+						//alert(213);
+						$('#myPopup').popup('open');
+					}
+					loadclose();
+	        	},
+	        	error:function(){
+					loadclose();
+	        	} 				
+			});
+		}
+		
+		/*
+			澹版槑涓�涓嚱鏁癱reateUl,鐢ㄤ簬鐢熸垚ul鍜宭i
+			@param ulCon ul鐨勫鍣�
+			@param dataList  ul鐨勬暟鎹唴瀹�
+		*/
+		function createUl(ulCon, dataList) {
+			//console.info(index);
+			// 娓呯悊瀹瑰櫒涓嬬殑ul
+			ulCon.find('ul').remove();
+			
+			// 鍒涘缓ul
+			var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
+			
+			// 閬嶅巻dataList鐢熸垚li鍜宎
+			for (var i = 0; i < dataList.length; i++){
+				var _li = $('<li></li');
+				
+				var _a = $('<a href="#page1" value=""  data-transition="slide">'+dataList[i].StationName1+'</a>');
+								
+				// 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
+				_li.append(_a);
+				_ul.append(_li);
+			}
+			
+			// 灏哶ul娣诲姞鍒板鍣ㄤ腑
+			ulCon.append(_ul).trigger('create');			
+			loadclose();
+		}
+		
+		//鑾峰彇褰撳墠閫変腑鐨刡att
+		function getbatt(arr,index){
+			if(arr.length>index){
+				return arr[index];
+			}
+			return undefined;
+		};
+	</script>
+	
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/js/battNav.js b/gx_tieta/WebRoot/mobil/js/battNav.js
index 78867f6..2b08b84 100644
--- a/gx_tieta/WebRoot/mobil/js/battNav.js
+++ b/gx_tieta/WebRoot/mobil/js/battNav.js
@@ -25,3 +25,7 @@
 	setCookie("pages","2");
 	window.location.href="machineroomM.html";
 }
+function JumpElegroupListPage(){
+	setCookie("pages","4");
+	window.location.href="elegroup-list.html";
+}
\ No newline at end of file

--
Gitblit v1.9.1