Skip to content

O
op-web-service
Commit 5df14751 authored by mengwenhao's avatar mengwenhao
Browse files
Options

update: 合并冲突

parent 980a2383
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 15 deletions
src/components/PageHeader/index.vue
View file @ 5df14751
...@@ -4,11 +4,7 @@ ...@@ -4,11 +4,7 @@
<el-menu <el-menu
class="el-menu-demo" class="el-menu-demo"
mode="horizontal" mode="horizontal"
<<<<<<< HEAD:fe/app/op-management/src/components/PageHeader/index.vue
router
=======
:router="true" :router="true"
>>>>>>> dev:src/components/PageHeader/index.vue
@select="handleSelect" @select="handleSelect"
background-color="#545c64" background-color="#545c64"
text-color="#fff" text-color="#fff"
...@@ -38,17 +34,10 @@ export default { ...@@ -38,17 +34,10 @@ export default {
basicPath: "/app/op-management", basicPath: "/app/op-management",
}; };
}, },
<<<<<<< HEAD:fe/app/op-management/src/components/PageHeader/index.vue
methods: {
handleSelect (path) {
this.activeMenu = path;
}
=======
computed: { computed: {
activeMenu: function () { activeMenu: function () {
return this.$route.path; return this.$route.path;
}, },
>>>>>>> dev:src/components/PageHeader/index.vue
}, },
methods: {}, methods: {},
}; };
...@@ -59,9 +48,5 @@ export default { ...@@ -59,9 +48,5 @@ export default {
display: inline-block; display: inline-block;
line-height: 60px; line-height: 60px;
width: 100%; width: 100%;
<<<<<<< HEAD:fe/app/op-management/src/components/PageHeader/index.vue
position: relative;
=======
>>>>>>> dev:src/components/PageHeader/index.vue
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment