Merge branch 'master' of http://172.16.1.12/huajimang/yanDuLargeScreen

src/App.vue

@@ -25,6 +25,7 @@
     </div>
     <div class="content">
       <router-view />
+
     </div>
   </div>
 </template>

src/router.js

@@ -3,18 +3,26 @@ import Router from 'vue-router'
 
 Vue.use(Router)
 
+const originalPush = Router.prototype.push
+
+Router.prototype.push = function push (location) {
+
+return originalPush.call(this, location).catch(err => err)
+
+}
+
 export default new Router({
   mode: 'history',
   base: process.env.BASE_URL,
   routes: [
     {
-      path: '/',
+        path: '/',
-      redirect:'/home',
+        redirect:'/index',
     },
     {
-      path: '/home',
+      path: '/index',
-      name: 'home',
+      name: 'index',
-      component: () => import ('./views/Home.vue')
+      component: () => import ('./views/index.vue')
     },
     {
       path: '/stationBuilding',