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

This commit is contained in:
@changcode
2021-05-25 17:58:49 +08:00
18 changed files with 45 additions and 30 deletions

View File

@@ -14,6 +14,7 @@
@header-dragend="dragend"
@sort-change="tableDataSort"
@selection-change="selectionChange"
@row-dblclick="(row)=>{$emit('messageDetail', row)}"
>
<el-table-column
:resizable="false"
@@ -169,7 +170,7 @@ export default {
label: 'ID',
prop: 'id',
show: true,
width: 80,
width: 160,
sortable: 'custom'
}, {
label: this.$t('alert.rule'),