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

NEZ-649 fix: alert silence 列表页面，当 state = 3 (expired) 禁用 edit 按钮

Browse Source
This commit is contained in:
@changcode
2021-05-20 18:45:27 +08:00
parent 3af803cf89
commit 1beab79d7f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/charts/chart-detail.vue
View File

@@ -410,7 +410,7 @@ export default {
this.panelIdInner = panelId this.panelIdInner = panelId
this.data = chartItem this.data = chartItem
this.detail = detail this.detail = detail
console.info(this.data, this.detail) // console.info(this.data, this.detail)
/* if (this.detail[0] && this.detail[0].type && this.detail[0].type == 'endpointInfo') { // endpointInfo的小图表 /* if (this.detail[0] && this.detail[0].type && this.detail[0].type == 'endpointInfo') { // endpointInfo的小图表
this.$nextTick(() => { this.$nextTick(() => {
this.initChart(this.detail[0].data.stateSeries) this.initChart(this.detail[0].data.stateSeries)

4
nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
View File

@@ -89,7 +89,7 @@
fixed="right"> fixed="right">
<div slot="header" class="table-operation-title">{{$t('overall.option')}}</div> <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
<div slot-scope="scope" class="table-operation-items"> <div slot-scope="scope" class="table-operation-items">
<button class="table-operation-item" v-has="'alertSilence_edit'" @click="$emit('edit', scope.row)"><i class="nz-icon nz-icon-edit"></i></button> <button class="table-operation-item" v-has="'alertSilence_edit'" @click="$emit('edit', scope.row)" :disabled="scope.row.state == 3"><i class="nz-icon nz-icon-edit"></i></button>
<el-dropdown size="medium" v-has="['alertSilence_expire']" trigger="hover" @command="tableOperation"> <el-dropdown size="medium" v-has="['alertSilence_expire']" trigger="hover" @command="tableOperation">
<div class="table-operation-item table-operation-item--more"> <div class="table-operation-item table-operation-item--more">
<span>…</span><i class="nz-icon nz-icon-arrow-down"></i> <span>…</span><i class="nz-icon nz-icon-arrow-down"></i>
@@ -205,7 +205,7 @@ export default {
result2.push(item) result2.push(item)
} }
}) })
console.log([...result, ...result2]) // console.log([...result, ...result2])
return [...result, ...result2] return [...result, ...result2]
} }
} }