Merge remote-tracking branch 'origin/codeCheck' into codeCheck

# Conflicts: # nezha-fronted/src/components/common/header.vue
2019-12-26 17:30:10 +08:00
parent 057e4ece33 9713286f34
commit 5e97fd3689
31 changed files with 2851 additions and 3181 deletions
--- a/nezha-fronted/src/router/index.js
+++ b/nezha-fronted/src/router/index.js
@@ -36,9 +36,17 @@ export default new Router({
          path: '/dashboard',
          component: resolve => require(['../components/page/dashboard.vue'], resolve),
        },
+        {
+          path: '/panel',
+          component: resolve => require(['../components/page/dashboard/panel.vue'], resolve),
+        },
+        {
+          path: '/metricPreview',
+          component: resolve => require(['../components/page/dashboard/metricPreview.vue'], resolve),
+        },
        {
          path: '/project',
-          component: resolve => require(['../components/page/project/project2.vue'], resolve),
+          component: resolve => require(['../components/page/project/project.vue'], resolve),
        },
        {
          path: '/asset',