fix: 修复二级列表一些样式错乱问题

This commit is contained in:
陈劲松
2020-03-20 13:58:19 +08:00
parent 720677635e
commit e750fbc2c3
2 changed files with 50 additions and 41 deletions

View File

@@ -78,6 +78,9 @@ li{
.float-right { .float-right {
float: right; float: right;
} }
.display-none {
display: none;
}
.line-100 { .line-100 {
width: 100%; width: 100%;
height: 1px; height: 1px;
@@ -923,6 +926,12 @@ li{
.el-scrollbar__bar.is-vertical { .el-scrollbar__bar.is-vertical {
width: 11px; width: 11px;
} }
.el-scrollbar__bar.is-horizontal {
height: 11px;
}
.new-search .el-scrollbar__bar.is-horizontal {
height: 4px;
}
.app>.el-scrollbar__bar.is-vertical { .app>.el-scrollbar__bar.is-vertical {
width: 5px; width: 5px;
} }

View File

@@ -147,7 +147,7 @@
</template> </template>
</export-excel> </export-excel>
</div> </div>
<div class="pagination-top pagination-top-hide"> <div class="pagination-top pagination-top-hide display-none">
<Pagination :tableId="tableId" v-cloak :pageObj="endpointPageObj" @pageNo='endpointPageNo' @pageSize='endpointPageSize' ref="endpointPagination"></Pagination> <Pagination :tableId="tableId" v-cloak :pageObj="endpointPageObj" @pageNo='endpointPageNo' @pageSize='endpointPageSize' ref="endpointPagination"></Pagination>
</div> </div>
</div> </div>
@@ -1120,18 +1120,6 @@
this.$refs.projectSearch.clearSearch(); this.$refs.projectSearch.clearSearch();
this.tableShow=1; this.tableShow=1;
this.selectedEndpoints=[]; this.selectedEndpoints=[];
//若原页面处于打开二级列表状态,调整分页组件的位置
let pagination = document.querySelector(".pagination-top");
if (pagination.classList.contains("pagination-top-show")) {
pagination.classList.remove("pagination-top-show");
}
if (!pagination.classList.contains("pagination-top-hide")) {
pagination.classList.add("pagination-top-hide");
}
// 主列表恢复全屏
this.mainResizeShow = this.subResizeShow = true;
document.querySelector('.main-list').style.height = "";
this.mainTableHeight = this.$tableHeight.normal; //重置table高度
}, },
//弹出endpoint编辑页 //弹出endpoint编辑页
@@ -1258,16 +1246,6 @@
}, },
showEndpoint:function(endpoint){ showEndpoint:function(endpoint){
this.tableShow=3; this.tableShow=3;
this.mainTableHeight = this.$tableHeight.openSubList.mainList; //重置table高度
//移动分页组件的位置
let pagination = document.querySelector(".pagination-top");
if (pagination.classList.contains("pagination-top-hide")) {
pagination.classList.remove("pagination-top-hide");
}
if (!pagination.classList.contains("pagination-top-show")) {
pagination.classList.add("pagination-top-show");
}
this.queryEdpLoading=true; this.queryEdpLoading=true;
setTimeout(() => { setTimeout(() => {
@@ -1370,24 +1348,6 @@
}, },
backToEdpTab:function(){ backToEdpTab:function(){
this.tableShow=1; this.tableShow=1;
this.mainTableHeight = this.$tableHeight.normal; //重置table的高度
this.isFullScreen = false;
//重置二级列表数据
this.selectedEndpoints=[];
this.showTableData = [];
//移动分页组件的位置
let pagination = document.querySelector(".pagination-top");
if (pagination.classList.contains("pagination-top-show")) {
pagination.classList.remove("pagination-top-show");
}
if (!pagination.classList.contains("pagination-top-hide")) {
pagination.classList.add("pagination-top-hide");
}
this.showTopBtn1 = false;
// 主列表恢复全屏
this.mainResizeShow = this.subResizeShow = true;
document.querySelector('.main-list').style.height = "";
}, },
changeTime:function(size,unit){ changeTime:function(size,unit){
let time=this.getTime(size,unit); let time=this.getTime(size,unit);
@@ -1820,6 +1780,46 @@
temp.tableFilter(); temp.tableFilter();
},500) },500)
}, },
tableShow(n) {
if (n == 1) {
this.mainTableHeight = this.$tableHeight.normal; //重置table的高度
this.isFullScreen = false;
//重置二级列表数据
this.selectedEndpoints=[];
this.showTableData = [];
//移动分页组件的位置
let pagination = document.querySelector(".pagination-top");
if (pagination.classList.contains("pagination-top-show")) {
pagination.classList.remove("pagination-top-show");
}
if (!pagination.classList.contains("pagination-top-hide")) {
pagination.classList.add("pagination-top-hide");
}
setTimeout(() => {
pagination.classList.add("display-none");
}, 210);
this.showTopBtn1 = false;
// 主列表恢复全屏
this.mainResizeShow = this.subResizeShow = true;
document.querySelector('.main-list').style.height = "";
//副列表高度清空
document.querySelector(".sub-list").style.height = '';
} else if (n == 3) {
this.mainTableHeight = this.$tableHeight.openSubList.mainList; //重置table高度
//移动分页组件的位置
let pagination = document.querySelector(".pagination-top");
pagination.classList.remove("display-none");
setTimeout(() => {
if (pagination.classList.contains("pagination-top-hide")) {
pagination.classList.remove("pagination-top-hide");
}
if (!pagination.classList.contains("pagination-top-show")) {
pagination.classList.add("pagination-top-show");
}
}, 210);
}
}
}, },
destroyed() { destroyed() {
window.onresize = null; window.onresize = null;