update: 合并冲突

src/components/PageHeader/index.vue

@@ -4,11 +4,7 @@
     <el-menu
       class="el-menu-demo"
       mode="horizontal"
-<<<<<<< HEAD:fe/app/op-management/src/components/PageHeader/index.vue
-      router
-=======
       :router="true"
->>>>>>> dev:src/components/PageHeader/index.vue
       @select="handleSelect"
       background-color="#545c64"
       text-color="#fff"
@@ -38,17 +34,10 @@ export default {
       basicPath: "/app/op-management",
     };
   },
-<<<<<<< HEAD:fe/app/op-management/src/components/PageHeader/index.vue
-  methods: {
-    handleSelect (path) {
-      this.activeMenu = path;
-    }
-=======
   computed: {
     activeMenu: function () {
       return this.$route.path;
     },
->>>>>>> dev:src/components/PageHeader/index.vue
   },
   methods: {},
 };
@@ -59,9 +48,5 @@ export default {
   display: inline-block;
   line-height: 60px;
   width: 100%;
-<<<<<<< HEAD:fe/app/op-management/src/components/PageHeader/index.vue
-  position: relative;
-=======
->>>>>>> dev:src/components/PageHeader/index.vue
 }
 </style>