diff --git a/src/assets/css/components/views/charts/chartEchartAppRelateDomain.scss b/src/assets/css/components/views/charts/chartEchartAppRelateDomain.scss index a041ca27..8a799862 100644 --- a/src/assets/css/components/views/charts/chartEchartAppRelateDomain.scss +++ b/src/assets/css/components/views/charts/chartEchartAppRelateDomain.scss @@ -65,7 +65,7 @@ } } } -.cn-panel2 .chart-list > .vue-grid-layout > .vue-grid-item > .panel-chart .chart-header { +.cn-panel2 .chart-list > .vue-grid-layout > .vue-grid-item > .panel-chart .chart-header,.cn-panel2 .chart-list > .dns-screen> .panel-chart .chart-header { border-bottom: 1px solid $--right-box-border-color; } .cn-panel2 .chart-list > .vue-grid-layout > .vue-grid-item > .panel-chart .chart-header.is-group-collapse { diff --git a/src/assets/css/components/views/charts/panel.scss b/src/assets/css/components/views/charts/panel.scss index d92a28cc..261920c0 100644 --- a/src/assets/css/components/views/charts/panel.scss +++ b/src/assets/css/components/views/charts/panel.scss @@ -11,7 +11,7 @@ } } .chart-list { - &>.vue-grid-layout>.vue-grid-item { + &>.vue-grid-layout>.vue-grid-item, &>.dns-screen { &>.panel-chart { border: 1px solid $--chart-box-border-color; background-color: #FFFFFF; diff --git a/src/views/charts/Panel.vue b/src/views/charts/Panel.vue index 05697a68..1d22e8ab 100644 --- a/src/views/charts/Panel.vue +++ b/src/views/charts/Panel.vue @@ -185,7 +185,6 @@ export default { this.$refs.panelChartList.groupParentCalcHeight(params.chart, params.childrenList) }, wholeScreenScroll (e) { - return if (this.scroll.prevent) { return } @@ -206,11 +205,11 @@ export default { // 向上滚动,若top在clientHeight内,则滚动到最顶部 this.scroll.prevScrollTop = currentScrollTop if (currentScrollTop < clientHeight) { - //console.info('up', this.scroll.prevScrollTop, currentScrollTop) + // console.info('up', this.scroll.prevScrollTop, currentScrollTop) scrollToTop(e.target, 0, 200, 'up') setTimeout(() => { this.scroll.prevScrollTop = e.target.scrollTop - //console.info('up2', this.scroll.prevScrollTop, currentScrollTop) + // console.info('up2', this.scroll.prevScrollTop, currentScrollTop) }, 210) } } diff --git a/src/views/charts/PanelChart.vue b/src/views/charts/PanelChart.vue index 1f5c3212..152e8d00 100644 --- a/src/views/charts/PanelChart.vue +++ b/src/views/charts/PanelChart.vue @@ -206,6 +206,7 @@ export default { if (requestUrl && requestUrl.indexOf('dnsServerRole') > -1) { this.queryParams.dnsServerRole = extraParams.dnsServerRole || dnsServerRole.RTDNS } + if (requestUrl) { get(replaceUrlPlaceholder(requestUrl, this.queryParams)).then(response => { if (response.code === 200) { diff --git a/src/views/charts/PanelChartList.vue b/src/views/charts/PanelChartList.vue index 71e462bf..1d0175fa 100644 --- a/src/views/charts/PanelChartList.vue +++ b/src/views/charts/PanelChartList.vue @@ -1,12 +1,17 @@