From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-param1.jsp | 10 +
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Bts_station_stateImpl.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Bts_station_stateImpl$6.class | 0
gx_tieta/WebRoot/iframe/batt-info-edit.html | 308 +++++++++++++++++++++++++++++++++++----------------
gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java | 4
5 files changed, 223 insertions(+), 99 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Bts_station_stateImpl$6.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Bts_station_stateImpl$6.class
index d03455b..9643426 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Bts_station_stateImpl$6.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Bts_station_stateImpl$6.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Bts_station_stateImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Bts_station_stateImpl.class
index 9a74f5b..ba4c6fc 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Bts_station_stateImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Bts_station_stateImpl.class
Binary files differ
diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
index cf87186..7cd9197 100644
--- a/gx_tieta/WebRoot/ele-param1.jsp
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -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];
}
diff --git a/gx_tieta/WebRoot/iframe/batt-info-edit.html b/gx_tieta/WebRoot/iframe/batt-info-edit.html
index ba74049..c054623 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-edit.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-edit.html
@@ -41,7 +41,7 @@
<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 }}">
+ <input type="text" name="StationId" lay-verify="required|number" disabled="" id="homenum" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.StationId }}">
</div>
</div>
</div>
@@ -49,7 +49,7 @@
<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 }}">
+ <input type="text" name="StationName1" lay-verify="required" disabled="" id="province" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.StationName1 }}">
</div>
</div>
</div>
@@ -57,7 +57,7 @@
<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 }}">
+ <input type="text" name="StationName2" lay-verify="required" disabled="" id="StationName2" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.StationName2 }}">
</div>
</div>
</div>
@@ -65,15 +65,7 @@
<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 }}">
+ <input type="text" name="StationName5" lay-verify="required" disabled="" id="county" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.StationName5 }}">
</div>
</div>
</div>
@@ -81,7 +73,7 @@
<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 }}">
+ <input type="text" name="StationName4" lay-verify="required" disabled="" id="homename" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.StationName4 }}">
</div>
</div>
</div>
@@ -89,7 +81,7 @@
<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 }}">
+ <input type="text" name="StationIp" lay-verify="required" disabled="" id="homeip" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.StationIp }}">
</div>
</div>
</div>
@@ -97,7 +89,7 @@
<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 }}">
+ <input type="text" name="FBSDeviceId" lay-verify="devid" disabled="" id="devid" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.FBSDeviceId }}">
</div>
</div>
</div>
@@ -129,7 +121,7 @@
<div class="layui-block">
<label class="layui-form-label">FBS璁惧鍚嶇О</label>
<div class="layui-input-block">
- <input type="text" name="FBSDeviceName" lay-verify="required" id="devname" autocomplete="off" class="layui-input" value="{{= d.FBSDeviceName }}">
+ <input type="text" name="FBSDeviceName" lay-verify="required" disabled="" id="devname" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.FBSDeviceName }}">
</div>
</div>
</div>
@@ -145,7 +137,7 @@
<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 }}">
+ <input type="text" name="FloatVolLevel" lay-verify="required|number" disabled="" id="floatVolLevel" autocomplete="off" class="layui-input layui-bg-gray" value="53.6">
</div>
</div>
</div>
@@ -153,7 +145,7 @@
<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 }}">
+ <input type="text" name="OfflineVolLevel" lay-verify="required|number" disabled="" id="offlineVolLevel" autocomplete="off" class="layui-input layui-bg-gray" value="51.5">
</div>
</div>
</div>
@@ -161,31 +153,7 @@
<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 }}">
+ <input type="text" name="BattFloatCurrent" lay-verify="required|number" disabled="" id="floatCurrLevel" autocomplete="off" class="layui-input layui-bg-gray" value="5">
</div>
</div>
</div>
@@ -193,7 +161,7 @@
<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 }}">
+ <input type="text" name="MonResStd" lay-verify="required|number" disabled="" id="monres" autocomplete="off" class="layui-input layui-bg-gray" value="0.2">
</div>
</div>
</div>
@@ -201,7 +169,7 @@
<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 }}">
+ <input type="text" name="MonSerStd" lay-verify="required|number" disabled="" id="monser" autocomplete="off" class="layui-input layui-bg-gray" value="5000">
</div>
</div>
</div>
@@ -209,15 +177,7 @@
<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 }}">
+ <input type="text" name="MonVolLowToAvg" lay-verify="required|number" disabled="" id="monVolLowToAvg" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.MonVolLowToAvg }}">
</div>
</div>
</div>
@@ -225,31 +185,7 @@
<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|number" 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 }}">
+ <input type="text" name="DisCurrMax" lay-verify="required|number" disabled="" id="discurrmax" autocomplete="off" class="layui-input layui-bg-gray" value="0">
</div>
</div>
</div>
@@ -257,7 +193,7 @@
<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 }}">
+ <input type="text" name="BattProductDate" disabled="" id="productdate" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.BattProductDate }}">
</div>
</div>
</div>
@@ -265,7 +201,31 @@
<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 }}">
+ <input type="text" name="BattInUseDate" disabled="" id="usedate" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.BattInUseDate }}">
+ </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">鍩虹珯鎵嬫満鍙风爜<span class="red">*</span></label>
+ <div class="layui-input-block">
+ <input type="text" name="station_phone" lay-verify="required|number" 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="Load_curr" lay-verify="required|number" id="loadcurr" autocomplete="off" class="layui-input" value="{{= d.Load_curr }}">
</div>
</div>
</div>
@@ -313,7 +273,7 @@
<div class="layui-block">
<label class="layui-form-label">璁惧绱㈠紩<span class="red">*</span></label>
<div class="layui-input-block">
- <select name="group{{index}}.index">
+ <select name="group{{index}}.index" disabled="" class="layui-bg-gray">
{{# layui.each([0,1,2,3], function(k) { }}
{{# if(item.GroupIndexInFBSDevice == k) { }}
<option value="{{ k }}" selected>{{ k }}</option>
@@ -337,7 +297,71 @@
<div class="layui-block">
<label class="layui-form-label">鐢垫睜缁勫悕绉�</label>
<div class="layui-input-block">
- <input type="text" name="group{{index}}.name" lay-verify="required" autocomplete="off" class="layui-input" value="{{item.BattGroupName}}">
+ <input type="text" name="group{{index}}.name" disabled="" lay-verify="required" autocomplete="off" class="layui-input layui-bg-gray" value="{{item.BattGroupName}}">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <div class="layui-block">
+ <label class="layui-form-label">鏍囩О瀹归噺</label>
+ <div class="layui-input-block">
+ <select name="group{{index}}.MonCapStd">
+ {{# layui.each(d.monCapStds, function(k, mItem){ }}
+ {{# if(item.MonCapStd == mItem) { }}
+ <option value="{{ mItem }}" selected="">{{ mItem }}</option>
+ {{# }else { }}
+ <option value="{{ mItem }}">{{ mItem }}</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">
+ <select name="group{{index}}.BattProducer">
+ {{# layui.each(d.battProducers, function(k, mItem){ }}
+ {{# if(item.BattProducer == mItem) { }}
+ <option value="{{ mItem }}" selected="">{{ mItem }}</option>
+ {{# }else { }}
+ <option value="{{ mItem }}">{{ mItem }}</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{{index}}.BattModel" lay-verify="required" autocomplete="off" class="layui-input" value="{{item.BattModel}}">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <div class="layui-block">
+ <label class="layui-form-label">鍗曚綋鏁伴噺</label>
+ <div class="layui-input-block">
+ <select name="group{{index}}.MonCount" class="mon-count" data-link="#group{{index}}MonVolStd" lay-filter="monCount">
+ {{# layui.each(d.monNums, function(k, mItem){ }}
+ {{# if(item.MonCount == mItem) { }}
+ <option value="{{ mItem }}" selected="">{{ mItem }}</option>
+ {{# }else { }}
+ <option value="{{ mItem }}">{{ mItem }}</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{{index}}.MonVolStd" id="group{{index}}MonVolStd" disabled="" lay-verify="required" autocomplete="off" class="layui-input layui-bg-gray" value="{{item.MonVolStd}}">
</div>
</div>
</div>
@@ -359,7 +383,7 @@
<div class="layui-block">
<label class="layui-form-label">璁惧绱㈠紩<span class="red">*</span></label>
<div class="layui-input-block">
- <select name="group{{item.num}}.index">
+ <select name="group{{item.num}}.index" disabled="">
{{# layui.each([0,1,2,3], function(k) { }}
{{# if(item.num == k) { }}
<option value="{{ k }}" selected>{{ k }}</option>
@@ -383,7 +407,59 @@
<div class="layui-block">
<label class="layui-form-label">鐢垫睜缁勫悕绉�</label>
<div class="layui-input-block">
- <input type="text" name="group{{item.num}}.name" lay-verify="required" autocomplete="off" class="layui-input" value="{{item.name}}">
+ <input type="text" name="group{{item.num}}.name" disabled="" lay-verify="required" autocomplete="off" class="layui-input layui-bg-gray" value="{{item.name}}">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <div class="layui-block">
+ <label class="layui-form-label">鏍囩О瀹归噺</label>
+ <div class="layui-input-block">
+ <select name="group{{item.num}}.MonCapStd">
+ {{# layui.each(item.monCapStds, function(k, mItem){ }}
+ <option value="{{ mItem }}">{{ mItem }}</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">
+ <select name="group{{item.num}}.BattProducer">
+ {{# layui.each(item.battProducers, function(k, mItem){ }}
+ <option value="{{ mItem }}">{{ mItem }}</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.num}}.BattModel" lay-verify="required" autocomplete="off" class="layui-input" value="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <div class="layui-block">
+ <label class="layui-form-label">鍗曚綋鏁伴噺</label>
+ <div class="layui-input-block">
+ <select name="group{{item.num}}.MonCount" class="mon-count" data-link="#group{{index}}MonVolStd" lay-filter="monCount">
+ {{# layui.each(item.monNums, function(k, mItem){ }}
+ <option value="{{ mItem }}">{{ mItem }}</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.num}}.MonVolStd" id="group{{index}}MonVolStd" disabled="" lay-verify="required" autocomplete="off" class="layui-input layui-bg-gray" value="12">
</div>
</div>
</div>
@@ -416,10 +492,18 @@
var $ = layui.jquery;
var element = layui.element;
var laydate = layui.laydate;
-
+
+ var monCapStds = [50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 1000];
+ var battProducers = ['鍦ｉ槼', '鐞嗗＋', '閾舵嘲', '鍗楅兘', '鍙岀櫥', 'SENRY', '鑹鹃粯鐢�', '绉戝＋杈�', '涓版棩', '涓叴鑳芥淳', '鍏夊畤', '閮庤揪', '鑹捐鏂崕杈�', '闆勯煬', '椋庡竼', '鏂囬殕', '涓北'];
+ var monNums = [4, 24]
+
var battInfoTpl = $('#battInfoTpl').html();
var editInfo = parent.$('#iframeEdit').data('data');
+ console.log(editInfo);
editInfo.FbsDeviceIp = getDevIp(editInfo.FBSDeviceId);
+ editInfo.monCapStds = monCapStds; // 鏍囩О瀹归噺鍒楄〃
+ editInfo.battProducers = battProducers; // 鐢垫睜鍝佺墝鍒楄〃
+ editInfo.monNums = monNums; // 鍗曚綋鏁伴噺
// console.log(editInfo);
var data = {
StationId: '4011100'
@@ -501,11 +585,25 @@
$('#fbsip').val(getDevIp(val));
});
+ // 淇敼鍗曚綋鏁伴噺鍚屾椂鏇存柊瀵瑰簲鐨勫崟浣撶數鍘�
+ form.on('select(monCount)', function(data) {
+ var elem = data.elem;
+ var _val = data.value;
+ var _link = $(elem).data('link');
+ // 淇敼鍗曚綋鐢靛帇鐨勫�� 鍗曚綋鏁伴噺4->12 鍗曚綋鏁伴噺24->2
+ if(_val == 4) {
+ $(_link).val(12);
+ }else if(_val == 24){
+ $(_link).val(2);
+ }
+ });
+
+
// 鏍规嵁鏍囩О鐢靛帇淇敼璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�
- $('#battInfo').on('input propertychange', '#monvol', setFloatAndoutLine);
+ //$('#battInfo').on('input propertychange', '#monvol', setFloatAndoutLine);
// 鏍规嵁鍗曚綋鏁伴噺淇敼璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�
- $('#battInfo').on('input propertychange', '#moncount', setFloatAndoutLine);
+ //$('#battInfo').on('input propertychange', '#moncount', setFloatAndoutLine);
// 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�
function setFloatAndoutLine() {
@@ -530,7 +628,6 @@
_data.StationName = province+'-'+city+'-'+home+'-'+bts;
var battNum = getBattGroupNum();
var temp = analysisData(battNum, _data);
- // console.log(temp);
// 鏇存柊鏁版嵁
updBatt(temp);
});
@@ -595,7 +692,7 @@
}
});
}
-
+ //alert(123);
// 瑙ｆ瀽娣诲姞鐨勬暟鎹�
function analysisData(btsinfo, data) {
//console.log(arr);
@@ -604,17 +701,32 @@
var temp = {};
var _num = i;
- var _index = 'group'+_num+'.index';
- var _name = 'group'+_num+'.name';
- var _id = 'group'+_num+'.id';
+ var _index = 'group'+_num+'.index'; // 璁惧绱㈠紩
+ var _name = 'group'+_num+'.name'; // 鐢垫睜缁勫悕绉�
+ var _id = 'group'+_num+'.id'; // 鐢垫睜缁処D
+ var _MonCount = 'group'+_num+'.MonCount'; // 鍗曚綋鏁伴噺
+ var _MonCapStd = 'group'+_num+'.MonCapStd'; // 鏍囩О瀹归噺
+ var _MonVolStd = 'group'+_num+'.MonVolStd'; // 鍗曚綋鐢靛帇
+ var _BattProducer = 'group'+_num+'.BattProducer'; // 鐢垫睜鍝佺墝
+ var _BattModel = 'group'+_num+'.BattModel'; // 鐢垫睜鍨嬪彿
Object.keys(data).forEach(function(key) {
if(checkKeyNotVal(key)) {
if(key == _index) {
- temp.GroupIndexInFBSDevice = data[key];
+ temp.GroupIndexInFBSDevice = data[key]; // 璁惧绱㈠紩
}else if(key == _name){
- temp.BattGroupName = data[key];
+ temp.BattGroupName = data[key]; // 鐢垫睜缁勫悕绉�
}else if(key == _id) {
- temp.BattGroupId = data[key];
+ temp.BattGroupId = data[key]; // 鐢垫睜缁刬d
+ }else if(key == _MonCount) {
+ temp.MonCount = data[key]; // 鍗曚綋鏁伴噺
+ }else if(key == _MonCapStd) {
+ temp.MonCapStd = data[key]; // 鏍囩О瀹归噺
+ }else if(key == _MonVolStd) {
+ temp.MonVolStd = data[key]; // 鍗曚綋鐢靛帇
+ }else if(key == _BattProducer) {
+ temp.BattProducer = data[key]; // 鐢垫睜鍝佺墝
+ }else if(key == _BattModel) {
+ temp.BattModel = data[key]; // 鐢垫睜鍨嬪彿
}
}else {
temp[key] = data[key];
@@ -706,7 +818,9 @@
_temp.num = i+min;
_temp.id = i+battid;
_temp.name = '鐢垫睜缁�'+(_temp.num+1);
-
+ _temp.monCapStds = monCapStds; // 鏍囩О瀹归噺鍒楄〃
+ _temp.battProducers = battProducers; // 鐢垫睜鍝佺墝鍒楄〃
+ _temp.monNums = monNums; // 鍗曚綋鏁伴噺
temp.push(_temp);
}
laytpl(addBattGroupTpl).render(temp, function(html) {
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
index 53ec2d7..0df18be 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Bts_station_stateImpl.java
@@ -314,7 +314,7 @@
try {
while(rs.next()) {
int station_stat=rs.getInt("station_stat");
- if((station_stat&1024)>1) {
+ if((station_stat&2048)>1) {
list.add(1);
}else {
list.add(0);
@@ -347,7 +347,7 @@
binf.setStationName2("");
binf.setStationName3("");
binf.setStationName5("");
- binf.setStationId("42000603");
+ binf.setStationId("42000408");
binf.setBattGroupNum(62);
User_inf uinf=new User_inf();
uinf.setUId(1002);
--
Gitblit v1.9.1