From 2b5602b77066ceb6e6e462405733c58c3220704c Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Fri, 28 Oct 2022 16:22:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=E8=AF=BE=E7=A8=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=BC=80=E8=AF=BE=E3=80=81=E5=AD=A6=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=81=E5=BD=92=E5=B1=9E=E6=9D=83=E3=80=81=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E8=A1=A8=E6=A0=BC=E5=88=86=E9=A1=B5=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/CorPowerlist.vue      |  8 ++++++--
 src/components/drawers/OwnPower.vue          | 14 +++++++++++---
 src/views/courselibrary/CoursewareManage.vue | 16 ++++++++++++----
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/components/drawers/CorPowerlist.vue b/src/components/drawers/CorPowerlist.vue
index 4a334e1f..d39314ef 100644
--- a/src/components/drawers/CorPowerlist.vue
+++ b/src/components/drawers/CorPowerlist.vue
@@ -59,7 +59,8 @@
                   </template>
                 </template>
               </a-table>
-              <div class="pa">
+              <div class="tableBox">
+                <div class="pa">
                 <a-pagination
                   showSizeChanger="true"
                   showQuickJumper="true"
@@ -70,6 +71,7 @@
                   class="pagination"
                 />
               </div>
+              </div>
           </div>
         </div>
         <div class="main_btns">
@@ -338,7 +340,8 @@
               > td {
               background: #f6f9fd;
             }
-            .pa {
+            .tableBox{
+              .pa {
               left: 0;
               width: 100%;
               // height: 20px;
@@ -348,6 +351,7 @@
               position: absolute;
               bottom: 20px;
             }
+            }
           }
       }
   
diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue
index 43c6248c..4e765153 100644
--- a/src/components/drawers/OwnPower.vue
+++ b/src/components/drawers/OwnPower.vue
@@ -77,6 +77,7 @@
                       onChange: onSelectChange,
                     }"
                   />
+                  <div class="tableBox">
                   <div class="pa">
                     <a-pagination
                       showSizeChanger="true"
@@ -88,6 +89,7 @@
                       class="pagination"
                     />
                   </div>
+                  </div>
                 </div>
               </a-tab-pane>
               <a-tab-pane key="2" tab="添加组织" force-render>
@@ -156,7 +158,8 @@
                         onChange: onSelectChange1,
                       }"
                     />
-                    <div class="pa">
+                    <div class="tableBox">
+                      <div class="pa">
                       <a-pagination
                         showSizeChanger="true"
                         showQuickJumper="true"
@@ -167,6 +170,7 @@
                         class="pagination"
                       />
                     </div>
+                    </div>
                   </div>
                 </div>
               </a-tab-pane>
@@ -237,7 +241,8 @@
                       onChange: onSelectChange2,
                     }"
                   />
-                  <div class="pa">
+                  <div class="tableBox">
+                    <div class="pa">
                     <a-pagination
                       showSizeChanger="true"
                       showQuickJumper="true"
@@ -248,6 +253,7 @@
                       class="pagination"
                     />
                   </div>
+                  </div>
                 </div>
               </a-tab-pane>
             </a-tabs>
@@ -997,7 +1003,8 @@ export default {
             //   align-items: center;
             //   margin-top: -2px;
             // }
-            .pa {
+            .tableBox{
+              .pa {
               // left: 0;
               margin-top: 15px;
               width: 100%;
@@ -1014,6 +1021,7 @@ export default {
                 margin-bottom: 10px;
               }
             }
+            }
           }
 
           .tab2 {
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 9753e23b..3840ef34 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -984,7 +984,8 @@
                 @expand="expandTable"
                 :pagination="false"
               />
-              <div class="pa">
+              <div class="tableBox">
+                <div class="pa">
                 <a-pagination
                   showSizeChanger="true"
                   showQuickJumper="true"
@@ -995,6 +996,7 @@
                   class="pagination"
                 />
               </div>
+              </div>
             </div>
             <!-- 有数据表格 -->
           </div>
@@ -1336,7 +1338,8 @@
                   @expand="expandTable"
                   :pagination="false"
                 />
-                <div class="pa">
+                <div class="tableBox">
+                  <div class="pa">
                   <a-pagination
                     showSizeChanger="true"
                     showQuickJumper="true"
@@ -1347,6 +1350,7 @@
                     class="pagination"
                   />
                 </div>
+                </div>
               </div>
             </div>
           </div>
@@ -4635,7 +4639,8 @@ export default defineComponent({
                   justify-content: right;
                 }
               }
-              .pa {
+              .tableBox{
+                .pa {
                 left: 0;
                 width: 100%;
                 // height: 20px;
@@ -4645,6 +4650,7 @@ export default defineComponent({
                 position: absolute;
                 bottom: 20px;
               }
+              }
             }
           }
         }
@@ -4876,7 +4882,8 @@ export default defineComponent({
                     cursor: pointer;
                   }
                 }
-                .pa {
+                .tableBox{
+                  .pa {
                   left: 0;
                   width: 100%;
                   // height: 20px;
@@ -4886,6 +4893,7 @@ export default defineComponent({
                   position: absolute;
                   bottom: 20px;
                 }
+                }
               }
             }
           }

From 9b4d027f5f030a1ec4c6d5df1a59dd4107c26498 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Fri, 28 Oct 2022 16:35:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=E9=A1=B9=E7=9B=AE=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E5=BD=92=E5=B1=9E=E6=9D=83=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=85=A8=E7=AE=A1=E7=90=86=E6=9D=83=E5=88=97=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ProjCheckPower.vue  | 15 ++++++++++++---
 src/components/drawers/ProjManagePower.vue | 15 ++++++++++++---
 src/components/drawers/ProjPowerList.vue   |  5 ++++-
 src/components/drawers/ProjectOwn.vue      | 12 +++++++++---
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue
index 1fa2662e..a802c8ff 100644
--- a/src/components/drawers/ProjCheckPower.vue
+++ b/src/components/drawers/ProjCheckPower.vue
@@ -78,7 +78,8 @@
                       onChange: onSelectChange,
                     }"
                   />
-                  <div class="pa">
+                  <div class="tableBox">
+                    <div class="pa">
                     <a-pagination
                       showSizeChanger="true"
                       showQuickJumper="true"
@@ -89,6 +90,8 @@
                       class="pagination"
                     />
                   </div>
+                  </div>
+
                 </div>
               </a-tab-pane>
               <a-tab-pane key="2" tab="添加组织" force-render>
@@ -157,7 +160,8 @@
                         onChange: onSelectChange1,
                       }"
                     />
-                    <div class="pa">
+                    <div class="tableBox">
+                      <div class="pa">
                       <a-pagination
                         showSizeChanger="true"
                         showQuickJumper="true"
@@ -168,6 +172,8 @@
                         class="pagination"
                       />
                     </div>
+                    </div>
+
                   </div>
                 </div>
               </a-tab-pane>
@@ -238,7 +244,8 @@
                       onChange: onSelectChange2,
                     }"
                   />
-                  <div class="pa">
+                  <div class="tableBox">
+                    <div class="pa">
                     <a-pagination
                       showSizeChanger="true"
                       showQuickJumper="true"
@@ -249,6 +256,8 @@
                       class="pagination"
                     />
                   </div>
+                  </div>
+
                 </div>
               </a-tab-pane>
             </a-tabs>
diff --git a/src/components/drawers/ProjManagePower.vue b/src/components/drawers/ProjManagePower.vue
index 2b27532d..35e1b42c 100644
--- a/src/components/drawers/ProjManagePower.vue
+++ b/src/components/drawers/ProjManagePower.vue
@@ -78,7 +78,8 @@
                       onChange: onSelectChange,
                     }"
                   />
-                  <div class="pa">
+                  <div class="tableBox">
+                    <div class="pa">
                     <a-pagination
                       showSizeChanger="true"
                       showQuickJumper="true"
@@ -89,6 +90,8 @@
                       class="pagination"
                     />
                   </div>
+                  </div>
+
                 </div>
               </a-tab-pane>
               <a-tab-pane key="2" tab="添加组织" force-render>
@@ -157,7 +160,8 @@
                         onChange: onSelectChange1,
                       }"
                     />
-                    <div class="pa">
+                    <div class="tableBox">
+                      <div class="pa">
                       <a-pagination
                         showSizeChanger="true"
                         showQuickJumper="true"
@@ -168,6 +172,8 @@
                         class="pagination"
                       />
                     </div>
+                    </div>
+
                   </div>
                 </div>
               </a-tab-pane>
@@ -238,7 +244,8 @@
                       onChange: onSelectChange2,
                     }"
                   />
-                  <div class="pa">
+                  <div class="tableBox">
+                    <div class="pa">
                     <a-pagination
                       showSizeChanger="true"
                       showQuickJumper="true"
@@ -249,6 +256,8 @@
                       class="pagination"
                     />
                   </div>
+                  </div>
+
                 </div>
               </a-tab-pane>
             </a-tabs>
diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue
index ba60607a..7ecd7d38 100644
--- a/src/components/drawers/ProjPowerList.vue
+++ b/src/components/drawers/ProjPowerList.vue
@@ -57,7 +57,8 @@
             }"
           />
         </div>
-        <div class="pa">
+        <div class="tableBox">
+          <div class="pa">
           <a-pagination
             showSizeChanger="true"
             showQuickJumper="true"
@@ -68,6 +69,8 @@
             class="pagination"
           />
         </div>
+        </div>
+
         <!-- <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
           <a-table
             style="border: 1px solid #f2f6fe"
diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue
index 8c52f026..8894e72d 100644
--- a/src/components/drawers/ProjectOwn.vue
+++ b/src/components/drawers/ProjectOwn.vue
@@ -78,7 +78,8 @@
                       onChange: onSelectChange,
                     }"
                   />
-                  <div class="pa">
+                  <div class="tableBox">
+                    <div class="pa">
                     <a-pagination
                       showSizeChanger="true"
                       showQuickJumper="true"
@@ -89,6 +90,7 @@
                       class="pagination"
                     />
                   </div>
+                  </div>
                 </div>
               </a-tab-pane>
               <a-tab-pane key="2" tab="添加组织" force-render>
@@ -157,7 +159,8 @@
                         onChange: onSelectChange1,
                       }"
                     />
-                    <div class="pa">
+                    <div class="tableBox">
+                      <div class="pa">
                       <a-pagination
                         showSizeChanger="true"
                         showQuickJumper="true"
@@ -168,6 +171,7 @@
                         class="pagination"
                       />
                     </div>
+                    </div>
                   </div>
                 </div>
               </a-tab-pane>
@@ -238,7 +242,8 @@
                       onChange: onSelectChange2,
                     }"
                   />
-                  <div class="pa">
+                  <div class="tableBox">
+                    <div class="pa">
                     <a-pagination
                       showSizeChanger="true"
                       showQuickJumper="true"
@@ -249,6 +254,7 @@
                       class="pagination"
                     />
                   </div>
+                  </div>
                 </div>
               </a-tab-pane>
             </a-tabs>

From d6b12ec6975a7061ea4aede675e1fcad007be78f 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: Fri, 28 Oct 2022 16:38:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=E8=AF=84=E4=BC=B0=E7=AE=A1=E7=90=86,?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=84=E4=BC=B0,=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BreadCrumb.vue         |  17 +-
 src/components/NavLeft.vue            |   2 +-
 src/components/drawers/ViewAssess.vue | 273 ++++++++++++++++++++++
 src/views/research/ManagePage.vue     |  51 ++++-
 src/views/research/ResearchAdd.vue    | 312 +++++++++++++++++++++-----
 src/views/research/ResearchManage.vue | 168 +++++++++-----
 6 files changed, 699 insertions(+), 124 deletions(-)
 create mode 100644 src/components/drawers/ViewAssess.vue

diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue
index 2947746f..1229413b 100644
--- a/src/components/BreadCrumb.vue
+++ b/src/components/BreadCrumb.vue
@@ -185,7 +185,7 @@ export default {
         if (n === "/researchmanage" || n === "/ResearchManage") {
           state.list = [
             {
-              name: "调研管理",
+              name: "评估管理",
               href: "",
               // href: "#/researchmanage",
             },
@@ -194,7 +194,7 @@ export default {
         if (n === "/managepage" || n === "/ManagePage") {
           state.list = [
             {
-              name: "调研管理",
+              name: "评估管理",
               href: "",
               // href: "#/researchmanage",
             },
@@ -204,6 +204,19 @@ export default {
           ];
         }
 
+        if (n === "/researchadd" || n === "/ResearchAdd") {
+          state.list = [
+            {
+              name: "评估管理",
+              href: "",
+              // href: "#/researchmanage",
+            },
+            {
+              name: "创建评估",
+            },
+          ];
+        }
+
         if (n === "/certificatecenter" || n === "/CertificateCenter") {
           state.list = [
             {
diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index bc060992..be43aaa2 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -114,7 +114,7 @@
               src="../assets/images/navleft/survey.png"
             />
           </div>
-          <router-link to="/researchmanage">调研管理</router-link>
+          <router-link to="/researchmanage">评估管理</router-link>
         </a-menu-item>
 
         <a-menu-item key="sub6" @titleClick="titleClick">
diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue
new file mode 100644
index 00000000..3df8b914
--- /dev/null
+++ b/src/components/drawers/ViewAssess.vue
@@ -0,0 +1,273 @@
+<template>
+  <a-drawer
+    :visible="Assessvisible"
+    class="drawerStyle assessment"
+    placement="right"
+    width="70%"
+    @after-visible-change="afterVisibleChange"
+  >
+    <div class="drawerMain">
+      <div class="header">
+        <div class="headerTitle">查看评估详情</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
+      </div>
+      <div class="main">
+        <div class="onerow">
+            <div class="assname">评估名称：</div>
+            <div class="asscontent">产品经理面授课评估</div>
+        </div>
+        <div class="onerow" style="margin-top: 30px">
+            <div class="assname">评估说明：</div>
+            <div class="asscontent">-</div>
+        </div>
+        <div class="assessbox" style="margin-top: 30px">
+            <div class="box1">
+                <div class="asstype">评估类型：</div>
+                <div class="typename">单选</div>
+            </div>
+            <div class="box1" style="margin-left: 64px">
+                <div class="asstype">题干：</div>
+                <div style="color: rgba(153, 153, 153, 1);font-size: 14px">这个课程你觉得对你有用吗？</div>
+            </div>
+            <a-radio-group v-model:value="value">
+                <div class="box1" style="margin-left: 55px;margin-top: 20px">
+                    <div class="asstype">选择1：</div>
+                    <a-radio :value="1">有用</a-radio>
+                </div>
+                <div class="box1" style="margin-left: 55px;margin-top: 20px;margin-bottom: 30px">
+                    <div class="asstype">选择2：</div>
+                    <a-radio :value="2">没用</a-radio>
+                </div>
+            </a-radio-group>
+            
+        </div>
+        <div class="assessbox" style="margin-top: 30px">
+            <div class="box1">
+                <div class="asstype">评估类型：</div>
+                <div class="typename">问答题</div>
+            </div>
+            <div class="box1" style="margin-left: 64px">
+                <div class="asstype">标题：</div>
+                <div style="color: rgba(153, 153, 153, 1);font-size: 14px">对这个课程有什么建议吗？</div>
+            </div>
+            <div class="box1" style="margin-left: 64px;margin-top: 20px;margin-bottom: 30px">
+                <div class="asstype">描述：</div>
+                <div style="color: rgba(51, 51, 51, 1);font-size: 14px">希望以后这样的课程能够躲开，让我们多多了解！</div>
+            </div>
+        </div>
+        <div class="assessbox" style="margin-top: 30px">
+            <div class="box1">
+                <div class="asstype">评估类型：</div>
+                <div class="typename">评分题</div>
+            </div>
+            <div class="box1" style="margin-left: 64px">
+                <div class="asstype">标题：</div>
+                <div style="color: rgba(153, 153, 153, 1);font-size: 14px">请给当前课程打分</div>
+            </div>
+            <div class="lastbox">
+                <div class="sorcetext">非常不满意</div>
+                <div class="sorcebox">
+                    <div class="numbox" >1</div>
+                    <div class="numbox">2</div>
+                    <div class="numbox">3</div>
+                    <div class="numbox">4</div>
+                    <div class="numbox">5</div>
+                    <div class="numbox">6</div>
+                    <div class="numbox">7</div>
+                    <div class="numbox">8</div>
+                    <div class="numbox1">9</div>
+                    <div class="numbox1">10</div>
+                </div>
+                <div class="sorcetext">非常满意</div>
+            </div>
+        </div>
+      </div>
+      <div class="btnn">
+        <button class="btn1">取消</button>
+        <button class="btn2">确定</button>
+      </div>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+import { reactive, toRefs } from "vue";
+export default {
+  name: "ViewAssess",
+  props: {
+    Assessvisible: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      value: "1",
+    });
+    const closeDrawer = () => {
+      ctx.emit("update:Assessvisible", false);
+    };
+
+    const afterVisibleChange = (bool) => {
+      console.log("state", bool);
+    };
+
+    return {
+      ...toRefs(state),
+      afterVisibleChange,
+      closeDrawer,
+      // change,
+    };
+  },
+};
+</script>
+
+<style lang="scss">
+.assessment {
+  .drawerMain {
+    min-width: 600px;
+    margin: 0px 32px 0px 32px;
+    overflow-x: scroll;
+    display: flex;
+    flex-direction: column;
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      // background-color: red;
+      margin-bottom: 20px;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        // margin-left: 24px;
+      }
+    }
+    .main {
+      display: flex;
+      flex-direction: column;
+      overflow-y: auto;
+      //align-items: center;
+      .onerow {
+        display: flex;
+        margin-top: 10px;
+        margin-left: 10px;
+        .assname {
+            font-size: 16px;
+            color: #333333;
+            font-weight: 500;
+        }
+        .asscontent {
+            color: #999999;
+            font-size: 16px;
+        }
+      }
+      .assessbox {
+        border: 1px solid rgba(151, 151, 151, 0.29);
+        border-radius: 8px;
+        display: flex;
+        flex-direction: column;
+        .box1 {
+            display: flex;
+            margin-top: 20px;
+            margin-left: 36px;
+            align-items: center;
+            .asstype {
+                color: rgba(51, 51, 51, 1);
+                font-size: 14px;
+                font-weight: 500;
+            }
+            .typename {
+                width: 80px;
+                height: 32px;
+                //margin-left: 10px;
+                border-radius: 4px;
+                border: 1px solid rgba(64, 158, 255, 1);
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                color: rgba(64, 158, 255, 1);
+                font-size: 14px;
+                background: rgba(64,158,255,0.1);
+            }
+        }
+        .lastbox {
+            display: flex;
+            align-items: center;
+            margin-left: 30px;
+            .sorcetext {
+                color: rgba(153, 153, 153, 1);
+                font-size: 14px;
+            }
+            .sorcebox {
+                display: flex;
+                .numbox {
+                    width: 32px;
+                    height: 32px;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    background: rgba(64, 158, 255, 1);
+                    color: #FFFFFF;
+                    font-size: 14px;
+                    border-radius: 4px;
+                    margin: 20px 5px;
+                    cursor: pointer;
+                }
+                .numbox1 {
+                    width: 32px;
+                    height: 32px;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    border: 1px solid rgba(151, 151, 151, 0.29);
+                    color: rgba(0, 0, 0, 0.6500);
+                    margin: 20px 5px;
+                    cursor: pointer;
+                    border-radius: 4px;
+                }
+            }
+            
+        }
+      }
+    }
+    .btnn {
+      height: 72px;
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+      .btn1 {
+        width: 100px;
+        height: 40px;
+        border: 1px solid #4ea6ff;
+        border-radius: 8px;
+        color: #4ea6ff;
+        background-color: #fff;
+        cursor: pointer;
+      }
+      .btn2 {
+        cursor: pointer;
+        width: 100px;
+        height: 40px;
+        background: #4ea6ff;
+        border-radius: 8px;
+        border: 0;
+        margin-left: 15px;
+        color: #fff;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue
index 4a5d4025..88c5bdae 100644
--- a/src/views/research/ManagePage.vue
+++ b/src/views/research/ManagePage.vue
@@ -10,14 +10,14 @@
           </div>
           <router-link to="/researchmanage" class="goback"><span class="return"></span><router-link class="returntext" to="/researchmanage">返回</router-link></router-link>
         </div>       
-        <div class="text">路径管理</div>
+        <div class="text">评估管理</div>
       </div>
       <div class="message">
         <div class="title">基本信息</div>
         <div class="messagebox">
           <div style="width: 186px;margin-right: 126px;float: left">
-            <span class="name">调研名称:</span>
-            <span class="descript">产品经理问卷调查</span>
+            <span class="name">评估名称:</span>
+            <span class="descript">课程评估</span>
           </div>
           <div style="width: 103px;margin-right: 126px;float:left">
             <span class="name">创建人:</span>
@@ -32,7 +32,7 @@
             <span class="descript">2022-07-22 9:30</span>
           </div>
           <div style="width: 192px;margin-right: 126px;float:left">
-            <span class="name">创建时间:</span>
+            <span class="name">发布时间:</span>
             <span class="descript">2022-07-22 9:30</span>
           </div>
         </div>
@@ -59,13 +59,24 @@
       <!-- 表格 -->
     </div>
   </div>
+  <view-assess v-model:Assessvisible="Assessvisible" />
 </template>
 
 <script>
+import ViewAssess from "../../components/drawers/ViewAssess";
+import { reactive, toRefs} from "vue";
 export default {
   name: "ManagePage",
+  components: { ViewAssess },
   setup() {
+      const state = reactive ({
+        Assessvisible: false,
+      });
+      const showassess = () => {
+        state.Assessvisible = true;
+      };
       return {
+        ...toRefs(state),
         dataSource: [
           {
             key: '1',
@@ -75,6 +86,7 @@ export default {
             project:'产品经理进阶-腾飞班1',
             learning:'产品经理学习路径',
             submit:'2022-07-22 9:30',
+            
           },
           {
             key: '2',
@@ -84,6 +96,7 @@ export default {
             project:'产品经理进阶-腾飞班1',
             learning:'高级产品经理学习路径',
             submit:'2022-07-22 9:30',
+         
           },
           {
             key: '3',
@@ -93,6 +106,7 @@ export default {
             project:'产品经理进阶-腾飞班1',
             learning:'-',
             submit:'2022-07-22 9:30',
+          
           },
           {
             key: '4',
@@ -102,13 +116,14 @@ export default {
             project:'产品经理进阶-腾飞班1',
             learning:'HR学习路径',
             submit:'2022-07-22 9:30',
+        
           },
         ],
 
         columns: [
           {
             title: '姓名',
-            width: 50,
+            width: 40,
             dataIndex: 'name',
             key: 'name',
           },
@@ -142,7 +157,29 @@ export default {
             dataIndex: 'submit',
             key: 'submit',
           },
+          {
+            title: '操作',
+            width: 50,
+            dataIndex: 'opacation',
+            key: 'opacation',
+            scopedSlots: { customRender: "action" }, //引入的插槽
+            customRender: () => {
+            return (             
+                <div class="opacationn">
+                  <span
+                    onClick={() => {
+                      showassess();
+                    }}
+                    style="cursor:pointer"
+                  >
+                    查看
+                  </span>
+                </div>
+            );
+          },
+          },
         ],
+        showassess,
       };
     },
 };
@@ -243,6 +280,10 @@ export default {
     flex-direction: column;
     .tableBox {
       margin: 20px 38px 30px ;
+      .opacationn {
+        color: #4EA6FF;
+        cursor: pointer;
+      }
       th.ant-table-cell {
         background-color:#EFF4FC !important;
         text-align: center;
diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index 914ee797..551ffd40 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -1,8 +1,8 @@
-<!-- 调研管理-基础信息页面 -->
+<!-- 调研管理-创建评估页面 -->
 <template>
   <div class="researchadd">
     <div class="header">
-      <span class="title">创建调研</span>
+      <span class="title">创建评估</span>
       <router-link to="/researchmanage" class="goback"
         ><span class="return"></span
         ><router-link class="returntext" to="/researchmanage"
@@ -10,34 +10,19 @@
         ></router-link
       >
     </div>
+    <div class="addtype">
+      <div class="addtypen">创建评估类型</div>
+      <div class="types">单选题</div>
+      <div class="types">多选题</div>
+      <div class="types">问答题</div>
+      <div class="types">评分题</div>
+    </div>
     <div class="content">
-      <div class="name">
-        <div class="namebox">
-          <div class="inname">类型</div>
-        </div>
-        <div class="in">
-          <input type="radio" name="type" id="single" checked="checked" /><label
-            for="single"
-            class="text"
-            style="margin-left: 5px"
-            >单选</label
-          >
-          <input
-            type="radio"
-            name="type"
-            id="double"
-            style="margin-left: 10px"
-          /><label for="double" class="text" style="margin-left: 5px"
-            >多选</label
-          >
-          <input
-            type="radio"
-            name="type"
-            id="score"
-            style="margin-left: 10px"
-          /><label for="score" class="text" style="margin-left: 5px"
-            >评分题</label
-          >
+      <div class="tagbox">
+        <div class="tagname">单选题</div>
+        <div class="deleteop">
+          <div><img src="../../assets/images/projectadd/delete.png"/></div>
+          <div  class="del_text">删除选项</div>
         </div>
       </div>
       <div class="name">
@@ -46,32 +31,18 @@
             class="nameimg"
             src="../../assets/images/basicinfo/asterisk.png"
           />
-          <div class="inname">提干</div>
+          <div class="inname">标题</div>
         </div>
         <div class="in">
           <a-input
             v-model:value="valueE"
-            placeholder="请输入项目名称"
+            placeholder="请输入提干名称"
             show-count
             :maxlength="20"
             style="border-radius: 8px"
           />
         </div>
       </div>
-      <div class="name">
-        <div class="in" style="margin-left: 133px">
-          <a-button
-            type="primary"
-            style="
-              width: 100px;
-              height: 40px;
-              border-radius: 8px;
-              background-color: #409eff;
-            "
-            >添加选项</a-button
-          >
-        </div>
-      </div>
       <div class="options">
         <div class="name">
           <div class="namebox">
@@ -81,7 +52,7 @@
             <a-input
               v-model:value="valueE"
               show-count
-              :maxlength="20"
+              :maxlength="30"
               style="border-radius: 8px"
             />
           </div>
@@ -96,13 +67,13 @@
       <div class="options">
         <div class="name">
           <div class="namebox">
-            <div class="inname">选项1</div>
+            <div class="inname">选项2</div>
           </div>
           <div class="in">
             <a-input
               v-model:value="valueE"
               show-count
-              :maxlength="20"
+              :maxlength="30"
               style="border-radius: 8px"
             />
           </div>
@@ -127,11 +98,82 @@
           src="../../assets/images/basicinfo/close.png"
         />
       </div>
-    </div>
-    <div class="header">
-      <span class="title" style="font-size: 14px">选项设置</span>
+      <div class="name">
+        <div class="in" style="margin-left: 85px;margin-bottom: 20px">
+          <a-button
+            type="primary"
+            style="
+              width: 100px;
+              height: 40px;
+              border-radius: 8px;
+              background-color: #409eff;
+            "
+            >添加选项</a-button
+          >
+        </div>
+      </div>
     </div>
     <div class="content">
+      <div class="tagbox">
+        <div class="tagname">问答题</div>
+        <div class="deleteop">
+          <div><img src="../../assets/images/projectadd/delete.png"/></div>
+          <div  class="del_text">删除选项</div>
+        </div>
+      </div>
+      <div class="name">
+        <div class="namebox">
+          <img
+            class="nameimg"
+            src="../../assets/images/basicinfo/asterisk.png"
+          />
+          <div class="inname">标题</div>
+        </div>
+        <div class="in">
+          <a-input
+            v-model:value="valueEi"
+            placeholder="请输入标题名称"
+            show-count
+            :maxlength="20"
+            style="border-radius: 8px"
+          />
+        </div>
+      </div>
+      <div class="name name2" style="margin-bottom: 20px">
+        <div class="namebox">
+          <div class="inname">描述</div>
+        </div>
+        <div class="in">
+          <a-textarea v-model:value="valueii" style="height: 148px" />
+        </div>
+      </div>
+    </div>
+    <div class="content">
+      <div class="tagbox">
+        <div class="tagname">评分题</div>
+        <div class="deleteop">
+          <div><img src="../../assets/images/projectadd/delete.png"/></div>
+          <div  class="del_text">删除选项</div>
+        </div>
+      </div>
+      <div class="name">
+        <div class="namebox">
+          <img
+            class="nameimg"
+            src="../../assets/images/basicinfo/asterisk.png"
+          />
+          <div class="inname">标题</div>
+        </div>
+        <div class="in">
+          <a-input
+            v-model:value="valueE1"
+            placeholder="请输入标题名称"
+            show-count
+            :maxlength="20"
+            style="border-radius: 8px"
+          />
+        </div>
+      </div>
       <div class="name">
         <div class="namebox">
           <div class="inname">最低分</div>
@@ -179,15 +221,36 @@
         </div>
         <div class="scoretext">非常不满意</div>
       </div>
-      <div class="name name2">
+      <div class="name" style="margin-bottom: 20px;">
         <div class="namebox">
-          <div class="inname" style="margin-top: 13px">备注</div>
+          <img
+            class="nameimg"
+            src="../../assets/images/basicinfo/asterisk.png"
+          />
+          <div class="inname">配置权重</div>
         </div>
-        <div class="in">
-          <a-textarea v-model:value="valuei" style="height: 80px" />
+        <div class="in" style="display:flex">
+          <div class="assess">
+            <div class="assesstype">评估类型</div>
+            <div class="assesswhole">整体评估</div>
+          </div>
+          <div class="assess" style="margin-left: 50px;position: relative">
+            <div class="assesstype">权重比例</div>
+            <div class="assesswhole" style="background: #FFFFFF">20</div>
+            <div class="ratio">%</div>
+          </div>
         </div>
       </div>
     </div>
+    <div class="opinion name2">
+        <div class="namebox">
+          <div class="inname" style="margin-top: 13px">您的其他意见</div>
+        </div>
+        <div class="in">
+          <a-textarea v-model:value="valuep" style="height: 110px" show-count
+            :maxlength="200"/>
+        </div>
+    </div>
     <div class="footer">
       <div class="btn">
         <a-button
@@ -379,9 +442,71 @@ export default {
       }
     }
   }
+  .addtype {
+    display: flex;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+    margin-right: 20px;
+    align-items: center;
+    margin-left: 41px;
+    .addtypen {
+      color: #6F6F6F;
+      font-size: 14px;
+    }
+    .types {
+      cursor: pointer;
+      width: 80px;
+      height: 40px;
+      color: #409EFF;
+      border: 1px solid #409EFF;
+      border-radius: 4px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin: 20px 10px;
+    }
+  }
   .content {
     display: flex;
     flex-direction: column;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    width: 70%;
+    min-width: 690px;
+    margin-left: 38px;
+    margin-top: 20px;
+    .tagbox {
+      display: flex;
+      justify-content: space-between;
+      .tagname {
+        width: 90px;
+        height: 32px;
+        margin-top: 24px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-left: 134px;
+        background: rgba(78, 166, 255, 0.1);
+        border-radius: 4px;
+        color: rgba(64, 158, 255, 1);
+        font-size: 16px;
+      }
+      .deleteop {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        margin-top: 20px;
+        margin-right: 30px;
+        border: 1px solid #409EFF;
+        border-radius: 8px;
+        cursor: pointer;
+        .del_text {
+          color: #409EFF;
+          font-size: 14px;
+          margin-left: 5px;
+        }
+      }
+    }
     .scorebox {
       display: flex;
       align-items: center;
@@ -429,10 +554,6 @@ export default {
         font-size: 14px;
       }
     }
-    .name2 {
-      display: flex;
-      align-items: flex-start;
-    }
     .options {
       display: flex;
     }
@@ -444,8 +565,12 @@ export default {
       color: #4ea6ff;
       font-size: 14px;
     }
+    .name2 {
+      display: flex;
+      align-items: flex-start;
+    }
     .name {
-      width: 50%;
+      width: 60%;
       // background-color: lightcoral;
       display: flex;
       margin-top: 20px;
@@ -464,13 +589,45 @@ export default {
         }
       }
       .inname {
-        color: #6f6f6f;
+        color: #6F6F6F;
         font-size: 14px;
         margin-left: 7px;
+        font-weight: 700;
       }
       .in {
         margin-left: 14px;
         flex: 1;
+        .assess {
+          display: flex;
+          width: 226px;
+          height: 40px;
+          border: 1px solid #56A3F9;
+          //margin-bottom: 20px;
+          .assesstype {
+            width: 50%;
+            background: #56A3F9;
+            color: #FFFFFF;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+          .assesswhole {
+            width: 50%;
+            background: rgba(86, 163, 249, 0.1);
+            font-size: 14px;
+            color: #6F6F6F;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+          .ratio {
+            position: absolute;
+            right: 10px;
+            top: 8px;
+            color: #6F6F6F;
+            font-size: 14px;
+          }
+        }
         .addimg {
           cursor: pointer;
           color: rgba(78, 166, 255, 1);
@@ -500,6 +657,8 @@ export default {
         width: 200px;
         .ant-input-number {
           width: 200px;
+          height: 40px;
+          border-radius: 8px;
         }
         // .ant-input-number-input-wrap {
         //   width: 200px;
@@ -507,6 +666,37 @@ export default {
       }
     }
   }
+  .name2 {
+      display: flex;
+      align-items: flex-start;
+    }
+    .opinion {
+      display: flex;
+      margin-top: 30px;
+      .namebox {
+        width: 120px;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        flex-shrink: 0;
+      }
+      .in {
+        margin-left: 14px;
+        width: 500px;
+        .ant-input-textarea-show-count {
+              position: relative;
+              height: 110px;
+        }
+        .ant-input-textarea-show-count::after {
+              position: absolute;
+              right: 10px;
+              bottom: 0px;
+        } 
+        .ant-input {
+          border-radius: 8px;
+        }
+      }
+    }
   .footer {
     width: 100%;
     margin-top: 31px;
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 36f3d455..edd2d6ec 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -1,4 +1,4 @@
-<!-- 调研管理页面 -->
+<!-- 评估管理页面 -->
 <template>
   <div class="researchmanage">
     <!-- 搜索框及按钮 -->
@@ -8,7 +8,7 @@
           <a-select
             v-model:value="projectName"
             style="width: 270px"
-            placeholder="请输入调研名称"
+            placeholder="请输入评估名称"
             :options="projectNameList"
             @change="selectProjectName"
             allowClear
@@ -40,19 +40,21 @@
             :placeholder="['        开始时间', '        结束时间']"
           />
         </div>
+        <div style="display: flex; margin-bottom: 20px">
+          <div class="btn btn1">
+            <div class="search"></div>
+            <div class="btnText">搜索</div>
+          </div>
+          <div class="btnn btn2">
+            <div class="search"></div>
+            <div class="btnText">重置</div>
+          </div>
+        </div>
       </div>
-      <div class="btns">
-        <div class="btn btn1">
-          <div class="search"></div>
-          <div class="btnText">搜索</div>
-        </div>
-        <div class="btn btn2">
-          <div class="search"></div>
-          <div class="btnText">重置</div>
-        </div>
+      <div class="btns">       
         <div class="btn btn3" @click="handleOut">
           <div class="search"></div>
-          <div class="btnText">创建调研</div>
+          <div class="btnText">创建评估</div>
         </div>
       </div>
     </div>
@@ -92,7 +94,7 @@
       <div class="out">
         <div class="top">
           <img class="topimg" src="../../assets/images/courseManage/add1.png" />
-          <div class="topc">创建调研</div>
+          <div class="topc">创建评估</div>
           <div @click="handleOut" style="margin-left: 500px; cursor: pointer">
             <img
               style="width: 20px; height: 20px"
@@ -102,7 +104,7 @@
         </div>
         <div class="mid clearfix">
           <div class="name">
-            <div class="inname">调研名称</div>
+            <div class="inname">评估名称</div>
             <div class="in">
               <a-input
                 v-model:value="valuen"
@@ -132,26 +134,25 @@
         <div class="del_header"></div>
         <div class="del_main">
           <div class="header">
-            <div class="del-icon" :style="{ display: del_hs || over_hs ? 'block' : 'none' }"><img src="@/assets/images/coursewareManage/notice.png" alt=""></div>
-            <div class="del-icon" :style="{ display: copy_hs || back_hs || pub_hs ? 'block' : 'none' }"><img src="@/assets/images/coursewareManage/QR.png" alt=""></div>
-            <span>提示</span>
+            <img src="@/assets/images/coursewareManage/QR.png" alt="">
+            <span style="margin-left: 9px">提示</span>
             <div class="close_exit" @click="delete_exit"></div>
           </div>
           <div class="body">
             <div :style="{ display: del_hs ? 'block' : 'none' }">
-              <span>您确定要删除此调研吗</span>
+              <span>您确定要删除此评估吗</span>
             </div>
             <div :style="{ display: over_hs ? 'block' : 'none' }">
-              <span>您确定要结束此调研吗</span>
+              <span>您确定要结束此评估吗</span>
             </div>
             <div :style="{ display: copy_hs ? 'block' : 'none' }">
-              <span>您确定要复制此调研吗</span>
+              <span>您确定要复制此评估吗</span>
             </div>
             <div :style="{ display: back_hs ? 'block' : 'none' }">
-              <span>您确定要撤回此调研吗</span>
+              <span>您确定要撤回此评估吗</span>
             </div>
             <div :style="{ display: pub_hs ? 'block' : 'none' }">
-              <span>您确定要发布此调研吗</span>
+              <span>您确定要发布此评估吗</span>
             </div>
           </div>
           <div class="del_btnbox">
@@ -220,7 +221,7 @@ export default {
         {
           key: 1,
           number: 1,
-          manager: "产品经理问卷调查",
+          manager: "产品经理评估",
           state: "已发布",
           creater: "管理员",
           pubtime: "2022-07-20 9:03",
@@ -230,7 +231,7 @@ export default {
         {
           key: 2,
           number: 2,
-          manager: "高级产品经理问卷调查",
+          manager: "高级产品经理评估",
           state: "已发布",
           creater: "管理员",
           pubtime: "2022-07-20 9:03",
@@ -240,7 +241,7 @@ export default {
         {
           key: 3,
           number: 3,
-          manager: "管理者进阶腾飞班问卷调查",
+          manager: "管理者进阶腾飞班管理者进阶腾飞班评估",
           state: "待发布",
           creater: "管理员",
           pubtime: "2022-07-20 9:03",
@@ -250,7 +251,7 @@ export default {
         {
           key: 4,
           number: 4,
-          manager: "HR问卷",
+          manager: "HR评估",
           state: "已结束",
           creater: "管理员",
           pubtime: "2022-07-20 9:03",
@@ -259,7 +260,7 @@ export default {
         },
       ],
       currentPage: 1,
-      tableDataTotal: 20,
+      tableDataTotal: 100,
       pageSize: 10,
       value1: " ",
       valuen: "",
@@ -372,17 +373,14 @@ export default {
               )}
               {value.state === "待发布" ? (
                 <div class="fb">
-                  <router-link to="/researchadd" class="jc">
-                    基础信息
-                  </router-link>
-                  <router-link to="/managepage" class="jc">
-                    管理
-                  </router-link>
-                  <div class="jc"
+                <div class="jc"
                   onClick={()=>{
                       state.delete_hs = true;
                       state.pub_hs = true;
                   }}>发布</div>
+                  <router-link to="/researchadd" class="jc">
+                    基础信息
+                  </router-link>
                   <div class="jc"
                   onClick={()=>{
                       state.delete_hs = true;
@@ -590,13 +588,33 @@ export default {
         margin-right: 20px;
         margin-bottom: 20px;
       }
-    }
-    .btns {
-      display: flex;
       .btn {
         padding: 0px 26px 0px 26px;
         height: 38px;
-        background: rgba(64, 158, 255, 0);
+        background: #409eff;
+        border-radius: 8px;
+        //border: 1px solid rgba(64, 158, 255, 1);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
+        cursor: pointer;
+        .search {
+          background-size: 100%;
+        }
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          color: #ffffff;
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
+      .btnn {
+        padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: #ffffff;
         border-radius: 8px;
         border: 1px solid rgba(64, 158, 255, 1);
         display: flex;
@@ -611,7 +629,7 @@ export default {
         .btnText {
           font-size: 14px;
           font-weight: 400;
-          color: rgba(64, 158, 255, 1);
+          color: #409eff;
           line-height: 36px;
           margin-left: 5px;
         }
@@ -620,7 +638,7 @@ export default {
         .search {
           width: 15px;
           height: 17px;
-          background-image: url("../../assets/images/courseManage/search1.png");
+          background-image: url("../../assets/images/courseManage/search0.png");
         }
       }
       .btn2 {
@@ -630,16 +648,8 @@ export default {
           background-image: url("../../assets/images/courseManage/reset1.png");
         }
       }
-      .btn3 {
-        margin-right: 0px;
-        .search {
-          width: 17px;
-          height: 18px;
-          background-image: url("../../assets/images/courseManage/add1.png");
-        }
-      }
       .btn1:hover {
-        background: rgba(64, 158, 255, 1);
+        background: rgba(64, 158, 255, 0.76);
         .search {
           background-image: url("../../assets/images/courseManage/search0.png");
         }
@@ -647,17 +657,51 @@ export default {
           color: #ffffff;
         }
       }
+      .btn1:active {
+        background: #0982ff;
+      }
       .btn2:hover {
-        background: rgba(64, 158, 255, 1);
+        background: rgba(64, 158, 255, 0.1);
+      }
+      .btn2:active {
+        background: rgba(64, 158, 255, 0.2);
+      }
+    }
+    .btns {
+      display: flex;
+      .btn {
+        padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: #409eff;
+        border-radius: 8px;
+        //border: 1px solid rgba(64, 158, 255, 1);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
+        cursor: pointer;
         .search {
-          background-image: url("../../assets/images/courseManage/reset0.png");
+          background-size: 100%;
         }
         .btnText {
+          font-size: 14px;
+          font-weight: 400;
           color: #ffffff;
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
+      .btn3 {
+        margin-right: 0px;
+        .search {
+          width: 17px;
+          height: 18px;
+          background-image: url("../../assets/images/courseManage/add0.png");
         }
       }
       .btn3:hover {
-        background: rgba(64, 158, 255, 1);
+        background: rgba(64, 158, 255, 0.76);
         .search {
           background-image: url("../../assets/images/courseManage/add0.png");
         }
@@ -665,6 +709,9 @@ export default {
           color: #ffffff;
         }
       }
+      .btn3:active {
+        background: #0982ff;
+      }
     }
   }
   .tableBox {
@@ -673,9 +720,14 @@ export default {
     flex: 1;
     flex-direction: column;
 
-    th.h {
-      background-color: #eff4fc !important;
-    }
+    th.ant-table-cell {
+        background-color:#EFF4FC !important;
+        text-align: center;
+        color: #999BA3;
+      }
+      td.ant-table-cell {
+        text-align: center;
+      }
 
     .ant-table-tbody
       > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
@@ -691,6 +743,12 @@ export default {
     .pagination {
       margin-bottom: 20px;
     }
+    .ant-pagination-item-link,
+    .ant-pagination-item,
+    .ant-select-selector,
+    .ant-pagination-options-quick-jumper input {
+      border-radius: 8px;
+    }
   }
 
   .unout {