diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue
index 5d62b10e..c72e0058 100644
--- a/src/components/BreadCrumb.vue
+++ b/src/components/BreadCrumb.vue
@@ -111,10 +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/components/NavLeft.vue b/src/components/NavLeft.vue
index bf2d295e..e28ef8ff 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -114,7 +114,7 @@
src="../assets/images/navleft/survey.png"
/>
- 调研管理
+ 调研管理
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index e69de29b..c40e72e1 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -0,0 +1,174 @@
+
+
+
+
+
+
\ No newline at end of file