gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-3500 fix: 图表时间查询有误

Browse Source
This commit is contained in:
zyh
2024-09-19 15:41:31 +08:00
parent 22dfe521fd
commit 2950d40195
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss
View File

@@ -71,7 +71,6 @@
.table-list { .table-list {
overflow-y: auto; overflow-y: auto;
height: 100%; height: 100%;
padding: 20px 0;
box-sizing: border-box; box-sizing: border-box;
} }

6
nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
View File

@@ -70,6 +70,7 @@ import alertDetail from '@/components/common/alert/alertDetail'
import dashboard from '@/components/page/integration/integration-tabs/dashboard' import dashboard from '@/components/page/integration/integration-tabs/dashboard'
import { fromRoute } from '@/components/common/js/constants' import { fromRoute } from '@/components/common/js/constants'
import snapshotProgress from '@/components/common/snapshotProgress/snapshotProgress.vue' import snapshotProgress from '@/components/common/snapshotProgress/snapshotProgress.vue'
import bus from '@/libs/bus'
// import alertLabelMixin from '@/components/common/mixin/alertLabelMixin' // import alertLabelMixin from '@/components/common/mixin/alertLabelMixin'
export default { export default {
name: 'alertMessageInfoTab', name: 'alertMessageInfoTab',
@@ -185,7 +186,10 @@ export default {
immediate: true, immediate: true,
handler (n) { handler (n) {
if (n && n.length) { if (n && n.length) {
this.timeRange = [this.timeFormate(n[0] * 1000), this.timeFormate(n[1] * 1000)] this.timeRange = this.timeRange = [
bus.timeFormate(bus.computeTimezone(n[0] * 1000)),
bus.timeFormate(bus.computeTimezone(n[1] * 1000))
]
} }
} }
} }

2
nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
View File

@@ -89,7 +89,7 @@
</div> </div>
</template> </template>
<!--图表--> <!--图表-->
<div id="tableList" class="table-list chart-list-box" style="padding-top: 0;overflow: hidden"> <div id="tableList" class="table-list chart-list-box" style="overflow: hidden;">
<div id="dashboardScrollbar" class="table-list-box"> <div id="dashboardScrollbar" class="table-list-box">
<div class="box-content" ref="dashboardScrollbar" v-my-loading="chartListLoading" style="overflow-y: scroll;display: flex;flex-direction: column;overflow-x: hidden"> <div class="box-content" ref="dashboardScrollbar" v-my-loading="chartListLoading" style="overflow-y: scroll;display: flex;flex-direction: column;overflow-x: hidden">
<panel-variables :labelArrs="variables" :time-range="searchTime" @getPanelData="getPanelData"></panel-variables> <panel-variables :labelArrs="variables" :time-range="searchTime" @getPanelData="getPanelData"></panel-variables>

2
nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
View File

@@ -394,7 +394,7 @@ export default {
boxHeight = null boxHeight = null
}) })
this.position.show = true this.position.show = true
setTimeout(()=>{ setTimeout(() => {
if (this.$refs.meta2dTooltip && this.$refs.meta2dTooltip.$refs.panelChart) { if (this.$refs.meta2dTooltip && this.$refs.meta2dTooltip.$refs.panelChart) {
this.$refs.meta2dTooltip.$refs.panelChart.loading = false this.$refs.meta2dTooltip.$refs.panelChart.loading = false
// console.log(this.chartParams) // console.log(this.chartParams)

4
nezha-fronted/src/components/page/alert/alertMessage.vue
View File

@@ -1309,6 +1309,10 @@ export default {
}, },
beforeDestroy () { beforeDestroy () {
clearTimeout(this.timer) clearTimeout(this.timer)
this.$store.dispatch('dispatchPanelTime', {
time: [],
nowTimeType: {}
})
}, },
destroyed () { destroyed () {
localStorage.removeItem('alertMessageProjectId') localStorage.removeItem('alertMessageProjectId')