NEZ-1856 fix:取消内容区页面 边框,边距

This commit is contained in:
zhangyu
2022-05-12 16:56:55 +08:00
parent 33431a7bf0
commit 639c4203e7
5 changed files with 21 additions and 9 deletions

View File

@@ -49,8 +49,10 @@
}
}
.panel-top-tools{
&.panel-top-tools-bottom{
border-bottom: 1px solid $--border-color-light;
}
}
.top-tool-btn-group {
display: flex;
.top-tool-btn:not(:last-of-type):not(:first-of-type) {

View File

@@ -22,12 +22,15 @@
}
}
.bottom-data-list .sub-container {
height: calc(100% - 64px);
height: calc(100% - 50px);
background-color: $--background-color-base;
overflow-y: auto;
&>div {
background-color: $--background-color-empty;
}
.pagination-bottom {
bottom: 8px;
}
&>.nz-table2 {
height: 100%;
padding-top: 20px !important;
@@ -71,7 +74,7 @@
padding: 0;
.bottom-data-list {
.sub-container {
padding: 10px;
//padding: 10px;
}
}
@@ -142,6 +145,7 @@
}
.bottom-log {
padding: 15px;
height: 100%;
}
.bottom-common {
padding: 20px;
@@ -166,7 +170,7 @@
bottom: 0;
}
.bottom-box .sub-container{
height: calc(100% - 64px);
height: calc(100% - 50px);
}
.bottom-box .sub-container .nz-table2 {
height: calc(100% - 20px);

View File

@@ -95,7 +95,7 @@
}
.table-list-box {
height: 100%;
border-top: 1px solid $--background-color-base;
//border-top: 1px solid $--background-color-base;
background-color: $--background-color-empty;
}
.box-content {

View File

@@ -7,7 +7,7 @@
</transition>
</div>
<div class="main-container">
<div class="top-tools panel-top-tools">
<div class="top-tools panel-top-tools" :class="showTopLine? 'panel-top-tools-bottom' : ''">
<div v-if="panelData.length === 0" class="top-tool-left" style="margin-left: 10px;">
<button id="panel-add-panel" class="nz-btn nz-btn-style-light nz-btn-size-small" @click="toAdd"><i class="nz-icon nz-icon-create-square"></i>&nbsp;&nbsp;{{$t("dashboard.panel.createPanelTitleSec")}}</button>
</div>
@@ -272,7 +272,8 @@ export default {
// ---图表相关参数--end
scrollbarWrap: null,
batchDeleteObjs: [],
nowTimeType: {}
nowTimeType: {},
showTopLine: false
}
},
components: {
@@ -750,7 +751,9 @@ export default {
_self.showTopBtn = _self.scrollbarWrap.scrollTop > 50
_self.overScroll10 = _self.scrollbarWrap.scrollTop > 50
_self.$refs.chartList.onScroll(_self.scrollbarWrap.scrollTop)
}, 300))
}, 300, function () {
_self.showTopLine = _self.scrollbarWrap.scrollTop > 10
}))
},
focusInput () {
let classVal = document.getElementById('queryPanel').parentElement.getAttribute('class')

View File

@@ -231,13 +231,16 @@ export default new Vue({
getOffsetTimezoneData (offset = 0) {
return new Date(this.computeTimezone(new Date().getTime())).setHours(new Date(this.computeTimezone(new Date().getTime())).getHours() + offset)
},
debounce (fn, delay) {
debounce (fn, delay, fn1) {
// 记录上一次的延时器
let timer = null
delay = delay || 200
return function () {
const args = arguments
const that = this
if (fn1) {
fn1()
}
// 清除上一次延时器
clearTimeout(timer)
timer = setTimeout(function () {