Commit b1a4f713 by 杨琪琪

layui table表格单元合并

parent 74d5b5da
...@@ -70,36 +70,28 @@ ...@@ -70,36 +70,28 @@
color: #2d6aea; color: #2d6aea;
} }
.layui-table-view { #tableContent > .layui-table-view {
border-color: #323232; border-color: #323232;
margin: 0; margin: 0;
} }
.layui-table thead tr { #tableContent > .layui-table thead tr {
background-color: #a1b9fd24; background-color: #a1b9fd24;
border-color: #323232; border-color: #323232;
} }
.layui-table tbody tr:hover { #tableContent > .layui-table tbody tr:hover {
background-color: #a1b9fd24; background-color: #a1b9fd24;
} }
.layui-table-header { #tableContent > .layui-table-header {
background-color: #b3b3b30d; background-color: #b3b3b30d;
} }
.layui-table td, .layui-table th, .layui-table-header { #tableContent > .layui-table td,#tableContent > .layui-table th,#tableContent > .layui-table-header {
border-color: #323232; border-color: #323232;
} }
/*.layui-table-cell {*/
/* overflow: visible;*/
/* text-overflow: inherit;*/
/* white-space: normal;*/
/* height: auto !important;*/
/* word-break: break-all;*/
/*}*/
.flex { .flex {
display: flex; display: flex;
} }
......
...@@ -98,19 +98,6 @@ var defaultXBarOptions = { ...@@ -98,19 +98,6 @@ var defaultXBarOptions = {
}, },
], ],
} }
const labelOption = {
show: true,
position: 'insideBottom',
distance: 15,
align: 'left',
verticalAlign: 'middle',
rotate: 90,
formatter: '{@metric} {name|{a}}',
fontSize: 16,
rich: {
name: {}
}
};
var defaultYBarOptions = { var defaultYBarOptions = {
title: { title: {
text: '服务器资源实时监控', text: '服务器资源实时监控',
...@@ -151,16 +138,7 @@ var defaultYBarOptions = { ...@@ -151,16 +138,7 @@ var defaultYBarOptions = {
type: 'value' type: 'value'
} }
], ],
series: [ series: [],
{
type: 'bar',
barGap: 0,
// label: labelOption,
emphasis: {
focus: 'series'
},
},
],
dataZoom: [ // 数据区域缩放配置 dataZoom: [ // 数据区域缩放配置
{ {
type: 'inside', // 内置型数据区域缩放 type: 'inside', // 内置型数据区域缩放
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment