From b040ac179af00dfe38204ebb708aed8c87f285ad Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.1.132>
Date: 星期三, 26 十二月 2018 17:27:21 +0800
Subject: [PATCH] 修改内容

---
 gx_tieta/WebRoot/js/base.js                                             |    5 
 gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class |    0 
 gx_tieta/WebRoot/index.jsp                                              |    2 
 gx_tieta/WebRoot/batch-set-curr.jsp                                     |  519 +++++++++++++++++++++++++++++++++++++++++++++++++++
 gx_tieta/WebRoot/pages/js/mylayui.js                                    |   65 ++++++
 5 files changed, 590 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class
new file mode 100644
index 0000000..fa5cb0e
--- /dev/null
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class
Binary files differ
diff --git a/gx_tieta/WebRoot/batch-set-curr.jsp b/gx_tieta/WebRoot/batch-set-curr.jsp
new file mode 100644
index 0000000..4b2c858
--- /dev/null
+++ b/gx_tieta/WebRoot/batch-set-curr.jsp
@@ -0,0 +1,519 @@
+<%@ 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>							<!-- 鏈烘埧鍚嶇О -->
+                            <td>绯荤粺绫诲瀷</td>
+                            <td>鐢垫睜缁勫彿</td>
+                        </tr>
+                        <tr>
+                            <td>
+                            	<div class="layui-form" lay-filter="provinceFilter">
+                            		<div class="layui-form-item">
+                            			<div class="layui-input-block">
+                            				<select name="province" id="province" lay-filter="province">
+												<option value="">璇烽�夋嫨鐪�</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                            <td>
+                            	<div class="layui-form" lay-filter="cityFilter">
+                            		<div class="layui-form-item">
+                            			<div class="layui-input-block">
+                            				<select name="city" id="city" lay-filter="city">
+												<option value="">璇烽�夋嫨甯�/鍖�</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                             <td>
+                            	<div class="layui-form" lay-filter="countyFilter">
+                            		<div class="layui-form-item">
+                            			<div class="layui-input-block">
+                            				<select name="county" id="county" lay-filter="county">
+												<option value="">璇烽�夋嫨鍖�/鍘�</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                            
+                            <td>
+                            	<div class="layui-form" lay-filter="homeFilter">
+                            		<div class="layui-form-item">
+                            			<div class="layui-input-block">
+                            				<select name="home" id="home" lay-filter="home" lay-search="">
+												<option value="">璇烽�夋嫨鏈烘埧</option>
+											</select>
+                            			</div>
+                            		</div>
+                            	</div>
+                            </td>
+                            <td>
+	                           	<div class="layui-form" lay-filter="sysTypeFilter">
+	                           		<div class="layui-form-item">
+	                           			<div class="layui-input-block">
+	                           				<select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
+	                           					<option value="12">1U璁惧</option>
+												<option value="2">2U璁惧</option>
+											</select>
+	                           			</div>
+	                           		</div>
+	                           	</div>
+	                        </td>
+                            <td>
+	                           	<div class="layui-form" lay-filter="battNumFilter">
+	                           		<div class="layui-form-item">
+	                           			<div class="layui-input-block">
+	                           				<select name="battNum" id="battNum" lay-filter="battNum" lay-search="">
+	                           					<option value="0">鐢垫睜缁�1</option>
+												<option value="1">鐢垫睜缁�2</option>
+											</select>
+	                           			</div>
+	                           		</div>
+	                           	</div>
+	                        </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <!-- 椤甸潰涓婚鍐呭 -->
+            <div class="layui-page-content" style="position: relative;">
+            	<div class="layui-tbl-filter">
+            		<div class="layui-form layui-form-pane"  lay-filter="tblFilter">
+            			<div class="layui-inline">
+							<div class="layui-input-inline">
+								<div class="layui-form" lay-filter="addTypeFilter">
+									<select name="addType" id="addType" lay-filter="addType">
+										<option value="0">鍗曚釜鏈烘埧</option>
+										<option value="5">鍏ㄥ尯/鍘�</option>
+										<option value="2">鍏ㄥ競</option>
+										<option value="1">鍏ㄧ渷</option>
+									</select>
+								</div>
+							</div>
+						</div>
+						<button class="layui-btn layui-btn-sm mrl8" id="batchAdd"><i class="fa fa-plus mrr8"></i>娣诲姞鐢垫睜缁�</button>
+            			<button class="layui-btn layui-btn-sm" id="batchSetCurr">鎵归噺璁剧疆鏀剧數鍙傛暟</button>
+            			<button class="layui-btn layui-btn-sm" id="batchSetSys">鎵归噺璁剧疆绯荤粺鍙傛暟</button>
+            			<button class="layui-btn layui-btn-sm" id="batchSetSys">鎵归噺鍚姩鏀剧數娴嬭瘯</button>
+            		</div>
+            	</div>
+            	<!-- 琛ㄦ牸鍐呭 -->
+				<table id="pageTbl" lay-filter="pageTbl"></table>
+            </div>
+        </div>
+	    <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', 'laytpl'], function() {
+        		var table = layui.table;		// 鑾峰彇琛ㄦ牸妯″潡
+        		var form = layui.form;			// 鑾峰彇琛ㄥ崟妯″潡
+        		var layer = layui.layer;		// 鑾峰彇寮瑰嚭妗嗘ā鍧�
+        		var element = layui.element;	// 鑾峰彇鍏冪礌鎿嶄綔妯″潡
+        		var laytpl = layui.laytpl;		// 鑾峰彇妯″潡鎿嶄綔
+        		
+        		var isNewLoad = true;
+				var pre_province = getQueryString('province');
+				// 鏌ヨ鐪佷笅鎷夋
+				searchProvince();
+				// 鏌ヨ鐪�
+				var filterLoad = layer.load();
+				function searchProvince() {
+					// 璇锋眰鍚庡彴鏌ヨ
+					$.ajax({
+						type:'post',
+						async:true,
+						url: 'User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup',
+						data: null,
+						dataType: 'json',
+						success:function(result) {
+							var rs = JSON.parse(result.result);
+							var list = [];				// option缁撴灉闆�
+							var ele = $('#province');	// 鐩爣select
+							if(rs.code == 1) {
+								var data = rs.data;
+								list.push(getLayuiSelect('璇烽�夋嫨鐪�/鐩磋緰甯�', '', {}, undefined));
+								// 閬嶅巻鏌ヨ缁撴灉
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									var _tmp = getLayuiSelect(_data, _data, {}, {});
+									if(pre_province == _data && isNewLoad){
+										_tmp = getLayuiSelect(_data, _data, {}, {},true);
+									}
+									list.push(_tmp);
+								}
+							}else {
+								list.push(getLayuiSelect('鏆傛棤鐪�/鐩磋緰甯�', '', {}, undefined));
+							}
+							
+							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+							createLayuiSelect(ele, list);
+							form.render('select', 'provinceFilter');
+							
+							// 鏌ヨ甯�
+							searchCity();
+						}
+					});
+				}
+				
+				// 鍒囨崲鐪�-甯�
+				form.on('select(province)', function(data) {
+					// 鏌ヨ甯�
+					searchCity(true);
+				});
+				
+				// 鏌ヨ甯�
+				function searchCity(isLoad) {
+					// 鏋勯�犳煡璇㈡潯浠�
+					var tmp = {
+						StationName1: $("#province").val()
+					};
+					var pre_city = getQueryString('city');
+					
+					// 鏄惁娣诲姞绛夊緟
+					if(isLoad) {
+						filterLoad = layer.load();
+					}
+					// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+					$.ajax({
+						type: 'post',
+						async: true,
+						url: 'BattInfAction!serchStationName2',
+						dataType: 'json',
+						data: "json = "+JSON.stringify(tmp),
+						success: function(result) {
+							var rs = JSON.parse(result.result);
+							var list = [];				// option缁撴灉闆�
+							var ele = $('#city');	// 鐩爣select
+							if(rs.code == 1) {
+								var data = rs.data;
+								list.push(getLayuiSelect('璇烽�夋嫨甯�/鍖�', '', {}, undefined));
+								// 閬嶅巻鏌ヨ缁撴灉
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									var _tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data);
+									if(pre_city == _data.StationName2 && isNewLoad){
+										_tmp = getLayuiSelect(_data.StationName2, _data.StationName2, {}, _data,true);
+									}
+									list.push(_tmp);
+								}
+							}else {
+								list.push(getLayuiSelect('鏆傛棤甯�/鍖�', '', {}, undefined));
+							}
+							
+							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+							createLayuiSelect(ele, list);
+							form.render('select', 'cityFilter');
+							
+							// 鏌ヨ鍖哄幙
+							searchCounty();
+						}
+					});
+				}
+				
+				// 鍒囨崲甯�-鍖哄幙
+				form.on('select(city)', function(data) {
+					// 鏌ヨ鍖哄幙
+					searchCounty(true);
+				});
+				
+				
+				// 鏌ヨ鍖�/鍘�
+				function searchCounty(isLoad) {
+					// 鏋勯�犳煡璇㈡潯浠�
+					var tmp = {
+						StationName1: $("#province").val(),
+						StationName2: $("#city").val()
+					};
+					// 鏄惁娣诲姞绛夊緟
+					if(isLoad) {
+						filterLoad = layer.load();
+					}
+					var pre_county = getQueryString('county');
+					// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+					$.ajax({
+						type: 'post',
+						async: true,
+						url: 'BattInfAction!serchStationName5',
+						dataType: 'json',
+						data: "json = "+JSON.stringify(tmp),
+						success: function(result) {
+							var rs = JSON.parse(result.result);
+							//console.info(rs);
+							var list = [];				// option缁撴灉闆�
+							var ele = $('#county');	// 鐩爣select
+							if(rs.code == 1) {
+								var data = rs.data;
+								list.push(getLayuiSelect('璇烽�夋嫨鍖�/鍘�', '', {}, undefined));
+								// 閬嶅巻鏌ヨ缁撴灉
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									var _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data);
+									if(pre_county ==  _data.StationName5 && isNewLoad){
+										_tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data,true);
+									}
+									//console.info(_tmp);
+									list.push(_tmp);
+								}
+							}else {
+								list.push(getLayuiSelect('鏆傛棤鍖�/鍘�', '', {}, undefined));
+							}
+							
+							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+							createLayuiSelect(ele, list);
+							form.render('select', 'countyFilter');
+							
+							// 鏌ヨ鏈烘埧
+							searchHome();
+						}
+					});
+				}
+				
+				// 鍒囨崲甯�-鍖哄幙
+				form.on('select(county)', function(data) {
+					// 鏌ヨ鍖哄幙
+					searchHome(true);
+				});
+				
+				// 鏌ヨ鏈烘埧
+				function searchHome(isLoad) {
+					// 鏋勯�犳煡璇㈡潯浠�
+					var tmp = {
+						StationName1:$("#province").val(),
+						StationName2:$("#city").val(),
+						StationName5:$("#county").val(),
+					};
+					var pre_home = getQueryString('home');
+					var auto_seach = false;
+					// 鏄惁娣诲姞绛夊緟
+					if(isLoad) {
+						filterLoad = layer.load();
+					}
+					// 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+					$.ajax({
+						type: 'post',
+						async: true,
+						url: 'BattInfAction!serchStationName3',
+						dataType: 'json',
+						data: "json = "+JSON.stringify(tmp),
+						success: function(result) {
+							var rs = JSON.parse(result.result);
+							var list = [];				// option缁撴灉闆�
+							var ele = $('#home');	// 鐩爣select
+							if(rs.code == 1) {
+								var data = rs.data;
+								list.push(getLayuiSelect('璇烽�夋嫨鏈烘埧', '', {StationId: '', dev_id: ''}, undefined));
+								// 閬嶅巻鏌ヨ缁撴灉
+								for(var i=0; i<data.length; i++) {
+									var _data = data[i];
+									var _attr = {
+										StationId: _data.StationId,
+										dev_id: _data.FBSDeviceId
+									};
+									var _tmp = getLayuiSelect(_data.StationName, _data.StationName, _attr, _data);
+									if(pre_home == _data.StationName && isNewLoad){
+										_tmp = getLayuiSelect(_data.StationName, _data.StationName, _attr, _data,true);
+										auto_seach = true;
+									}
+									list.push(_tmp);
+								}
+							}else {
+								list.push(getLayuiSelect('鏆傛棤鏈烘埧', '', {}, undefined));
+							}
+							// 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+							createLayuiSelect(ele, list);
+							form.render('select', 'homeFilter');
+							isNewLoad = false;
+							layer.close(filterLoad);
+						}
+					});
+				}
+        		
+        		// 鍒囨崲鏈烘埧
+				form.on('select(home)', function(data) {
+					
+				});
+				
+				// 琛ㄦ牸妯″潡
+				var tOptions = {
+					elem: '#pageTbl'
+					,toolbar: true
+					,defaultToolbar: []
+					,cellMinWidth: 80
+					,cols: [[
+						{type:'checkbox',fixed: 'left'}
+						,{field:'StationName', title:'鏈烘埧鍚嶇О', align:'center', width: 360}
+						,{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}
+				    ]]
+					,data:[]
+					,limit: 20
+				    ,page: true
+				    ,height: 'full-252'
+				};
+				
+				// 鐢熸垚琛ㄦ牸鏁版嵁
+				table.render(tOptions);
+        		
+        		// 鏇存柊琛ㄦ牸鐨勫璞�
+        		var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);
+        		
+        		// 鏌ヨ鍚庡彴鏁版嵁
+        		
+        		
+        		// 鐐瑰嚮娣诲姞鐢垫睜缁�
+        		$('#batchAdd').click(function() {
+        			var structData = structAddData();
+					// 鍒ゆ柇鏄惁閫夋嫨瑕佹坊鍔犵殑鍐呭
+					if(structData.msg) {
+						layer.msg(structData.msg);
+						return;
+					}
+					
+					// 寮瑰嚭璁剧疆閫夋嫨绛涢�夋潯浠�
+					search(structData);
+        		});
+        		
+        		// 鏍规嵁鏌ヨ鏉′欢鏌ヨ鍐呭
+        		function search(temp) {
+        			var load = layer.load(1);
+        			// 鏌ヨ鍚庡彴
+        			$.ajax({
+        				type: 'post'
+        				,async: true
+        				,url: 'BattInfAction!serchByDischarge'
+        				,data: 'json='+JSON.stringify(temp)
+        				,dataType: 'json'
+        				,success: function(res) {
+        					console.log(res);
+        					var rs = JSON.parse(res.result);
+        					if(rs.code == 1) {
+        						var data = rs.data;
+        						console.log(data);
+        						tOptions.data = data;
+        						// 鐢熸垚琛ㄦ牸鏁版嵁
+								table.render(tOptions);
+        					}else {
+        						layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
+        					}
+        				}
+        				,complete:function() {
+        					layer.close(load);
+        				}
+        			});
+        		}
+        		
+        		
+        		
+        		// 鐐瑰嚮娣诲姞鏋勯�犳煡璇�
+				function structAddData() {
+					//1鐪�(鏂囨湰鍊�)  			2:甯傦紙鏂囨湰鍊硷級			5:鍖哄幙锛堟枃鏈�硷級			0:鏈烘埧  (璁惧id)
+					var addType = $('#addType').val();	// 娣诲姞鏈烘埧鐨勬柟寮�
+					var msg = '';	// 鎻愮ず淇℃伅
+					var rs = {
+						num: addType,
+						StationName: '',
+						GroupIndexInFBSDevice: $('#battNum').val(),
+						MonVolStd: $('#sysType').val()
+					};
+					switch(addType) {
+						case '1':
+							var province = $('#province').val();
+							rs.StationName = province;
+							msg = '璇烽�夋嫨鐪�';
+						break;
+						case '2':
+							var city = $('#city').val();
+							rs.StationName = city;
+							msg = '璇烽�夋嫨甯�';
+						break;
+						case '5':
+							var county = $('#county').val();
+							rs.StationName = county;
+							msg = '璇烽�夋嫨鍖�/鍘�';
+						break;
+						case '0':
+							var home = $('#home').find('option:selected').attr('stationid');
+							rs.StationName = home;
+							msg = '璇烽�夋嫨鏈烘埧';
+						break;
+					}
+					if(!rs.StationName) {
+						rs.msg = msg;
+					}
+					return rs;
+				}
+        	});
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 3a85a6e..6fcf891 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1705,7 +1705,7 @@
 	// 鐢熸垚鍥炬爣鐨勮鏄�
 	function createIconExplain(mapEle) {
 		var iconExplain = $('<div id="mapImgDesc" style="position:absolute;background-color: #fff; border: 1px solid #ccc; right: 10px; bottom: 10px; z-index: 99999"></div>');	// 鍦板浘鍥炬爣璇存槑瀹瑰櫒
-		var iconExplainHt = $('<div class="explain-header" style="padding:4px 8px; border-bottom:1px solid #ccc; background-color: #CDDCFA">鍦板浘鍥炬爣璇存槑<img src="image/explain-down.gif" style="float:right;"/></div>');
+		var iconExplainHt = $('<div class="explain-header" style="padding:4px 8px; border-bottom:1px solid #ccc; background-color: #CDDCFA">鍥炬爣鏄剧ず涓庨�夋嫨<img src="image/explain-down.gif" style="float:right;"/></div>');
 		iconExplain.append(iconExplainHt);
 		
 		changeMapImgDesc(iconExplain, 'normal');
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 0c3a6a8..6e0c50b 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -623,6 +623,11 @@
 			}
 			totalAlm_num=model.sum;
 			
+			// 5绉掑悗鍏抽棴闈㈡澘
+			setTimeout(function() {
+				$('body').children('#eleWarning').remove();
+			}, 5000);
+			
 			self.setTimeout("searchAlm()",10000); 
 		}
 	});	
diff --git a/gx_tieta/WebRoot/pages/js/mylayui.js b/gx_tieta/WebRoot/pages/js/mylayui.js
index 91ecfb3..141ec8f 100644
--- a/gx_tieta/WebRoot/pages/js/mylayui.js
+++ b/gx_tieta/WebRoot/pages/js/mylayui.js
@@ -389,3 +389,68 @@
     }
 };
 
+//layui琛ㄦ牸鍐呭鏇存柊
+var LayuiTbl = function(options, layui, laytpl, cache) {
+    this.opts = options;
+    this.cache = cache;
+    this.layui = layui;
+    this.tpl = laytpl;
+    this.ele = options.elem;
+    this.col = options.cols[0];
+};
+
+// 璁剧疆鍘熷瀷鍑芥暟
+LayuiTbl.prototype = {
+    updateTr: function(index, data) {
+        var layui = this.layui;
+        
+        var preData = this.cache[index];
+        var _data = $.extend(preData, data||{});
+        var tds = this._getBodyTds(index);
+        console.log(preData);
+        // 閬嶅巻
+        var _this = this;
+        layui.each(_data, function(key, value) {
+            // 閬嶅巻tds鐨勫��
+            tds.each(function() {
+                var _field = $(this).data('field');
+                if(key == _field) {
+                    var cell = $(this).find('.layui-table-cell');
+                    var content = _this._getContent(key, value, _data);
+                    cell.html(content);
+                }
+            });
+        });
+    }
+    ,_getBodyTds: function(index) {
+        var layuiTableView = $(this.ele).next('.layui-table-view');
+        var layuiTableBody = layuiTableView.find('.layui-table-body .layui-table tbody');
+        var trList = layuiTableBody.find('tr');
+
+        return trList.eq(index).find('td');
+    }
+    ,_getContent: function(key, value, data) {
+        var col = this.col;             //  鎵�鏈夌殑鍒�
+        var laytpl = this.tpl;
+        var rs = '';
+        var templet = '';
+        // 閬嶅巻鎵�鏈夌殑鍒�
+        for(var i=0; i<col.length; i++) {
+            var _col = col[i];
+            // 鍒ゆ柇褰撳墠鍐呭鏄惁涓哄搴旂殑闇�瑕佹洿鏂扮殑鏁版嵁
+            if(key == _col.field) {
+                // 鍒ゆ柇鏄惁鏈夋ā鏉�
+                templet = _col.templet?$(_col.templet).html():_col.toolbar?$(_col.toolbar).html():value;
+                // 鏍规嵁妯℃澘鏋勬垚content
+                laytpl(templet).render(data, function(html) {
+                    rs = html;
+                });
+
+                return rs;
+            }
+        }
+
+        return false;
+    }
+};
+

--
Gitblit v1.9.1