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

# Conflicts: # .gitlab-ci.yml
2022-04-15 16:30:28 +08:00
parent 3de0416f66 9c5df8a354
commit 8a822b94d7
3 changed files with 7 additions and 5 deletions
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -181,6 +181,7 @@ export default {
    return {
      fromRoute,
      pdfId: 'pdfDom',
+      htmlTitle: 'panel',
      panelTabLoading: false,
      showTopBtn: false, // top按钮
      visible: false,