81041
2018-10-18 67047bebb45c0426ac96df76ed18e3879ffc09b0
Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
5个文件已修改
80 ■■■■ 已修改文件
gx_tieta/WebRoot/batt-state-manage.jsp 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batt-state-statistical.jsp 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/navConfig.jsp 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/pages/css/pages/navconfig.css 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/global_zh_CN.properties 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batt-state-manage.jsp
@@ -24,7 +24,7 @@
    <meta http-equiv="description" content="This is my page">
    <style type="text/css">
       body {
         body {
           overflow-x: hidden !important;
       }
       #tbHead table{
@@ -65,7 +65,8 @@
       .filter a:hover {
           background-color: #2f97ff;
           color: #FFFFFF;
       }
       }
    </style>
    </head>
    <body>
@@ -168,7 +169,7 @@
        var tblStatus = new Array();    // 表格状态数组
        var tblOptsHd = new Array();    // 表格选项头部
        var tblOptsBd = new Array();  // 表格选项数组
        arrTh = ['省','市', '机房名称','停电','停电开始时间', '发电','发电开始时间','掉站','掉站开始时间', '开门/开关电源异常','开门/开关电源异常开始时间', '温度异常','湿度异常'];
        arrTh = ['省','市', '机房名称','停电','停电开始时间','停电时长','发电','发电开始时间','发电时长','掉站','掉站开始时间', '掉站时长','开门/关门异常','开门/关门异常开始时间','开门/关门异常时长', '温度异常','湿度异常'];
       
        //tblOptsHd = ['编号', '选项', '是否选择'];
        tblOptsHd = ['<s:text name="Number"/>', '<s:text name="Options"/>', '<s:text name="IsChecked"/>'];
@@ -193,6 +194,17 @@
            createCard(cardHd, tblOptsHd, tblOptsBd);
            createCard(cardBd, tblOptsHd, tblOptsBd);
        });
         $(document).ready(function(){
        $('#tbBrdw').scroll(function(){
            var scrollX=$(this).scrollLeft();
            $('#tbHead table').css('left',-scrollX+'px');
        });
    });
        // 点击条件筛选更改表格的高度
        $(function() {
@@ -219,7 +231,7 @@
            $('#paging .search').click(function() {
                
                searchstationstate();
                 searchstationstate();
                //noContent.showNoContent();            //显示查询失败框
                
            });
@@ -415,7 +427,7 @@
                    
                }
                
                searchstationstate();
                searchstationstate();
            });
        }
        
@@ -468,7 +480,7 @@
                            }
                            
                            arrTd[index++]=_data.station_poff_start_time //停电开始时间
                            arrTd[index++]=formartTime(_data.station_poff_tlong);      //停电时长
                            // 发电
                            if(_data.station_stat_fadian) {
                                arrTd[index++]= create_ali_font('icon-dynamotor', 'red', {msg: '发电异常'}); //发电
@@ -476,8 +488,8 @@
                                arrTd[index++]= create_ali_font('icon-dynamotor', 'green', {msg: '正常'}); //发电
                            }
                            
                            arrTd[index++]=_data.station_fadian_start_time;//发电开始时间
                            arrTd[index++]=_data.station_fadian_start_time;   //发电开始时间
                            arrTd[index++]=formartTime(_data.station_fadian_tlong);
                            // 掉站
                            if(_data.station_stat_diaozhan) {
                                arrTd[index++]= create_ali_font('icon-dianchi', 'red', {msg: '已掉站'});
@@ -486,7 +498,7 @@
                            }
                            
                            arrTd[index++]=_data.station_diaozhan_start_time;//掉站开始时间
                            arrTd[index++]=formartTime(_data.station_diaozhan_tlong);
                            // 开门关门异常
                            if(_data.station_stat_dooropen) {
                                arrTd[index++] = create_ali_font('icon-quankaimen', 'red', {msg: '开门'});
@@ -495,6 +507,7 @@
                            }
                            
                            arrTd[index++]=_data.station_dooropen_start_time;//开门关门异常时间
                            arrTd[index++]=formartTime(_data.station_dooropen_tlong);
                            
                            arrTd[index++]=_data.station_temp; //温度
                            arrTd[index++]=_data.station_damp; //湿度
@@ -509,7 +522,24 @@
            })    
        }
                
            //格式化时间
        function formartTime(value){
            value = Math.abs(parseInt(value));
            //console.info(value);
            var day_num = 0;
            var hour_num = 0;
            var min_num = 0;
            if(value>=24*60){
                day_num = Math.floor(value/(24*60));
                value = value%(24*60);
            }
            if(value>=60){
                hour_num = Math.floor(value/60);
                value = value%60;
            }
            min_num = value;
            return day_num+"天"+hour_num+"小时"+min_num+"分";
        }
                    
        //首页
        $('#home').click(function(){
gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -162,16 +162,6 @@
            ArrWarnTb = new Array(); // 用于存放表格数据
            
            createFullTbl($('.tbl-header'), $('.tbl-body'), ArrWarnTh, ArrWarnTb);
            var arr=$.map(ArrWarnTh,function(n){return{'name':n,'state':1 }});
            $('.condi-opt td').each(function(k){
                  $(this).find('input').click(function(){
                         var changeTh=[];
                         if($(this).prop("checked")){arr[k+1].state=1;}
                         else{arr[k+1].state=0;}
                         $.each(arr,function(i,v){if(v.state){changeTh.push(v.name)}});
                         createFullTbl($('.tbl-header'), $('.tbl-body'), changeTh, ArrWarnTb);
                  })
            });
            
            // 点击表格的右键显示右键菜单
            var $tblBody = $('.tbl-body');
gx_tieta/WebRoot/navConfig.jsp
@@ -14,6 +14,7 @@
       <meta charset="UTF-8">
    <title><s:text name='Site_content_configuration'/></title>                <!-- 配置页面内容 -->
    <link type="text/css" rel="stylesheet" href="css/basic.css" />
    <link type="text/css" rel="stylesheet" href="src/css/layui.css" />
    <link type="text/css" rel="stylesheet" href="css/loading.css" />
    <link type="text/css" rel="stylesheet" href="css/navConfigLayout.css" />
    <link type="text/css" rel="stylesheet" href="css/index_layout.css" />
@@ -150,9 +151,9 @@
        <div id="navSort">
            <div class="navSort-title fb">子导航排序<div class="fr f16 mr10"><i class="fa fa-close navSort-close" onclick="GLOBAL.Nav.hide()"></i></div></div>
            <div class="navSort-content clearfix">
                <div class="navSort-content-item mr10 fl"></div>
                <div class="navSort-content-item mr10 fl"></div>
                <div class="navSort-content-item mr10 fl"></div>
                <div class="navSort-content-item layui-col-md4"></div>
                <div class="navSort-content-item layui-col-md4"></div>
                <div class="navSort-content-item layui-col-md4"></div>
            </div>
        </div>
            
gx_tieta/WebRoot/pages/css/pages/navconfig.css
@@ -31,7 +31,8 @@
    overflow-y: auto;
}
.navSort-content-item {
    width: 350px;
    padding-left: 15px;
    padding-right: 15px;
}
#navSortShadow {
    display: none;
gx_tieta/src/global_zh_CN.properties
@@ -1085,3 +1085,13 @@
##################  ele-match-group.jsp \u7535\u6c60\u7ec4\u914d\u7ec4\u7ba1\u7406   ####################################
Batt_pack_management = \u7535\u6c60\u7ec4\u914d\u7ec4\u7ba1\u7406
##################  set-match-group.jsp  \u7535\u6c60\u7ec4\u914d\u7ec4\u8bb0\u5f55    #################################
Batt_makegrouprecord = \u7535\u6c60\u7ec4\u914d\u7ec4\u8bb0\u5f55
##################   batt-state-mange.jsp \u673a\u623f\u72b6\u6001\u67e5\u8be2   ###########################
Station_statequery = \u673a\u623f\u72b6\u6001\u67e5\u8be2
##################  batt-state-statistical.jsp  \u673a\u623f\u72b6\u6001\u7edf\u8ba1    #############################
Station_statestatistical = \u673a\u623f\u72b6\u6001\u7edf\u8ba1\u67e5\u8be2