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

81041

2018-10-11 5de347e1a4dc3b32b230e092cd12cac9af75bda0

 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();    // 表格的头部

@@ -188,7 +188,7 @@
      

      // 根据表格的头部生成表格选项和表格的状态数组

      $(function() {

         searchDevAlarm();

         //searchDevAlarm();

      

          centerDiv($('#cardOption'));

          // 遍历表格头部生成状态数组

@@ -574,7 +574,7 @@
               pageCurr:Page.pageCurr,                  //当前页

            }

           };

           console.log(temp);

           //console.log(temp);

           return temp;

        }