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

Administrator

2018-12-25 d7049dae792f0a6d2ee4246acf4b42bf0b36635c

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

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

               <select name="StationName1" id="province" lay-filter="province"></select>

                </div>

            </div>

        </div>

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

               <select name="StationName2" id="city" lay-filter="city"></select>

                </div>

            </div>

        </div>

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

               <select name="StationName5" id="county"></select>

                </div>

            </div>

        </div>

@@ -126,7 +126,7 @@
        </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>

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

                </div>

@@ -347,7 +347,10 @@
      {{# }); }}

      </div>

    </script>

    <script type="text/javascript" src="../js/jquery-1.8.3.js"></script>

    <script type="text/javascript" src="../js/base.js"></script>

    <script type="text/javascript" src="../src/layui.js"></script>

    <script type="text/javascript" src="../pages/js/mylayui.js"></script>

    <script  type="text/javascript">

        layui.use(['form', 'laytpl', 'jquery', 'element', 'laydate'], function() {

            var form = layui.form;

@@ -414,8 +417,43 @@
                    elem: '#usedate'

                    ,format: 'yyyy-MM-dd HH:mm:ss'

                });

            });

            
            // 添加省-市-区/县联动操作

            var linkAge = new LinkAge('../json/cut-area.json', $('#province'), $('#city'), $('#county'), function() {

               form.render();

            });

            
            // 省切换 更新 市-区/县

            form.on('select(province)', function(data) {

               var elem = $(data.elem);

               var val = elem.find('option:selected').attr('num');

            	
               // 市

                var citiesData = linkAge._getCities(val);

                var citiesOptions = linkAge._createDom(citiesData);

                linkAge.city.html(citiesOptions);

                

                // 区/县

                var countiesData = linkAge._getCounty(val, linkAge.city.find('option:selected').attr('num'));

                var countiesOptions = linkAge._createDom(countiesData);

                linkAge.county.html(countiesOptions);

                

                form.render();

            });

            
            
            // 市切换 更新区/县

            form.on('select(city)', function(data) {

               var elem = $(data.elem);

               var val = elem.find('option:selected').attr('num');

                console.log(linkAge.province.find('option:selected').attr('num'));

                // 区/县

                var countiesData = linkAge._getCounty(linkAge.province.find('option:selected').attr('num'), val);

                var countiesOptions = linkAge._createDom(countiesData);

                linkAge.county.html(countiesOptions);

                
                form.render();

            });

            

            // 验证信息

@@ -463,7 +501,7 @@
            

            // 提交内容

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

               // console.log(data);

               //console.log(data);

               layer.confirm('是否确认添加', {icon: 3, title:'提示'}, function(index){

                   var _data = data.field;

                   var province = _data.StationName1;      // 省

@@ -471,15 +509,57 @@
                   var home = _data.StationName3;         // 机房名称

                   var bts = _data.StationName4;         // 设备名称

                   _data.StationName = province+'-'+city+'-'+home+'-'+bts;

                   //console.log(_data);

            		 
                   var temp = analysisData(editInfo.addGroupNum, _data);

                   //console.log(temp);

                   // 添加电池信息

                   addBatt(temp);

                   checkDevId(_data.FBSDeviceId, function(devid){

                      // 添加电池信息

                      addBatt(temp);

                   }, function(pre, max) {

                      layer.msg('设备ID:'+pre+'被占用,推荐使用'+max);

                      // 更新设备id和设备ip

                      $('#devid').val(max);

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

                   });

               });

               return false;

            });

            

            // 监测当前提交的设备ID是否为最大

            function checkDevId(devid, success, error) {

               var load = layer.load(1);

            // 查询后台

            $.ajax({

               type: 'post'

               ,async: true

               ,url: 'BattInfAction!searchmaxdev_id'

               ,data:null

               ,dataType: 'json'

               ,success:function(res) {

                  var rs = JSON.parse(res.result);

                  if(rs.data.length != 0) {

                     if(rs.data == devid) {

                        if(isFunction(success)) {

                           success(rs.data);

                        }

                     }else {

                        if(isFunction(error)) {

                           error(devid, rs.data);

                        }

                     }

							
                  }else {

                     layer.msg('计算设备id失败！')

                  }

               }

               ,complete: function() {

                  layer.close(load);

               }

					
            });

            }

            
            
            // 关闭面板

            $('#closePage').click(function() {

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