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

# Conflicts: # nezha-fronted/src/components/chart/panelChart.vue
2022-04-20 09:38:03 +08:00
parent 8b41a30f34 12f996555f
commit 07accb61c0
5 changed files with 50 additions and 6 deletions
--- a/nezha-fronted/src/components/common/js/htmlToPdf.js
+++ b/nezha-fronted/src/components/common/js/htmlToPdf.js
@@ -31,7 +31,6 @@ export default {
        // a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的宽高
        const imgWidth = 595.28
        const imgHeight = 592.28 / contentWidth * contentHeight
-        console.log(canvas)
        // canvas.paddingTop = '30px'
        const pageDataImg = canvas.toDataURL('image/jpeg', 1.0)
        const img = new Image()