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

didiyu

2018-12-11 b8f449dca8e53bbd5c0e424befe07c8207c10032

 gx_tieta/WebRoot/ele-param1.jsp

@@ -653,37 +653,67 @@
               if(len) {

                  _rsData = tOptions.data[len-1];

               }

					 
               // 打开面板设置新建电池组个数

               layer.open({

                  type: 1

                  ,title: '选择新建电池组个数'

                  ,content: addGroupContent

                  ,fixed: true

                  ,resize: false

                  ,btn:['确定', '取消']

                  ,yes: function(index) {

                     var groupNum = $('#addGroupnum').val();

                     layer.close(index);

                     // 生成数组

                     var _arr = [];

                     for(var i=0; i<groupNum; i++) {

                        _arr.push(i+1);

               getMaxDevId(function(id) {

                  // 打开面板设置新建电池组个数

                  layer.open({

                     type: 1

                     ,title: '选择新建电池组个数'

                     ,content: addGroupContent

                     ,fixed: true

                     ,resize: false

                     ,btn:['确定', '取消']

                     ,yes: function(index) {

                        var groupNum = $('#addGroupnum').val();

                        layer.close(index);

                        // 生成数组

                        var _arr = [];

                        for(var i=0; i<groupNum; i++) {

                           _arr.push(i+1);

                        }

								
                        _rsData.addGroupNum = _arr;

                        _rsData.FBSDeviceId = id;

                        $('#iframeEdit').data('data', _rsData);

								
                        iframePopup = layer.open({

                           type: 2

                           ,title: '新建电池组'

                           ,area:['1200px', '520px']

                           ,resize: false

                           ,content: 'iframe/batt-info-add.html'

                        });

                     }

							
                     _rsData.addGroupNum = _arr;

                     $('#iframeEdit').data('data', _rsData);

							
                     iframePopup = layer.open({

                        type: 2

                        ,title: '新建电池组'

                        ,area:['1200px', '520px']

                        ,resize: false

                        ,content: 'iframe/batt-info-add.html'

                     });

                  }

               });

                  });

               }); 
					
            });

				
            // 获取最大设备id

            function getMaxDevId(callback) {

               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(isFunction(callback)) {

                           callback(rs.data);

                        }

                     }else {

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

                     }

                  }

                  ,complete: function() {

                     layer.close(load);

                  }

						
               });

            }

            

            

            // 查询电池组信息

@@ -804,7 +834,7 @@
               var value=$('#number').val();

               //当输入的数大于0时

               if(value>0){

                  if(value != Page.pageSize){

                  if(value != Page.size){

                     Page.setSize(parseInt(value));

                     Page.setCurr(1);

                  }