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

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

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/chart/chart/chartGauge.vue
#	nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
This commit is contained in:
zhangyu
2022-03-24 13:40:37 +08:00
parent 792f9bf95a 308f891da4
commit 9e00d50795
29 changed files with 154 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nezha-fronted/src/components/common/mixin/dataList.js
View File

@@ -347,7 +347,10 @@ export default {
}
},
created () {
const path = this.$route.fullPath.match(/\/(\S*)\?/)[1]
let path = ''
if (this.$route.fullPath.match(/\/(\S*)\?/)) {
path = this.$route.fullPath.match(/\/(\S*)\?/)[1]
}
if (this.$route.query.orderBy && !this.isSubList) {
this.orderBy = this.$route.query.orderBy
}