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

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-14 920004ebb4f6305d0be692db20a5a15839985394

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

 gx_tieta/WebRoot/bat-set-test.jsp

@@ -163,6 +163,8 @@
                        <button class="layui-btn layui-btn-sm mrl8" id="batchAdd"><i class="fa fa-plus mrr8"></i>添加设备</button>

                        <button class="layui-btn layui-btn-sm" id="sysSet">批量设置电池参数</button>

                        <button class="layui-btn layui-btn-sm" id="batchRead">批量读取电池参数</button>

                        <span class="mrl8">选中个数/总数：</span>

                        <button class="layui-btn layui-btn-sm" id="qNumber">0/0</button>

                    </div>

                </div>

                <!-- 表格内容 -->

@@ -589,6 +591,16 @@
                // 更新表格的对象

                var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);

                

                // 统计已选中个数和添加到表格中数据的个数

                var quantNum = new QuantNumber($('#qNumber'));

        		
                // 表格复选框点击监测

                table.on('checkbox(pageTbl)', function(obj){

                    var checkStatus = table.checkStatus('pageTbl'); //idTest 即为基础参数 id 对应的值

                    var checkData = checkStatus.data;        // 被选中的数据

                    quantNum.setMol(checkData.length);

                });

        		
                // 点击表格中同步的按钮

                $('.layui-page-content').on('click', '.layui-table-header .fa', function() {

                    var title = $(this).attr('title');

@@ -949,6 +961,8 @@
                            }

                            

                            tOptions.data = data;

                            // 统计添加到表格中的个数

                            quantNum.set(0, data.length);

                            //console.log(data);

                               // 生成表格数据

                            table.render(tOptions);


 gx_tieta/WebRoot/pages/js/mylayui.js

@@ -607,3 +607,34 @@
        return isGood;

    }

};



// 统计数据选中个数/总个数

var QuantNumber = function(ele) {

    this.ele = ele;

    this.mol = 0;

    this.den = 0;

    this._init();

}

// 设置原型方法

QuantNumber.prototype = {

    _init: function() {

        this._setEleTxt();

    }

    ,set: function(mol, den) {

        this.mol = mol;

        this.den = den;

        this._setEleTxt();

    }

    ,setMol: function(val) {

        this.mol = val;

        this._setEleTxt();

    }

    ,setDen: function(val) {

        this.den = val;

        this._setEleTxt();

    }

    ,_setEleTxt: function() {

        var str = this.mol+'/'+this.den;

        this.ele.text(str)

    }

};

 gx_tieta/WebRoot/sys-set-test.jsp

@@ -165,6 +165,8 @@
                        <button class="layui-btn layui-btn-sm" id="sysSet">下发系统参数</button>

                        <button class="layui-btn layui-btn-sm" id="readSysSet">读取系统参数</button>

                        <button class="layui-btn layui-btn-sm" id="sysRestart">批量重启设备</button>

                        <span class="mrl8">选中个数/总数：</span>

                        <button class="layui-btn layui-btn-sm" id="qNumber">0/0</button>

                    </div>

                </div>

                <!-- 表格内容 -->

@@ -584,6 +586,16 @@
                // 更新表格的对象

                var layuiTbl = new LayuiTbl(tOptions, layui, laytpl, table.cache.pageTbl);

                

                // 统计已选中个数和添加到表格中数据的个数

                var quantNum = new QuantNumber($('#qNumber'));

        		
                // 表格复选框点击监测

                table.on('checkbox(pageTbl)', function(obj){

                    var checkStatus = table.checkStatus('pageTbl'); //idTest 即为基础参数 id 对应的值

                    var checkData = checkStatus.data;        // 被选中的数据

                    quantNum.setMol(checkData.length);

                });

        		
                // 定义系统参数面板中form

                var sysSetForm = new LayuiForm('sysSetForm');

                

@@ -899,6 +911,9 @@
                            }

                            

                            tOptions.data = formaterSearchRsData(data);

        					
                            // 统计选中的个数/总数

                            quantNum.set(0, data.length);

                               // 生成表格数据

                            table.render(tOptions);

                            

@@ -1246,6 +1261,18 @@
                                        _tmp.allStatus = 0;

                                    }

                                    

                                    // 获取当前dev_id所在行的数据

                                    var _trData = layuiTbl.getTr('dev_id', _data.dev_id);

                                    // 判断是否获取到了当前dev_id所在行的数据

                                    if(_trData.code == 1) {

                                        var monVolStd = _trData.data.MonVolStd;        // 单体标称电压

                                        // 设置电流钳量程状态

                                        _tmp.CurrentRange_bool = checkCurrentRange(monVolStd, _tmp.CurrentRange);

        								
                                        // 设置DCDC模块数量状态

                                        _tmp.LoaderCount_bool = checkLoaderCount(monVolStd, _tmp.LoaderCount);

                                    }

        							
                                    rsData.push(_tmp);

                                }

                            }else {