Authored by xwx

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

... ... @@ -430,7 +430,7 @@
}
.overflow-scroll-y{
max-height: 500px;
overflow-y: scroll;
overflow-y: auto;
}
.icon-step{
width:30px;
... ...
... ... @@ -33,7 +33,7 @@
</el-col>
</el-row>
<el-row class="margin-bottom-50">
<el-col :span="24">
<el-col :span="24" class="overflow-scroll-y">
<cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"
:showIndex="true" :total="count"
:showBorder="true" :loading="false" :pageSize="pageSize"
... ...