monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 5b0960c7238ccaa0fa8dad61e90c947490c93138 2 parents a1072258 4a9f8aae

Merge branch 'master-500-dev-xwx' into 'master-500-dev' 

快照管理快照列表优化



See merge request !758
Inline Side-by-side
Showing 3 changed files with 4 additions and 9 deletions
@@ -24,21 +24,16 @@ @@ -24,21 +24,16 @@
24 v-model="search.endTime" 24 v-model="search.endTime"
25 value-format="YYYY-MM-DD HH:mm:ss" 25 value-format="YYYY-MM-DD HH:mm:ss"
26 /> 26 />
27 -  
28 </el-form-item> 27 </el-form-item>
29 <el-form-item> 28 <el-form-item>
30 <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList">查询</el-button> 29 <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList">查询</el-button>
31 </el-form-item> 30 </el-form-item>
32 - </div>  
33 - </div>  
34 - <div class="search">  
35 - <div class="condition ping">  
36 <el-form-item> 31 <el-form-item>
37 - <el-button type="danger" :size="$global.elementConfig.size.button" @click="deleteHistory">删除</el-button> 32 + <el-button :size="$global.elementConfig.size.button" @click="deleteHistory">删除</el-button>
38 </el-form-item> 33 </el-form-item>
39 </div> 34 </div>
40 </div> 35 </div>
41 - <div class="search-table" style="padding: 0 10px;"> 36 + <div class="search-table">
42 <cm-table-page :columns="tableData.columns" :dataList="tableData.dataList" :height="(height - 110)" 37 <cm-table-page :columns="tableData.columns" :dataList="tableData.dataList" :height="(height - 110)"
43 :loading="false" :pageSize="search.pageSize" :showBorder="true" 38 :loading="false" :pageSize="search.pageSize" :showBorder="true"
44 :showIndex="true" :showPage="true" :showSelection="true" 39 :showIndex="true" :showPage="true" :showSelection="true"
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 <div class="search-table"> 73 <div class="search-table">
74 <h3 style="text-align: left;color:#2b9eef;">快照信息</h3> 74 <h3 style="text-align: left;color:#2b9eef;">快照信息</h3>
75 <cm-table-page :columns="tableData.columns" :dataList="tableData.dataList" 75 <cm-table-page :columns="tableData.columns" :dataList="tableData.dataList"
76 - :height="height - 300" 76 + :height="height - 550"
77 :loading="false" 77 :loading="false"
78 :pageSize="queryParams.pageSize" 78 :pageSize="queryParams.pageSize"
79 :showBorder="true" 79 :showBorder="true"
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 <div class="search-table"> 52 <div class="search-table">
53 <h3 style="text-align: left;color:#2b9eef;">快照信息</h3> 53 <h3 style="text-align: left;color:#2b9eef;">快照信息</h3>
54 <cm-table-page :columns="tableData.columns" :dataList="tableData.dataList" 54 <cm-table-page :columns="tableData.columns" :dataList="tableData.dataList"
55 - :height="height - 300" 55 + :height="height - 423"
56 :loading="false" 56 :loading="false"
57 :pageSize="queryParams.pageSize" 57 :pageSize="queryParams.pageSize"
58 :showBorder="true" 58 :showBorder="true"