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

# Conflicts:
#	nezha-fronted/src/components/charts/chart-alert-list.vue
#	nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
#	nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
This commit is contained in:
zhangyu
2022-04-12 10:46:19 +08:00
53 changed files with 55 additions and 12696 deletions

View File

@@ -21,6 +21,7 @@ export default {
}).then(function (canvas) {
loading.close()
document.body.style.height = '100%'
document.getElementsByClassName('left-menu')[0].style.height = '100%'
document.getElementsByTagName('html')[0].style.overflow = 'hidden'
const contentWidth = canvas.width
const contentHeight = canvas.height
@@ -53,12 +54,13 @@ export default {
if (flag) {
loading = Loading.service({
lock: true,
customClass: 'export-pdf-mask',
text: this.$t('overall.downloadProgress') + 'pdf...',
background: 'rgba(0,0,0,.3)'
})
} else {
if (loading) {
loading.close()
// loading.close()
document.body.style.height = '100%'
document.getElementsByTagName('html')[0].style.overflow = 'hidden'
}