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

This commit is contained in:
zhangyu
2022-03-18 09:39:48 +08:00
4 changed files with 6 additions and 2 deletions

View File

@@ -109,7 +109,6 @@ export default {
prop: 'state',
show: true,
minWidth: 200,
sortable: 'custom'
}
// {
// label: this.$t('project.endpoint.status'),

View File

@@ -226,6 +226,10 @@ export default {
params.x = 0
params.y = 999
}
if (this.from === 'explore') { // explore 新增 放在最后
params.x = 0
params.y = 999
}
if (!params.x && !params.y && this.from === 'chartTemp') { // chartTemp 新增 在第一位
params.x = 0
params.y = 0

View File

@@ -19,6 +19,7 @@
<operation-log-table
v-if="profileShow"
ref="dataTable"
:orderByFa="orderBy"
v-loading="tools.loading"
:loading="tools.loading"
:api="url"

View File

@@ -982,7 +982,7 @@ export default {
this.chartData = chart
this.rightBox.show = true
},
createSuccess (type, response, param, panel) { // 添加chart成功
createSuccess (panel) { // 添加chart成功
this.$confirm(this.$t('dashboard.metric.goPanelTip'), this.$t('tip.saveSuccess'), {
confirmButtonText: this.$t('tip.yes'),
cancelButtonText: this.$t('tip.no'),