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

81041

2018-12-06 954517b2ba6192ec535238edd4de1150d83941c1

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

 gx_tieta/WebRoot/batt-state-manage.jsp

@@ -708,7 +708,7 @@
                        $('#current').text(Page.pageCurr+"/"+pageNum);

                    }

                    layer.close(load);

                    createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);

                    createFullTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);

                    

                    // 给每一行添加数据

                    var trList = tblBd.find('tbody tr');

@@ -723,6 +723,11 @@
            });

        }

        

        // 页面容器大小改变触发

        $(window).resize(function() {

            setTblWidth(tblHd, tblBd);

        });

		
        // 获取续航时长

        function StringtoData(value){

            var date1= value;  //开始时间


 gx_tieta/WebRoot/bts-comm-task.jsp

@@ -141,6 +141,7 @@
        <script type="text/javascript" src="jqueryui/jquery-ui.min.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" src="pages/js/common.js"></script>

        <script type="text/javascript">

            layui.use(['form', 'table', 'layer', 'element'], function() {

                var table = layui.table;        // 获取表格模块

@@ -427,11 +428,12 @@
                                    _tmp.connet_time = _data.connet_time;

                                    _tmp.dev_comm_runtime = _data.dev_comm_runtime;

                                    _tmp.break_type = _data.break_type;

                                    _tmp.break_type_txt = createDeviceType(_data.break_type);

                                    arr_td.push(_tmp);

                                    Page.setAll(_data.num);

                                }

                            }

                            //console.info(arr_td);

                            //console.info(tOptions);

                            tOptions.data = arr_td;

                            // 生成表格数据

                            table.render(tOptions);

@@ -442,6 +444,19 @@
                        }

                    });

                    

                }

				
                //获取设备连接的状态

                function createDeviceType(dev_type){

                    var str_type = "未知类型";

                    //console.info(typeof dev_type);

                    switch(dev_type){

                        case 0:str_type="成功连接";break;

                        case 1:str_type="找不到对应设备ID";break;

                        case 2:str_type="通信异常断开";break;

                        default:str_type="未知类型";

                    }

                    return str_type;

                }

                

                

@@ -538,6 +553,42 @@
                    $('#total').text(page.all);

                }

                

                //点击导出报表

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

                    var tblData = GLOBAL.Table.cTblData(tOptions);					
                    GLOBAL.Table.expExcel.xls(tblData);

                });

				
                //构造导出表格对象

                function createTableData(tOptions){

                    var thead_arr = new Array();                //表头数据数组

                    var thody_arr = new Array();                //表格数据数组

                    var proname_arr = new Array();                //属性名数组

                    //console.info(tOptions);				
                    if(tOptions != undefined){	
                        //构造表头数组					
                        for(var i = 0;i< tOptions.cols.length;i++){

                            var _th = tOptions.cols[i];

                            for(var k=0;k<_th.length;k++){							
                                if(_th[k].field != undefined){									
                                    proname_arr.push(_th[k].field);

                                    thead_arr.push(_th[k].title);

                                }

                            }

                        }

                        //构造表格内部数据数组

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

                            var _data = tOptions.data[j];

                            for(var k=0;k<proname_arr.length;k++){

                                thody_arr.push(_data[proname_arr[k]]);

                            }

                        }

                    }

                    return {

                           thead: [thead_arr],

                          tbody:[thody_arr]

                    }

                }

            });

        </script>

    </body>


 gx_tieta/WebRoot/pages/js/common.js

@@ -549,7 +549,7 @@
// 导出报表

;(function($, window, document, gl, undefined) {

    // 定义testVal的命名空间

    gl.namespace('expExcel');

    gl.namespace('Table');

    var ExpExcel = function() {

        this.thead = '';        // 表格的头部

        this.tbody = '';        // 表格的内容

@@ -678,9 +678,44 @@
    

    

    var expExcel = new ExpExcel();

    console.log(expExcel);

    //console.log(expExcel);

    // 绑定导出数据对象

    GLOBAL.expExcel = expExcel; 
    GLOBAL.Table.expExcel = expExcel;

    
    
    //构造导出表格对象

    function createTableData(tOptions){

        var thead_arr = new Array();                //表头数据数组

        var thody_arr = new Array();                //表格数据数组

        var proname_arr = new Array();                //属性名数组

        //console.info(tOptions);				
        if(tOptions != undefined){	
            //构造表头数组					
            for(var i = 0;i< tOptions.cols.length;i++){

                var _th = tOptions.cols[i];

                for(var k=0;k<_th.length;k++){							
                    if(_th[k].field != undefined){									
                        proname_arr.push(_th[k].field);

                        thead_arr.push(_th[k].title);

                    }

                }

            }

            //构造表格内部数据数组

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

                var _data = tOptions.data[j];

                for(var k=0;k<proname_arr.length;k++){

                    thody_arr.push(_data[proname_arr[k]]);

                }

            }

        }

        return {

               thead: [thead_arr],

              tbody:[thody_arr]

        };

    }

	
    // 绑定导出数据对象

    GLOBAL.Table.cTblData = createTableData;

})(jQuery, window, document, GLOBAL);



// 生成阿里图标的元素