diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 1292b3907..2ffaa54f3 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -97,6 +97,7 @@ @close="screenModal = false;screenLegendListMore=[]" style="margin-top: 1vh !important;" @opened="initDialog" + @closed="closeDialog" :modal-append-to-body="false" > { const filterItem = ele let query = encodeURIComponent(filterItem.expression) @@ -1459,7 +1465,6 @@ export default { } return this.$get('/prom/api/v1/query_range?query=' + query + '&start=' + this.$stringTimeParseToUnix(startTime) + '&end=' + this.$stringTimeParseToUnix(endTime) + '&step=' + step) }) - console.log(this.$refs.pickTime.$refs.multipleTime.searchTime) if (this.$refs.pickTime.$refs.multipleTime && this.$refs.pickTime.$refs.multipleTime.searchTime.length) { // 判断是否需要添加比较 startTime = bus.timeFormate(this.$refs.pickTime.$refs.multipleTime.searchTime[0], 'yyyy-MM-dd hh:mm:ss') endTime = bus.timeFormate(this.$refs.pickTime.$refs.multipleTime.searchTime[1], 'yyyy-MM-dd hh:mm:ss') @@ -1627,10 +1632,8 @@ export default { } }) this.setColor(legend.length) - console.log(series) - const minusTime = (new Date(this.searchTime[0]).getTime() - new Date(this.$refs.pickTime.$refs.multipleTime.searchTime[0]).getTime()) - console.log(minusTime) if (this.$refs.pickTime.$refs.multipleTime && this.$refs.pickTime.$refs.multipleTime.searchTime.length && res.length > this.data.elements.length) { + const minusTime = (new Date(this.searchTime[0]).getTime() - new Date(this.$refs.pickTime.$refs.multipleTime.searchTime[0]).getTime()) let cutPoint = 0 res.forEach((item, index) => { if (index < res.length / 2) { diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue index 9ffc89889..ccd7f33ec 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue @@ -6,7 +6,9 @@ .plTableBox.nz-table /deep/ .el-table{ display: block !important; } - +.project-calendar{ + margin-top: 2px; +}