diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index c72e0058..6c4bf7b8 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -111,19 +111,19 @@ export default { }, ]; } -<<<<<<< HEAD if (n === "/researchmanage" || n === "/ResearchManage") { state.list = [ { name: "调研管理", href: "", // href: "#/researchmanage", -======= + }, + ]; + } if (n === "/systemmanage" || n === "/SystemManage") { state.list = [ { name: "系统管理", ->>>>>>> e4c5bddd27044684b5bca09f3451b40713469f3a }, ]; } diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 17875ebf..79aae109 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -2,7 +2,7 @@