From 5d5b4e97bba7a6061e4dd4625f4b528bcd6824c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Sun, 9 Oct 2022 18:31:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=BF=94=E5=9B=9E=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BreadCrumb.vue          |  6 +--
 src/views/projectcenter/ProjectAdd.vue |  2 +-
 src/views/research/ResearchAdd.vue     | 72 ++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 4 deletions(-)

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 @@
 <template>
     <div class="header">
         <span class="title">创建/编辑单层项目</span>
-        <div class="goback"><span class="return"></span><span class="returntext">返回</span></div>
+        <div class="goback"><span class="return"></span><router-link class="returntext" to="/projectmanage">返回</router-link></div>
     </div>
     <div class="content">
         <div class="main"> 
diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index e69de29b..bbe46ff7 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -0,0 +1,72 @@
+<template>
+    <div class="header">
+        <span class="title">创建调研</span>
+        <div class="goback"><span class="return"></span><router-link class="returntext" to="/researchmanage">返回</router-link></div>
+    </div>
+    <div class="content">
+        <div class="type"></div>
+        <div class="name">
+            <div class="star">*</div>
+            <div class="inname">提干</div>
+            <div class="in">
+                <a-input v-model:value="valueE" placeholder="请输入项目名称"/>
+            </div>
+        </div>
+    </div>
+    <div class="footer">
+        <div class="btn">
+            <a-button type="primary" style="width: 100px;height: 40px;border-radius: 8px">保存</a-button>
+            <a-button type="primary" ghost style="width: 100px;height: 40px;margin-left: 14px;border-radius: 8px">取消</a-button>
+        </div>
+    </div>
+</template>
+<style>
+    .header {
+        width: 100%;
+        display: flex;
+        justify-content: space-between;
+        .title {
+            color: #000000;
+            font-size: 18px;
+            //line-height: 36px;
+            padding-top: 30px;
+            padding-left: 37px;
+            //font-weight: 500;
+        }
+        .goback {           
+            padding-right: 70px;
+            //padding-top: 37px;
+            position: relative;
+            .return {
+                display: inline-block;
+                width: 42px;
+                height: 42px;
+                margin-top: 17px;
+                margin-right: 10px;
+                background-image: url("../../assets/images/projectadd/return.png");
+            }
+            .returntext {
+                display: inline-block;
+                position: absolute;
+                top: 27px;
+                color: #4EA6FF;
+                font-size: 14px;
+            }
+        }
+    }
+    .content {
+        display: flex;
+        flex-direction: column;
+        
+    }
+    .footer {
+        width: 100%;
+        margin-top: 31px;
+        margin-bottom: 14px;
+        .btn {
+            display: flex;
+            justify-content: center;
+            cursor: pointer;
+        }
+    }
+</style>
\ No newline at end of file