Browse Source

修复错误的merge

wsy 3 years ago
parent
commit
382ce3ed25
2 changed files with 771 additions and 561 deletions
  1. 587 486
      src/router/index.js
  2. 184 75
      src/views/layout/Menu.vue

File diff suppressed because it is too large
+ 587 - 486
src/router/index.js


+ 184 - 75
src/views/layout/Menu.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="menu">
     <ul class="menu-list">
-      <li class="menu-item" v-for="(menu, index) of currentMenu" :key="menu" @click="click(index)" :class="{ active: activeIndex == index }" @mouseenter="subMenuShow(menu.children, index)">
+      <li class="menu-item" v-for="(menu, index) of currentMenu" :key="menu" @click="click(index)" :class="{ active: activeIndex == index }"
+        @mouseenter="subMenuShow(menu.children, index)">
         <router-link v-if="!menu.children" :to="menu.path">
           <el-tooltip class="item" effect="dark" :content="menu.text" placement="right" :show-after="500">
             <div class="menu-icon svg-icon" :class="activeIndex == index ? 'svg-icon-green' : 'svg-icon-gray'">
@@ -37,7 +38,7 @@ export default {
     SvgIcon,
   },
   props: {},
-  data() {
+  data () {
     return {
       currRoot: "monitor",
       menuData: [
@@ -80,7 +81,7 @@ export default {
               icon: "svg-agc",
               path: "/monitor/agc",
             },
-           {
+            {
               text: "风场",
               icon: "svg-wind-site",
               path: "/monitor/windsite/home/MHS_FDC",
@@ -99,19 +100,51 @@ export default {
                 {
                   text: "测点数据查询",
                   icon: "svg-wind-site",
-                  path: "/realSearch"
+                  path: "/realSearch",
                 },
                 {
                   text: "测点历史数据查询",
                   icon: "svg-wind-site",
-                  path: "/historySearch"
-                }
-              ]
-            }
+                  path: "/historySearch",
+                },
+              ],
+            },
+            {
+              text: "预警记录",
+              icon: "svg-wind-site",
+              path: "/new",
+              children: [
+                {
+                  text: "预警管理",
+                  icon: "svg-wind-site",
+                  path: "/new/alarmcenter",
+                },
+                {
+                  text: "预警管理1",
+                  icon: "svg-wind-site",
+                  path: "/new/alarmcenter1",
+                },
+                {
+                  text: "预警管理2",
+                  icon: "svg-wind-site",
+                  path: "/new/alarmcenter2",
+                },
+                {
+                  text: "预警管理3",
+                  icon: "svg-wind-site",
+                  path: "/new/tjsj",
+                },
+                {
+                  text: "预警管理4",
+                  icon: "svg-wind-site",
+                  path: "/new/xdgl",
+                },
+              ],
+            },
           ],
         },
         {
-          id: "singleAnalysis",
+          id: "performanceAnalysis",
           text: "统计分析",
           data: [
             {
@@ -153,8 +186,8 @@ export default {
                   text: "单机饱和度",
                   icon: "svg-wind-site",
                   path: "/wtSaturability",
-                }
-              ]
+                },
+              ],
             },
             {
               text: "风光资源分析",
@@ -165,31 +198,108 @@ export default {
                   text: "风资源分析",
                   icon: "svg-wind-site",
                   path: "/windAnalysis",
-                }
-              ]
+                },
+              ],
             },
             {
-              text: "单机分析",
+              text: "专题分析",
               icon: "svg-wind-site",
               path: "/fgzyfx",
               children: [
                 {
-                  text: "单机分析详细",
+                  text: "综合分析",
                   icon: "svg-wind-site",
-                  path: "/new/dj1",
+                  path: "/new/ztfx",
                 },
                 {
-                  text: "电量预测",
+                  text: "风能利用率",
                   icon: "svg-wind-site",
-                  path: "/new/pf1",
+                  path: "/new/fnlyl",
                 },
                 {
-                  text: "气象预测",
+                  text: "维护损失率",
                   icon: "svg-wind-site",
-                  path: "/new/fs",
-                }
+                  path: "/new/whssl",
+                },
+                {
+                  text: "故障损失率",
+                  icon: "svg-wind-site",
+                  path: "/new/gzssl",
+                },
+                {
+                  text: "限电损失率",
+                  icon: "svg-wind-site",
+                  path: "/new/xdssl",
+                },
+                {
+                  text: "性能损失率",
+                  icon: "svg-wind-site",
+                  path: "/new/xnssl",
+                },
+                {
+                  text: "受累损失率",
+                  icon: "svg-wind-site",
+                  path: "/new/slssl",
+                },
+                {
+                  text: "MTBF分析",
+                  icon: "svg-wind-site",
+                  path: "/new/mtbf",
+                },
+                {
+                  text: "MTTR分析",
+                  icon: "svg-wind-site",
+                  path: "/new/mttr",
+                },
+                {
+                  text: "复位及时率",
+                  icon: "svg-wind-site",
+                  path: "/new/zfwjsl",
+                },
+                {
+                  text: "状态转换率",
+                  icon: "svg-wind-site",
+                  path: "/new/zztzhl",
+                },
+                {
+                  text: "消缺及时率",
+                  icon: "svg-wind-site",
+                  path: "/new/zxqjsl",
+                },
+                {
+                  text: "发电量分析",
+                  icon: "svg-wind-site",
+                  path: "/new/zfdl",
+                },
+                {
+                  text: "综合场用电量",
+                  icon: "svg-wind-site",
+                  path: "/new/zzhcydl",
+                },
               ]
-            }
+            },
+            // {
+            //   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",
+            //     }
+            //   ]
+            // }
           ],
         },
         {
@@ -238,7 +348,6 @@ export default {
                 },
               ],
             },
-            
           ],
         },
         {
@@ -275,16 +384,16 @@ export default {
               icon: "svg-matrix",
               path: "/decision/decision2Xldb",
             },
-            // {
-            //   text: "决策支持3",
-            //   icon: "svg-matrix",
-            //   path: "/decision/decision3",
-            // },
-            // {
-            //   text: "决策支持4",
-            //   icon: "svg-matrix",
-            //   path: "/decision/decision4",
-            // },
+            {
+              text: "性能对标",
+              icon: "svg-matrix",
+              path: "/decision/decision3",
+            },
+            {
+              text: "值际对标",
+              icon: "svg-matrix",
+              path: "/decision/decision4",
+            },
             {
               text: "排行榜",
               icon: "svg-matrix",
@@ -304,32 +413,32 @@ export default {
                   text: "报警排行",
                   icon: "svg-wind-site",
                   path: "/warningRank",
-                }
-              ]
+                },
+              ],
             },
             // 三率管理
             {
-              text:'三率管理',
-              icon:'svg-matrix',
-              path:'/slgl',
-              children:[
+              text: "三率管理",
+              icon: "svg-matrix",
+              path: "/slgl",
+              children: [
                 {
-                  text:'复位及时率',
-                  icon:'svg-wind-site',
-                  path:'/fwjsl'
+                  text: "复位及时率",
+                  icon: "svg-wind-site",
+                  path: "/fwjsl",
                 },
                 {
-                  text:'状态转换率',
-                  icon:'svg-wind-site',
-                  path:'/ztzhl'
+                  text: "状态转换率",
+                  icon: "svg-wind-site",
+                  path: "/ztzhl",
                 },
                 {
-                  text:'消缺及时率',
-                  icon:'svg-wind-site',
-                  path:'/xqjsl'
-                }
-              ]
-            }
+                  text: "消缺及时率",
+                  icon: "svg-wind-site",
+                  path: "/xqjsl",
+                },
+              ],
+            },
           ],
         },
         {
@@ -370,7 +479,7 @@ export default {
               text: "作业指导知识",
               icon: "svg-matrix",
               path: "/knowledge4",
-            }
+            },
           ],
         },
         {
@@ -387,11 +496,11 @@ export default {
     };
   },
   methods: {
-    click(index) {
+    click (index) {
       this.activeIndex = index;
       this.subIndex = null;
     },
-    subMenuShow(children, index) {
+    subMenuShow (children, index) {
       if (children) {
         this.isShowSubMenu = true;
         this.parentIndex = index;
@@ -401,18 +510,18 @@ export default {
       }
       this.subMenu = children;
     },
-    subMenuHide() {
+    subMenuHide () {
       this.isShowSubMenu = false;
       this.parentIndex = null;
       this.subMenu = [];
     },
-    subclick(index) {
+    subclick (index) {
       this.activeIndex = this.parentIndex;
       this.subIndex = index;
     },
   },
   computed: {
-    currentMenu() {
+    currentMenu () {
       let data = this.menuData.filter((t) => {
         return t.id == this.currRoot;
       })[0].data;
@@ -422,7 +531,7 @@ export default {
   watch: {
     // 监听路由
     $route: {
-      handler: function(val, oldVal) {
+      handler: function (val, oldVal) {
         this.menuData.some((element, index) => {
           if (val.path.includes(element.id)) {
             this.currRoot = element.id;
@@ -443,38 +552,38 @@ export default {
   },
 };
 </script>
-
+ 
 <style lang="less">
 .menu {
   padding-top: 1.481vh;
-
+ 
   .menu-list {
     margin: 0;
     padding: 0;
     list-style: none;
-
+ 
     .menu-item {
       padding: 1.481vh 0;
       text-align: center;
-
+ 
       .menu-icon {
         display: flex;
         justify-content: center;
       }
-
+ 
       &.active i {
         color: #05bb4c;
         transition: color 1s;
       }
     }
   }
-
+ 
   i {
     font-size: 2.222vh;
     color: rgba(255, 255, 255, 50%);
   }
 }
-
+ 
 .sub-menu {
   position: absolute;
   top: 0;
@@ -485,19 +594,19 @@ export default {
   background: fade(#192a26, 75);
   border-right: 1px solid fade(@green, 50);
   box-shadow: inset 11px 0px 20px 0px fade(#021412, 60);
-
+ 
   .menu-list {
     margin: 0;
     padding: 0;
     list-style: none;
-
+ 
     .menu-item {
       display: flex;
       text-align: center;
       line-height: 1.5;
       padding: 8px 0;
       background: #121d1c;
-
+ 
       a {
         display: flex;
         width: 100%;
@@ -505,7 +614,7 @@ export default {
         padding: 0 1.4815vh;
         font-size: @fontsize-s;
         text-decoration: unset;
-
+ 
         .menu-icon {
           display: flex;
           align-items: center;
@@ -518,10 +627,10 @@ export default {
           }
         }
       }
-
+ 
       &.active {
         background: #323e70;
-
+ 
         .menu-icon {
           display: flex;
           svg use {
@@ -529,21 +638,21 @@ export default {
           }
         }
       }
-
+ 
       .sub-menu-text {
         margin-left: 1.1111vh;
         color: @gray-l;
       }
-
+ 
       & + .menu-item {
         border-top: 1px solid fade(@darkgray, 40);
       }
     }
   }
-
+ 
   i {
     font-size: 2.222vh;
     color: rgba(255, 255, 255, 50%);
   }
 }
-</style>
+</style>