From d97a77aa801b9300e2ec1144a25cf2498ea3b7ad Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 22 Jun 2022 14:37:48 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-1966=20fix=EF=BC=9A=E5=9C=A8=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=88=87=E6=8D=A2=E8=A7=86=E5=9B=BE=E7=9A=84=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BD=BF=E7=94=A8Graph=E5=8A=9F=E8=83=BD=E6=97=B6?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=90=8E=E6=B2=A1=E6=9C=89=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/detailView/nzDetailView.vue | 36 +++++++++++++++++-- .../components/common/table/nzDataList.vue | 1 + 2 files changed, 35 insertions(+), 2 deletions(-) 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"