Authored by 鲁尚清

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing
@@ -374,7 +374,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -374,7 +374,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
374 }, 374 },
375 grid: [{ 375 grid: [{
376 top: 20, 376 top: 20,
377 - bottom: 35, 377 + bottom: 45,
378 left: 30, 378 left: 30,
379 right: 5 379 right: 5
380 }], 380 }],
@@ -385,7 +385,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -385,7 +385,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
385 color: '#333', 385 color: '#333',
386 show: true, 386 show: true,
387 interval:0, 387 interval:0,
388 - rotate:20 388 + rotate:15
389 }, 389 },
390 axisLine: { 390 axisLine: {
391 lineStyle: { 391 lineStyle: {