diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index 7f0e19842..11ce0f201 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -909,6 +909,8 @@ //是否需要排序 sortableShow(prop){ switch(prop){ + case 'id': + case 'state': case 'alertRule': case 'severity': case 'startAt': @@ -920,6 +922,8 @@ // prop字段 propTitle(prop){ switch(prop){ + case 'id': return'am.id'; + case 'state': return'am.state'; case 'alertRule': return'ar.alert_name'; case 'severity': return'am.severity'; case 'startAt': return'am.start_at'; diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 3cce58bfa..290d974dc 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -16,8 +16,8 @@ {{item.name}} - - + + @@ -31,8 +31,8 @@ {{item.name}} - - + + @@ -46,8 +46,8 @@ {{item.name}} - - + + @@ -61,8 +61,8 @@ {{item.label}} - - + + @@ -97,7 +97,8 @@ :height="mainTableHeight" style="width: 100%;" :data="tableData" - v-scrollBar:el-table="'large'" + v-scrollBar + :el-table="'large'" v-show="mainResizeShow" border v-loading="loading"