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

Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

Browse Source
This commit is contained in:
zhangyu
2021-09-15 11:42:56 +08:00
parent d79afc8836 278044a1bb
commit 48ae3a4061
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
View File

@@ -209,6 +209,11 @@ export default {
}
this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
if (this.from === fromRoute.model) {
this.$set(this.searchLabel, 'modelIds', this.obj.id)
} else if (this.from === fromRoute.dc) {
this.$set(this.searchLabel, 'dcIds', this.obj.id)
}
this.tools.loading = true
this.$get(this.url, { ...this.searchLabel, ...this.searchCheckBox }).then(response => {
this.tools.loading = false

2
nezha-fronted/src/components/common/browserWindowZoom.vue
View File

@@ -1,6 +1,6 @@
<template>
<transition name="el-zoom-in-center">
<div v-show="browserWindowZoom" class="zoom">
<div v-show="browserWindowZoom" class="zoom" style="z-index: 101;">
<i class="nz-icon nz-icon-about-full"></i>
<span>{{$t('tip.zoomStatusPrompt')}}</span>
<button class="zoom-button" @click="doNotAskAgain">{{$t('tip.doNotAskAgain')}}</button>

1
nezha-fronted/src/components/common/searchInput.vue
View File

@@ -651,7 +651,6 @@ export default {
this.severitySelect.forEach((item, index) => {
this.$set(item, 'searchType', 'severity')
})
console.log(this.severitySelect)
}
})
},

6
nezha-fronted/src/components/page/config/system.vue
View File

@@ -70,9 +70,9 @@
<div class="system-config-form basicForm" v-if="activeTab === 'monitor'">
<div class="system-title">{{$t('config.system.basic.title')}}</div>
<el-form :model="monitor" label-width="180px" size="small" ref="monitorForm" :rules="monitorRules" :validate-on-rule-change="false">
<el-form-item :label="$t('config.system.monitor.alertApi')" prop="asset_ping_interval">
<el-input v-model="monitor.alert_api" id="monitor-alert-api"></el-input>
</el-form-item>
<!-- <el-form-item :label="$t('config.system.monitor.alertApi')" prop="asset_ping_interval">-->
<!-- <el-input v-model="monitor.alert_api" id="monitor-alert-api"></el-input>-->
<!-- </el-form-item>-->
<el-form-item :label="$t('config.system.monitor.prometheusFederation')" prop="prometheus_federation_enabled">
<el-switch v-model="monitor.prometheus_federation_enabled " active-color="rgb(238, 157, 63)" active-value='1' inactive-value='0' id="system-monitor-prometheus_federation_enabled">
</el-switch>

2
nezha-fronted/src/components/page/dashboard/chartBox.vue
View File

@@ -361,7 +361,7 @@
</el-form-item>
<div v-if="!isUrl&&!isAlert&& editChart.type != 'text'&& editChart.type != 'group' && editChart.type != 'diagram'" class="form__sub-title">
<span>{{$t('alert.config.expr')}}</span>
<span>{{$t('alert.config.exprBox')}}</span>
<span v-if="!isSingleStat" @click="addExpression">
<i class="nz-icon nz-icon-create-square" style="font-weight: normal; font-size: 17px; cursor: pointer;"></i>
</span>