Authored by 王涛

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

快照概览-【无】-列表优化



See merge request !991
@@ -24,7 +24,7 @@ layui.define(['element', 'admin', 'view'], function (exports) { @@ -24,7 +24,7 @@ layui.define(['element', 'admin', 'view'], function (exports) {
24 * hash变更 24 * hash变更
25 */ 25 */
26 hashChane: function () { 26 hashChane: function () {
27 - debugger 27 + // debugger
28 var hash = window.top.location.hash; 28 var hash = window.top.location.hash;
29 sessionStorage.setItem("pagePath", hash); 29 sessionStorage.setItem("pagePath", hash);
30 sessionStorage.setItem("batchNo", window.generateUUID().replace(/-/g, "")); 30 sessionStorage.setItem("batchNo", window.generateUUID().replace(/-/g, ""));
@@ -311,7 +311,7 @@ layui.define(['element', 'admin', 'view'], function (exports) { @@ -311,7 +311,7 @@ layui.define(['element', 'admin', 'view'], function (exports) {
311 */ 311 */
312 clickEventHandle(thisObj, key) { 312 clickEventHandle(thisObj, key) {
313 let that = this; 313 let that = this;
314 -debugger 314 +// debugger
315 sessionStorage.setItem("groupId",window.generateUUID().replace(/-/g, "")); 315 sessionStorage.setItem("groupId",window.generateUUID().replace(/-/g, ""));
316 316
317 let layHref = thisObj.attr('lay-href') ? thisObj.attr('lay-href') : ''; 317 let layHref = thisObj.attr('lay-href') ? thisObj.attr('lay-href') : '';
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 <div class="search-table"> 78 <div class="search-table">
79 <h3 style="text-align: left;color:#2b9eef;">快照信息</h3> 79 <h3 style="text-align: left;color:#2b9eef;">快照信息</h3>
80 <cm-table-page :columns="tableData.columns" :dataList="tableData.dataList" 80 <cm-table-page :columns="tableData.columns" :dataList="tableData.dataList"
81 - :height="height - 423" 81 + :height="height - 365"
82 :loading="false" 82 :loading="false"
83 :pageSize="queryParams.pageSize" 83 :pageSize="queryParams.pageSize"
84 :showBorder="true" 84 :showBorder="true"