From 9c5df8a3540e6b7cf9f7cf3313078b91e314f13b Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 15 Apr 2022 16:29:23 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AF=BC?= =?UTF-8?q?=E5=87=BApdf=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chartMixin.js | 5 +++-- .../src/components/common/bottomBox/tabs/panelTabNew.vue | 1 + nezha-fronted/src/components/page/dashboard/panel.vue | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js index 3359143d1..dab16c545 100644 --- a/nezha-fronted/src/components/chart/chartMixin.js +++ b/nezha-fronted/src/components/chart/chartMixin.js @@ -123,7 +123,8 @@ export default { alias += chartInfo.elements[expressionIndex].expression } // proj_status_ - const name = alias + '-' + dataIndex + const legendIndex = expressionIndex + 'and' + dataIndex + const name = alias + '-' + legendIndex // 若需要统计,处理统计数据 const statisticsTypes = chartInfo.param.legend ? chartInfo.param.legend.values : '' @@ -292,7 +293,7 @@ export default { } }, mounted () { - + this.chartId = `${this.chartInfo.id}${this.isFullscreen ? '-fullscreen' : ''}` }, beforeDestroy () { diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue index e36add882..7106104be 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue @@ -180,6 +180,7 @@ export default { return { fromRoute, pdfId: 'pdfDom', + htmlTitle: 'panel', panelTabLoading: false, showTopBtn: false, // top按钮 visible: false, diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index acf705790..65f6cef78 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -819,7 +819,7 @@ export default { let dom = document.getElementsByClassName(this.pdfId)[0] if (dom) { // dom = dom.getElementsByClassName('vue-grid-layout')[0] - this.htmlTitle = this.panel.name + this.htmlTitle = this.showPanel.name this.scrollbarWrap.scrollTop = this.scrollbarWrap.scrollHeight this.$refs.chartList.onScroll(this.scrollbarWrap.scrollTop) console.log(dom.children)