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

# Conflicts:
#	.gitignore
#	nezha-fronted/src/assets/css/font/iconfont.js
#	nezha-fronted/src/components/chart/chart/chartAutotopology.vue
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/js/common.js
#	nezha-fronted/src/components/common/js/tools.js
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/static/config.json
This commit is contained in:
zhangyu
2022-07-14 10:19:06 +08:00
519 changed files with 13170 additions and 16 deletions

View File

@@ -771,7 +771,7 @@ export default {
document.body.style.height = 'auto'
// document.getElementsByTagName('html')[0].style.overflow = 'visible'
const position = dom.getBoundingClientRect()
this.getPdf(dom, -1 * position.left, -1 * position.top,this.searchTime)
this.getPdf(dom, -1 * position.left, -1 * position.top, this.searchTime)
// this.getPdf(dom, 0, 0)
}, 2000)
}