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

Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
This commit is contained in:
chenjinsong
2021-11-11 11:28:19 +08:00
parent e7273d0be0 6abf76db08
commit a0dcb8d877
10076 changed files with 1357 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nezha-fronted/src/components/page/dashboard/panel.vue
View File

@@ -351,7 +351,7 @@ export default {
const chartData = res.data.data
// console.log(typeof chartData.param)
if (typeof chartData.param === 'string') {
chartData.param = JSON.parse(chartData.param)
chartData.param = chartData.param ? JSON.parse(chartData.param) : {}
}
if (!chartData.param) {
chartData.param = { url: '', threshold: '' }
@@ -569,7 +569,6 @@ export default {
this.$store.state.showPanel.id = 0
this.$store.state.showPanel.name = ''
this.$store.state.showPanel.type = 'dashboard'
} else {
if (response.msg) {
this.$message.error(response.msg)