From 582ab1900e62416b477e428a71d95c075ca43b8b Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 02 一月 2019 11:24:13 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-param1.jsp | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
index cf87186..7ac0de9 100644
--- a/gx_tieta/WebRoot/ele-param1.jsp
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -129,6 +129,7 @@
</div>
<!-- 瀛樺偍iframe -->
<div id="iframeEdit"></div>
+ <div id="iframeAddData"></div>
<!-- 鍏抽棴椤甸潰涓璱frame寮瑰嚭灞� -->
<div id="iframeClose"></div>
<script type="text/html" id="battGrouptools">
@@ -530,6 +531,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