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

81041

2019-01-11 68dfe47cf6a32ac3560fc4b64e11eaa47c3bb6e7

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

 gx_tieta/WebRoot/Top.jsp

@@ -214,7 +214,7 @@
           }

           

           

           var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');

        var visibilityChangeEvent = hiddenProperty.replace(/hidden/i, 'visibilitychange');

        var onVisibilityChange = function(){

            if (!document[hiddenProperty]) {    

                pageIsVisit = true;

@@ -253,7 +253,7 @@
                });

            }

        });

        searchAlm();                //查询电池告警总数(我在base.js里)

        searchAlm(pageIsVisit);                //查询电池告警总数(我在base.js里)

        searchlowmon();                //查询落后单体总数

        searchpoweroff();            //查询机房停电总数

        searchdevalarm();            //查询设备实时告警总数


 gx_tieta/WebRoot/ex-battinfo.jsp

@@ -714,11 +714,7 @@
                            if(isUpdateTbl) {

                                $('#applyNum').text(Page.all);     // 设置徽章

                                tOptions.data = resData;    //  设置表格的数据

								
                                // 当前选项卡没有显示

                                if(tabsIndex != 0) {

                                    table.render(tOptions);

                                }

                                table.render(tOptions);

                            }

                            // console.log(456);

                            // 实时回调

@@ -856,6 +852,7 @@
                        ,success: function(res) {

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

                            var resData = [];

                            var isUpdateTbl = false;        // 判断是否添加/删除待验收表格

                            if(rs.code == 1) {

                                var data = rs.data;

                                // 遍历数据的值

@@ -863,22 +860,41 @@
                                    var _data = data[i];

                                    var _tmp = formaterResData(_data);

                                    resData.push(_tmp);

                                    acceptPage.setAll(_data.apply_note);

									
                                    // 判断是否添加/删除待验收表格

                                    if(_data.apply_note &&_data.apply_note != Page.all) {

                                        acceptPage.setAll(_data.apply_note);

                                        isUpdateTbl = true;

                                    }

                                }

                                //console.log(resData);

                            }else {

                                acceptPage.setAll(0);

                                isUpdateTbl = true;

                            }

                            layuiTbl.setCache(table.cache.acceptTbl);

                            // 遍历data的值更新数据

                            for(var i=0; i<resData.length; i++) {

                                var _resData = resData[i];

                                _resData.doThings = '';

                                // 当前选项卡没有显示

                                if(tabsIndex != 1) {

                                    layuiTbl.updateTr(i, _resData);

                            if(isUpdateTbl) {

                                // 遍历data的值更新数据

                                for(var i=0; i<resData.length; i++) {

                                    var _resData = resData[i];

                                    _resData.doThings = '';

                                }

                                acceptTbl.data = resData;    // 设置表格数据

                                // 更新表格

                                table.render(acceptTbl);    // 重新加载表格

                                layuiTbl.setCache(table.cache.acceptTbl);

                            }else {

                                // 遍历data的值更新数据

                                for(var i=0; i<resData.length; i++) {

                                    var _resData = resData[i];

                                    _resData.doThings = '';

                                    // 当前选项卡没有显示

                                    if(tabsIndex != 1) {

                                        layuiTbl.updateTr(i, _resData);

                                    }

                                }

                            }

							
                            //console.log(123);

                            // 实时回调

                            updateAcceptSearchTimer = setTimeout(updateAcceptSearch, 4000);


 gx_tieta/WebRoot/js/base.js

@@ -616,8 +616,13 @@


var totalAlm_num=Number.POSITIVE_INFINITY;

//查询告警数

function searchAlm(){

    //createEleWarning();

function searchAlm(isShowVoice){

    // 判断是否显示右下角的告警提示框

    if(!isShowVoice) {

        self.setTimeout("searchAlm()",10000);

        return;

    }

    // 请求后台查询最新出现的告警个数

    $.post("Battalarm_dataAction!serchRealTime",null,function(data){

        model=eval("("+data.result+")");

        if(model.code==1){


 gx_tieta/WebRoot/sys-set-test.jsp

@@ -1089,6 +1089,8 @@
                    

                    // 弹出询问弹出框

                    layer.confirm('是否批量重启设备', {icon: 3, title: '提示'}, function(index) {

                        // 关闭弹出框

                        layer.close(index);

                        // 对数据进行处理

                        var rsData = [];

                        // 遍历params的值