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

fix : 二级页面排序只在正序倒序切换

Browse Source
This commit is contained in:
zhangyu
2020-07-28 10:19:00 +08:00
parent 43a44f707b
commit 7224423e35
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/components/charts/chart-alert-list.vue
View File

@@ -78,6 +78,7 @@
min-width="110px" min-width="110px"
:sortable="sortableShow(item.prop)" :sortable="sortableShow(item.prop)"
:prop="propTitle(item.prop)" :prop="propTitle(item.prop)"
:sort-orders="['ascending', 'descending']"
> >
<template slot-scope="scope" :column="item"> <template slot-scope="scope" :column="item">
<template v-if="item.prop == 'alertRule'"> <template v-if="item.prop == 'alertRule'">

6
nezha-fronted/src/components/common/alert/alertLabel.vue
View File

@@ -25,7 +25,7 @@
</div> </div>
<div class="alertLabelBox"> <div class="alertLabelBox">
<div class="alertLabelTitle">Description</div> <div class="alertLabelTitle">Description</div>
<div class="alertLabelValue">{{alertLabelData?alertLabelData.remark:''}}</div> <div class="alertLabelValue">{{alertLabelData?(alertLabelData.remark?alertLabelData.remark:'-'):''}}</div>
</div> </div>
</div> </div>
<div class="alertLabelInfo" v-if="type==='project'"> <div class="alertLabelInfo" v-if="type==='project'">
@@ -39,7 +39,7 @@
</div> </div>
<div class="alertLabelBox"> <div class="alertLabelBox">
<div class="alertLabelTitle">Description</div> <div class="alertLabelTitle">Description</div>
<div class="alertLabelValue">{{alertLabelData?alertLabelData.remark:''}}</div> <div class="alertLabelValue">{{alertLabelData?(alertLabelData.remark?alertLabelData.remark:'-'):''}}</div>
</div> </div>
</div> </div>
</span> </span>
@@ -93,7 +93,7 @@
data() { data() {
return { return {
alertLabelData:null, alertLabelData:null,
loading:module loading:true
} }
}, },
components:{ components:{

1
nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
View File

@@ -57,6 +57,7 @@
min-width="110px" min-width="110px"
:sortable="sortableShow(item.prop)" :sortable="sortableShow(item.prop)"
:prop="propTitle(item.prop)" :prop="propTitle(item.prop)"
:sort-orders="['ascending', 'descending']"
> >
<template slot-scope="scope" :column="item"> <template slot-scope="scope" :column="item">
<template v-if="item.prop == 'alertRule'"> <template v-if="item.prop == 'alertRule'">

1
nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue
View File

@@ -47,6 +47,7 @@
min-width="110px" min-width="110px"
:sortable="sortableShow(item.prop)" :sortable="sortableShow(item.prop)"
:prop="propTitle(item.prop)" :prop="propTitle(item.prop)"
:sort-orders="['ascending', 'descending']"
> >
<template slot-scope="scope" :column="item"> <template slot-scope="scope" :column="item">
<span v-if="item.prop == 'asset' && scope.row[item.prop]" class="link" @click="">{{scope.row[item.prop].host}}</span> <span v-if="item.prop == 'asset' && scope.row[item.prop]" class="link" @click="">{{scope.row[item.prop].host}}</span>

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

@@ -117,6 +117,7 @@
:class-name="item.prop == 'option' ? 'content-right-options' : ''" :class-name="item.prop == 'option' ? 'content-right-options' : ''"
:sortable="sortableShow(item.prop)" :sortable="sortableShow(item.prop)"
:prop="propTitle(item.prop)" :prop="propTitle(item.prop)"
:sort-orders="['ascending', 'descending']"
> >
<template slot-scope="scope" :column="item"> <template slot-scope="scope" :column="item">
<div v-if="item.prop=='ID'"> <div v-if="item.prop=='ID'">