gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：alerMessage页面 可以根据id和state排序

Browse Source
This commit is contained in:
zhangyu
2020-07-20 13:45:09 +08:00
parent 8328997d7a
commit 2ac064b75d
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/page/alert/list.vue
View File

@@ -909,6 +909,8 @@
//是否需要排序 //是否需要排序
sortableShow(prop){ sortableShow(prop){
switch(prop){ switch(prop){
case 'id':
case 'state':
case 'alertRule': case 'alertRule':
case 'severity': case 'severity':
case 'startAt': case 'startAt':
@@ -920,6 +922,8 @@
// prop字段 // prop字段
propTitle(prop){ propTitle(prop){
switch(prop){ switch(prop){
case 'id': return'am.id';
case 'state': return'am.state';
case 'alertRule': return'ar.alert_name'; case 'alertRule': return'ar.alert_name';
case 'severity': return'am.severity'; case 'severity': return'am.severity';
case 'startAt': return'am.start_at'; case 'startAt': return'am.start_at';

19
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -16,8 +16,8 @@
</el-popover> </el-popover>
<span v-else>{{item.name}}</span> <span v-else>{{item.name}}</span>
</div> </div>
<el-tooltip :content="item.total" placement="top" effect="light" :disabled="item.total<99"> <el-tooltip :content="''+item.total" placement="top" effect="light" :disabled="item.total<99">
<el-badge class="mark" :value="item.total" max="99"/> <el-badge class="mark" :value="item.total" :max="99"/>
</el-tooltip> </el-tooltip>
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
@@ -31,8 +31,8 @@
</el-popover> </el-popover>
<span v-else>{{item.name}}</span> <span v-else>{{item.name}}</span>
</div> </div>
<el-tooltip :content="item.total" placement="top" effect="light" :disabled="item.total<99"> <el-tooltip :content="''+item.total" placement="top" effect="light" :disabled="item.total<99">
<el-badge class="mark" :value="item.total" max="99"/> <el-badge class="mark" :value="item.total" :max="99"/>
</el-tooltip> </el-tooltip>
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
@@ -46,8 +46,8 @@
</el-popover> </el-popover>
<span v-else>{{item.name}}</span> <span v-else>{{item.name}}</span>
</div> </div>
<el-tooltip :content="item.total" placement="top" effect="light" :disabled="item.total<99"> <el-tooltip :content="''+item.total" placement="top" effect="light" :disabled="item.total<99">
<el-badge class="mark" :value="item.total" max="99"/> <el-badge class="mark" :value="item.total" :max="99"/>
</el-tooltip> </el-tooltip>
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
@@ -61,8 +61,8 @@
</el-popover> </el-popover>
<span v-else>{{item.label}}</span> <span v-else>{{item.label}}</span>
</div> </div>
<el-tooltip :content="item.total" placement="top" effect="light" :disabled="item.total<99"> <el-tooltip :content="''+item.total" placement="top" effect="light" :disabled="item.total<99">
<el-badge class="mark" :value="item.total" max="99"/> <el-badge class="mark" :value="item.total" :max="99"/>
</el-tooltip> </el-tooltip>
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
@@ -97,7 +97,8 @@
:height="mainTableHeight" :height="mainTableHeight"
style="width: 100%;" style="width: 100%;"
:data="tableData" :data="tableData"
v-scrollBar:el-table="'large'" v-scrollBar
:el-table="'large'"
v-show="mainResizeShow" v-show="mainResizeShow"
border border
v-loading="loading" v-loading="loading"