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

didiyu

2018-12-11 b8f449dca8e53bbd5c0e424befe07c8207c10032

 gx_tieta/WebRoot/iframe/batt-info-add.html

@@ -28,7 +28,7 @@
                <div style="height: 8px;"></div>

                <div class="layui-row">

                    <div class="layui-col-xs3 layui-col-xs-offset9 layui-col-sm3 layui-col-sm-offset9 layui-col-md2 layui-col-md-offset10 layui-col-lg2 layui-col-lg-offset10">

                        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="" lay-filter="enAdd">确认添加</button>

                        <button class="layui-btn layui-btn-sm layui-btn-normal layui-anim-scaleSpring" lay-submit="" lay-filter="enAdd">确认添加</button>

                        <button class="layui-btn layui-btn-sm layui-btn-normal" id="closePage">关闭面板</button>

                    </div>

                </div>

@@ -96,7 +96,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" id="devid" autocomplete="off" disabled="" class="layui-input layui-bg-gray" value="{{= d.FBSDeviceId }}">

                </div>

            </div>

        </div>

@@ -240,7 +240,7 @@
            <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|phone" id="stationphone" autocomplete="off" class="layui-input" value="{{= d.station_phone }}">

                    <input type="text" name="station_phone" lay-verify="required|number" id="stationphone" autocomplete="off" class="layui-input" value="{{= d.station_phone }}">

                </div>

            </div>

        </div>

@@ -358,6 +358,9 @@


            var battInfoTpl = $('#battInfoTpl').html();

         var editInfo = parent.$('#iframeEdit').data('data');

			
			
         editInfo.FbsDeviceIp = getDevIp(editInfo.FBSDeviceId);

         //console.log(editInfo);

            var data = {

                StationId: '4011100'

@@ -440,6 +443,23 @@
               

               $('#fbsip').val(getDevIp(val));

            });

            
            // 根据标称电压修改设置浮充电压阀值/设置离线电压阀值

            $('#battInfo').on('input propertychange', '#monvol', setFloatAndoutLine);

            
            // 根据单体数量修改设置浮充电压阀值/设置离线电压阀值

            $('#battInfo').on('input propertychange', '#moncount', setFloatAndoutLine);

            
            // 设置浮充电压阀值/设置离线电压阀值

            function setFloatAndoutLine() {

               var vol = $('#monvol').val();

               var monnum = $('#moncount').val();

               var chargeVol = (vol*1.117*monnum).toFixed(1);      // 浮充电压阀值

            var outlineVol = (vol*1.073*monnum).toFixed(1);      // 离线电压阀值

				
            $('#floatVolLevel').val(chargeVol);      // 浮充电压阀值

            $('#offlineVolLevel').val(outlineVol);   // 离线电压阀值

            }

            

            // 提交内容

            form.on('submit(enAdd)', function(data) {

@@ -538,11 +558,11 @@
                     layer.msg('添加成功！3秒后面板自动关闭');

                     setTimeout(function() {

                        parent.$('#iframeClose').click();

                        parent.$('#paging .search').click();

                     }, 3000);

                  }else{

                     layer.msg('添加失败！');

                  }

                  loading.hideLoading($('#main'));			
                  }			
                 },

                 error:function(){

                    layer.msg('添加失败！');