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

# Conflicts:
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/pagination.vue
#	nezha-fronted/src/components/common/searchInput.vue
#	nezha-fronted/src/components/common/table/settings/endpointTable.vue
#	nezha-fronted/src/components/page/dashboard/overview/overview2.vue
This commit is contained in:
chenjinsong
2021-11-15 14:06:42 +08:00
25 changed files with 2178 additions and 122 deletions

View File

@@ -427,7 +427,8 @@ export default {
}
},
toProject (projectInfo) { // 跳转对应project页面
this.$store.commit('setOverViewProject', projectInfo)
this.$store.commit('currentProjectChange', projectInfo)
this.jumpTo('project')
},
queryAssetData () {
return new Promise(resolve => {