合并分支

src/router/index.js

@@ -23,11 +23,11 @@ const routes = [
     component: () => import(/* webpackChunkName: "agc" */ '../views/Agc/Agc.vue'),
   },
   {
-    path: '/windsite', // 场站监视
+    path: '/windsite',
     name: 'WindSite',
     component: () => import(/* webpackChunkName: "windsite" */ '../views/WindSite/WindSite.vue'),
     children: [{
-      path: 'home',
+      path: 'home',  // 场站监视
       component: () => import(/* webpackChunkName: "windsitehome" */ '../views/WindSite/pages/Home/Home.vue'),
     }, {
       path: 'draughtfanlist',