monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 53e5206c86bb6fda7083d6cb6dfb1fac434f0e2d 2 parents ff9bf89a 4ccdf19a

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

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
@@ -430,7 +430,7 @@ @@ -430,7 +430,7 @@
430 } 430 }
431 .overflow-scroll-y{ 431 .overflow-scroll-y{
432 max-height: 500px; 432 max-height: 500px;
433 - overflow-y: scroll; 433 + overflow-y: auto;
434 } 434 }
435 .icon-step{ 435 .icon-step{
436 width:30px; 436 width:30px;
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 </el-col> 33 </el-col>
34 </el-row> 34 </el-row>
35 <el-row class="margin-bottom-50"> 35 <el-row class="margin-bottom-50">
36 - <el-col :span="24"> 36 + <el-col :span="24" class="overflow-scroll-y">
37 <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" 37 <cm-table-page :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList"
38 :showIndex="true" :total="count" 38 :showIndex="true" :total="count"
39 :showBorder="true" :loading="false" :pageSize="pageSize" 39 :showBorder="true" :loading="false" :pageSize="pageSize"