Merge branch 'master-mj-joke' into 'master-mj'

fix:工作日志查看在暗黑模式下柱状图页面提示语为黑色，导致有些字体看不见

fix:工作日志查看在暗黑模式下柱状图页面提示语为黑色，导致有些字体看不见

See merge request !1178

@@ -96,6 +96,10 @@ layui.define(['table', 'layer', 'laytpl', 'common', 'sessions', 'admin'], functi
                 access_token: accessToken,
                 access_token: accessToken,
                 nickname: $('#userlist-condition-nickname').val()
                 nickname: $('#userlist-condition-nickname').val()
             }
             }
+            ,request: {
+                pageName: 'page' //页码的参数名称，默认：page
+                ,limitName: 'perPage' //每页数据量的参数名，默认：limit
+            }
             , cols: tableCols
             , cols: tableCols
             , limit: 20
             , limit: 20
             , limits: [300, 600, 900]
             , limits: [300, 600, 900]

@@ -727,7 +727,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                         type: 'value',
                         type: 'value',
                         gridIndex: 0,
                         gridIndex: 0,
                         axisLabel: {
                         axisLabel: {
-                            color: '#333'
+                            color: '#a3a3a4'
                         },
                         },
                         splitLine: {
                         splitLine: {
                             lineStyle: {
                             lineStyle: {