hdw
2018-12-21 3eea4e6edb201c9804aa9c93b1d8e7fc87493385
Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
3个文件已修改
46 ■■■■ 已修改文件
gx_tieta/WebRoot/mobil/ele-param2.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/equiphistwarn.html 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/equipwarn.html 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/mobil/ele-param2.html
@@ -127,7 +127,7 @@
        <div data-role="footer" data-position="fixed" data-theme="a">    
            <div data-role="navbar">
                <ul>
                  <li><a href="index.html" id="cancel"  class="ui-btn ui-btn-inline ui-corner-all  ui-btn-icon-delete" data-position-to="window" data-icon="delete" data-role="button">首页</a></li>
                  <li><a href="index.html" id="cancel"  class="ui-btn ui-btn-inline ui-corner-all  ui-btn-icon-delete" data-position-to="window" data-icon="home" data-role="button">首页</a></li>
                  <li><a href="#yourPopup" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all  ui-btn-icon-check" data-position-to="window" data-icon="check" data-role="button">新建</a></li>
                </ul>
            </div>        
gx_tieta/WebRoot/mobil/equiphistwarn.html
@@ -152,7 +152,7 @@
            $.post("Batt_devalarm_data_historyAction!serchByCondition","json="+json,function(data){
                data=data.result;
                model=eval("("+data+")");
                //console.info(data);
                console.info(data);
                if(model.code==1){
                    var dev_no = (Page.pageCurr-1)*Page.pageSize+1;
                    for(var i=0;i<model.data.length;i++){
@@ -161,7 +161,7 @@
                        newArrTd.push(model.data[i].dev_name);        //设备名称
                        newArrTd.push(model.data[i].dev_ip);        //设备ip
                        newArrTd.push(model.data[i].stationName);    //机房名称
                        newArrTd.push("通讯故障");                        //通讯故障
                        newArrTd.push(getAlarmTypeByAlmType(model.data[i].alm_type));                        //通讯故障
                        newArrTd.push(getAlarmLevel(model.data[i].alm_level));        //告警等级
                        if(model.data[i].alm_is_confirmed == 1){
                            newArrTd.push('是');
@@ -413,6 +413,25 @@
            }
            return "";
        }
        //获取设备的告警类型
        function getAlarmTypeByAlmType(alm_type){
            if(alm_type>0){
                switch(alm_type){
                    case 618501:return "继电器K1告警";
                    case 618502:return "通讯告警";
                    case 618503:return "设备过温告警";
                    case 618504:return "二极管D1告警";
                    case 119023:return "续航不足告警";
                    case 119024:return "基站停电告警";
                    case 119025:return "基站发电告警";
                    case 119026:return "基站掉站告警";
                    case 119027:return "基站开门告警";
                    case 119028:return "设备高温告警";
                }
            }
            return "通信故障";
        }
        </script>
    </div>
</body>
gx_tieta/WebRoot/mobil/equipwarn.html
@@ -183,7 +183,7 @@
                    
                    arr[index++]=data[i].dev_ip ;                        //设备IP
                    arr[index++]=data[i].stationName;                      //机房名
                    arr[index++]=data[i].alm_type;                      //告警事件
                    arr[index++]=getAlarmTypeByAlmType(data[i].alm_type);                      //告警事件
                    arr[index++]=getAlarmLevel(data[i].alm_level);      //告警等级
                    arr[index++]=data[i].alm_is_confirmed==0?"否":"是";  //告警确认
                    if(data[i].alm_is_confirmed==1){
@@ -278,7 +278,24 @@
        return "";
    };
    //获取设备的告警类型
    function getAlarmTypeByAlmType(alm_type){
        if(alm_type>0){
            switch(alm_type){
                case 618501:return "继电器K1告警";
                case 618502:return "通讯告警";
                case 618503:return "设备过温告警";
                case 618504:return "二极管D1告警";
                case 119023:return "续航不足告警";
                case 119024:return "基站停电告警";
                case 119025:return "基站发电告警";
                case 119026:return "基站掉站告警";
                case 119027:return "基站开门告警";
                case 119028:return "设备高温告警";
            }
        }
        return "通信故障";
    }