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

fix： 隐藏alertMessahgeInfo dashboard chart的全屏显示

Browse Source
This commit is contained in:
zhangyu
2023-04-26 13:41:04 +08:00
parent 5e438b5bbd
commit 80f8f19840
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@
<i class="nz-icon nz-icon-replay tool__icon"></i> <i class="nz-icon nz-icon-replay tool__icon"></i>
</div> </div>
</span> </span>
<span v-if="from !== this.$CONSTANTS.fromRoute.chartTemp && chartInfo.type!=='group'" class="chart-header__tool" @click="showFullscreen"> <span v-if="from !== this.$CONSTANTS.fromRoute.chartTemp && chartInfo.type!=='group' && showTool" class="chart-header__tool" @click="showFullscreen">
<div :title="$t('dashboard.screen')" effect="light" placement="top"> <div :title="$t('dashboard.screen')" effect="light" placement="top">
<i class="nz-icon nz-icon-maxview tool__icon"></i> <i class="nz-icon nz-icon-maxview tool__icon"></i>
</div> </div>

3
nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
View File

@@ -118,8 +118,9 @@ export default {
} }
}) })
// && n.alertRule.dashboardId // && n.alertRule.dashboardId
n.alertRule && (n.alertRule.dashboardId = 102224)
if (n.alertRule && n.alertRule.dashboardId) { if (n.alertRule && n.alertRule.dashboardId) {
// n.alertRule.dashboardId = 1487 //
this.cardNames.push({ this.cardNames.push({
key: 'dashboard', key: 'dashboard',
label: this.$t('overall.dashboard') label: this.$t('overall.dashboard')

4
nezha-fronted/src/components/page/integration/integration-tabs/dashboard.vue
View File

@@ -174,7 +174,9 @@ export default {
this.getData(this.filter) this.getData(this.filter)
} }
} }
this.chartListLoading = false if (this.urlType === 'template') {
this.chartListLoading = false
}
}).catch((error) => { }).catch((error) => {
this.chartListLoading = false this.chartListLoading = false
if (error) { if (error) {