菜单调整

src/router/index.js

@@ -67,11 +67,11 @@ const routes = [
       component: () => import(/* webpackChunkName: "windsitemap1" */ '../views/WindSite/pages/Map1.vue'),
     }, 
     {
-      path: 'boosterstation', // 升压站
+      path: 'boosterstation/:wpId', // 升压站
       component: () => import(/* webpackChunkName: "boosterstation" */ '../views/WindSite/pages/BoosterStation.vue'),
     },
     {
-      path: "generalappearance", // 总样貌
+      path: "generalappearance/:wpId", // 总样貌
       component: () => import(/* webpackChunkName: "generalappearance" */ "../views/WindSite/pages/GeneralAppearance.vue"),
     },
   ]
@@ -184,6 +184,14 @@ const routes = [
     path: '/health/health4',
     name: 'health4',
     children: [{
+      path: "/health/health0/:wtId",
+      name: "health0",
+      component: () => import("../views/HealthControl/Health0.vue"),
+    },{
+      path: "/health/health10/:wtId",
+      name: "health10",
+      component: () => import(/* webpackChunkName: "health8" */ "../views/HealthControl/Health10.vue"),
+    },{
       path: 'healthLineChart/:wtId', // 风机健康趋势
       component: () => import(/* webpackChunkName: "healthLineChart" */ '../views/HealthControl/healthLineChart.vue'),
     },
@@ -289,16 +297,6 @@ const routes = [
     component: () => import(/* webpackChunkName: "sandtable" */ "../views/SandTable/SandTable.vue"),
   },
   {
-    path: "/health/health0",
-    name: "health0",
-    component: () => import("../views/HealthControl/Health0.vue"),
-  },
-  {
-    path: "/health/health10",
-    name: "health10",
-    component: () => import(/* webpackChunkName: "health8" */ "../views/HealthControl/Health10.vue"),
-  },
-  {
     path: "/new/dj1",
     name: "dj1",
     component: () => import(/* webpackChunkName: "dj1" */ "../views/NewPages/dj1.vue"),

src/views/HealthControl/Health2.vue

@@ -344,6 +344,7 @@ export default {
         color: fade(@white, 75);
         font-size: @fontsize-s;
         margin-bottom: 0.7407vh;
+        cursor: pointer;
       }
 
       & + .fc-item {

src/views/HealthControl/Health3.vue

@@ -89,7 +89,7 @@
             </div>
           </template>
           <div class="matrix">
-            <div class="item" :class="item[1] === '1' ? 'green' : item[1] === '2' ? 'purple' : 'orange'" v-for="(item, index) in sourceMap.wtIdls" :key="index">{{item[2]}}</div>
+            <div class="item" :class="item[1] === '1' ? 'green' : item[1] === '2' ? 'purple' : 'orange'" v-for="(item, index) in sourceMap.wtIdls" :key="index" @click="jumpUrl(item)">{{item[2]}}</div>
             <div class="blank" v-for="index of 20" :key="index"></div>
           </div>
         </toolbar-panel>
@@ -256,6 +256,10 @@ export default {
       this.type = type;
       this.requestData();
     },
+
+    jumpUrl(item){
+      this.$router.push(`/health/health0/${item[0]}`);
+    }
   }
 };
 </script>
@@ -446,6 +450,7 @@ export default {
             margin-bottom: 4px;
             text-align: center;
             border: 1px solid transparent;
+            cursor: pointer;
 
             & + .item {
               margin-left: 4px;

src/views/HealthControl/Health4.vue

@@ -34,6 +34,12 @@ export default {
       wtId:"",
       menuDatas: [{
         icon: "svg-agc",
+        path: "/health/health0",
+      },{
+        icon: "svg-agc",
+        path: "/health/health10",
+      },{
+        icon: "svg-agc",
         path: "/health/health4/healthLineChart2",
       },{
         icon: "svg-agc",

src/views/HealthControl/Health5.vue

@@ -90,7 +90,7 @@ export default {
     // 跳转按钮
     onClickJump(item){
        this.$router.push({
-        path: `/health/health4/healthLineChart2/${item.wtId}`
+        path: `/health/health0/${item.wtId}`
       });
     }
   }

src/views/WindSite/WindSite.vue

@@ -81,6 +81,14 @@ export default {
           icon: "svg-matrix",
           path: "/monitor/windsite/matrix",
         },
+        {
+          icon: "svg-matrix",
+          path: "/monitor/windsite/generalappearance",
+        },
+        {
+          icon: "svg-matrix",
+          path: "/monitor/windsite/boosterstation",
+        },
       ],
     };
   },

src/views/layout/Menu.vue

@@ -167,6 +167,28 @@ export default {
                   path: "/windAnalysis",
                 }
               ]
+            },
+            {
+              text: "单机分析",
+              icon: "svg-wind-site",
+              path: "/fgzyfx",
+              children: [
+                {
+                  text: "单机分析详细",
+                  icon: "svg-wind-site",
+                  path: "/new/dj1",
+                },
+                {
+                  text: "电量预测",
+                  icon: "svg-wind-site",
+                  path: "/new/pf1",
+                },
+                {
+                  text: "气象预测",
+                  icon: "svg-wind-site",
+                  path: "/new/fs",
+                }
+              ]
             }
           ],
         },
@@ -203,14 +225,15 @@ export default {
                 //   text: "健康列表",
                 //   icon: "svg-wind-site",
                 //   path: "/health/health6",
-                // }
+                // },
+                {
+                  text: "健康列表",
+                  icon: "svg-wind-site",
+                  path: "/health/health8",
+                },
               ],
             },
-            {
-              text: "健康管理8",
-              icon: "svg-wind-site",
-              path: "/health/health8",
-            },
+            
           ],
         },
         {