From a9ba5f6b5eb52d40e9f8db01c3789038232b32b1 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 16 Nov 2022 08:28:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8A=BD=E5=B1=89=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ AssessmentList.vue    |  347 +++++
 src/components/drawers/AddActive.vue          |    1 +
 src/components/drawers/AddCase.vue            |    1 +
 src/components/drawers/AddDiscuss.vue         |    1 +
 src/components/drawers/AddEval.vue            |    1 +
 src/components/drawers/AddHomework.vue        |  135 +-
 src/components/drawers/AddInvist.vue          |  247 ++--
 src/components/drawers/AddLive.vue            |    1 +
 src/components/drawers/AddRef.vue             |    6 +-
 src/components/drawers/AddTest.vue            |  178 +--
 .../drawers/{AddVote.vue => AddVotebak.vue}   |  327 ++---
 src/components/drawers/CreVote.vue            |   19 +-
 src/components/vote/AddVote.vue               |  253 ++--
 src/components/vote/CreateVote.vue            | 1123 ++++++++---------
 src/views/learningpath/LevelAddDetail.vue     |    2 +-
 src/views/projectcenter/TaskAdd.vue           |    4 +-
 src/views/system/SystemManage.vue             |    2 +-
 17 files changed, 1381 insertions(+), 1267 deletions(-)
 create mode 100644 src/components/drawers/ AssessmentList.vue
 rename src/components/drawers/{AddVote.vue => AddVotebak.vue} (62%)

diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue
new file mode 100644
index 00000000..3669d29c
--- /dev/null
+++ b/src/components/drawers/ AssessmentList.vue	
@@ -0,0 +1,347 @@
+<template>
+  <a-drawer
+    :visible="assessmentVisible"
+    class="drawerStyle addinvistDrawer"
+    width="70%"
+    title="添加评估"
+    placement="right"
+    @after-visible-change="afterVisibleChange"
+  >
+    <div class="drawerMain">
+      <div class="header">
+        <div v-if="edit" class="headerTitle">编辑评估</div>
+        <div v-else class="headerTitle">添加评估</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
+      </div>
+      <div class="contentMain">
+        <div class="main_left">
+          <div class="main_item">
+            <div class="fi_input">
+              <a-input
+                v-model:value="inputV1"
+                style="width: 424px; height: 40px"
+                placeholder="请输入评估名称"
+                maxlength="20"
+              />
+            </div>
+            <div class="btns" @click="getAllInvistText">
+              <div class="search"></div>
+              <div class="btnText">搜索</div>
+            </div>
+            <div class="btnsn" @click="resetInvist">
+              <div class="search"></div>
+              <div class="btnText">重置</div>
+            </div>
+          </div>
+          <div class="main_item2">
+            <a-table
+              style="border: 1px solid #f2f6fe"
+              :columns="tableDataFunc()"
+              :data-source="tableData"
+              :loading="tableDataTotal === -1 ? true : false"
+              expandRowByClick="true"
+              @expand="expandTable"
+              :pagination="false"
+              :row-selection="rowSelection"
+              filterMultiple:false
+            />
+
+            <div class="pa">
+              <a-pagination
+                showSizeChanger="true"
+                showQuickJumper="true"
+                hideOnSinglePage="true"
+                :pageSize="pageSize"
+                :current="currentPage"
+                :total="tableDataTotal"
+                class="pagination"
+                @change="handelChangePage"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+  
+    </div>
+  </a-drawer>
+</template>
+<script>
+import { reactive, toRefs} from "vue";
+import * as api from "../../api/indexInvist.js";
+import dayjs from "dayjs";
+export default {
+  name: "AssessmentList",
+  // components: {
+  // },
+  props: {
+      assessmentVisible: {
+      type: Boolean,
+      default: false,
+      },
+    
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      assessmentVisible:false,
+      assessment:null,
+      inputV1:"",
+      currentPage: 1,
+      pageSize: 10,
+      tableDataTotal: 0,
+      tableData: [],
+      selectedRowKeys:[],
+    });
+    const closeDrawer = () => {
+      ctx.emit("update:assessmentVisible", false);
+      
+    };
+    const afterVisibleChange = (bool) => {
+      console.log("state getAllInvistText", bool);
+      if(props.assessmentVisible){
+        getAllInvistText();
+      }
+      
+    };
+    const tableDataFunc = () => {
+      const columns = [
+        {
+          title: "名称",
+          dataIndex: "name",
+          // width: "30%",
+          key: "name",
+          width: "150px",
+          align: "left",
+          className: "classify",
+        },
+        {
+          title: "题数",
+          dataIndex: "num",
+          key: "num",
+          width: "80px",
+          align: "center",
+        },
+        {
+          title: "创建人",
+          dataIndex: "creator",
+          key: "creator",
+          width: "150px",
+          align: "center",
+        },
+        {
+          title: "创建时间",
+          dataIndex: "time",
+          key: "time",
+          width: "200px",
+          align: "center",
+        },
+      ];
+      return columns;
+    };
+    const rowSelection = {
+      type: "radio",
+      onSelect:(selectedRows,)=>{
+        state.assessment = selectedRows;
+        console.log("selectedRows=======",state.assessment);
+        ctx.emit("checkedAss", state.assessment);
+        state.selectedRowKeys = [],
+        closeDrawer();
+      }
+     
+    };
+    const handelChangePage = (page, pageSize) => {
+      state.currentPage = page;
+      state.pageSize = pageSize;
+      getAllInvistText();
+    };
+    const getTableDate = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value, index) => {
+        let obj = {
+          key: index,
+          assessmentId:value.assessmentId,
+          num: value.essayQuestionVoList.length,
+          name: value.assessmentName ? value.assessmentName : "-",
+          creator: value.createUser ? value.createUser : "-",
+          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+        };
+        array.push(obj);
+      });
+      state.selectedRowKeys = [],
+      state.tableData = array;
+    };
+    //获取全部评估信息接口
+    const getAllInvistText = () => {
+      api
+        .queryAssessmentDetailList({
+        assessmentName:state.inputV1,
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+      })
+        .then((res) => {
+          let arr = res.data.data.rows;
+          if (res.status === 200) {
+            // console.log("获取全部评估信息", res.data.data);
+            getTableDate(arr);
+            state.tableDataTotal = Number(res.data.data.total);
+          }
+        })
+        .catch((err) => {
+          console.log("获取全部评估信息接口失败", err);
+          // state.createLoading = false;
+        });
+    };
+
+  
+    //重置评估信息
+    const resetInvist = () => {
+      state.inputV1 = "";
+      getAllInvistText();
+    };
+
+    return {
+      ...toRefs(state),
+      afterVisibleChange,
+      closeDrawer,
+      tableDataFunc,
+      rowSelection,
+      getAllInvistText,
+      resetInvist,
+      handelChangePage,
+    };
+  },
+};
+</script>
+<style lang="scss">
+.ant-table-striped :deep(.table-striped) td {
+  background-color: #fafafa !important;
+}
+.addinvistDrawer {
+  .drawerMain {
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        margin-left: 24px;
+      }
+    }
+    .contentMain {
+      display: flex;
+      justify-content: space-between;
+      .main_left {
+        padding-right: 30px;
+        margin-top:32px;
+        .main_item {
+          display: flex;
+          align-items: center;
+          margin-bottom: 32px;
+          .fi_input {
+            margin-right: 20px;
+          }
+          .btns {
+            margin-right: 20px;
+            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 {
+              width: 15px;
+              height: 17px;
+              background-image: url("../../assets/images/courseManage/search0.png");
+              background-size: 100% 100%;
+            }
+            .btnText {
+              font-size: 14px;
+              font-weight: 400;
+              color: #ffffff;
+              line-height: 36px;
+              margin-left: 5px;
+            }
+          }
+          .btnsn {
+            padding: 0px 26px 0px 26px;
+            height: 38px;
+            background: #ffffff;
+            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 {
+              width: 16px;
+              height: 18px;
+              background-image: url("../../assets/images/courseManage/reset1.png");
+              background-size: 100% 100%;
+            }
+            .btnText {
+              font-size: 14px;
+              font-weight: 400;
+              color: #409eff;
+              line-height: 36px;
+              margin-left: 5px;
+            }
+          }
+        }
+        .main_item2 {
+          .pa {
+            width: 100%;
+            margin: 15px auto;
+            display: flex;
+            justify-content: center;
+          }
+        }
+      }
+    }
+    .main_btns {
+      height: 72px;
+      width: 100%;
+      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/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index fb0719f1..0a265904 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -503,6 +503,7 @@ export default {
         border-radius: 8px;
       }
       .main_left {
+        margin-top:32px;
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 93ad2825..86b9849b 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -227,6 +227,7 @@
       }
       .contentMain {
         .main_items {
+          margin-top:32px;
           display: flex;
           justify-content: space-between;
           margin-bottom: 12px;
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index b2166686..e30307f1 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -294,6 +294,7 @@ export default {
       display: flex;
       justify-content: space-between;
       .main_left {
+        margin-top:32px;
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 06daaada..3f894f99 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -316,6 +316,7 @@ export default {
       display: flex;
       justify-content: space-between;
       .main_left {
+        margin-top:32px;
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index c3c75f15..dbc751ac 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -245,7 +245,7 @@ export default {
     // };
     const handleFinish = (values) => {
       console.log(values);
-      updateWork(props.workId);
+      updteHomeWork();
     };
 
     const handleFinishFailed = (errors) => {
@@ -288,77 +288,40 @@ export default {
       console.log("state", bool);
     };
 
-    const updateWork = () => {
-      state.addLoading = true;
-      if (props.edit) {
-        // 编辑任务
-        myUpdateWorkTaskUsing();
-      } else {
-        // 创建任务
-        console.log("创建任务***************");
-        myCreateWorkTask();
-      }
-    };
+
 
     // 新增任务
-    const myCreateWorkTask = () => {
+    const updteHomeWork = () => {
       let obj = {
-        createTime: "",
-        createUser: 0,
         submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
         submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-        updateTime: "",
-        updateUser: 0,
         workEnclosureAddress: "",
-        workFlag: "",
-        workId: 0,
+        workId: props.edit?props.EditWorkId:0,
         workName: formState.workName,
         workRequirement: formState.workRequirement,
-        workTag: "",
       };
-      createWorkTask(obj)
+      if(props.edit){
+        updateWorkTaskUsing(obj)
         .then((res) => {
-          if (props.isLevel) {
-            // 如果是关卡页面进入 ---------------------------------
-            myRouterEditTask(res.data.data.workId);
-          } else {
-            myProjectEditTask(res.data.data.workId);
-          }
+          updateTask(res);
+          closeDrawer();
         })
         .catch((err) => {
           message.error(`添加失败${err}`);
         });
-    };
-    // 编辑任务
-    const myUpdateWorkTaskUsing = () => {
-      let editObj = {
-        createTime: "",
-        createUser: 0,
-        submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-        submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-        updateTime: "",
-        updateUser: 0,
-        workEnclosureAddress: "",
-        workFlag: "",
-        workId: props.EditWorkId,
-        workName: formState.workName,
-        workRequirement: formState.workRequirement,
-        workTag: "",
-      };
-      updateWorkTaskUsing(editObj)
+      }else{
+        createWorkTask(obj)
         .then((res) => {
-          console.log(res);
-          if (props.isLevel) {
-            // 如果是关卡页面进入 ---------------------------------
-            myRouterEditTask(res.data.data.workId);
-          } else {
-            myProjectEditTask(res.data.data.workId);
-          }
+          updateTask(res);
+          closeDrawer();
         })
         .catch((err) => {
-          message.error(`编辑失败${err}`);
+          message.error(`添加失败${err}`);
         });
+      }
+      
     };
+
     // 查询任务
     const queryWork = () => {
       state.addLoading = true;
@@ -381,57 +344,49 @@ export default {
         });
     };
     // 新增编辑或新增项目任务
-    const myProjectEditTask = (workId) => {
-      let editObj = {
-        courseId: workId,
-        duration: 60,
-        flag: true,
-        name: formState.workName,
-        projectId: props.projectId,
-        projectTaskId: props.projectTaskId || 0,
-        stageId: props.chooseStageId,
-        type: 4,
-      };
-      ProjectEditTask(editObj)
-        .then((res) => {
-          console.log(` 编辑项目成功的打印 ${res}`);
-          message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-          ctx.emit("changeData", false);
-          state.addLoading = false;
-          closeDrawer();
-        })
-        .catch((err) => {
-          message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-          console.log(` 编辑项目失败的打印 ${err}`);
-        });
-    };
-    // 新增编辑或新增关卡任务
-    const myRouterEditTask = (testId) => {
-      let editObj1 = {
+    const updateTask = (res) => {
+      if(props.isLevel){
+        let editObj1 = {
         chapterId: props.isactive,
-        courseId: testId,
-        duration: 30,
-        flag: true,
-        name: formState.workName,
+        courseId: res.data.data.workId,
+        name: res.data.data.workName,
         routerId: props.routerId,
         routerTaskId: props.routerTaskId || 0,
         type: 4,
       };
 
       RouterEditTask(editObj1)
-        .then((res) => {
-          console.log(` 编辑关卡成功的打印 ${res}`);
+        .then(() => {
           message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
           ctx.emit("changeData", false);
           state.addLoading = false;
-          closeDrawer();
         })
-        .catch((err) => {
+        .catch(() => {
           message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-          console.log(` 编辑关卡失败的打印 ${err}`);
         });
+      }else{
+        let editObj = {
+        courseId: res.data.data.workId,
+        name:res.data.data.workName,
+        projectId: props.edit?props.projectId:0,
+        projectTaskId: props.projectTaskId || 0,
+        stageId: props.chooseStageId,
+        type: 4,
+      };
+      ProjectEditTask(editObj)
+        .then(() => {
+          message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+          ctx.emit("changeData", false);
+          state.addLoading = false;
+        })
+        .catch(() => {
+          message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+        });
+      }
+      
     };
 
+
     return {
       afterVisibleChange,
       closeDrawer,
@@ -446,7 +401,6 @@ export default {
       formRef,
       // layout,
       rules,
-      updateWork,
       ...toRefs(state),
     };
   },
@@ -484,6 +438,7 @@ export default {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+        margin-top:32px;
 
         .main_item {
           display: flex;
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index dc7e3929..31374fc8 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -18,51 +18,38 @@
         />
       </div>
       <div class="contentMain">
+      <div class="main">
         <div class="main_left">
+          <div class="main_notice">
+          <div class="mntc_left">
+            <div class="notice_icon"></div>
+           <div v-if="assessment==null"> 
+            <span class="title">已选择 <span class ="data">0</span> 条</span>
+           </div>
+           <div v-else> 
+            <span class="title">已选择 <span class ="data">1</span> 条;</span>
+            <span class="title">名称： <span class ="data">{{assessment.name}}</span> </span>
+            <span class="title">题数： <span class ="data">{{assessment.num}}</span> </span>
+            <span class="title">创建人： <span class ="data">{{assessment.creator}}</span> </span>
+            <span class="title">创建时间： <span class ="data">{{assessment.time}}</span> </span>
+           </div>
+          </div>
+           
+          </div>
           <div class="main_item">
             <div class="fi_input">
-              <a-input
-                v-model:value="inputV1"
-                style="width: 424px; height: 40px"
-                placeholder="请输入评估名称"
-                maxlength="20"
-              />
-            </div>
-            <div class="btns" @click="getAllInvistText">
+        
+            <div class="btns" @click="checkAssDrawer">
               <div class="search"></div>
-              <div class="btnText">搜索</div>
+              <div class="btnText">选择评估</div>
+              <div class="main_item2">
+              <AssessmentList 
+              v-model:assessmentVisible="assessmentVisible"
+              @checkedAss="getCheckedAss"/>
             </div>
-            <div class="btnsn" @click="resetInvist">
-              <div class="search"></div>
-              <div class="btnText">重置</div>
-            </div>
-          </div>
-          <div class="main_item2">
-            <a-table
-              style="border: 1px solid #f2f6fe"
-              :columns="tableDataFunc()"
-              :data-source="tableData"
-              :loading="tableDataTotal === -1 ? true : false"
-              expandRowByClick="true"
-              @expand="expandTable"
-              :pagination="false"
-              :row-selection="rowSelection"
-              filterMultiple:false
-            />
-
-            <div class="pa">
-              <a-pagination
-                showSizeChanger="true"
-                showQuickJumper="true"
-                hideOnSinglePage="true"
-                :pageSize="pageSize"
-                :current="currentPage"
-                :total="tableDataTotal"
-                class="pagination"
-                @change="handelChangePage"
-              />
             </div>
           </div>
+         
         </div>
       </div>
       <div class="main_btns">
@@ -70,19 +57,21 @@
         <button class="btn2" @click="updateTask">确定</button>
       </div>
     </div>
+  </div>
+  </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, onMounted } from "vue";
-import * as api from "../../api/indexInvist.js";
+import { reactive, toRefs} from "vue";
 import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
-import dayjs from "dayjs";
+import AssessmentList from "./ AssessmentList.vue";
 import { RouterEditTask } from "@/api/indexTask";
 export default {
   name: "AddInvist",
-  // components: {
-  // },
+  components: {
+    AssessmentList,
+  },
   props: {
     addinvistVisible: {
       type: Boolean,
@@ -134,118 +123,36 @@ export default {
       pageSize: 10,
       tableDataTotal: 0,
       tableData: [
-
       ],
       assessmentId:null,
       assessmentName:"",
-
-
+      assessment:null,
+      assessmentVisible:false,
      
     });
+    const getCheckedAss = (ass) =>{
+      state.assessment = ass
+      console.log("checed===",state.assessment);
+    }
     const closeDrawer = () => {
       ctx.emit("update:addinvistVisible", false);
       ctx.emit("update:edit", false);
       state.inputV1 = "";
     };
+    const checkAssDrawer =() =>{
+      state.assessmentVisible = true;
+    }
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
-    const tableDataFunc = () => {
-      const columns = [
-        {
-          title: "名称",
-          dataIndex: "name",
-          // width: "30%",
-          key: "name",
-          width: "150px",
-          align: "left",
-          className: "classify",
-        },
-        {
-          title: "题数",
-          dataIndex: "num",
-          key: "num",
-          width: "80px",
-          align: "center",
-        },
-        {
-          title: "创建人",
-          dataIndex: "creator",
-          key: "creator",
-          width: "150px",
-          align: "center",
-        },
-        {
-          title: "创建时间",
-          dataIndex: "time",
-          key: "time",
-          width: "200px",
-          align: "center",
-        },
-      ];
-      return columns;
-    };
-    const rowSelection = {
-      type: "radio",
-      onSelect: (selectedRows, selected, selectedRowKeys) => {
-        console.log(
-          "selectedRowKeys",selectedRowKeys,"selectedRows",selectedRows, "selected",selected );
-        console.log(selectedRows.assessmentId);
-        state.assessmentId =selectedRows.assessmentId;
-        state.assessmentName = selectedRows.name;
-      },
-     
-    };
-    const handelChangePage = (page, pageSize) => {
-      state.currentPage = page;
-      state.pageSize = pageSize;
-      getAllInvistText();
-    };
-    const getTableDate = (tableData) => {
-      let data = tableData;
-      let array = [];
-      data.map((value, index) => {
-        let obj = {
-          key: index,
-          assessmentId:value.assessmentId,
-          num: value.essayQuestionVoList.length,
-          name: value.assessmentName ? value.assessmentName : "-",
-          creator: value.createUser ? value.createUser : "-",
-          time: dayjs(value.createTime).format("YYYY-MM-DD"),
-        };
-        array.push(obj);
-      });
-      state.tableData = array;
-    };
-    //获取全部评估信息接口
-    const getAllInvistText = () => {
-    
-      api
-        .queryAssessmentDetailList({
-        assessmentName:state.inputV1,
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-      })
-        .then((res) => {
-          let arr = res.data.data.rows;
-          if (res.status === 200) {
-            // console.log("获取全部评估信息", res.data.data);
-            getTableDate(arr);
-            state.tableDataTotal = Number(res.data.data.total);
-          }
-        })
-        .catch((err) => {
-          console.log("获取全部评估信息接口失败", err);
-          // state.createLoading = false;
-        });
-    };
+
     const updateTask =()=>{
-      console.log("jinlaile=================",state.assessmentName)
+      console.log("jinlaile=================",state.assessment.assessmentName)
       if(props.isLevel){
         RouterEditTask({
               chapterId: props.isactive,
-              courseId: state.assessmentId,
-              name: state.assessmentName,
+              courseId: state.assessment.assessmentId,
+              name: state.assessment.assessmentName,
               routerId: props.routerId,
               routerTaskId: props.routerTaskId || 0,
               type: 11,
@@ -264,8 +171,8 @@ export default {
         console.log("=========projectTaskId",props.projectTaskId);
         apiTask
             .addTask({
-              courseId: state.assessmentId,
-              name: state.assessmentName,
+              courseId: state.assessment.assessmentId,
+              name: state.assessment.assessmentName,
               projectId: props.projectId,
               projectTaskId: props.projectTaskId || 0,
               stageId: props.chooseStageId,
@@ -282,25 +189,15 @@ export default {
       }
     }
  
-    //重置评估信息
-    const resetInvist = () => {
-      state.inputV1 = "";
-      getAllInvistText();
-    };
-    onMounted(() => {
-      // createInvist();
-      getAllInvistText();
-    });
+
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      tableDataFunc,
-      rowSelection,
-      getAllInvistText,
       updateTask,
-      resetInvist,
-      handelChangePage,
+      AssessmentList,
+      checkAssDrawer,
+      getCheckedAss,
     };
   },
 };
@@ -328,14 +225,18 @@ export default {
     .contentMain {
       display: flex;
       justify-content: space-between;
+      .main{
+        width:100%;
       .main_left {
         padding-right: 30px;
+        margin-top:32px;
         .main_item {
           display: flex;
           align-items: center;
-          margin-bottom: 32px;
+          margin-bottom: 64px;
           .fi_input {
             margin-right: 20px;
+         
           }
           .btns {
             margin-right: 20px;
@@ -391,19 +292,45 @@ export default {
             }
           }
         }
-        .main_item2 {
-          .pa {
-            width: 100%;
-            margin: 15px auto;
+        .main_notice {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: 32px;
+          height: 40px;
+          background-color: #e9f6fe;
+          .mntc_left {
             display: flex;
-            justify-content: center;
+            align-items: center;
+            .title{
+              color: rgba(0, 0, 0, 0.65);
+               margin-right: 17px
+            }
+            .data{
+              color: #388be1
+            }
+            .notice_icon {
+              width: 14px;
+              height: 14px;
+              margin-right: 9px;
+              margin-left: 9px;
+              background-image: url(@/assets/images/coursewareManage/gan.png);
+              background-size: 100% 100%;
+            }
+          }
+          .mntc_right {
+            cursor: pointer;
           }
         }
+     
       }
+      }
+     
     }
     .main_btns {
       height: 72px;
       width: 100%;
+      margin-top: 180px;
       bottom: 0;
       left: 0;
       display: flex;
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 43904a80..788c9536 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -698,6 +698,7 @@ export default {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+        margin-top:32px;
         .main_item {
           display: flex;
           align-items: center;
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index 687243a8..81ab5a89 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -134,10 +134,7 @@ export default {
       type: Boolean,
       default: null,
     },
-    EditWorkId: { // 要编辑的workId 
-      type: Number,
-      default: null,
-    },
+
     projectTaskId: { // 要编辑的projectId 
       type: Number,
       default: null,
@@ -315,6 +312,7 @@ export default {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+        margin-top:32px;
         .main_item {
           display: flex;
           align-items: center;
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index a56544a7..b9462499 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -207,22 +207,7 @@ import {createExamination,queryExaminationDetailById,updateExamination} from "@/
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask"
 
 import  dayjs from 'dayjs';
-const rowSelection = ref({
-  checkStrictly: false,
-  onChange: (selectedRowKeys, selectedRows) => {
-    console.log(
-      `selectedRowKeys: ${selectedRowKeys}`,
-      "selectedRows: ",
-      selectedRows
-    );
-  },
-  onSelect: (record, selected, selectedRows) => {
-    console.log(record, selected, selectedRows);
-  },
-  onSelectAll: (selected, selectedRows, changeRows) => {
-    console.log(selected, selectedRows, changeRows);
-  },
-});
+
 export default {
   name: "AddTest",
   // components: {
@@ -460,118 +445,51 @@ export default {
     }
     const updateTest = () => {
       state.addLoading = true;
+      let obj = {
+            "examinationDuration": formState.examinationDuration,
+            "examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
+            "examinationExplain": formState.examinationExplain,
+            "examinationId":  props.edit?props.EditTestId : 0,
+            "examinationLimit": formState.examinationLimit,
+            "examinationName": formState.examinationName,
+            "examinationPaperId": 0,
+            "examinationPaperName": formState.choosedTest,
+            "examinationStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
+            "passLine": formState.passLine,
+            "questionArrangement": formState.questionArrangement,
+            "scoringModel": formState.scoringModel,
+            "showAnalysis": formState.showAnalysis,
+            "showAnswers": formState.showAnswers,
+      }
         if(props.edit) { // 编辑任务
-          myUpdateExamination()
+          updateExamination(obj)
+          .then((res)=>{
+          updateTask(res);
+          closeDrawer();
+          }).catch(()=>{
+            message.error(`编辑失败`)
+          });
         }else { // 创建任务
-          myCreateExamination()
-        }
+        createExamination(obj)
+        .then((res)=>{
+          updateTask(res);
+          closeDrawer();
+        }).catch(()=>{
+          message.error(`编辑失败`)
+        });
+      }
     }
     
-    const myUpdateExamination = () => {
-      let obj = {
-            "createTime": "",
-            "createUser": 0,
-            "examinationDuration": formState.examinationDuration,
-            "examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-            "examinationExplain": formState.examinationExplain,
-            "examinationFlag": "",
-            "examinationId":  props.EditTestId,
-            "examinationLimit": formState.examinationLimit,
-            "examinationName": formState.examinationName,
-            "examinationPaperId": 0,
-            "examinationPaperName": formState.choosedTest,
-            "examinationStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-            "examinationTag": "",
-            "passLine": formState.passLine,
-            "questionArrangement": formState.questionArrangement,
-            "scoringModel": formState.scoringModel,
-            "showAnalysis": formState.showAnalysis,
-            "showAnswers": formState.showAnswers,
-            "updateTime": "",
-            "updateUser": 0
-      }
-      updateExamination(obj).then((res)=>{
-        console.log(res);
-        // 如果是关卡页面进入 ---------------------------------
-        if(props.isLevel) {
-          myRouterEditTask(res.data.data.examinationId)
-        }else { 
-          myProjectEditTask(res.data.data.examinationId)
-        }
-      }).catch(()=>{
-        message.error(`编辑失败`)
-      })
-
-    }
-    const myCreateExamination = () => {
-      let obj = {
-            "createTime": "",
-            "createUser": 0,
-            "examinationDuration": formState.examinationDuration,
-            "examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
-            "examinationExplain": formState.examinationExplain,
-            "examinationFlag": "",
-            "examinationId":  0,
-            "examinationLimit": formState.examinationLimit,
-            "examinationName": formState.examinationName,
-            "examinationPaperId": 0,
-            "examinationPaperName": formState.choosedTest,
-            "examinationStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-            "examinationTag": "",
-            "passLine": formState.passLine,
-            "questionArrangement": formState.questionArrangement,
-            "scoringModel": formState.scoringModel,
-            "showAnalysis": formState.showAnalysis,
-            "showAnswers": formState.showAnswers,
-            "updateTime": "",
-            "updateUser": 0
-      }
-      createExamination(obj).then((res)=>{
-        if(props.isLevel) {
-          myRouterEditTask(res.data.data.examinationId)
-        }else { 
-          myProjectEditTask(res.data.data.examinationId)
-        }
-      }).catch((err)=>{
-        message.error(`添加失败${err}`)
-      })
-    }
-    const myProjectEditTask = (testId) => {
-      let editObj = {
-        "courseId": testId,
-        "duration": 50,
-        "flag": true,
-        "name": formState.examinationName,
-        "projectId": props.projectId,
-        "projectTaskId": props.projectTaskId || null,
-        "stageId": props.chooseStageId,
-        "type": 5
-      }
-       // 新增编辑或新增项目
-       ProjectEditTask(editObj).then(res => {
-        console.log(` 编辑项目成功的打印 ${res}`);
-        message.success(`${props.EditTestId? '编辑' : '新增'}阶段任务成功`)
-        ctx.emit("changeData", false);
-        state.addLoading = false;
-        closeDrawer();
-      }).catch(err => {
-        message.error(`${props.EditTestId? '编辑' : '新增'}阶段任务失败`)
-        console.log(` 编辑项目失败的打印 ${err}`);
-      })
-    }
-
-    const myRouterEditTask = (testId) => {
-      let editObj1 = {
+    const updateTask = (res) => {
+      if(props.isLevel){
+        let editObj1 = {
             "chapterId": props.isactive,
-            "courseId": testId,
-            "duration": 30,
-            "flag": true,
-            "name": formState.examinationName,
+            "courseId": res.data.data.examinationId,
+            "name": res.data.data.examinationName,
             "routerId": props.routerId,
             "routerTaskId":  props.routerTaskId || 0,
             "type": 5
           }
-
           RouterEditTask(editObj1).then(res => {
             console.log(` 编辑关卡成功的打印 ${res}`);
             message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
@@ -581,7 +499,26 @@ export default {
           }).catch(err => {
             message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
             console.log(` 编辑关卡失败的打印 ${err}`);
-          })
+          });
+      }else{
+          let editObj = {
+          "courseId": res.data.data.examinationId,
+          "duration": 0,
+          "name": res.data.data.examinationName,
+          "projectId": props.projectId,
+          "projectTaskId": props.projectTaskId || 0,
+          "stageId": props.chooseStageId,
+          "type": 5
+        }
+        // 新增编辑或新增项目
+        ProjectEditTask(editObj).then(() => {
+          message.success(`${props.EditTestId? '编辑' : '新增'}阶段任务成功`)
+          ctx.emit("changeData", false);
+        }).catch(() => {
+          message.error(`${props.EditTestId? '编辑' : '新增'}阶段任务失败`)
+        });
+      }
+      
     }
 
     const cloradio1 = (value) => {
@@ -608,7 +545,6 @@ export default {
       formState,
       afterVisibleChange,
       closeDrawer,
-      rowSelection,
       cloradio1,
       cloradio2,
       cloradio3,
diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVotebak.vue
similarity index 62%
rename from src/components/drawers/AddVote.vue
rename to src/components/drawers/AddVotebak.vue
index 9986004b..2b579eae 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVotebak.vue
@@ -75,8 +75,7 @@
               <cre-vote
                 v-model:crevoteVisible="crevotevisible"
                 @getData="getStemId"
-                v-model:voteStemId="voteStemId"
-                v-model:editStem="editStem"
+                v-model:ballotId="ballotId"
               />
             </div>
             <!-- 创建投票侧弹窗 -->
@@ -122,42 +121,21 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1">取消</button>
-        <button class="btn2" @click="creoredi()">确定</button>
+        <button class="btn1" @click="closeDrawer()">取消</button>
+        <button class="btn2" @click="updateVoteInfo()">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
-import CreVote from "../../components/drawers/CreVote.vue";
+import { reactive, toRefs} from "vue";
+import CreVote from "./CreVote.vue";
 import * as api from "../../api/indexVote";
-import * as apitaskadd from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
-import { toDate } from "../../api/method";
 import { RouterEditTask } from "@/api/indexTask";
-const options1 = ref([
-  {
-    value: "value1",
-    label: "请选择状态",
-  },
-]);
-const rowSelection = ref({
-  checkStrictly: false,
-  onChange: (selectedRowKeys, selectedRows) => {
-    console.log(
-      `selectedRowKeys: ${selectedRowKeys}`,
-      "selectedRows: ",
-      selectedRows
-    );
-  },
-  onSelect: (record, selected, selectedRows) => {
-    console.log(record, selected, selectedRows);
-  },
-  onSelectAll: (selected, selectedRows, changeRows) => {
-    console.log(selected, selectedRows, changeRows);
-  },
-});
+import dayjs from "dayjs";
+import * as apiTask from "../../api/indexTaskadd";
+
 
 export default {
   name: "AddVote",
@@ -173,9 +151,9 @@ export default {
       type: Boolean,
       default: false,
     },
-    learn: {
+    voteId: {
       type: Number,
-      default: 0,
+      default: null,
     },
     projectId: {
       type: Number,
@@ -185,83 +163,71 @@ export default {
       type: Number,
       default: null,
     },
-    voteId: {
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
       type: Number,
       default: null,
     },
-    ballotId: {
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
       type: Number,
       default: null,
     }
+
+
   },
   setup(props, ctx) {
     const state = reactive({
       inputV1: "",
       textV1: "",
-      creVote: false,
       crevotevisible: false,
       time: undefined,
+      startTime:"",
+      endTime:"",
       basevote: "",
-      endTimes: "",
-      startTimes: "",
       ascriptionId: "",
       voteStemId: null,
       voteId:"",
       voteStemName:"",
       ballotName: "",
       editStem: false,  //编辑状态
-      ballotId: "", //题干id
+      ballotId: 0, //题干id
       optionId: "", //删除，修改选项id
     });
     const closeDrawer = () => {
-      state.inputV1 = "",
+        state.inputV1 = "",
         state.textV1 = "",
-        state.startTimes = "",
         state.time = undefined,
-        state.endTimes = "",
         state.basevote = "",
       ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
-      // if (props.edit == true) {
-      //   queryVoteText()
-      // }
+        queryVoteInfo();
     };
     const showDrawerCreVote = () => {
       state.crevotevisible = true;
-      if (state.creVote == true) {
-        state.editStem = true
-      }
     };
     const getStemId = (data) => {
       state.ballotName = data.ballotName;
-      state.voteStemName = data.voteStemName;
-      state.voteStemId = Number(data.voteStemId);
-      state.ballotId = Number(data.ballotId)
-      state.creVote = data.creVote;
-      console.log('state.voteStemId', state.voteStemId);
-      console.log('state.voteStemId', state.creVote);
+      state.ballotId =data.ballotId;
     }
-    //暂时没用 之前给子用传参来着
-    // const changeVData = (data) => {
-    //   console.log("111", data);
-    //   state.creVote = data.creVote;
-    //   state.ascriptionId = data.ascriptionId;
-    //   state.voteStemId = data.voteStemId;
-    //   state.voteStemName = data.voteStemName;
-    //   console.log("222", state.creVote);
-    //   console.log("333", state.ascriptionId);
-    // };
+
     const delBox = () => {
       state.creVote = false;
     };
 
-    const updateTableData = (data) => {
-      console.log(data, 'data');
-    }
-
     //删除题干信息接口
     const dleVoteStem = () => {
       let objdelstem = {
@@ -275,17 +241,68 @@ export default {
       })
     }
 
-    //新建还是编辑方法
-    const creoredi = () => {
-      if (props.eidt == false) {
-        createVoteText()
+    //根据投票id获取投票信息
+     const queryVoteInfo = ()=>{
+    /** 
+       let obj = {
+        voteId:props.voteId
       }
-      else {
-        changeVoteText()
+      .queryVoteText(obj)
+       .then((res)=>{
+        console.log('获取投票信息成功',res);
+        state.inputV1 = res.data.data.voteName
+        state.time = [dayjs(res.data.data.voteEndTime).format("YYYY-MM-DD"), dayjs(res.data.data.voteEndTime).format("YYYY-MM-DD")]
+        state.textV1 = res.data.data.voteExplain
+        state.baseVote = res.data.data.baseVote
+        state.ascriptionId = res.data.data.ascriptionId
+        state.ballotId = res.data.data.ballotId
+       })
+       .catch((err)=>{
+         console.log('获取投票信息失败',err);
+       })
+       **/
+      
+     }
+     const updateToTask =(res)=>{
+      if(props.isLevel){
+        RouterEditTask({
+          chapterId: props.isactive,
+          courseId: res.data.data.voteId,
+          name: res.data.data.voteName,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 12,
+        })
+          .then((res) => {
+            console.log(res, 11111);
+            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            ctx.emit("changeData", false);
+            state.addLoading = false;               
+          })
+          .catch((err) => {
+            console.log(err, 1111);
+          });
+      }else{
+        apiTask
+          .addTask({
+            courseId:res.data.data.voteId,
+            name: res.data.data.voteName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
+            type: 12,
+          })
+          .then((res) => {
+            console.log("调用项目添加接口后111", res.data, 11111);
+            ctx.emit("changeData", false);   
+          })
+          .catch((err) => {
+            console.log(err, 111111);
+          });
       }
     }
-    //创建投票信息
-    const createVoteText = () => {
+    //修改投票信息接口
+    const updateVoteInfo = () => {
       if (!state.inputV1) {
         message.destroy();
         return message.info("请输入投票名称");
@@ -294,137 +311,47 @@ export default {
       if (state.basevote == "") {
         state.basevote = 1;
       }
-
-      if (state.time != undefined) {
-        state.endTimes = toDate(
-          new Date(state.time[0].$d).getTime() / 1000,
-          "Y-M-D"
-        );
-        state.startTimes = toDate(
-          new Date(state.time[1].$d).getTime() / 1000,
-          "Y-M-D"
-        );
+      if(state.time != undefined){
+        state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
+        state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD");
       }
 
-
       let obj = {
+        voteId: props.edit?state.voteId : 0,
+        voteName: state.inputV1,
+        voteStartTime: state.startTime,
+        voteEndTime: state.endTime,
         ballotId: state.ballotId,
         baseVote: state.basevote,
-        createTime: "",
-        createUser: 0,
-        updateTime: "",
-        updateUser: 0,
-        voteEndTime: state.endTimes,
-        voteExplain: state.textV1,
-        voteFlag: "",
-        voteId: 0,
-        voteName: state.inputV1,
-        voteStartTime: state.startTimes,
-        voteTag: ""
-
-      };
-      api
-        .createVote(obj)
-        .then((res) => {
-          console.log("创建成功123", res);
-          message.success("创建成功");
-          let changeVoteId = {
-            voteId: res.data.data.voteId,
-            ballotId: state.ballotId,
-          }
-          ctx.emit("getData", changeVoteId);
-          closeDrawer();
-          if (props.learn == 0)
-            //添加到项目任务列表
-            apitaskadd
-              .addTask({
-                courseId: 0,
-                duration: 0,
-                flag: true,
-                name: obj.voteName,
-                projectId: props.projectId,
-                projectTaskId: 0,
-                stageId: props.chooseStageId,
-                type: 12,
-              })
-              .then((res) => {
-                console.log("调用项目添加接口后", res.data);
-                //自定义事件给父组件传值
-                ctx.emit("changeData", false);
-                //重新获取任务列表
-                // apiTask.getTask({ projectId: 28 });
-                // router.push("/taskadd");
-              })
-              .catch((err) => {
-                console.log(err);
-              });
-          else {
-            let editObj1 = {
-              chapterId: 36,
-              courseId: 0,
-              duration: 0,
-              flag: true,
-              name: obj.voteName,
-              routerId: 92,
-              routerTaskId: 0,
-              type: 12,
-            };
-            RouterEditTask(editObj1);
-          }
-        })
-        .catch((err) => {
-          console.log("创建失败", err);
-        });
-    };
-
-    //根据投票id获取投票信息
-    // const queryVoteText = ()=>{
-    //   let objqurvt = {
-    //     voteStemId:state.voteStemId
-    //     //没有接口 个人认为应该是这个id
-    //   }
-    //   api
-    //   //目前没接口 大概写的
-    //   .queryVoteText(objqurvt)
-    //   .then((res)=>{
-    //     console.log('获取投票信息成功',res);
-    //      state.inputV1 = res.data.data.voteName
-    //      state.endTimes = res.data.data.voteEndTime
-    //      state.startTimes = res.data.data.voteStartTime
-    //      state.textV1 = res.data.data.voteExplain
-    //      state.baseVote = res.data.data.baseVote
-    //      state.ascriptionId = res.data.data.ascriptionId
-    //      state.ballotId = res.data.data.ballotId
-    //   })
-    //   .catch((err)=>{
-    //     console.log('获取投票信息失败',err);
-    //   })
-    // }
-    //修改投票信息接口
-    const changeVoteText = () => {
-      let objcvt = {
-        ballotId: state.ballotId,
-        baseVote: state.basevote,
-        createTime: "",
-        createUser: 0,
-        updateTime: "",
-        updateUser: 0,
-        voteEndTime: state.endTimes,
-        voteExplain: state.textV1,
-        voteFlag: "",
-        voteId: state.voteId,
-        voteName: state.inputV1,
-        voteStartTime: state.startTimes,
-        voteTag: ""
+        voteExplain: state.textV1, 
+        createUser:0,
+        updateUser:0,
+        voteTag:"",
       }
-      api
-        .editVote(objcvt)
+      if(props.edit){
+        api
+        .editVote(obj)
         .then((res) => {
+          updateToTask(res);
+          closeDrawer();
           console.log('修改投票信息成功', res);
         })
         .catch((err) => {
           console.log('修改投票信息失败', err);
         })
+      }else{
+        api
+        .createVote(obj)
+        .then((res) => {
+          updateToTask(res);
+          closeDrawer();
+          console.log('创建投票信息成功', res);
+        })
+        .catch((err) => {
+          console.log('创建投票信息失败', err);
+        })
+      }
+      
     }
     return {
       ...toRefs(state),
@@ -432,16 +359,11 @@ export default {
       afterVisibleChange,
       closeDrawer,
       getStemId,
-      // changeVData,
-      rowSelection,
-      options1,
+      queryVoteInfo,
       dleVoteStem,
-      creoredi,
-      createVoteText,
-      changeVoteText,
+      updateVoteInfo,
       delBox,
-      // queryVoteText,
-      updateTableData,
+      
     };
   },
 };
@@ -474,6 +396,7 @@ export default {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+        margin-top: 32px;
         .main_item {
           display: flex;
           align-items: center;
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index a0e4dbf8..48e9933e 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -123,9 +123,9 @@ export default {
       type: Boolean,
       default: false,
     },
-    editStem: {
-      type: Boolean,
-      default: false,
+    ballotId: {
+      type: Number,
+      default: null,
     },
   },
   setup(props, ctx) {
@@ -204,13 +204,13 @@ export default {
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
-      if (props.editStem == true) {
+      if (props.ballotId != 0) {
         queryStemText()
       }
     };
     //创建题干还是编辑题干
     const creoredi = () => {
-      if (props.eidtStem == false) {
+      if (props.ballotId) {
         createQueTit()
       }
       else {
@@ -320,13 +320,11 @@ export default {
     }
     //根据id获取题干信息
     const queryStemText = () => {
-      let objqurst = {
-        stemId: 1,
-        ballotId: "",
-      }
       api
-        .queryStemByStemId(objqurst)
+        .queryStemByStemId({ballotId:props.ballotId})
         .then((res) => {
+       
+ 
           console.log('获取题干信息成功', res);
           state.inputV1 = res.data.data.voteName
         })
@@ -436,6 +434,7 @@ export default {
         display: flex;
         align-items: center;
         margin-bottom: 32px;
+        margin-top: 32px;;
         .signbox {
           width: 120px;
           display: flex;
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 57cbf792..198af544 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -9,7 +9,8 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div  class="headerTitle">添加投票任务</div>
+        <div v-if="edit" class="headerTitle">编辑投票</div>
+        <div v-else class="headerTitle">添加投票</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -32,7 +33,7 @@
               <a-input
                 v-model:value="inputV1"
                 style="width: 424px; height: 32px"
-                placeholder="请输入任务名称"
+                placeholder="请输入投票名称"
                 maxlength="20"
               />
             </div>
@@ -51,29 +52,37 @@
               <button
                 class="xkbtn"
                 :style="{ display: creVote ? 'none' : 'block' }"
-                @click="showDrawerCreateVote"
+                @click="showDrawerCreVote"
               >
                 创建投票
               </button>
+              <div>
+            <CreateVote
+              v-model:createVoteVisible="createVoteVisible"
+              v-model:ballotId="ballotId"
+              v-model:editChild="editChild"
+            />
+          </div>
               <button
                 class="xkbtn"
                 :style="{ display: creVote ? 'block' : 'none' }"
-                @click="showDrawerCreateVote"
+                @click="showDrawerCreVote"
               >
                 编辑投票
               </button>
               <div :style="{ display: creVote ? 'block' : 'none' }">
                 <div class="fileTigan">
-                  <span style="color: #388be1">{{voteStemName}}</span>
-                  <div class="delBox" @click="delBox()"></div>
+                  <span style="color: #388be1">{{ballotName}}</span>
+                  <div class="delBox" @click="dleVoteStem()"></div>
                 </div>
               </div>
             </div>
             <!-- 创建投票侧弹窗 -->
             <div>
-              <CreateVote
-                v-model:createVoteVisible="createVoteVisible"
-          
+              <cre-vote
+                v-model:crevoteVisible="crevotevisible"
+                @getData="getStemId"
+                v-model:ballotId="ballotId"
               />
             </div>
             <!-- 创建投票侧弹窗 -->
@@ -85,7 +94,6 @@
             <div class="btnbox">
               <a-range-picker
                 style="width: 424px"
-                v-model:value="time"
                 :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
@@ -120,38 +128,38 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1">取消</button>
-        <button class="btn2" @click="createVoteText()">确定</button>
+        <button class="btn1" @click="closeDrawer()">取消</button>
+        <button class="btn2" @click="updateVoteInfo()">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 <script>
 import { reactive, toRefs} from "vue";
-import CreateVote from "./CreateVote.vue";
+import CreVote from "./CreateVote.vue";
 import * as api from "../../api/indexVote";
-import * as apitaskadd from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
-import { toDate } from "../../api/method";
 import { RouterEditTask } from "@/api/indexTask";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
+import * as apiTask from "../../api/indexTaskadd";
+
 
 export default {
   name: "AddVote",
   components: {
-    CreateVote,
+    CreVote,
   },
   props: {
     addvoteVisible: {
       type: Boolean,
       default: false,
     },
-    EditVoteId:{
-      type: Number,
-      default: 0,
-    },
-    edit: { //  是否为编辑
+    edit: {
       type: Boolean,
+      default: false,
+    },
+    voteId: {
+      type: Number,
       default: null,
     },
     projectId: {
@@ -182,36 +190,55 @@ export default {
       type: Number,
       default: null,
     }
-  
+
+
   },
   setup(props, ctx) {
     const state = reactive({
-      voteName: "",
-      voteExplain: "",
+      inputV1: "",
+      textV1: "",
       createVoteVisible: false,
       time: undefined,
+      startTime:"",
+      endTime:"",
       basevote: "",
       ascriptionId: "",
+      voteStemId: null,
+      voteId:"",
+      voteStemName:"",
+      ballotName: "",
+      editStem: false,  //编辑状态
+      ballotId: 0, //题干id
+      optionId: "", //删除，修改选项id
+      editChild:false,
     });
     const closeDrawer = () => {
-
+        state.inputV1 = "",
+        state.textV1 = "",
+        state.time = undefined,
+        state.basevote = "",
       ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+        queryVoteInfo();
     };
-    const showDrawerCreateVote = () => {
+    const showDrawerCreVote = () => {
       state.createVoteVisible = true;
-      console.log("进来了====");
-    };
-    const changeVData = (data) => {
-      state.ascriptionId = data.ascriptionId;
+      state.editChild = props.edit;
+      console.log("=======前")
 
     };
+    const getStemId = (data) => {
+      state.ballotName = data.ballotName;
+      state.ballotId =data.ballotId;
+    }
+
     const delBox = () => {
-      dleVoteStem()
+      state.creVote = false;
     };
+
     //删除题干信息接口
     const dleVoteStem = () => {
       let objdelstem = {
@@ -221,106 +248,133 @@ export default {
         .then((res) => {
           console.log('删除题干信息成功', res)
           message.success('删除题干信息成功')
+          delBox()
       })
     }
-    const updteVote = (res) =>{
-      if (props.isLevel)
-            apitaskadd
-              .addTask({
-                courseId: res.data.data.voteId,
-                name: res.data.data.voteName,
-                projectId: props.projectId,
-                projectTaskId:props.projectTaskId || 0,
-                stageId: props.chooseStageId,
-                type: 12,
-              })
-              .then((res) => {
-                console.log("调用项目添加接口后", res.data);
-                ctx.emit("changeData", false);
-              })
-              .catch((err) => {
-                console.log(err);
-              });
-          else {
-            RouterEditTask({
-              chapterId: props.isactive,
-              courseId: res.data.data.voteId,
-              name: res.data.data.voteName,
-              routerId: props.routerId,
-              routerTaskId: props.routerTaskId,
-              type: 12,
-            }) .then((res) => {
-                console.log("调用项目添加接口后", res.data);
-                ctx.emit("changeData", false);
-              })
-              .catch((err) => {
-                console.log(err);
-              });
-          }
+
+    //根据投票id获取投票信息
+     const queryVoteInfo = ()=>{
+    /** 
+       let obj = {
+        voteId:props.voteId
+      }
+      .queryVoteText(obj)
+       .then((res)=>{
+        console.log('获取投票信息成功',res);
+        state.inputV1 = res.data.data.voteName
+        state.time = [dayjs(res.data.data.voteEndTime).format("YYYY-MM-DD"), dayjs(res.data.data.voteEndTime).format("YYYY-MM-DD")]
+        state.textV1 = res.data.data.voteExplain
+        state.baseVote = res.data.data.baseVote
+        state.ascriptionId = res.data.data.ascriptionId
+        state.ballotId = res.data.data.ballotId
+       })
+       .catch((err)=>{
+         console.log('获取投票信息失败',err);
+       })
+       **/
+      
+     }
+     const updateToTask =(res)=>{
+      if(props.isLevel){
+        RouterEditTask({
+          chapterId: props.isactive,
+          courseId: res.data.data.voteId,
+          name: res.data.data.voteName,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 12,
+        })
+          .then((res) => {
+            console.log(res, 11111);
+            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            ctx.emit("changeData", false);
+            state.addLoading = false;               
+          })
+          .catch((err) => {
+            console.log(err, 1111);
+          });
+      }else{
+        apiTask
+          .addTask({
+            courseId:res.data.data.voteId,
+            name: res.data.data.voteName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
+            type: 12,
+          })
+          .then((res) => {
+            console.log("调用项目添加接口后111", res.data, 11111);
+            ctx.emit("changeData", false);   
+          })
+          .catch((err) => {
+            console.log(err, 111111);
+          });
+      }
     }
-    //创建投票信息
-    const createVoteText = () => {
-      if (!state.voteName) {
+    //修改投票信息接口
+    const updateVoteInfo = () => {
+      if (!state.inputV1) {
         message.destroy();
         return message.info("请输入投票名称");
       }
+
       if (state.basevote == "") {
         state.basevote = 1;
       }
-      if (state.time != undefined) {
-        state.time[0] = toDate(
-          new Date(state.time[0].$d).getTime() / 1000,
-          "Y-M-D"
-        );
-        state.time[1] = toDate(
-          new Date(state.time[1].$d).getTime() / 1000,
-          "Y-M-D"
-        );
+      if(state.time != undefined){
+        state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
+        state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD");
       }
 
       let obj = {
-        ascriptionId: state.ascriptionId,
+        voteId: props.edit?state.voteId : 0,
+        voteName: state.inputV1,
+        voteStartTime: state.startTime,
+        voteEndTime: state.endTime,
+        ballotId: state.ballotId,
         baseVote: state.basevote,
-        voteEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
-        voteExplain: state.voteExplain,
-        voteName: state.voteName,
-        voteStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
-      };
+        voteExplain: state.textV1, 
+        createUser:0,
+        updateUser:0,
+        voteTag:"",
+      }
       if(props.edit){
         api
         .editVote(obj)
         .then((res) => {
-          console.log("创建成功123", res);
-          message.success("创建成功");
-          updteVote(res);
+          updateToTask(res);
           closeDrawer();
-          
+          console.log('修改投票信息成功', res);
         })
         .catch((err) => {
-          console.log("创建失败", err);
-        });
+          console.log('修改投票信息失败', err);
+        })
       }else{
         api
         .createVote(obj)
         .then((res) => {
-          updteVote(res);
+          updateToTask(res);
           closeDrawer();
-          
+          console.log('创建投票信息成功', res);
         })
         .catch((err) => {
-          console.log("创建失败", err);
-        });
-      } 
-    };
+          console.log('创建投票信息失败', err);
+        })
+      }
+      
+    }
     return {
       ...toRefs(state),
-      showDrawerCreateVote,
+      showDrawerCreVote,
       afterVisibleChange,
       closeDrawer,
-      changeVData,
+      getStemId,
+      queryVoteInfo,
       dleVoteStem,
-      createVoteText,
+      updateVoteInfo,
       delBox,
+      
     };
   },
 };
@@ -353,6 +407,7 @@ export default {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+        margin-top: 32px;
         .main_item {
           display: flex;
           align-items: center;
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index 2b9d3e18..e79d4b4d 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -1,91 +1,91 @@
 <!-- 评估管理-创建评估页面 -->
 <template>
-    <a-drawer
-    :visible="createVoteVisible"
-    class="drawerStyle createvoteDrawer"
-    width="80%"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
-  >
-  <div class="researchadd">
-    <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_left">
-      <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">投票名称：</span>
-            </div>
-            <div class="btnbox">
-              <a-input
-                v-model:value="voteName"
-                style="width: 424px; height: 32px"
-                placeholder="请输入任务名称"
-                maxlength="20"
+  <a-drawer
+  :visible="createVoteVisible"
+  class="drawerStyle createvoteDrawer"
+  width="80%"
+  placement="right"
+  @after-visible-change="afterVisibleChange"
+>
+<div class="researchadd">
+  <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_left">
+    <div class="main_item">
+          <div class="signbox">
+            <div class="sign">
+              <img
+                src="@/assets/images/coursewareManage/asterisk.png"
+                alt=""
               />
             </div>
-        </div>
-      <div class="main_item">
-        <div class="signbox">
-          <div class="sign">
-            <img
-              src="@/assets/images/coursewareManage/asterisk.png"
-              alt=""
+            <span style="margin-right: 3px">投票名称：</span>
+          </div>
+          <div class="btnbox">
+            <a-input
+              v-model:value="voteName"
+              style="width: 424px; height: 32px"
+              placeholder="请输入任务名称"
+              maxlength="20"
             />
           </div>
-          <span>创建题干：</span>
-        </div>
-        <div class="btnbox">
-          <button
-            class="xkbtn"
-            @click="handleTypes"
-          >
-            创建题干
-          </button>
-        </div>
-      </div> <!-- 创建投票侧弹窗 -->
-    </div>
-    <div v-for="(item, index) in allFormsData" :key="index">
-      <VoteQuestion
-        :item="item"
-        :assessmentId="assessmentId"
-        @del="handleDel"
-        
-      />
-      
-    </div>
- 
-    <div class="footer">
-      <div class="btn">
-        <a-button
-          type="primary"
-          style="width: 100px;height: 40px;border-radius: 8px; background-color: #409eff;"
-          @click="handleSave"
-        >
-          保存
-        </a-button>
-        <a-button
-          type="primary"
-          ghost
-          style="width: 100px;height: 40px;margin-left: 14px;border-radius: 8px;"
-          @click="handleAllCancel"
-        >
-          取消
-        </a-button>
       </div>
+    <div class="main_item">
+      <div class="signbox">
+        <div class="sign">
+          <img
+            src="@/assets/images/coursewareManage/asterisk.png"
+            alt=""
+          />
+        </div>
+        <span>创建题干：</span>
+      </div>
+      <div class="btnbox">
+        <button
+          class="xkbtn"
+          @click="handleTypes"
+        >
+          创建题干
+        </button>
+      </div>
+    </div> <!-- 创建投票侧弹窗 -->
+  </div>
+  <div v-for="(item, index) in allFormsData" :key="index">
+    <VoteQuestion
+      :item="item"
+      :ballotId="ballotId"
+      @del="handleDel"
+      
+    />
+    
+  </div>
+
+  <div class="footer">
+    <div class="btn">
+      <a-button
+        type="primary"
+        style="width: 100px;height: 40px;border-radius: 8px; background-color: #409eff;"
+        @click="handleSave"
+      >
+        保存
+      </a-button>
+      <a-button
+        type="primary"
+        ghost
+        style="width: 100px;height: 40px;margin-left: 14px;border-radius: 8px;"
+        @click="handleAllCancel"
+      >
+        取消
+      </a-button>
     </div>
   </div>
+</div>
 </a-drawer>
 </template>
 <script>
@@ -95,558 +95,527 @@ import { reactive,toRefs} from "vue";
 import VoteQuestion from "./VoteQuestion.vue";
 
 import {
-  sortBy,
-  traverseArr,
-  filterCommon,
-  deepCloneFilterString,
+// sortBy,
+traverseArr,
+// filterCommon,
+// deepCloneFilterString,
 } from "../../utils/utils";
 
-import { useRouter } from "vue-router";
+
 //import store from "@/store";
 import {
-  queryResearchDetailById,
-  editResearchMessage,
-  createResearch,
+//createOptionMessage,
+queryStemByStemId
+}from "@/api/indexVote";
+import {
+
+
+
 
 } from "@/api/indexResearch";
-import { message } from "ant-design-vue";
+//import { message } from "ant-design-vue";
+
 
 export default {
-  name: "CreateVote",
-  components: {
-    VoteQuestion,
+name: "CreateVote",
+components: {
+  VoteQuestion,
 
+},
+props: {
+  createVoteVisible: {
+    type: Boolean,
+    default: false,
   },
-  props: {
-    createVoteVisible: {
-      type: Boolean,
-      default: false,
-    },
+  ballotId: {
+    type: Number,
+    default: null,
+  },
+  editChild: {
+    type: Boolean,
+    default: false,
+  },
+  
+},
+setup(props,ctx) {
+  const state = reactive({
+    ballotId: "", 
+    ballotName: "",
+    allFormsData: [],
+
+  });
+  const afterVisibleChange = (bool) => {
+    console.log("state======进来creates", bool);
+    handleTypes();
+  };
+  const closeDrawer = () => {
+    ctx.emit("update:createVoteVisible", false);
     
-  },
-  setup(props,ctx) {
-    const router = useRouter();
-    const state = reactive({
-      createVoteVisible:false,
-      allFormsData: [],
-     
-    });
-    const afterVisibleChange = (bool) => {
-      console.log("state======进来creates", bool);
-      handleTypes();
-    };
-    const closeDrawer = () => {
-      ctx.emit("update:createVoteVisible", false);
-     
-      console.log("======关闭");
-    }
-    // 详情
-    const getInfoDate = async () => {
-      let id = router.currentRoute.value.params.id;
-      if (id) {
-        state.assessmentId = id;
-        let res = await queryResearchDetailById({
-          assessmentId: state.assessmentId,
-        }).then((res) => {
-          if (res.data.code === 200) {
-            return res.data.data;
-          }
-        });
-        state.assessmentName = res.assessmentName;
-        state.valueMore = res.assessmentMark;
-        let renderArr = [
-          ...res.singleStemVoList,
-          ...res.multipleStemVoList,
-          ...res.essayQuestionVoList,
-          ...res.scoringQuestionVoList,
-        ];
-        sortBy(renderArr, "orderNumber"); //序号
-        state.allFormsData = parseData(renderArr, "questionType"); //类型
-        // console.log("state.allFormsData");
-        // console.log(state.allFormsData);
-      }
-    };
-    getInfoDate();
-
-    // 转换成前端格式
-    const parseData = (arr, typeKey) => {
-      const resultArr = [];
-      arr.forEach((item) => {
-        let key = Number(item[typeKey]);
-        let obj = {};
-        if (key === 1) {
-          let restList = traverseArr(item.assessmentSingleChoiceVoList, {
-            inputVal: "singleOptionName",
-            imgVal: "singleOptionPictureAddress",
-            optionId: "singleOptionId",
-          }).map((itm, idx) => {
-            itm.id = idx + 1;
-            return itm;
-          });
-
-          obj = {
-            type: key,
-            valueSingle: item.singleStemName,
-            singleList: restList,
-            orderNumber: item.orderNumber,
-          };
-          resultArr.push(obj);
-        }
-        if (key === 2) {
-          let restList = traverseArr(item.multipleChoiceVoList, {
-            inputVal: "multipleOptionName",
-            imgVal: "multipleOptionPictureAddress",
-            optionId: "multipleOptionId",
-          }).map((itm, idx) => {
-            itm.id = idx + 1;
-            return itm;
-          });
-
-          obj = {
-            type: key,
-            valueMutil: item.multipleStemName,
-            mutilList: restList,
-            orderNumber: item.orderNumber,
-          };
-          resultArr.push(obj);
-        }
-        if (key === 3) {
-          obj = {
-            type: key,
-            valueAsk: item.assessmentQaTitle,
-            valueAskDesc: item.assessmentQaDescribe,
-            optionId: item.assessmentQaId,
-          };
-          resultArr.push(obj);
-        }
-        if (key === 4) {
-          obj = {
-            type: key,
-            valuePin: item.assessmentScTitle,
-            minScore: item.assessmentMinScore,
-            maxScore: item.assessmentMaxScore,
-            pinQuan: item.weightScale,
-            optionId: item.assessmentScId,
-          };
-          resultArr.push(obj);
+    console.log("======关闭");
+  }
+  // 详情
+  const getInfoDate = async () => {
+    if (props.editChild) {
+      //stemId 多余字段
+      let res = await queryStemByStemId({stemId:0,
+        ballotId: state.ballotId,
+      }).then((res) => {
+        if (res.data.code === 200) {
+          return res.data.data;
         }
       });
-      resultArr.map((itm, idx) => {
+      state.ballotName = res[0].ballotId;
+      let renderArr = [
+        ...res,
+      ];
+      // sortBy(renderArr, "orderNumber"); //序号
+      state.allFormsData = parseData(renderArr); //类型
+      // console.log("state.allFormsData");
+      // console.log(state.allFormsData);
+    }
+  };
+  getInfoDate();
+
+  // 转换成前端格式
+  const parseData = (arr) => {
+    const resultArr = [];
+    arr.forEach((item) => {
+      let obj = {};
+      let restList = traverseArr(item.optionDetailList, {
+        inputVal: "singleOptionName",
+        imgVal: "singleOptionPictureAddress",
+        optionId: "singleOptionId",
+      }).map((itm, idx) => {
         itm.id = idx + 1;
         return itm;
       });
-      return resultArr;
-    };
-    // 转换成后端格式
-    const restData = (arr, typeKey) => {
-      const resultArr = [];
-      arr.forEach((item) => {
-        let obj = {};
-        if (item[typeKey] === 1) {
-          let restList = traverseArr(item.singleList, {
-            singleOptionName: "inputVal",
-            singleOptionPictureAddress: "imgVal",
-            singleOptionId: "optionId",
-          }).map((itm, idx) => {
-            itm.optionOrderNum = idx + 1;
-            return itm;
-          });
-          restList.forEach((item) => {
-            item.singleOptionId = item.singleOptionId
-              ? item.singleOptionId
-              : "";
-          });
 
-          obj = {
-            questionType: item[typeKey],
-            singleStemName: item.valueSingle,
-            singleList: restList,
-            orderNumber: item.orderNumber,
-          };
-          resultArr.push(obj);
-        }
-        if (item[typeKey] === 2) {
-          let restList = traverseArr(item.mutilList, {
-            multipleOptionName: "inputVal",
-            multipleOptionPictureAddress: "imgVal",
-            multipleOptionId: "optionId",
-          }).map((itm, idx) => {
-            itm.optionOrderNum = idx + 1;
-            return itm;
-          });
-          restList.forEach((item) => {
-            item.multipleOptionId = item.multipleOptionId
-              ? item.multipleOptionId
-              : "";
-          });
-
-          obj = {
-            questionType: item[typeKey],
-            multipleStemName: item.valueMutil,
-            mutilList: restList,
-            orderNumber: item.orderNumber,
-          };
-          resultArr.push(obj);
-        }
-        if (item[typeKey] === 3) {
-          obj = {
-            questionType: item[typeKey],
-            assessmentQaTitle: item.valueAsk,
-            assessmentQaDescribe: item.valueAskDesc,
-            assessmentQaId: item.optionId ? item.optionId : "",
-          };
-          resultArr.push(obj);
-        }
-        if (item[typeKey] === 4) {
-          obj = {
-            questionType: item[typeKey],
-            assessmentScTitle: item.valuePin,
-            assessmentMinScore: item.minScore,
-            assessmentMaxScore: item.maxScore,
-            weightScale: item.pinQuan,
-            assessmentScId: item.optionId ? item.optionId : "",
-          };
-          resultArr.push(obj);
-        }
-      });
-      resultArr.map((itm, idx) => {
-        itm.orderNumber = idx + 1;
-        return itm;
-      });
-      return resultArr;
-    };
-    // 解散传值
-    const parseItem = (arr) => {
-      const filterComObj = filterCommon(arr, "questionType");
-      let resultObj = {};
-      for (let key in filterComObj) {
-        if (key === "1") {
-          let arrSingle = filterComObj[key];
-          let arr = [];
-          arrSingle.forEach((item) => {
-            if (item.singleList.length) {
-              item.singleList.forEach((itm) => {
-                arr.push({
-                  ...itm,
-                  singleStemName: item.singleStemName,
-                  orderNumber: item.orderNumber,
-                  questionType: item.questionType,
-                });
-              });
-            }
-          });
-          resultObj.assessmentSingleChoiceDtoList = arr;
-        }
-        if (key === "2") {
-          let arrMulti = filterComObj[key];
-          let arr = [];
-          arrMulti.forEach((item) => {
-            if (item.mutilList.length) {
-              item.mutilList.forEach((itm) => {
-                arr.push({
-                  ...itm,
-                  multipleStemName: item.multipleStemName,
-                  orderNumber: item.orderNumber,
-                  questionType: item.questionType,
-                });
-              });
-            }
-          });
-          resultObj.assessmentMultipleChoiceDtoList = arr;
-        }
-        if (key === "3") {
-          resultObj.assessmentEssayQuestionDtoList = filterComObj[key];
-        }
-        if (key === "4") {
-          resultObj.assessmentScoringQuestionDtoList = filterComObj[key];
-        }
-      }
-      return resultObj;
-    };
-
-
-    const handleTypes = () => {
-      let   obj = {
-            id: state.allFormsData.length,
-            valueSingle: "",
-            singleList: [
-              {
-                id: 1,
-                inputVal: "",
-                imgVal: "",
-              },
-            ],
-          };
-      state.allFormsData.push(obj);
-      console.log("state.allFormsData=====",state.allFormsData,state.allFormsData.length);
-    };
-
-    const handleDel = ({ id ,curItem}) => {
-      state.allFormsData.forEach((item, index) => {
-        if (item.id === id) {
-          state.allFormsData.splice(index, 1);
-        }
-      });
-      state.allFormsData.map((item, index) => {
-        item.id = index + 1;
-        return item;
-      });
-      console.log("curItem.orderNumber",curItem.orderNumber);
-     
-       // orderNumber: curItem.orderNumber,
-     
+      obj = {
+        voteStemName: item.singleStemName,
+        singleList: restList,
+      };
+      resultArr.push(obj);
       
-    };
 
-    const handleSave = () => {
-      let resultPost = {};
-      let filterData = parseItem(restData(state.allFormsData, "type"));
-      // 校验
-      if (!checkVal(filterData)) {
-        return false;
-      }
-      console.log(12121212);
-      console.log(filterData);
+    });
+    resultArr.map((itm, idx) => {
+      itm.id = idx + 1;
+      return itm;
+    });
+    return resultArr;
+  };
+    /**
+  // 转换成后端格式
+  const restData = (arr, typeKey) => {
+    const resultArr = [];
+    arr.forEach((item) => {
+      let obj = {};
+      if (item[typeKey] === 1) {
+        let restList = traverseArr(item.singleList, {
+          singleOptionName: "inputVal",
+          singleOptionPictureAddress: "imgVal",
+          singleOptionId: "optionId",
+        }).map((itm, idx) => {
+          itm.optionOrderNum = idx + 1;
+          return itm;
+        });
+        restList.forEach((item) => {
+          item.singleOptionId = item.singleOptionId
+            ? item.singleOptionId
+            : "";
+        });
 
-      if (state.assessmentId) {
-        resultPost = {
-          assessmentId: state.assessmentId,
-          assessmentName: state.assessmentName,
-          assessmentMark: state.valueMore,
-          ...filterData,
+        obj = {
+          questionType: item[typeKey],
+          singleStemName: item.valueSingle,
+          singleList: restList,
+          orderNumber: item.orderNumber,
         };
-        resultPost = deepCloneFilterString(resultPost, [
-          "assessmentMaxScore",
-          "assessmentMinScore",
-        ]);
-        console.log(1212334);
-        console.log(resultPost);
-        editResearchMessage(resultPost).then((res) => {
-          if (res.data.code === 200) {
-            message.success("编辑成功");
-            router.push({
-              path: "/researchmanage",
+        resultArr.push(obj);
+      }
+      if (item[typeKey] === 2) {
+        let restList = traverseArr(item.mutilList, {
+          multipleOptionName: "inputVal",
+          multipleOptionPictureAddress: "imgVal",
+          multipleOptionId: "optionId",
+        }).map((itm, idx) => {
+          itm.optionOrderNum = idx + 1;
+          return itm;
+        });
+        restList.forEach((item) => {
+          item.multipleOptionId = item.multipleOptionId
+            ? item.multipleOptionId
+            : "";
+        });
+
+        obj = {
+          questionType: item[typeKey],
+          multipleStemName: item.valueMutil,
+          mutilList: restList,
+          orderNumber: item.orderNumber,
+        };
+        resultArr.push(obj);
+      }
+      if (item[typeKey] === 3) {
+        obj = {
+          questionType: item[typeKey],
+          assessmentQaTitle: item.valueAsk,
+          assessmentQaDescribe: item.valueAskDesc,
+          assessmentQaId: item.optionId ? item.optionId : "",
+        };
+        resultArr.push(obj);
+      }
+      if (item[typeKey] === 4) {
+        obj = {
+          questionType: item[typeKey],
+          assessmentScTitle: item.valuePin,
+          assessmentMinScore: item.minScore,
+          assessmentMaxScore: item.maxScore,
+          weightScale: item.pinQuan,
+          assessmentScId: item.optionId ? item.optionId : "",
+        };
+        resultArr.push(obj);
+      }
+    });
+    resultArr.map((itm, idx) => {
+      itm.orderNumber = idx + 1;
+      return itm;
+    });
+    return resultArr;
+  };
+
+  // 解散传值
+  const parseItem = (arr) => {
+    const filterComObj = filterCommon(arr, "questionType");
+    let resultObj = {};
+    for (let key in filterComObj) {
+      if (key === "1") {
+        let arrSingle = filterComObj[key];
+        let arr = [];
+        arrSingle.forEach((item) => {
+          if (item.singleList.length) {
+            item.singleList.forEach((itm) => {
+              arr.push({
+                ...itm,
+                singleStemName: item.singleStemName,
+                orderNumber: item.orderNumber,
+                questionType: item.questionType,
+              });
             });
           }
         });
-      } else {
-        resultPost = {
-          assessmentName: state.assessmentNameNew,
-          assessmentMark: state.valueMore,
-          ...filterData,
-        };
-        resultPost = deepCloneFilterString(resultPost, [
-          "assessmentMaxScore",
-          "assessmentMinScore",
-        ]);
-        createResearch(resultPost).then((res) => {
-          if (res.data.code === 200) {
-            message.success("创建成功");
-            router.push({
-              path: "/researchmanage",
+        resultObj.assessmentSingleChoiceDtoList = arr;
+      }
+      if (key === "2") {
+        let arrMulti = filterComObj[key];
+        let arr = [];
+        arrMulti.forEach((item) => {
+          if (item.mutilList.length) {
+            item.mutilList.forEach((itm) => {
+              arr.push({
+                ...itm,
+                multipleStemName: item.multipleStemName,
+                orderNumber: item.orderNumber,
+                questionType: item.questionType,
+              });
             });
           }
         });
+        resultObj.assessmentMultipleChoiceDtoList = arr;
       }
-    };
-    const handleAllCancel = () => {
-      state.allFormsData = [];
-      router.push({
-        path: "/researchmanage",
+      if (key === "3") {
+        resultObj.assessmentEssayQuestionDtoList = filterComObj[key];
+      }
+      if (key === "4") {
+        resultObj.assessmentScoringQuestionDtoList = filterComObj[key];
+      }
+    }
+    return resultObj;
+  };
+
+*/
+  const handleTypes = () => {
+    let   obj = {
+          id: state.allFormsData.length,
+          valueSingle: "",
+          singleList: [
+            {
+              id: 1,
+              inputVal: "",
+              imgVal: "",
+            },
+          ],
+        };
+    state.allFormsData.push(obj);
+    console.log("state.allFormsData=====",state.allFormsData,state.allFormsData.length);
+  };
+
+  const handleDel = ({ id ,curItem}) => {
+    state.allFormsData.forEach((item, index) => {
+      if (item.id === id) {
+        state.allFormsData.splice(index, 1);
+      }
+    });
+    state.allFormsData.map((item, index) => {
+      item.id = index + 1;
+      return item;
+    });
+    console.log("curItem.orderNumber",curItem.orderNumber);
+    
+      // orderNumber: curItem.orderNumber,
+    
+    
+  };
+
+  const handleSave = () => {
+    /** 
+    let resultPost = {};
+    
+    let filterData = parseItem(restData(state.allFormsData, "type"));
+    // 校验
+    if (!checkVal(filterData)) {
+      return false;
+    }
+    console.log(12121212);
+    console.log(filterData);
+
+    if (state.ballotId) {
+      resultPost = {
+        ballotId: state.ballotId,
+        ballotName: state.ballotName,
+        ...filterData,
+      };
+      resultPost = deepCloneFilterString(resultPost, [
+        "assessmentMaxScore",
+        "assessmentMinScore",
+      ]);
+      console.log(1212334);
+      console.log(resultPost);
+      editResearchMessage(resultPost).then((res) => {
+        if (res.data.code === 200) {
+          message.success("编辑成功");
+          router.push({
+            path: "/researchmanage",
+          });
+        }
       });
-    };
-    const checkVal = (filterData) => {
-      // 问答
-      if (
-        filterData.assessmentEssayQuestionDtoList &&
-        filterData.assessmentEssayQuestionDtoList.length
-      ) {
-        let arr = filterData.assessmentEssayQuestionDtoList;
-        for (let item of arr) {
-          if (!item.assessmentQaTitle) {
-            message.error("问答题干为必填 请确认");
-            return false;
-          }
+    } else {
+      resultPost = {
+        ballotName: state.ballotNameNew,
+        assessmentMark: state.valueMore,
+        ...filterData,
+      };
+      resultPost = deepCloneFilterString(resultPost, [
+        "assessmentMaxScore",
+        "assessmentMinScore",
+      ]);
+      createOptionMessage(resultPost).then((res) => {
+        if (res.data.code === 200) {
+          message.success("创建成功");
+        
         }
-      }
-      // 多选
-      if (
-        filterData.assessmentMultipleChoiceDtoList &&
-        filterData.assessmentMultipleChoiceDtoList.length
-      ) {
-        let arr = filterData.assessmentMultipleChoiceDtoList;
-        for (let item of arr) {
-          if (!item.multipleStemName) {
-            message.error("多选题干为必填 请确认");
-            return false;
-          }
-        }
-      }
-      // 评分
-      if (
-        filterData.assessmentScoringQuestionDtoList &&
-        filterData.assessmentScoringQuestionDtoList.length
-      ) {
-        let CountNum = 0;
-        let CountArr = filterData.assessmentScoringQuestionDtoList;
-        for (let item of CountArr) {
-          if (!item.assessmentScTitle) {
-            message.error("评分题干为必填 请确认");
-            return false;
-          }
-          CountNum += Number(item["weightScale"]);
-        }
-        if (CountNum !== 100) {
-          message.error("当前权重设置是百分制 请重新配置");
+      });
+    }
+    */
+  };
+  const handleAllCancel = () => {
+    state.allFormsData = [];
+  
+  };
+  /** 
+  const checkVal = (filterData) => {
+    // 问答
+    if (
+      filterData.assessmentEssayQuestionDtoList &&
+      filterData.assessmentEssayQuestionDtoList.length
+    ) {
+      let arr = filterData.assessmentEssayQuestionDtoList;
+      for (let item of arr) {
+        if (!item.assessmentQaTitle) {
+          message.error("问答题干为必填 请确认");
           return false;
         }
       }
-      // 单选
-      if (
-        filterData.assessmentSingleChoiceDtoList &&
-        filterData.assessmentSingleChoiceDtoList.length
-      ) {
-        let arr = filterData.assessmentSingleChoiceDtoList;
-        for (let item of arr) {
-          if (!item.singleStemName) {
-            message.error("单选题干为必填 请确认");
-            return false;
-          }
+    }
+    // 多选
+    if (
+      filterData.assessmentMultipleChoiceDtoList &&
+      filterData.assessmentMultipleChoiceDtoList.length
+    ) {
+      let arr = filterData.assessmentMultipleChoiceDtoList;
+      for (let item of arr) {
+        if (!item.multipleStemName) {
+          message.error("多选题干为必填 请确认");
+          return false;
         }
       }
-      return true;
-    };
+    }
+    // 评分
+    if (
+      filterData.assessmentScoringQuestionDtoList &&
+      filterData.assessmentScoringQuestionDtoList.length
+    ) {
+      let CountNum = 0;
+      let CountArr = filterData.assessmentScoringQuestionDtoList;
+      for (let item of CountArr) {
+        if (!item.assessmentScTitle) {
+          message.error("评分题干为必填 请确认");
+          return false;
+        }
+        CountNum += Number(item["weightScale"]);
+      }
+      if (CountNum !== 100) {
+        message.error("当前权重设置是百分制 请重新配置");
+        return false;
+      }
+    }
+    // 单选
+    if (
+      filterData.assessmentSingleChoiceDtoList &&
+      filterData.assessmentSingleChoiceDtoList.length
+    ) {
+      let arr = filterData.assessmentSingleChoiceDtoList;
+      for (let item of arr) {
+        if (!item.singleStemName) {
+          message.error("单选题干为必填 请确认");
+          return false;
+        }
+      }
+    }
+    return true;
+  };
+  */
 
-    return {
-      ...toRefs(state),
-      handleTypes,
-      handleSave,
-      handleAllCancel,
-      handleDel,
-      afterVisibleChange,
-      closeDrawer,
-    };
-  },
+  return {
+    ...toRefs(state),
+    handleTypes,
+    handleSave,
+    handleAllCancel,
+    handleDel,
+    afterVisibleChange,
+    closeDrawer,
+  };
+},
 };
 </script>
 <style lang="scss">
-  .researchadd {
-    .header {
-      height: 73px;
-      border-bottom: 1px solid #e8e8e8;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      flex-shrink: 0;
-      margin-bottom: 25px;
-      .headerTitle {
-        font-size: 18px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 25px;
-        margin-left: 24px;
-      }
+.researchadd {
+  .header {
+    height: 73px;
+    border-bottom: 1px solid #e8e8e8;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-shrink: 0;
+    margin-bottom: 25px;
+    .headerTitle {
+      font-size: 18px;
+      font-weight: 600;
+      color: #333333;
+      line-height: 25px;
+      margin-left: 24px;
     }
-    .main_left {
-        padding-right: 30px;
-        flex: 1;
-        border-right: 1px solid #e8e8e8;
-        .main_item {
+  }
+  .main_left {
+      padding-right: 30px;
+      flex: 1;
+      border-right: 1px solid #e8e8e8;
+      .main_item {
+        display: flex;
+        align-items: center;
+        margin-bottom: 32px;
+        .signbox {
+          width: 120px;
           display: flex;
+          justify-content: end;
           align-items: center;
-          margin-bottom: 32px;
-          .signbox {
-            width: 120px;
+          .sign {
+            margin-right: 5px;
+          }
+        }
+        .btnbox {
+          display: flex;
+          flex: 1;
+          align-items: center;
+          .xkbtn {
+            cursor: pointer;
+            width: 130px;
+            height: 40px;
+            background: #388be1;
+            border-radius: 8px;
+            border: 0;
+            margin-right: 8px;
+            color: #fff;
+            margin-right: 10px;
+          }
+          .fileTigan {
             display: flex;
-            justify-content: end;
             align-items: center;
-            .sign {
+            padding: 3px 5px;
+            background-color: rgba(42, 103, 209, 0.4);
+            span {
               margin-right: 5px;
             }
-          }
-          .btnbox {
-            display: flex;
-            flex: 1;
-            align-items: center;
-            .xkbtn {
-              cursor: pointer;
-              width: 130px;
-              height: 40px;
-              background: #388be1;
-              border-radius: 8px;
-              border: 0;
-              margin-right: 8px;
-              color: #fff;
-              margin-right: 10px;
+            .delBox {
+              width: 13px;
+              height: 13px;
+              background-image: url(@/assets/images/basicinfo/ch.png);
+              background-size: 100% 100%;
+              border-radius: 50%;
             }
-            .fileTigan {
+          }
+        }
+      }
+      .main_item2 {
+        display: flex;
+        align-items: flex-start;
+        margin-bottom: 32px;
+        .signbox {
+          width: 120px;
+          display: flex;
+          justify-content: end;
+          align-items: center;
+          .sign {
+            margin-right: 5px;
+          }
+        }
+        .kqszbox {
+          .qdqtbox {
+            margin-left: 56px;
+          }
+          .setbox {
+            display: flex;
+            flex-wrap: wrap;
+            margin-top: 10px;
+            margin-bottom: 24px;
+            .timerbox {
+              margin-top: 6px;
+              margin-right: 32px;
               display: flex;
               align-items: center;
-              padding: 3px 5px;
-              background-color: rgba(42, 103, 209, 0.4);
-              span {
-                margin-right: 5px;
-              }
-              .delBox {
-                width: 13px;
-                height: 13px;
-                background-image: url(@/assets/images/basicinfo/ch.png);
-                background-size: 100% 100%;
-                border-radius: 50%;
-              }
+              flex-wrap: nowrap;
             }
           }
         }
-        .main_item2 {
+        .btnbox2 {
           display: flex;
-          align-items: flex-start;
-          margin-bottom: 32px;
-          .signbox {
-            width: 120px;
-            display: flex;
-            justify-content: end;
-            align-items: center;
-            .sign {
-              margin-right: 5px;
-            }
-          }
-          .kqszbox {
-            .qdqtbox {
-              margin-left: 56px;
-            }
-            .setbox {
-              display: flex;
-              flex-wrap: wrap;
-              margin-top: 10px;
-              margin-bottom: 24px;
-              .timerbox {
-                margin-top: 6px;
-                margin-right: 32px;
-                display: flex;
-                align-items: center;
-                flex-wrap: nowrap;
-              }
-            }
-          }
-          .btnbox2 {
-            display: flex;
-            flex-direction: column;
-            justify-content: flex-start;
-            .xkbtn {
-              cursor: pointer;
-              width: 130px;
-              height: 40px;
-              background: #388be1;
-              border-radius: 8px;
-              border: 0;
-              margin-right: 16px 8px 32px 0;
-              color: #fff;
-              margin-top: 16px;
-              margin-bottom: 60px;
-            }
+          flex-direction: column;
+          justify-content: flex-start;
+          .xkbtn {
+            cursor: pointer;
+            width: 130px;
+            height: 40px;
+            background: #388be1;
+            border-radius: 8px;
+            border: 0;
+            margin-right: 16px 8px 32px 0;
+            color: #fff;
+            margin-top: 16px;
+            margin-bottom: 60px;
           }
         }
-    }
-
+      }
   }
+
+}
 </style>
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index aea37d17..47e89683 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -908,7 +908,7 @@ import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
 import AddActive from "../../components/drawers/AddActive.vue";
 import AddEval from "../../components/drawers/AddEval.vue";
 import AddInvist from "../../components/drawers/AddInvist.vue";
-import AddVote from "../../components/drawers/AddVote.vue";
+import AddVote from "../../components/vote/AddVote.vue";
 import AddLive from "../../components/drawers/AddLive.vue";
 import AddRef from "../../components/drawers/AddRef.vue";
 import * as api from "../../api/indexLevel";
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index bfa79cc6..2ed5f715 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -877,10 +877,10 @@ import AddTest from "../../components/drawers/AddTest.vue";
 import AddLive from "../../components/drawers/AddLive.vue";
 import AddRef from "../../components/drawers/AddRef.vue";
 import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
-import AddActive from "../../components/drawers/AddActive.vue";
+import AddActive from "../../components/drawers/AddActive.vue";s
 import AddEval from "../../components/drawers/AddEval.vue";
 import AddInvist from "../../components/drawers/AddInvist.vue";
-import AddVote from "../../components/drawers/AddVote.vue";
+import AddVote from "../../components/vote/AddVote.vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
 import * as apistage from "../../api/indexStage";
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 215b48f6..6c7271f8 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -98,7 +98,7 @@
 </template>
 <script>
 import { reactive, toRefs } from "vue";
-import AddVote from "../../components/drawers/AddVote";
+import AddVote from "../../components/vote/AddVote";
 // import { PlusOutlined, LoadingOutlined } from "@ant-design/icons-vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/index1";