冲突处理

src/App.vue

@@ -540,11 +540,7 @@ body {
 .el-tree-node__label {
   font-size: 18px !important;
 }
-<<<<<<< HEAD
-</style>
-=======
 .el-pagination.is-background .el-pager li:not(.disabled).active{
   background-color: #05bb4c !important;
 }
 </style>
->>>>>>> b1304280f10e412f55f384f411309a5c63f6d7ad

src/views/layout/Menu.vue

@@ -419,18 +419,6 @@ export default {
                   icon: "svg-wind-site",
                   path: "/health/gzzd/malfunctionRecall",
                 },
-<<<<<<< HEAD
-                {
-                  text: "故障分类",
-                  icon: "svg-wind-site",
-                  path: "/health/gzzd/gzfl",
-                },
-                {
-                  text: "预警分类",
-                  icon: "svg-wind-site",
-                  path: "/health/gzzd/yjfl",
-                },
-=======
                 // {
                 //   text: "故障分类",
                 //   icon: "svg-wind-site",
@@ -441,7 +429,6 @@ export default {
                 //   icon: "svg-wind-site",
                 //   path: "/health/gzzd/yjfl",
                 // },
->>>>>>> b1304280f10e412f55f384f411309a5c63f6d7ad
               ],
             },
             {