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

fix：解决冲突

Browse Source
This commit is contained in:
zyh
2023-09-07 10:37:43 +08:00
parent 8d95d012ee 2f6b349e80
commit 56ec2398f0
20 changed files with 528 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -271,6 +271,10 @@ export default {
tooltip: {
mode: 'all',
sort: 'none'
},
option: {
lineWidth: 1,
pointSize: 6
}
},
elements: [{ expression: '', legend: '', type: 'expert', id: '', name: 'A', state: 1, orderNum: 0 }],
@@ -638,6 +642,12 @@ export default {
}
this.chart.param.enable.tooltip = true
}
if (!this.chart.param.option) {
this.chart.param.option = {
lineWidth: 1,
pointSize: 6
}
}
}
if (this.chart.type === 'stat') {
if (!this.chart.param.sparklineMode) { this.chart.param.sparklineMode = 'none' }
@@ -697,6 +707,12 @@ export default {
}
this.chart.param.enable.tooltip = true
}
if (!this.chart.param.option) {
this.chart.param.option = {
lineWidth: 1,
pointSize: 6
}
}
}
if (this.chart.type === 'stat') {
if (!this.chart.param.sparklineMode) { this.chart.param.sparklineMode = 'none' }
@@ -1247,7 +1263,7 @@ export default {
this.$store.commit('setMode', this.mode)
await this.getTableData()
if (this.nowTimeType.type) {
this.setSearchTime('searchTime',this.nowTimeType)
this.setSearchTime('searchTime', this.nowTimeType)
}
if (this.nowTimeType) {
this.nowTimeType.start_time = this.searchTime[0]