Merge branch 'master-V32-LH' into 'master'

选择巡检结果通知的人



See merge request !391

@@ -78,7 +78,7 @@ layui.define(['table', 'layer', 'laytpl', 'common', 'sessions', 'admin'], functi
 
         var userListTable = table.render({
             elem: '#userlist-table'
-            , height: 'full'
+            , height: '650'
             , url: domainName + '/api-user/users'
             , parseData: function (res) {
                 return {
@@ -91,13 +91,13 @@ layui.define(['table', 'layer', 'laytpl', 'common', 'sessions', 'admin'], functi
                 access_token: accessToken,
                 nickname: $('#userlist-condition-nickname').val()
             }
+            , cols: tableCols
+            , limit: 300
+            , limits: [300, 600, 900]
             , page: {
                 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                 theme: '#1E9FFF'
-            }
-            , limit: 300
-            , limits: [300, 600, 900]
-            , cols: tableCols,
+            },
             done: function (res, curr, count) {
                 //判断的条件是否选中
                 if(oldUsers){