Merge branch 'nz-release1.2' into 'codeCheck'

Nz release1.2 See merge request nezha/nezha-fronted!2
2020-03-17 20:13:28 +08:00
parent 7ab9e62d8e 9e3c49348b
commit ff9d9d7e29
12 changed files with 409 additions and 41 deletions
--- a/nezha-fronted/src/components/common/pagination.vue
+++ b/nezha-fronted/src/components/common/pagination.vue
@@ -87,7 +87,6 @@ export default {
       this.resetPageSizes();
    }else{
      let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId);
-      console.log(typeof pageSize)
      if(pageSize != 'undefined' && pageSize != null){
        this.pageSize=parseInt(pageSize);
      }