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

# 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
29 changed files with 154 additions and 52 deletions

View File

@@ -34,16 +34,16 @@ export default new Router({
component: resolve => require(['../components/page/dashboard/overview/overview.vue'], resolve)
},
{
path: '/monitor/project',
path: '/project',
component: resolve => require(['../components/page/monitor/project/index.vue'], resolve)
},
{
path: '/monitor/module',
name: '/monitor/module',
path: '/module',
name: '/module',
component: resolve => require(['../components/page/monitor/module/moduleList.vue'], resolve)
},
{
path: '/monitor/endpoint',
path: '/endpoint',
component: resolve => require(['../components/page/monitor/endpoint/endpointList.vue'], resolve)
},
{