冲突处理

src/router/index.js

@@ -489,108 +489,13 @@ export const asyncRoutes = [
         },
         children: [
             {
-                path: "scadaWarning", // 温度监控
-                name: "scadaWarning",
-                component: () =>
-                    import("@/views/IntegratedAlarm/safe/scadaWarning"),
-                meta: {
-                    title: "SCADA报警查询",
-                    icon: "",
-                    permissions: ["jn_safe_bjcx"],
-                },
-            },
-            {
-                path: "temperatureMonitoring", // 温度监控
-                name: "temperatureMonitoring",
-                component: () =>
-                    import("@/views/IntegratedAlarm/safe/temperatureMonitoring"),
-                meta: {
-                    title: "温度监控",
-                    icon: "",
-                    permissions: ["jn_safe_bjcx"],
-                },
-            },
-            {
-                path: "historyWarning", // 历史报警
-                name: "historyWarning",
-                component: () =>
-                import("@/views/IntegratedAlarm/safe/historyWarning"),
-                meta: {
-                title: "历史报警",
-                icon: "",
-                permissions: ["jn_safe_bjcx"],
-                },
-            },
-            {
-                path: "boostlegWarning", // 升压站报警
-                name: "boostlegWarning",
-                component: () =>
-                  import("@/views/IntegratedAlarm/safe/boostlegWarning"),
-                meta: {
-                  title: "升压站报警",
-                  icon: "",
-                  permissions: ["jn_safe_bjcx"],
-                },
-            },
-            {
-              path: "stopQuery", //停机事件
-              name: "stopQuery",
-              component: () => import("@/views/IntegratedAlarm/safe/stopQuery"),
-              meta: {
-                title: "停机事件",
-                icon: "",
-                permissions: ["jn_safe_tjcx"],
-              },
-            },
-            {
-                path: "powerRationing", // 限电管理
-                name: "powerRationing",
-                component: () =>
-                    import("@/views/IntegratedAlarm/safe/powerRationing"),
-                    meta: {
-                    title: "限电管理",
-                    icon: "",
-                    permissions: ["jn_safe_yjcx"],
-                },
-            },
-            {
-                path: "affectedManagement", //受累管理
-                name: "affectedManagement",
-                component: () => import("@/views/IntegratedAlarm/safe/affectedManagement"),
-                meta: {
-                title: "受累管理",
-                icon: "",
-                permissions: ["jn_safe_tjcx"],
-                },
-            },
-            {
-                path: "faultManagement", //故障管理
-                name: "faultManagement",
-                component: () => import("@/views/IntegratedAlarm/safe/faultManagement"),
+                path: "safe", // 综合报警
+                name: "safe",
+                component: () => import("@/views/IntegratedAlarm/safe"),
                 meta: {
-                title: "故障管理",
-                icon: "",
-                permissions: ["jn_safe_sjcx"],
-                },
-            },
-            {
-                path: "maintenance", //维护管理
-                name: "maintenance",
-                component: () => import("@/views/IntegratedAlarm/safe/maintenance"),
-                meta: {
-                title: "维护管理",
-                icon: "",
-                permissions: ["jn_safe_sjcx"],
-                },
-            },
-            {
-                path: "WNSpower", //维护管理
-                name: "WNSpower",
-                component: () => import("@/views/IntegratedAlarm/safe/WNSpower"),
-                meta: {
-                title: "卧牛山电量管理",
-                icon: "",
-                permissions: ["jn_safe_sjcx"],
+                    title: "综合报警",
+                    icon: "svg-zhbj",
+                    permissions: ["jn_safe"],
                 },
                 children: [
                     {
@@ -621,7 +526,7 @@ export const asyncRoutes = [
                         component: () =>
                             import("@/views/IntegratedAlarm/safe/historyWarning"),
                         meta: {
-                            title: "报警查询",
+                            title: "历史报警",
                             icon: "",
                             permissions: ["jn_safe_bjcx"],
                         },
@@ -630,7 +535,7 @@ export const asyncRoutes = [
                         path: "boostlegWarning", // 升压站报警
                         name: "boostlegWarning",
                         component: () =>
-                            import("@/views/IntegratedAlarm/safe/historyWarning"),
+                            import("@/views/IntegratedAlarm/safe/boostlegWarning"),
                         meta: {
                             title: "升压站报警",
                             icon: "",
@@ -651,7 +556,7 @@ export const asyncRoutes = [
                         path: "powerRationing", // 限电管理
                         name: "powerRationing",
                         component: () =>
-                            import("@/views/IntegratedAlarm/safe/customWarning"),
+                            import("@/views/IntegratedAlarm/safe/powerRationing"),
                         meta: {
                             title: "限电管理",
                             icon: "",
@@ -661,7 +566,7 @@ export const asyncRoutes = [
                     {
                         path: "affectedManagement", //受累管理
                         name: "affectedManagement",
-                        component: () => import("@/views/IntegratedAlarm/safe/stopQuery"),
+                        component: () => import("@/views/IntegratedAlarm/safe/affectedManagement"),
                         meta: {
                             title: "受累管理",
                             icon: "",
@@ -671,7 +576,7 @@ export const asyncRoutes = [
                     {
                         path: "faultManagement", //故障管理
                         name: "faultManagement",
-                        component: () => import("@/views/IntegratedAlarm/safe/dataSearch"),
+                        component: () => import("@/views/IntegratedAlarm/safe/faultManagement"),
                         meta: {
                             title: "故障管理",
                             icon: "",
@@ -681,7 +586,7 @@ export const asyncRoutes = [
                     {
                         path: "maintenance", //维护管理
                         name: "maintenance",
-                        component: () => import("@/views/IntegratedAlarm/safe/dataSearch"),
+                        component: () => import("@/views/IntegratedAlarm/safe/maintenance"),
                         meta: {
                             title: "维护管理",
                             icon: "",
@@ -691,7 +596,7 @@ export const asyncRoutes = [
                     {
                         path: "WNSpower", //维护管理
                         name: "WNSpower",
-                        component: () => import("@/views/IntegratedAlarm/safe/dataSearch"),
+                        component: () => import("@/views/IntegratedAlarm/safe/WNSpower"),
                         meta: {
                             title: "卧牛山电量管理",
                             icon: "",