From 398be7e48387b49ac209dd5ed5fe7a135f268e5c Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 28 十二月 2018 17:38:35 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/ele-param1.jsp |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
index aee382c..7cd9197 100644
--- a/gx_tieta/WebRoot/ele-param1.jsp
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -90,7 +90,7 @@
                             	<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">
+                            				<select name="home" id="home" lay-filter="home" lay-search="">
 												<option value="">璇烽�夋嫨鏈烘埧</option>
 											</select>
                             			</div>
@@ -530,6 +530,16 @@
 				        					_tmp.BattGroupName = _data.BattGroupName;
 				        				}else if(key == 'BattGroupId') {	// 鐢垫睜缁処D
 				        					_tmp.BattGroupId = _data.BattGroupId;
+				        				}else if(key == 'MonCount') {		// 鍗曚綋鏁伴噺
+				        					_tmp.MonCount = _data.MonCount;
+				        				}else if(key == 'MonCapStd') {		// 鏍囩О瀹归噺
+				        					_tmp.MonCapStd = _data.MonCapStd;
+				        				}else if(key == 'MonVolStd') {		// 鍗曚綋鐢靛帇
+				        					_tmp.MonVolStd = _data.MonVolStd;
+				        				}else if(key == 'BattProducer') {	// 鐢垫睜鍝佺墝
+				        					_tmp.BattProducer = _data.BattProducer;
+				        				}else if(key == 'BattModel') {		// 鐢垫睜鍨嬪彿
+				        					_tmp.BattModel = _data.BattModel;
 				        				}else {
 				        					tmp[key] = _data[key];
 				        				}

--
Gitblit v1.9.1