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

军

2018-10-09 5eafdec8ecb2226f2077e8ae1138ee0d7d1aae7d

 gx_tieta/WebRoot/equipWarn1.jsp

@@ -171,7 +171,7 @@
        <script type="text/javascript">

        var Page={

         pageCurr:1,

         pageSize:14,

         pageSize:16,

         pageAll:0,

        };

      var arrTh = new Array();    // 表格的头部

@@ -722,6 +722,7 @@
               case 618502:return "通讯告警";

               case 618503:return "设备过温告警";

               case 618504:return "二极管D1告警";

               case 119023:return "续航不足告警";

            }

         }

         return "通信故障";