Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

【无】【登录日志】在线用户列表分页条数与每页条数相匹配，高度调整



See merge request !951

@@ -21,10 +21,14 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi
         function loginLogTable() {
         function loginLogTable() {
             loginLog = table.render({
             loginLog = table.render({
                 elem: '#onlineUserTable'
                 elem: '#onlineUserTable'
-                , height: 'full-auto'
+                , height: 'full-420'
                 , cellMinWidth: 0
                 , cellMinWidth: 0
-                , page: 1
                 , limit: 10
                 , limit: 10
+                , limits: [10,50, 100, 150, 200] //lsq 分页条数与每页条数相匹配 2022-09-01
+                , page: {
+                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    theme: '#1E9FFF'
+                }
                 , url: common.domainName + '/api-log/sysLogin/findLogUser?access_token=' + accessToken
                 , url: common.domainName + '/api-log/sysLogin/findLogUser?access_token=' + accessToken
                 , cols: [cols]
                 , cols: [cols]
                 , done: function (res, curr, count) {
                 , done: function (res, curr, count) {

@@ -48,7 +48,7 @@ layui.define(['table', 'laydate', 'admin', 'view', 'common', 'sessions'], functi
                             //     reloadTable();
                             //     reloadTable();
                             common.openWin('setting/onlineUser', '在线用户', {}, [], function f() {
                             common.openWin('setting/onlineUser', '在线用户', {}, [], function f() {
 
 
-                            }, null, ['60%', '45%']);
+                            }, null, ['60%', '60%']);
                         })
                         })
                     } else {
                     } else {
                         $("#generalUserHeader").show();
                         $("#generalUserHeader").show();