diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss b/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss index 0b7ff93ba..e2db4c7ce 100644 --- a/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss +++ b/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss @@ -58,6 +58,11 @@ max-width: 210px; } } +.alert-rule-detail{ + .alert-label, .alert-labelUp{ + position: absolute; + } +} //.alert-label::after, .alert-labelUp::after { // content: ''; // display: block; diff --git a/nezha-fronted/src/components/chart/chart/chartStat.vue b/nezha-fronted/src/components/chart/chart/chartStat.vue index 4585dbbf0..b98375703 100644 --- a/nezha-fronted/src/components/chart/chart/chartStat.vue +++ b/nezha-fronted/src/components/chart/chart/chartStat.vue @@ -113,7 +113,6 @@ export default { }) }, statMouseMove (e) { - console.log(e) const windowWidth = window.innerWidth// 窗口宽度 const windowHeight = window.innerHeight// 窗口高度 const box = document.getElementById(`chart-canvas-tooltip-${this.chartId}`) diff --git a/nezha-fronted/src/components/chart/chart/grid/GridLayout.vue b/nezha-fronted/src/components/chart/chart/grid/GridLayout.vue index f6c23bf34..c3685ea21 100644 --- a/nezha-fronted/src/components/chart/chart/grid/GridLayout.vue +++ b/nezha-fronted/src/components/chart/chart/grid/GridLayout.vue @@ -297,8 +297,6 @@ export default { }, containerHeight: function () { if (!this.autoSize) return - // console.log("bottom: " + bottom(this.layout)) - // console.log("rowHeight + margins: " + (this.rowHeight + this.margin[1]) + this.margin[1]) const containerHeight = bottom(this.layout) * (this.rowHeight + this.margin[1]) + this.margin[1] + 'px' return containerHeight }, diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue index 39a12ca69..555dc0052 100644 --- a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue +++ b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue @@ -65,6 +65,7 @@ export default { props: { id: {}, messageLoad: {}, + detailList: Boolean, that: {}, severityData: Array }, @@ -91,14 +92,15 @@ export default { // const windowWidth = window.innerWidth const boxHeight = this.$refs.alertLabels ? this.$refs.alertLabels.offsetHeight : 231 const windowHeight = window.innerHeight + const leftOffSetView = this.detailList ? -80 : 10 if (position.top > windowHeight / 2) { return { - left: `${position.left + position.width + 10}px`, + left: `${position.left + position.width + leftOffSetView}px`, top: `${position.top - boxHeight}px` } } else { return { - left: `${position.left + position.width + 10}px`, + left: `${position.left + position.width + leftOffSetView}px`, top: `${position.top}px` } } diff --git a/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue b/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue index ccf36e426..13b9fbe66 100644 --- a/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/alertRule/alertRuleDetail.vue @@ -20,19 +20,15 @@