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

快照管理快照列表优化



See merge request !758

@@ -24,21 +24,16 @@
                             v-model="search.endTime"
                             value-format="YYYY-MM-DD HH:mm:ss"
                     />
-
                 </el-form-item>
                 <el-form-item>
                     <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList">查询</el-button>
                 </el-form-item>
-            </div>
-        </div>
-        <div class="search">
-            <div class="condition ping">
                 <el-form-item>
-                    <el-button type="danger" :size="$global.elementConfig.size.button" @click="deleteHistory">删除</el-button>
+                    <el-button :size="$global.elementConfig.size.button" @click="deleteHistory">删除</el-button>
                 </el-form-item>
             </div>
         </div>
-        <div class="search-table" style="padding: 0 10px;">
+        <div class="search-table">
             <cm-table-page :columns="tableData.columns" :dataList="tableData.dataList" :height="(height - 110)"
                                :loading="false" :pageSize="search.pageSize" :showBorder="true"
                                :showIndex="true" :showPage="true" :showSelection="true"

@@ -73,7 +73,7 @@
         <div class="search-table">
             <h3 style="text-align: left;color:#2b9eef;">快照信息</h3>
             <cm-table-page :columns="tableData.columns" :dataList="tableData.dataList"
-                           :height="height - 300"
+                           :height="height - 550"
                            :loading="false"
                            :pageSize="queryParams.pageSize"
                            :showBorder="true"

@@ -52,7 +52,7 @@
         <div class="search-table">
             <h3 style="text-align: left;color:#2b9eef;">快照信息</h3>
             <cm-table-page :columns="tableData.columns" :dataList="tableData.dataList"
-                           :height="height - 300"
+                           :height="height - 423"
                            :loading="false"
                            :pageSize="queryParams.pageSize"
                            :showBorder="true"