fix: remove redundant nested routes

lbwa · Sep 26, 2018 · 1121557 · 1121557
1 parent 2429629
commit 1121557
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 49 deletions.
diff --git a/src/components/MainWrapper.vue b/src/components/MainWrapper.vue
diff --git a/src/router/components.js b/src/router/components.js
@@ -1,7 +1,6 @@
 export default {
-  wrapper: () => import(/* webpackChunkName: 'wrapper' */ 'COMPONENTS/MainWrapper'),
-  analysis: () => import(/* webpackChunkName: 'dashboard' */ 'VIEW/Analysis'),
-  monitor: () => import(/* webpackChunkName: 'dashboard' */ 'VIEW/Monitor'),
-  workspace: () => import(/* webpackChunkName: 'dashboard' */ 'VIEW/Workspace'),
-  basicForm: () => import(/* webpackChunkName: 'form' */ 'VIEW/BasicForm')
+  analysis: () => import(/* webpackChunkName: 'analysis' */ 'VIEW/Analysis'),
+  monitor: () => import(/* webpackChunkName: 'monitor' */ 'VIEW/Monitor'),
+  workspace: () => import(/* webpackChunkName: 'workspace' */ 'VIEW/Workspace'),
+  basicForm: () => import(/* webpackChunkName: 'basic-form' */ 'VIEW/BasicForm')
 }
diff --git a/src/router/routes.js b/src/router/routes.js
@@ -6,31 +6,19 @@ export default [
     redirect: '/dashboard/analysis'
   },
   {
-    path: '/dashboard',
-    component: components.wrapper,
-    children: [
-      {
-        path: 'analysis',
-        component: components.analysis
-      },
-      {
-        path: 'monitor',
-        component: components.monitor
-      },
-      {
-        path: 'workspace',
-        component: components.workspace
-      }
-    ]
+    path: '/dashboard/analysis',
+    component: components.analysis
   },
   {
-    path: '/form',
-    component: components.wrapper,
-    children: [
-      {
-        path: 'basic-form',
-        component: components.basicForm
-      }
-    ]
+    path: '/dashboard/monitor',
+    component: components.monitor
+  },
+  {
+    path: '/dashboard/workspace',
+    component: components.workspace
+  },
+  {
+    path: '/form/basic-form',
+    component: components.basicForm
   }
 ]
diff --git a/src/view/App.vue b/src/view/App.vue
@@ -3,8 +3,8 @@
     <app-aside/>
     <el-container>
       <app-header @toggleAside="toggleAside"></app-header>
-      <router-view></router-view>
-      <el-footer class="footer__layout footer__font" height="auto">
+      <router-view class="main__wrapper"></router-view>
+      <el-footer class="footer__layout footer__font" height="100">
         <div class="footer__icon">
           <svg height="1.2em" fill="currentColor" class="octicon-mark" viewBox="0 0 16 16" width="1.2em" aria-hidden="true"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg>
         </div>
@@ -74,4 +74,8 @@ export default {
   &:hover
     color: #3273dc
 
+.main__wrapper
+  min-height: calc(100vh - 60px - 100px)
+  padding: 24px 24px 0 24px
+  background-color: #f0f2f5
 </style>