diff --git a/nezha-fronted/src/components/common/detailView/nzDetailView.vue b/nezha-fronted/src/components/common/detailView/nzDetailView.vue index 41c30e8bd..211435bcd 100644 --- a/nezha-fronted/src/components/common/detailView/nzDetailView.vue +++ b/nezha-fronted/src/components/common/detailView/nzDetailView.vue @@ -58,6 +58,26 @@ + + + + @@ -65,11 +85,13 @@ import { fromRoute } from '@/components/common/js/constants' import { bottomBoxWindow } from '@/components/common/js/tools' import detailViewRight from '@/components/common/detailView/view/detailViewRight' +import panelChart from "@/components/chart/panelChart"; export default { name: 'nzDataList', components: { - detailViewRight + detailViewRight, + panelChart }, props: { from: { @@ -110,6 +132,12 @@ export default { } } return '' + }, + topologyShow () { + return this.$store.getters.getTopologyShow + }, + topologyChartInfo () { + return this.$store.getters.getTopologyChartInfo } }, data () { @@ -130,7 +158,8 @@ export default { tableHover: false, // 控制滚动条和top按钮同时出现 showCustomTableTitle: false // 自定义列弹框是否显示 }, - showLayout: [] + showLayout: [], + timeRange: [new Date(), new Date()] } }, methods: { @@ -165,6 +194,9 @@ export default { }, changeDetailType (item) { this.$emit('changeDetailType', item) + }, + showFullscreen (flag) { + this.$store.commit('setTopologyShow', flag) } }, watch: { diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue index fbc9687eb..5774a4daf 100644 --- a/nezha-fronted/src/components/common/table/nzDataList.vue +++ b/nezha-fronted/src/components/common/table/nzDataList.vue @@ -83,6 +83,7 @@ :visible.sync="topologyShow" :show-close="false" class="nz-dialog chart-fullscreen" + :close-on-click-modal="false" destroy-on-close fullscreen :modal-append-to-body="false"