Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git...

81041

2018-12-25 1cd67d97e505e5c09f2d4a3a5d436f9ec1d2a4d8

Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/ele-param1.jsp

@@ -530,6 +530,16 @@
                                            _tmp.BattGroupName = _data.BattGroupName;

                                        }else if(key == 'BattGroupId') {    // 电池组ID

                                            _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];

                                        }


 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,7 +185,31 @@
            <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 }}">

                    <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>

        <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" disabled="" id="productdate" autocomplete="off" class="layui-input layui-bg-gray" 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" 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>

@@ -239,33 +223,9 @@
        </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>

                <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 }}">

                    <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>

@@ -417,9 +493,17 @@
            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';                // 电池组ID

                    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];                // 电池组id

                            }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) {


 gx_tieta/WebRoot/mobil/batt-approved.html

@@ -87,10 +87,13 @@
            margin: 0;

            padding-top: 0.1em;

            padding-bottom: 0.1em;

            margin-left:7em;

            
        }

        .ui-table-reflow td .ui-table-cell-label, .ui-table-reflow th .ui-table-cell-label{

            width:35%;

        } 
        .fr{

        float:right;

        } 

    </style>

    <link rel="stylesheet" href="css/fgpanel.css">

@@ -138,7 +141,7 @@


 <script type="text/javascript">

          /* 获取点击的是哪个按钮   */

    function getButIndex(t){

    function getButIndex(t){ //查看实时数据 
        var index = $(t).attr("but-index");   

       // index=(index/33-1);

           console.info(index);

@@ -149,11 +152,18 @@
    function getApplyYanshouIndex(t){

        var index = $(t).attr("but-index");

        console.info(index);

        setApplyYanshou(index);

        var arr=setApplyYanshou(index);

                                    //方法一：1按钮搞定所有。请在此对接加入弹出框，上传视频经纬度等

        

        applyendyanshou(arr);

        return ;

    }

 
     function getApplyYanshoupicture(t){

         var index = $(t).attr("but-index");

        console.info(index);//方法2

        var arr=setApplyYanshou(index);

        //请在此对接加入弹出框

     }

    var arrTd = new Array();        //当前表格td数据

    var tblCon = $('.tbl-container');

    var Page = {

@@ -223,8 +233,10 @@
    function yanshou(check_en){

        if(check_en==0){

            return "未验收";

        }else{

            return "已验收";

        }else if(check_en==2){

            return "已申请验收";

        }else if(check==1){

            return"已完成验收";s

        }

    }

    // 查询内容

@@ -247,8 +259,9 @@
                 if(data.code!=0&&data.data.length>0){

                     data=data.data

                     console.info(data);

                     Page.pageAll=data[data.length-1].num;

                     for(var i=0;i<data.length;i++){

                     arrdata.push(data[i].binf);//存储数据

                     arrdata.push(data[i]);//存储数据

                     arrTd[index++] = data[i].binf.StationId;

                     arrTd[index++] = data[i].binf.StationName1;

                     arrTd[index++] = data[i].binf.StationName2;

@@ -286,77 +299,111 @@
                     arrTd[index++] = yanshou(data[i].check_en);

                     arrTd[index++]='<a onclick="getButIndex(this)"  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>电池组实时数据</a>'+

                     '<a onclick="getApplyYanshouIndex(this)" href="#myPopup" id="apply_yanshou" data-rel="popup"  class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>申请验收</a>';

                     //方法2 2按钮解开以下一条注释按钮

                     //'<a onclick="getApplyYanshoupicture(this)" href="#myPopup" id="apply_yanshou" data-rel="popup"  class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>经纬度图片上传</a>'

                     }

                 }

                 console.info(arrTd);

                 console.info(arrdata);

                 //Page.pageCurr=Math.ceil(Page.pageAll/Page.pageSize);

                 //console.info(Page.pageCurr);

                 setPage();

                 createTbl(tblCon, arrTh, arrTd);

                 timeer = window.setTimeout(function() {

                 /*timeer = window.setTimeout(function() {

                            searchBattLife();

                        }, 5000);	
                        }, 5000);    */

             }

         });            

    }

        

        function setApplyYanshou(index){

            //var value = Math.floor(34*index);

            console.info(arrdata);

            if(arrdata){

                creatYanshouObj(arrdata);

            if(arrdata.length>0){   //存入的为所有已查出数据		                                      
                var arr= creatYanshouObj(arrdata,index);//申请验收方法。

                return arr;

            }else{

                alert("请等待几秒后再提交申请");

            }

        }

        

        function creatYanshouObj(arrdata){

            for(var i=0;i<tempindex.length;i++){

        function creatYanshouObj(arrdata,index){

            var StationId = arrdata[index].binf.StationId;

            //console.info(StationId);

            var arr = new Array(); //初始化传参数组

            for(var i=0;i<arrdata.length;i++){//一次验收该机房下的所有电池组构建对象 。

                if(StationId == arrdata[i].binf.StationId){		
                var obj = {

                    binf:{

                        StationId : temp[0],    // 机房编号

                        StationName : (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]),    // 拼接机房名称

                        StationName1 :temp[1],        // 省

                        StationName2 : temp[2],        // 市

                        StationName5 : temp[3],        // 区/县

                        StationName3 : temp[4],        // 机房名称

                        StationName4 :temp[5],        // 设备名称

                        StationIp : temp[6],                //机房ip

                        FBSDeviceId : temp[7],                //设备id

                        FbsDeviceIp : temp[8],                //设备ip

                        FbsDeviceIp_YM : temp[9],            // 设备掩码

                        FbsDeviceIp_WG : temp[10],            // 网关

                        FBSDeviceName : temp[11],            //设备名称

                        GroupIndexInFBSDevice : temp[12],    //fbs设备索引

                        BattGroupId : tempid[temp[12]],                //电池组id

                        BattGroupNum : temp[14],            //机房内电池组编号

                        BattGroupName : temp[15],        //电池组索引

                        FloatVolLevel : temp[16],            //浮充电压阀值

                        OfflineVolLevel : temp[17],            //离线电压阀值

                        BattFloatCurrent : temp[18],        //浮充电流阀值

                        MonCount : temp[19],                //单体数量

                        MonCapStd : temp[20],                //标称容量

                        MonVolStd : temp[21],                //标称电压

                        MonResStd : temp[22],                //标称内阻

                        MonSerStd : temp[23],                //标称电导

                        MonVolLowToAvg : temp[24],            //单体电压次低偏移量

                            StationId : arrdata[i].binf.StationId,    // 机房编号

                            StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName5+"-"+arrdata[i].binf.StationName3),    // 拼接机房名称

                            StationName1 :arrdata[i].binf.StationName1,        // 省

                            StationName2 : arrdata[i].binf.StationName2,        // 市

                            StationName5 :  arrdata[i].binf.StationName5,        // 区/县

                            StationName3 :  arrdata[i].binf.StationName3,        // 机房名称

                            StationName4 : arrdata[i].binf.StationName5,        // 设备名称

                            StationIp :arrdata[i].binf.StationIp,                //机房ip

                            FBSDeviceId : arrdata[i].binf.FBSDeviceId,                //设备id

                            FbsDeviceIp : arrdata[i].binf.FbsDeviceIp,                //设备ip

                            FbsDeviceIp_YM :  arrdata[i].binf.FbsDeviceIp_YM,            // 设备掩码

                            FbsDeviceIp_WG : arrdata[i].binf.FbsDeviceIp_WG ,            // 网关

                            FBSDeviceName : arrdata[i].binf.FBSDeviceName,            //设备名称

                            GroupIndexInFBSDevice : arrdata[i].binf.GroupIndexInFBSDevice,    //fbs设备索引

                            BattGroupId : arrdata[i].binf.BattGroupId,                //电池组id

                            BattGroupNum : arrdata[i].binf.BattGroupNum ,            //机房内电池组编号

                            BattGroupName :arrdata[i].binf.BattGroupName,        //电池组索引

                            FloatVolLevel : arrdata[i].binf.FloatVolLevel,            //浮充电压阀值

                            OfflineVolLevel : arrdata[i].binf.OfflineVolLevel,            //离线电压阀值

                            BattFloatCurrent : arrdata[i].binf.BattFloatCurrent,        //浮充电流阀值

                            MonCount : arrdata[i].binf.MonCount,                //单体数量

                            MonCapStd : arrdata[i].binf.MonCapStd,                //标称容量

                            MonVolStd : arrdata[i].binf.MonVolStd,                //标称电压

                            MonResStd : arrdata[i].binf.MonResStd,                //标称内阻

                            MonSerStd : arrdata[i].binf.MonSerStd,                //标称电导

                            MonVolLowToAvg : arrdata[i].binf.MonVolLowToAvg,            //单体电压次低偏移量

                

                        Load_curr : temp[25],                //负载电流

                        DisCurrMax : temp[26],                //最大核容电流

                        station_phone : temp[27],            //基站号码

                            Load_curr : arrdata[i].binf.Load_curr,                //负载电流

                            DisCurrMax : arrdata[i].binf.DisCurrMax,                //最大核容电流

                            station_phone : arrdata[i].binf.station_phone,            //基站号码

                                        

                        BattProducer : temp[28],            //电池品牌

                        BattModel : temp[29],                //电池型号

                        BattProductDate :  temp[30]+" 00:00:00",        //电池生产日期

                        BattInUseDate :  temp[31]+" 00:00:00",            //电池使用日期

                        install_user : temp[32],            //安装人员

                            BattProducer : arrdata[i].binf.BattProducer,            //电池品牌

                            BattModel : arrdata[i].binf.BattModel,                //电池型号

                            BattProductDate :  arrdata[i].binf.BattProductDate+" 00:00:00",        //电池生产日期

                            BattInUseDate :  arrdata[i].binf.BattInUseDate+" 00:00:00",            //电池使用日期

                            install_user : arrdata[i].binf.install_user,            //安装人员

                    }

                }

            arr.push(obj);

            }

        }

            console.info(arr);

			
					
            return arr;

            //applyendyanshou(arr);//申请验收方法。

        }

		
        function applyendyanshou(arr){

        var temp = JSON.stringify(arr);

            $.ajax({                                   //申请验收

                 type: 'post',

                async: true,

                url: 'Battinf_applyAction!checkPro',

                data: "json="+temp,

                dataType: 'json',

                success:function(data) {

                    console.info(data);

                    data = JSON.parse(data.result);

                    if(data.code==1){

                        alert("申请验收成功");					
                    }

                }

            });

		
        }

         function setcookiedit(index){

                 var arrcookie = new Array();    

                   for(var i=0;i<33;i++){//共34项，最后一项为按钮，不必SET进数据

                       var value = Math.floor(34*index);

                   for(var i=0;i<33;i++){//共arrTh.length项，最后几项为按钮，不必SET进数据

                       var value = Math.floor(arrTh.length*index);

                       value = Math.floor(value+i);

                       arrcookie.push(arrTd[value]);

                   }

@@ -407,77 +454,7 @@
                 setCookie("batt",json1);

         }

         

         function setcookieCreat(index){

                 var arrcookie = new Array();	
                   for(var i=0;i<33;i++){//共34项，最后一项为按钮，不必SET进数据

                       var value = Math.floor(34*index);

                       //console.info(value);

                       value = Math.floor(value+i);

                     if(i==13){//新建功能，电池组ID默认为当页最后一个电池组ID号加1

                         var groupid = Math.floor(arrTd[value]+1);

                         console.info(groupid);

                         arrcookie.push(groupid);

                     }else{

                           //console.info(value);

                           arrcookie.push(arrTd[value]);

                       }

                   }

                   arrcookie.push("new");

                   //console.info(arrcookie);

                   var json=window.JSON.stringify(arrcookie);

                   setCookie("eleparm",json);  //这里setcookie,若有上一条cookie则清空上一笔

         }

		
    // 查询内容



        function getUpdateArr(temp){

            var arr = new Array();

            var obj = new Object();

            obj.StationId = temp[0];    // 机房编号

            obj.StationName = (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]);    // 拼接机房名称

            obj.StationName1 = temp[1];        // 省

            obj.StationName2 = temp[2];        // 市

            obj.StationName5 = temp[3];        // 区/县

            obj.StationName3 = temp[4];        // 机房名称

            obj.StationName4 = temp[5];        // 设备名称

            obj.StationIp = temp[6];                //机房ip

            obj.FBSDeviceId = temp[7];                //设备id

            obj.FbsDeviceIp = temp[8];                //设备ip

            obj.FbsDeviceIp_YM = temp[9];            // 设备掩码

            obj.FbsDeviceIp_WG = temp[10];            // 网关

            obj.FBSDeviceName = temp[11];            //设备名称

            obj.GroupIndexInFBSDevice = temp[12];    //fbs设备索引

            obj.BattGroupId = temp[13];                //电池组id

            obj.BattGroupNum = temp[14];            //机房内电池组编号

            obj.BattGroupName = temp[15];            //电池组名称

            obj.FloatVolLevel = temp[16];            //浮充电压阀值

            obj.OfflineVolLevel = temp[17];            //离线电压阀值

            obj.BattFloatCurrent = temp[18];        //浮充电流阀值

            obj.MonCount = temp[19];                //单体数量

            obj.MonCapStd = temp[20];                //标称容量

            obj.MonVolStd = temp[21];                //标称电压

            obj.MonResStd = temp[22];                //标称内阻

            obj.MonSerStd = temp[23];                //标称电导

            obj.MonVolLowToAvg = temp[24];            //单体电压次低偏移量

			
			
            obj.Load_curr = temp[25];                //负载电流

            obj.DisCurrMax = temp[26];                //最大核容电流

            obj.station_phone = temp[27];            //基站号码

							
            obj.BattProducer = temp[28];            //电池品牌

            obj.BattModel = temp[29];                //电池型号

            obj.BattProductDate =  temp[30];        //电池生产日期

            obj.BattInUseDate =  temp[31];            //电池使用日期

            obj.install_user = temp[32];            //安装人员

            arr.push(obj);

            console.info(arr);

            return arr;

        }	
	
	
			
    function createSearchForm(){

    function createSearchForm(){//查询已审核传参。

        var temp={

                page:Page,

                StationName1:$('#mainteArea').val(),

@@ -503,7 +480,6 @@
            };

            console.info(temp);

            return temp;

			
        }    

    

    $(function() {