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

Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

Browse Source 
# Conflicts:
#	.gitlab-ci.yml
This commit is contained in:
zhangyu
2022-04-15 16:30:28 +08:00
parent 3de0416f66 9c5df8a354
commit 8a822b94d7
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nezha-fronted/src/components/chart/chartMixin.js
View File

@@ -123,7 +123,8 @@ export default {
alias += chartInfo.elements[expressionIndex].expression alias += chartInfo.elements[expressionIndex].expression
} }
// proj_status_ // proj_status_
const name = alias + '-' + dataIndex const legendIndex = expressionIndex + 'and' + dataIndex
const name = alias + '-' + legendIndex
// 若需要统计，处理统计数据 // 若需要统计，处理统计数据
const statisticsTypes = chartInfo.param.legend ? chartInfo.param.legend.values : '' const statisticsTypes = chartInfo.param.legend ? chartInfo.param.legend.values : ''

1
nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
View File

@@ -181,6 +181,7 @@ export default {
return { return {
fromRoute, fromRoute,
pdfId: 'pdfDom', pdfId: 'pdfDom',
htmlTitle: 'panel',
panelTabLoading: false, panelTabLoading: false,
showTopBtn: false, // top按钮 showTopBtn: false, // top按钮
visible: false, visible: false,

8
nezha-fronted/src/components/page/dashboard/panel.vue
View File

@@ -77,9 +77,9 @@
<el-dropdown-item v-has="'main_add'"> <el-dropdown-item v-has="'main_add'">
<div id="chart-htmltopdf" @click="htmlToPdf"><i class="nz-icon nz-icon-export-pdf"></i>{{ $t('overall.downloadToPdf') }}</div> <div id="chart-htmltopdf" @click="htmlToPdf"><i class="nz-icon nz-icon-export-pdf"></i>{{ $t('overall.downloadToPdf') }}</div>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-has="'main_add'"> <!-- <el-dropdown-item v-has="'main_add'">-->
<div id="chart-htmltoData" @click="exportData"><i class="nz-icon nz-icon-download1"></i>{{ $t('overall.downloadToPdf') }}</div> <!-- <div id="chart-htmltoData" @click="exportData"><i class="nz-icon nz-icon-download1"></i>{{ $t('overall.downloadToPdf') }}</div>-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
</template> </template>
</top-tool-more-options> </top-tool-more-options>
</div> </div>
@@ -823,7 +823,7 @@ export default {
const dom = document.getElementsByClassName(this.pdfId)[0] const dom = document.getElementsByClassName(this.pdfId)[0]
if (dom) { if (dom) {
// dom = dom.getElementsByClassName('vue-grid-layout')[0] // dom = dom.getElementsByClassName('vue-grid-layout')[0]
this.htmlTitle = this.panel.name this.htmlTitle = this.showPanel.name
this.scrollbarWrap.scrollTop = this.scrollbarWrap.scrollHeight this.scrollbarWrap.scrollTop = this.scrollbarWrap.scrollHeight
this.$refs.chartList.onScroll(this.scrollbarWrap.scrollTop) this.$refs.chartList.onScroll(this.scrollbarWrap.scrollTop)
// const div = document.createElement('div') // const div = document.createElement('div')