菜单目录结构调整

src/router/index.js

@@ -87,7 +87,7 @@ const routes = [{
 			import( /* webpackChunkName: "windsitemap1" */ '../views/WindSite/pages/Map1.vue'),
 	},
 	{
-		path: '/decision/decision3db', //单机横向对比
+		path: '/decision3db', //单机横向对比
 		name: 'decision3db',
 		component: () => import( /* webpackChunkName: "decision3db" */
 			'../views/Decision/Decision3Db.vue'),
@@ -134,61 +134,61 @@ const routes = [{
 	component: () =>
 		import( /* webpackChunkName: "lightmatrix3" */ '../views/LightMatrix3/LightMatrix3.vue'),
 }, {
-	path: '/decision/decision1', //风机绩效榜
+	path: '/decision1', //风机绩效榜
 	name: 'decision1',
 	component: () =>
 		import( /* webpackChunkName: "decision1" */ '../views/Decision/Decision1.vue'),
 },
 {
-	path: '/decision/decision1Mx', //风机绩效榜明细
+	path: '/decision1Mx', //风机绩效榜明细
 	name: 'decision1Mx',
 	component: () =>
 		import( /* webpackChunkName: "decision1Mx" */ '../views/Decision/Decision1Mx.vue'),
 },
 {
-	path: '/decision/decision2', //五项损失率
+	path: '/decision2', //五项损失率
 	name: 'decision2',
 	component: () =>
 		import( /* webpackChunkName: "decision2" */ '../views/Decision/Decision2.vue'),
 },
 {
-	path: '/decision/decision2Cndb', //场内对标
+	path: '/decision2Cndb', //场内对标
 	name: 'decision2Cndb',
 	component: () =>
 		import( /* webpackChunkName: "decision2Cndb" */ '../views/Decision/Decision2Cndb.vue'),
 },
 {
-	path: '/decision/decision2Cjdb', //场际对标
+	path: '/decision2Cjdb', //场际对标
 	name: 'decision2Cjdb',
 	component: () =>
 		import( /* webpackChunkName: "decision2Cjdb" */ '../views/Decision/Decision2Cjdb.vue'),
 },
 {
-	path: '/decision/decision2Xmdb', //项目对标
+	path: '/decision2Xmdb', //项目对标
 	name: 'decision2Xmdb',
 	component: () =>
 		import( /* webpackChunkName: "decision2Xmdb" */ '../views/Decision/Decision2Xmdb.vue'),
 },
 {
-	path: '/decision/decision2Xldb', //线路对标
+	path: '/decision2Xldb', //线路对标
 	name: 'decision2Xldb',
 	component: () =>
 		import( /* webpackChunkName: "decision2Xldb" */ '../views/Decision/Decision2Xldb.vue'),
 },
 {
-	path: '/decision/decision3', //性能对标
+	path: '/decision3', //性能对标
 	name: 'decision3',
 	component: () =>
 		import( /* webpackChunkName: "decision3" */ '../views/Decision/Decision3.vue'),
 },
 {
-	path: '/decision/decision4', //值际对标
+	path: '/decision4', //值际对标
 	name: 'decision4',
 	component: () =>
 		import( /* webpackChunkName: "decision4" */ '../views/Decision/Decision4.vue'),
 },
 {
-	path: '/decision/decision4czzl', //操作指令统计
+	path: '/decision4czzl', //操作指令统计
 	name: 'decision4czzl',
 	component: () =>
 		import( /* webpackChunkName: "decision4czzl" */ '../views/Decision/Decision4Czzl.vue'),

src/views/layout/Header.vue

@@ -29,16 +29,23 @@ export default {
           path: "/monitor/home",
           isActive: true,
         },
+
         {
-          id: "realSearch",
-          text: "数据管理",
-          path: "/realSearch",
+          id: "performanceAnalysis",
+          text: "增电分析",
+          path: "/performanceAnalysis",
           isActive: false,
         },
         {
-          id: "performanceAnalysis",
-          text: "统计分析",
-          path: "/performanceAnalysis",
+          id: "ztfx",
+          text: "降损分析",
+          path: "/new/ztfx",
+          isActive: false,
+        },
+         {
+          id: "realSearch",
+          text: "数据支撑",
+          path: "/realSearch",
           isActive: false,
         },
         {
@@ -47,16 +54,16 @@ export default {
           path: "/health",
           isActive: false,
         },
+        // {
+        //   id: "decision",
+        //   text: "决策支持",
+        //   path: "/decision/decision1",
+        //   isActive: false,
+        // },
         {
-          id: "decision",
-          text: "决策支持",
-          path: "/decision/decision1",
-          isActive: false,
-        },
-        {
-          id: "knowledge",
-          text: "知识管理",
-          path: "/knowledge",
+          id: "personnel",
+          text: "安措管控",
+          path: "/new/personnel",
           isActive: false,
         },
         {

src/views/layout/Menu.vue

@@ -88,79 +88,13 @@ export default {
           ],
         },
         {
-          id: "realSearch",
-          text: "数据管理",
-          data: [
-            {
-              text: "原始数据查询",
-              icon: "svg-wind-site",
-              path: "/yssjcx",
-              children: [
-                {
-                  text: "测点数据查询",
-                  icon: "svg-wind-site",
-                  path: "/realSearch",
-                },
-                {
-                  text: "测点历史数据查询",
-                  icon: "svg-wind-site",
-                  path: "/historySearch",
-                },
-              ],
-            },
-            {
-              text: "预警记录",
-              icon: "svg-wind-site",
-              path: "/new",
-              children: [
-                {
-                  text: "预警管理",
-                  icon: "svg-wind-site",
-                  path: "/new/alarmcenter",
-                },
-
-                {
-                  text: "停机事件管理",
-                  icon: "svg-wind-site",
-                  path: "/new/tjsj",
-                },
-                {
-                  text: "限电管理",
-                  icon: "svg-wind-site",
-                  path: "/new/xdgl",
-                },
-                {
-                  text: "升压站报警",
-                  icon: "svg-wind-site",
-                  path: "/alarmCenter/boosterAlarm",
-                },
-                {
-                  text: "SCADA报警",
-                  icon: "svg-wind-site",
-                  path: "/alarmCenter/scadaAlarm",
-                },
-                {
-                  text: "自定义报警",
-                  icon: "svg-wind-site",
-                  path: "/alarmCenter/customAlarm",
-                },
-                {
-                  text: "自定义报警统计",
-                  icon: "svg-wind-site",
-                  path: "/alarmCenter/customStatistics",
-                },
-              ],
-            },
-          ],
-        },
-        {
           id: "performanceAnalysis",
-          text: "统计分析",
+          text: "增电分析",
           data: [
             {
               text: "能效分析",
               icon: "svg-wind-site",
-              path: "/nxfx",
+              path: "/powerCurve",
               children: [
                 {
                   text: "功率曲线拟合",
@@ -241,7 +175,37 @@ export default {
                   path: "/windAnalysis/fx",
                 },
               ],
-            },
+            }
+            // {
+            //   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",
+            //     }
+            //   ]
+            // }
+          ],
+        },
+        ,
+        {
+          id: "ztfx",
+          text: "降损分析",
+          data: [
+           
             {
               text: "专题分析",
               icon: "svg-wind-site",
@@ -318,6 +282,85 @@ export default {
                   path: "/new/zzhcydl",
                 },
               ]
+            }, {
+              text: "对标管理",
+              icon: "svg-matrix",
+              path: "/dbgl",
+              children: [
+              
+                {
+                  text: "风机绩效榜",
+                  icon: "svg-wind-site",
+                  path: "/decision1",
+                },
+                {
+                  text: "五项损失率",
+                  icon: "svg-wind-site",
+                  path: "/decision2",
+                },
+                {
+                  text: "场内对标",
+                  icon: "svg-wind-site",
+                  path: "/decision2Cndb",
+                },
+                {
+                  text: "场际对标",
+                  icon: "svg-wind-site",
+                  path: "/decision2Cjdb",
+                },
+                {
+                  text: "项目对标",
+                  icon: "svg-wind-site",
+                  path: "/decision2Xmdb",
+                },
+                {
+                  text: "线路对标",
+                  icon: "svg-wind-site",
+                  path: "/decision2Xldb",
+                },
+                {
+                  text: "性能对标",
+                  icon: "svg-wind-site",
+                  path: "/decision3",
+                },
+                {
+                  text: "值际对标",
+                  icon: "svg-wind-site",
+                  path: "/decision4",
+                },
+                {
+                  text: "单机横向对比",
+                  icon: "svg-matrix",
+                  path: "/decision3db",
+                },{
+                  text: "操作指令统计",
+                  icon: "svg-matrix",
+                  path: "/decision4czzl",
+                },
+                
+              ],
+            }, // 三率管理
+            {
+              text: "三率管理",
+              icon: "svg-matrix",
+              path: "/slgl",
+              children: [
+                {
+                  text: "复位及时率",
+                  icon: "svg-wind-site",
+                  path: "/fwjsl",
+                },
+                {
+                  text: "状态转换率",
+                  icon: "svg-wind-site",
+                  path: "/ztzhl",
+                },
+                {
+                  text: "消缺及时率",
+                  icon: "svg-wind-site",
+                  path: "/xqjsl",
+                },
+              ],
             },
             // {
             //   text: "单机分析",
@@ -344,6 +387,114 @@ export default {
           ],
         },
         {
+          id: "realSearch",
+          text: "数据管理",
+          data: [
+            {
+              text: "原始数据查询",
+              icon: "svg-wind-site",
+              path: "/yssjcx",
+              children: [
+                {
+                  text: "测点数据查询",
+                  icon: "svg-wind-site",
+                  path: "/realSearch",
+                },
+                {
+                  text: "测点历史数据查询",
+                  icon: "svg-wind-site",
+                  path: "/historySearch",
+                },
+              ],
+            },
+            {
+              text: "预警记录",
+              icon: "svg-wind-site",
+              path: "/new",
+              children: [
+                {
+                  text: "预警管理",
+                  icon: "svg-wind-site",
+                  path: "/new/alarmcenter",
+                },
+
+                {
+                  text: "停机事件管理",
+                  icon: "svg-wind-site",
+                  path: "/new/tjsj",
+                },
+                {
+                  text: "限电管理",
+                  icon: "svg-wind-site",
+                  path: "/new/xdgl",
+                },
+                {
+                  text: "升压站报警",
+                  icon: "svg-wind-site",
+                  path: "/alarmCenter/boosterAlarm",
+                },
+                {
+                  text: "SCADA报警",
+                  icon: "svg-wind-site",
+                  path: "/alarmCenter/scadaAlarm",
+                },
+                {
+                  text: "自定义报警",
+                  icon: "svg-wind-site",
+                  path: "/alarmCenter/customAlarm",
+                },
+                {
+                  text: "自定义报警统计",
+                  icon: "svg-wind-site",
+                  path: "/alarmCenter/customStatistics",
+                },
+              ],
+            },
+            {
+              text: "专家知识",
+              icon: "svg-wind-site",
+              path: "/zjzs",
+              children: [
+                 {
+              text: "故障知识列表",
+              icon: "svg-matrix",
+              path: "/knowledge",
+            },
+            {
+              text: "安全措施知识",
+              icon: "svg-matrix",
+              path: "/knowledge2",
+            },
+            {
+              text: "排查检修方案",
+              icon: "svg-matrix",
+              path: "/knowledge6",
+            },
+            {
+              text: "预警知识",
+              icon: "svg-matrix",
+              path: "/knowledge7",
+            },
+            {
+              text: "特征参数",
+              icon: "svg-matrix",
+              path: "/knowledge5",
+            },
+            {
+              text: "风险辨识知识",
+              icon: "svg-matrix",
+              path: "/knowledge3",
+            },
+            {
+              text: "作业指导知识",
+              icon: "svg-matrix",
+              path: "/knowledge4",
+            },
+              ],
+            },
+          ],
+        },
+        {
           id: "health",
           text: "健康管理",
           data: [
@@ -398,192 +549,109 @@ export default {
           ],
         },
         {
-          id: "decision",
-          text: "决策支持",
+          id: "personnel",
+          text: "安措管控",
           data: [
-            {
-              text: "对标管理",
-              icon: "svg-matrix",
-              path: "/decision/decision1",
-              children: [
-              
-                {
-                  text: "风机绩效榜",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision1",
-                },
-                {
-                  text: "五项损失率",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision2",
-                },
-                {
-                  text: "场内对标",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision2Cndb",
-                },
-                {
-                  text: "场际对标",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision2Cjdb",
-                },
-                {
-                  text: "项目对标",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision2Xmdb",
-                },
-                {
-                  text: "线路对标",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision2Xldb",
-                },
-                {
-                  text: "性能对标",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision3",
-                },
-                {
-                  text: "值际对标",
-                  icon: "svg-wind-site",
-                  path: "/decision/decision4",
-                },
-                {
-                  text: "单机横向对比",
-                  icon: "svg-matrix",
-                  path: "/decision/decision3db",
-                },{
-                  text: "操作指令统计",
-                  icon: "svg-matrix",
-                  path: "/decision/decision4czzl",
-                },
-                
-              ],
-            }
+           
             // ,
             // {
             //   text: "五项损失率",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision2",
+            //   path: "/decision2",
             // },
             // {
             //   text: "场内对标",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision2Cndb",
+            //   path: "/decision2Cndb",
             // },
             // {
             //   text: "场际对标",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision2Cjdb",
+            //   path: "/decision2Cjdb",
             // },
             // {
             //   text: "项目对标",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision2Xmdb",
+            //   path: "/decision2Xmdb",
             // },
             // {
             //   text: "线路对标",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision2Xldb",
+            //   path: "/decision2Xldb",
             // },
             // {
             //   text: "性能对标",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision3",
+            //   path: "/decision3",
             // },
             // {
             //   text: "值际对标",
             //   icon: "svg-matrix",
-            //   path: "/decision/decision4",
+            //   path: "/decision4",
             // }
-            ,
+            
             {
-              text: "排行榜",
+              text: "安全管控",
               icon: "svg-matrix",
-              path: "/phb",
+              path: "/aqgk",
               children: [
                 {
-                  text: "发电效率排行",
-                  icon: "svg-wind-site",
-                  path: "/powerRank",
-                },
-                {
-                  text: "总发电效率排行",
-                  icon: "svg-wind-site",
-                  path: "/totalPowerRank",
-                },
-                {
-                  text: "报警排行",
-                  icon: "svg-wind-site",
-                  path: "/warningRank",
-                },
-              ],
-            },
-            // 三率管理
-            {
-              text: "三率管理",
-              icon: "svg-matrix",
-              path: "/slgl",
-              children: [
-                {
-                  text: "复位及时率",
-                  icon: "svg-wind-site",
-                  path: "/fwjsl",
-                },
-                {
-                  text: "状态转换率",
+                  text: "人员矩阵",
                   icon: "svg-wind-site",
-                  path: "/ztzhl",
+                  path: "/new/personnel",
                 },
                 {
-                  text: "消缺及时率",
+                  text: "全局监视",
                   icon: "svg-wind-site",
-                  path: "/xqjsl",
+                  path: "/new/personnel",
                 },
+
               ],
             },
+           
           ],
         },
-        {
-          id: "knowledge",
-          text: "知识管理",
-          data: [
-            {
-              text: "故障知识列表",
-              icon: "svg-matrix",
-              path: "/knowledge",
-            },
-            {
-              text: "安全措施知识",
-              icon: "svg-matrix",
-              path: "/knowledge2",
-            },
-            {
-              text: "排查检修方案",
-              icon: "svg-matrix",
-              path: "/knowledge6",
-            },
-            {
-              text: "预警知识",
-              icon: "svg-matrix",
-              path: "/knowledge7",
-            },
-            {
-              text: "特征参数",
-              icon: "svg-matrix",
-              path: "/knowledge5",
-            },
-            {
-              text: "风险辨识知识",
-              icon: "svg-matrix",
-              path: "/knowledge3",
-            },
-            {
-              text: "作业指导知识",
-              icon: "svg-matrix",
-              path: "/knowledge4",
-            },
-          ],
-        },
+        // {
+        //   id: "knowledge",
+        //   text: "知识管理",
+        //   data: [
+        //     {
+        //       text: "故障知识列表",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge",
+        //     },
+        //     {
+        //       text: "安全措施知识",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge2",
+        //     },
+        //     {
+        //       text: "排查检修方案",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge6",
+        //     },
+        //     {
+        //       text: "预警知识",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge7",
+        //     },
+        //     {
+        //       text: "特征参数",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge5",
+        //     },
+        //     {
+        //       text: "风险辨识知识",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge3",
+        //     },
+        //     {
+        //       text: "作业指导知识",
+        //       icon: "svg-matrix",
+        //       path: "/knowledge4",
+        //     },
+        //   ],
+        // },
         {
           id: "bdzcx",
           text: "智能报表",