Merge branch 'codeCheck' of https://git.mesalab.cn/nezha/nezha-fronted into codeCheck 合并代码解决冲突

2020-08-05 09:31:48 +08:00
parent 2ecf2acae9 06a3000af1
commit 674acaabd6
23 changed files with 471 additions and 1448 deletions
--- a/nezha-fronted/src/components/charts/chart-alert-list.vue
+++ b/nezha-fronted/src/components/charts/chart-alert-list.vue
@@ -71,8 +71,6 @@
            @tableDataSort="tableDataSort"
            @deleteMessage="deleteMessage"
            ref="alertListScreenTable"
-            :form="'chartList'"
-            :fromPath="'/alertList'"
          ></alertMessageTable>
          <Pagination :pageObj="screenPageObj"  @pageNo='screenPageNo' @pageSize='screenPageSize' ref="Pagination" ></Pagination>
          <loading  :ref="'localLoadingScreen'+chartIndex"></loading>