From 3efc67ce7ad0caf659f3338576152d2ef79cb9be Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Tue, 15 Nov 2022 10:48:53 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=E6=A8=A1=E4=BB=BF=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=9C=A8=E7=BA=BF=E6=8A=BD=E5=B1=89=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue | 378 ++++++++++++++++-----------
 src/views/projectcenter/TaskAdd.vue  |  20 +-
 2 files changed, 237 insertions(+), 161 deletions(-)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index a7b5e9bb..ec1fa777 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -8,8 +8,9 @@
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
-      <div class="header">
-        <div class="headerTitle">添加在线</div>
+      <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"
@@ -23,7 +24,7 @@
               <div class="ipt_name">课程编号：</div>
               <div class="fi_input">
                 <a-input
-                  v-model:value="value1"
+                  v-model:value="inputV1"
                   style="width: 240px; height: 40px; border-radius: 8px"
                   placeholder="请输入项目名称"
                 />
@@ -48,7 +49,7 @@
               <div class="search"></div>
               <div class="btnText">搜索</div>
             </div>
-            <div class="btn btn2">
+            <div class="btn btn2" @click="resetInvist">
               <div class="search"></div>
               <div class="btnText">重置</div>
             </div>
@@ -75,11 +76,14 @@
               (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
             "
             :row-selection="rowSelection"
-            :columns="columns1"
-            :data-source="tableData1"
+            :columns="tableDataFunc()"
+            :data-source="tableData"
             :loading="tableDataTotal === -1 ? true : false"
+              expandRowByClick="true"
         		this.getMilitaryDeployment()
+              @expand="expandTable"
             :pagination="false"
+              filterMultiple:false
           />
           <div class="pa">
                 <a-pagination
@@ -90,85 +94,25 @@
                   :current="currentPage"
                   :total="tableDataTotal"
                   class="pagination"
+                  @change="handelChangePage"
                 />
               </div>
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="updateTask">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
-const options1 = ref([
-  {
-    value: "value1",
-    label: "请选择状态",
-  },
-]);
-const columns1 = [
-  {
-    title: "课程编号",
-    width: "20%",
-    dataIndex: "num",
-    key: "num",
-    align: "center",
-  },
-  {
-    title: "名称",
-    width: "20%",
-    dataIndex: "name",
-    key: "name",
-    align: "center",
-  },
-  {
-    title: "内容分类",
-    width: "13%",
-    dataIndex: "content",
-    key: "content",
-    align: "center",
-  },
-  {
-    title: "授课教师",
-    width: "13%",
-    dataIndex: "teacher",
-    key: "teacher",
-    align: "center",
-  },
-  {
-    title: "创建人",
-    width: "13%",
-    dataIndex: "creator",
-    key: "creator",
-    align: "center",
-  },
-  {
-    title: "完成时间",
-    width: "20%",
-    dataIndex: "time",
-    key: "time",
-    align: "center",
-  },
-];
-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 { reactive, toRefs, onMounted } from "vue";
+import * as api from "../../api/indexInvist.js";
+import * as apiTask from "../../api/indexTaskadd";
+import { message } from "ant-design-vue";
+import { RouterEditTask } from "@/api/indexTask";
+import dayjs from "dayjs";
 export default {
   name: "AddOnline",
   props: {
@@ -176,109 +120,227 @@ export default {
       type: Boolean,
       default: false,
     },
+    EditInvistId: {
+      type: Number,
+      default: null,
+    },
+    edit: { //  是否为编辑
+      type: Boolean,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    }
   },
   setup(props, ctx) {
     const state = reactive({
-      tableData1: [
+      inputV1:"",
+      options1 : [
         {
-          key: "1",
-          num: "JDF2022071100001",
-          name: "时间管理课程",
-          content: "通用力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "2",
-          num: "JDF2022071100001",
-          name: "管理能力课程",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "3",
-          num: "JDF2022071100001",
-          name: "快速换模SMED",
-          content: "通用力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "4",
-          num: "JDF2022071100001",
-          name: "巧妙对话人见人夸",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "5",
-          num: "JDF2022071100001",
-          name: "管理能力课程",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "6",
-          num: "JDF2022071100001",
-          name: "时间管理课程",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "7",
-          num: "JDF2022071100001",
-          name: "时间管理课程",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "8",
-          num: "JDF2022071100001",
-          name: "时间管理课程",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
-        },
-        {
-          key: "9",
-          num: "JDF2022071100001",
-          name: "时间管理课程",
-          content: "领导力",
-          teacher: "BOE教师",
-          creator: "管理员",
-          time: "2022-10-31 23:12:00",
+          value: "value1",
+          label: "未完成",
         },
       ],
+      time: undefined,
+      assessmentId:null,
+      assessmentName:"",
+      tableData: [ ],
       currentPage: 1,
-      tableDataTotal: 100,
+      tableDataTotal: 0,
       pageSize: 10,
     });
     const closeDrawer = () => {
       ctx.emit("update:addonlineVisible", false);
+      ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
+    const tableDataFunc = () => {
+      const columns = [
+      {
+          title: "课程编号",
+          dataIndex: "num",
+          key: "num",
+          width: "200px",
+          align: "center",
+        },
+        {
+          title: "名称",
+          dataIndex: "name",
+          // width: "30%",
+          key: "name",
+          width: "100px",
+          align: "left",
+          className: "classify",
+        }, {
+          title: "内容分类",
+          dataIndex: "content",
+          key: "content",
+          width: "80px",
+          align: "center",
+        },
+        {
+          title: "授课教师",
+          dataIndex: "teacher",
+          key: "teacher",
+          width: "80px",
+          align: "center",
+        },
+        {
+          title: "创建人",
+          dataIndex: "creator",
+          key: "creator",
+          width: "80px",
+          align: "center",
+        },
+        {
+          title: "完成时间",
+          dataIndex: "time",
+          key: "time",
+          width: "200px",
+          align: "center",
+        },
+      ];
+      return columns;
+    };
+    const rowSelection = {
+      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: "",
+          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)
+      if(props.isLevel){
+        RouterEditTask({
+              chapterId: props.isactive,
+              courseId: state.assessmentId,
+              name: state.assessmentName,
+              routerId: props.routerId,
+              routerTaskId: props.routerTaskId || 0,
+              type: 1,
+            })
+              .then((res) => {
+                console.log(res, 11111);
+                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+                ctx.emit("changeData", false);
+                closeDrawer();
+                state.addLoading = false;               
+              })
+              .catch((err) => {
+                console.log(err, 1111);
+              });
+      }else{
+        console.log("=========projectTaskId",props.projectTaskId);
+        apiTask
+            .addTask({
+              courseId: state.assessmentId,
+              name: state.assessmentName,
+              projectId: props.projectId,
+              projectTaskId: props.projectTaskId || 0,
+              stageId: props.chooseStageId,
+              type: 1,
+            })
+            .then((res) => {
+              console.log("调用项目添加接口后111", res.data, 11111);
+              ctx.emit("changeData", false); 
+              closeDrawer();    
+            })
+            .catch((err) => {
+              console.log(err, 111111);
+            });
+      }
+    }
+    //重置在线信息
+    const resetInvist = () => {
+      state.inputV1 = "";
+      getAllInvistText();
+    };
+    onMounted(() => {
+      // createInvist();
+      getAllInvistText();
+    });
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      options1,
-      columns1,
+      tableDataFunc,
       rowSelection,
+      handelChangePage,
+      getTableDate,
+      updateTask,
+      resetInvist,
     };
   },
 };
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index cb6a6a98..fb7cb860 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -97,7 +97,14 @@
           </div>
           <!-- 添加在线侧弹窗 -->
           <div>
-            <add-online v-model:addonlineVisible="addonlinevisible" />
+            <add-online 
+            v-model:addonlineVisible="addonlinevisible" 
+            @changeData="updateTableData"
+              v-model:edit="edit"
+              v-model:projectId="projectId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:projectTaskId="projectTaskId"
+              v-model:EditOnlineId = "EditOnlineId"/>
           </div>
           <!-- 添加在线侧弹窗 -->
           <div class="lin"></div>
@@ -925,7 +932,9 @@ export default {
       EditActiveId:null,//要编辑的活动id
       EditWorkId:null, // 要编辑的作业id
       EditTestId: null,// 要编辑的考试id
+      EditOnlineId:null, //要编辑的在线id
       EditEvalId:null,
+      evaluationId: null, //编辑需要的id
       EditInvistId:null,
       EditVoteId: null, //编辑需要投票的id
       ballotId: "", //编辑需要的题干id
@@ -1471,8 +1480,10 @@ export default {
       document.getElementsByTagName("main")[0].style.boxShadow =
         "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
     });
-    const showDrawerOnline = () => {
+    const showDrawerOnline = (id, eleId) => {
       state.addonlinevisible = true;
+      state.EditOnlineId = id;
+      state.projectTaskId = eleId;
     };
     const showDrawerFaceteach = () => {
       state.addfaceteachvisible = true;
@@ -1514,15 +1525,16 @@ export default {
     };
     const showDrawerAddEval = (id, eleId) => {
       state.addevalvisible = true;
+      // state.EditEvalId = id;
       state.evaluationId = id;
       state.projectTaskId = eleId;
     };
     const showDrawerAddInvist = (id, eleId) => {
+      console.log(id, eleId, '213312');
       state.addinvistvisible = true;
       state.projectTaskId = eleId;
     };
     const showDrawerAddVote = (id, eleId) => {
-      console.log(id, eleId, '95835325932953295325');
       state.addvotevisible = true;
       state.EditVoteId = id;
       state.projectTaskId = eleId;
@@ -1645,6 +1657,8 @@ export default {
         showDrawerAddHomework(id, eleId);
       } else if (type == "考试") {
         showDrawerAddTest(id, eleId);
+      } else if (type == "在线") {
+        showDrawerOnline(id, eleId);
       }
     };
     return {

From 633ec2d6bfc8876921323de49a235a73235315ca Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Tue, 15 Nov 2022 12:50:02 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E6=A1=88=E4=BE=8B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=20=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=88=86=E6=8A=BD=E5=B1=89=E7=9A=84margintop=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue    |   1 +
 src/components/drawers/AddCase.vue      | 487 ++++++++++++++----------
 src/components/drawers/AddDiscuss.vue   |   1 +
 src/components/drawers/AddEval.vue      |   1 +
 src/components/drawers/AddFaceteach.vue | 181 +++++----
 src/components/drawers/AddHomework.vue  |   1 +
 src/components/drawers/AddInvist.vue    |   1 +
 src/components/drawers/AddLive.vue      |   1 +
 src/components/drawers/AddOnline.vue    |  18 +-
 src/components/drawers/AddTest.vue      |   5 +-
 src/components/drawers/AddVote.vue      |   1 +
 src/components/drawers/CreVote.vue      |   1 +
 src/views/projectcenter/TaskAdd.vue     |  10 +-
 13 files changed, 418 insertions(+), 291 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index fb0719f1..41bcf8ed 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -509,6 +509,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 93ad2825..4c06bb5d 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -1,210 +1,300 @@
 <template>
-    <a-drawer
-      :visible="addcaseVisible"
-      class="drawerStyle addcaseDrawer"
-      width="80%"
-      title="添加案例"
-      placement="right"
-      @after-visible-change="afterVisibleChange"
-    >
-      <div class="drawerMain">
-        <div class="header">
-          <div class="headerTitle">添加案例</div>
-          <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
-          />
-        </div>
-        <div class="contentMain">
-          <div class="main_items">
-            <div class="mi_ipts">
-              <div class="mii_ipt">
-                <div class="ipt_name">案例标题：</div>
-                <div class="fi_input">
-                  <a-input
-                    v-model:value="inputV1"
-                    style="width: 264px; height: 40px; border-radius: 8px"
-                    placeholder="请输入项目名称"
-                  />
-                </div>
-              </div>
-            </div>
-            <div class="mi_btns">
-              <div class="btn btn1">
-                <div class="search"></div>
-                <div class="btnText">搜索</div>
-              </div>
-              <div class="btn btn2">
-                <div class="search"></div>
-                <div class="btnText">重置</div>
-              </div>
-            </div>
-          </div>
-  
-          <div class="main_table">
-            <a-table
-              class="ant-table-striped"
-              :row-class-name="
-                (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
-              "
-              :row-selection="rowSelection"
-              :columns="columns1"
-              :data-source="tableData1"
-              :loading="tableDataTotal === -1 ? true : false"
-              :pagination="false"
-            />
-            <div class="pa">
-                <a-pagination
-                  showSizeChanger="true"
-                  showQuickJumper="true"
-                  hideOnSinglePage="true"
-                  :pageSize="pageSize"
-                  :current="currentPage"
-                  :total="tableDataTotal"
-                  class="pagination"
+  <a-drawer
+    :visible="addcaseVisible"
+    class="drawerStyle addcaseDrawer"
+    width="80%"
+    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_items">
+          <div class="mi_ipts">
+            <div class="mii_ipt">
+              <div class="ipt_name">案例标题：</div>
+              <div class="fi_input">
+                <a-input
+                  v-model:value="inputV1"
+                  style="width: 264px; height: 40px; border-radius: 8px"
+                  placeholder="请输入项目名称"
                 />
               </div>
+            </div>
           </div>
-        </div>
-        <div class="main_btns">
-          <button class="btn1">取消</button>
-          <button class="btn2">确定</button>
+          <div class="mi_btns">
+            <div class="btn btn1">
+              <div class="search"></div>
+              <div class="btnText">搜索</div>
+            </div>
+            <div class="btn btn2" @click="resetCase()">
+              <div class="search"></div>
+              <div class="btnText">重置</div>
+            </div>
+            </div>
+            </div>
+            
+            <div class="main_table">
+              <a-table class="ant-table-striped" :row-class-name="
+                            (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
+                          " :row-selection="rowSelection" :columns="tableDataFunc()" :data-source="tableData"
+                :loading="tableDataTotal === -1 ? true : false" expandRowByClick="true" this.getMilitaryDeployment()
+                @expand="expandTable" :pagination="false" 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>
-    </a-drawer>
-  </template>
-  <script>
-  import { reactive, toRefs, ref } from "vue";
-  const columns1 = [
-    {
-      title: "案例标题",
-      width: "40%",
-      dataIndex: "title",
-      key: "num",
-      align: "center",
-      ellipsis: true,
+      <div class="main_btns">
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="updateTask">确定</button>
+      </div>
+    </div>
+  </a-drawer>
+</template>
+<script>
+import { reactive, toRefs, onMounted } from "vue";
+import * as api from "../../api/indexInvist.js";
+import * as apiTask from "../../api/indexTaskadd";
+import { message } from "ant-design-vue";
+import { RouterEditTask } from "@/api/indexTask";
+import dayjs from "dayjs";
+
+export default {
+  name: "AddCase",
+  props: {
+    addcaseVisible: {
+      type: Boolean,
+      default: false,
     },
-    {
-      title: "作者",
-      width: "25%",
-      dataIndex: "name",
-      key: "name",
-      align: "center",
+    EditCaseId: {
+      type: Number,
+      default: null,
     },
-    {
-      title: "导入时间",
-      width: "35%",
-      dataIndex: "time",
-      key: "time",
-      align: "center",
+    edit: { //  是否为编辑
+      type: Boolean,
+      default: null,
     },
-  ];
-  const rowSelection = ref({
-    checkStrictly: false,
-    onChange: (selectedRowKeys, selectedRows) => {
-      console.log(
-        `selectedRowKeys: ${selectedRowKeys}`,
-        "selectedRows: ",
-        selectedRows
-      );
+    projectId: {
+      type: Number,
+      default: null,
     },
-    onSelect: (record, selected, selectedRows) => {
-      console.log(record, selected, selectedRows);
+    chooseStageId: {
+      type: Number,
+      default: null,
     },
-    onSelectAll: (selected, selectedRows, changeRows) => {
-      console.log(selected, selectedRows, changeRows);
+    routerTaskId: {
+      type: Number,
+      default: 0,
     },
-  });
-  export default {
-    name: "AddCase",
-    props: {
-      addcaseVisible: {
-        type: Boolean,
-        default: false,
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    }
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      tableData: [
+        {
+          key: "1",
+          title: "基于BOE显示PNL工厂的工序平1111112222222221111111111111122222333335555",
+          name: "李玉冰",
+          time: "2022-10-31  23:12:00",
+        },
+      ],
+      currentPage: 1,
+      tableDataTotal: 0,
+      pageSize: 10,
+      inputV1: '',
+      time: undefined,
+      assessmentId: null,
+      assessmentName: "",
+    });
+    const closeDrawer = () => {
+      ctx.emit("update:addcaseVisible", false);
+      ctx.emit("update:edit", false);
+    };
+    const afterVisibleChange = (bool) => {
+      console.log("state", bool);
+    };
+    const tableDataFunc = () => {
+      const columns = [
+        {
+          title: "案例标题",
+          dataIndex: "tit",
+          key: "tit",
+          width: "400px",
+          align: "center",
+        },
+        {
+          title: "作者",
+          dataIndex: "name",
+          // width: "30%",
+          key: "name",
+          width: "100px",
+          align: "center",
+          className: "classify",
+        },
+        {
+          title: "导入时间",
+          dataIndex: "time",
+          key: "time",
+          width: "200px",
+          align: "center",
+        },
+      ];
+      return columns;
+    };
+    const rowSelection = {
+      onSelect: (selectedRows, selected, selectedRowKeys) => {
+        console.log(
+          "selectedRowKeys", selectedRowKeys, "selectedRows", selectedRows, "selected", selected);
+        console.log(selectedRows.assessmentId);
+        state.assessmentId = selectedRows.assessmentId;
+        state.assessmentName = selectedRows.name;
       },
-    },
-    setup(props, ctx) {
-      const state = reactive({
-        tableData1: [
-          {
-            key: "1",
-            title: "基于BOE显示PNL工厂的工序平1111112222222221111111111111122222333335555",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "2",
-            title: "OEM 企业一线用工之路探索",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "3",
-            title: " 销售数字化转型的痛苦与探索",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "4",
-            title: "疫情突发，技能人才招聘的相关…",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "5",
-            title: "设计效率提升之工具化",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "6",
-            title: "疫情突发，技能人才招聘的相关…",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "7",
-            title: "基于BOE显示PNL工厂的工序平…",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "8",
-            title: "基于BOE显示PNL工厂的工序平…",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-          {
-            key: "9",
-            title: "基于BOE显示PNL工厂的工序平…",
-            name: "李玉冰",
-            time: "2022-10-31  23:12:00",
-          },
-        ],
-        currentPage: 1,
-        tableDataTotal: 100,
-        pageSize: 10,
-        inputV1:'',
+    };
+    const handelChangePage = (page, pageSize) => {
+      state.currentPage = page;
+      state.pageSize = pageSize;
+      getAllCaseText();
+    };
+    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);
       });
-      const closeDrawer = () => {
-        ctx.emit("update:addcaseVisible", false);
-      };
-      const afterVisibleChange = (bool) => {
-        console.log("state", bool);
-      };
-      return {
-        ...toRefs(state),
-        afterVisibleChange,
-        closeDrawer,
-        columns1,
-        rowSelection,
-      };
-    },
-  };
-  </script>
-  <style lang="scss">
-  .ant-table-striped :deep(.table-striped) td {
+      state.tableData = array;
+    };
+    //获取全部案例信息接口
+    const getAllCaseText = () => {
+      api
+        .queryAssessmentDetailList({
+          assessmentName: "",
+          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)
+      if (props.isLevel) {
+        RouterEditTask({
+          chapterId: props.isactive,
+          courseId: state.assessmentId,
+          name: state.assessmentName,
+          routerId: props.routerId,
+          routerTaskId: props.routerTaskId || 0,
+          type: 3,
+        })
+          .then((res) => {
+            console.log(res, 11111);
+            message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            ctx.emit("changeData", false);
+            closeDrawer();
+            state.addLoading = false;
+          })
+          .catch((err) => {
+            console.log(err, 1111);
+          });
+      } else {
+        console.log("=========projectTaskId", props.projectTaskId);
+        apiTask
+          .addTask({
+            courseId: state.assessmentId,
+            name: state.assessmentName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId,
+            type: 3,
+          })
+          .then((res) => {
+            console.log("调用项目添加接口后111", res.data, 11111);
+            ctx.emit("changeData", false);
+            closeDrawer();
+          })
+          .catch((err) => {
+            console.log(err, 111111);
+          });
+      }
+    }
+    //重置案例信息
+    const resetCase = () => {
+      state.inputV1 = "";
+      getAllCaseText();
+    };
+    onMounted(() => {
+      // createCase();
+      getAllCaseText();
+    });
+    return {
+      ...toRefs(state),
+      afterVisibleChange,
+      closeDrawer,
+      tableDataFunc,
+      rowSelection,
+      handelChangePage,
+      getTableDate,
+      updateTask,
+      getAllCaseText,
+      resetCase,
+    };
+  },
+};
+</script>
+<style lang="scss">
+.ant-table-striped :deep(.table-striped) td {
     background-color: #fafafa !important;
   }
   
@@ -226,9 +316,12 @@
         }
       }
       .contentMain {
-        .main_items {
-          display: flex;
-          justify-content: space-between;
+        padding-right: 15px;
+        
+          .main_items {
+            display: flex;
+            justify-content: space-between;
+            margin-top: 32px;
           margin-bottom: 12px;
           flex-wrap: wrap;
           .mi_ipts {
@@ -381,4 +474,4 @@
       }
     }
   }
-  </style>
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index b2166686..357bd86f 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -300,6 +300,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 06daaada..9221e473 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -322,6 +322,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index cd42ca90..e8687d52 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -400,99 +400,116 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
-          margin-bottom: 32px;
-          .signbox {
-            width: 120px;
-            display: flex;
-            justify-content: end;
-            align-items: center;
-            .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;
-            }
-          }
-        }
-        .main_item2 {
-          display: flex;
-          align-items: flex-start;
-          margin-bottom: 32px;
-          .signbox {
-            width: 120px;
-            display: flex;
-            justify-content: end;
-            align-items: center;
-          }
-          .kqszbox {
-            .qdqtbox {
-              margin-left: 5px;
-              cursor: pointer;
-            }
-            .qdbtn,
-            .qtbtn {
-              width: 75px;
-              height: 24px;
-              background: rgba(56, 139, 225, 0.16);
-              border-radius: 2px;
-              border: 1px solid #387df7;
+          margin-top: 32px;
+            margin-bottom: 32px;
+          
+            .signbox {
+              width: 120px;
               display: flex;
+              justify-content: end;
               align-items: center;
-              justify-content: center;
-              .btntext {
-                color: #387df7;
+          
+              .sign {
+                margin-right: 5px;
               }
             }
-            .setbox {
+          
+            .btnbox {
               display: flex;
-              flex-wrap: wrap;
-              margin-top: 10px;
-              margin-bottom: 24px;
-              .timerbox {
-                margin-top: 6px;
-                margin-right: 32px;
+              flex: 1;
+              align-items: center;
+          
+              .xkbtn {
+                cursor: pointer;
+                width: 130px;
+                height: 40px;
+                background: #388be1;
+                border-radius: 8px;
+                border: 0;
+                margin-right: 8px;
+                color: #fff;
+              }
+            }
+          }
+          
+          .main_item2 {
+            display: flex;
+            align-items: flex-start;
+            margin-bottom: 32px;
+          
+            .signbox {
+              width: 120px;
+              display: flex;
+              justify-content: end;
+              align-items: center;
+            }
+          
+            .kqszbox {
+              .qdqtbox {
+                margin-left: 5px;
+                cursor: pointer;
+              }
+          
+              .qdbtn,
+              .qtbtn {
+                width: 75px;
+                height: 24px;
+                background: rgba(56, 139, 225, 0.16);
+                border-radius: 2px;
+                border: 1px solid #387df7;
                 display: flex;
                 align-items: center;
-                flex-wrap: nowrap;
+                justify-content: center;
+          
+                .btntext {
+                  color: #387df7;
+                }
+              }
+          
+              .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;
               }
             }
           }
-          .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;
-            }
           }
-        }
-      }
-      .main_right {
-        width: 337px;
-        .main_item {
-          display: flex;
-          align-items: center;
+          
+          .main_right {
+            width: 337px;
+          
+            .main_item {
+              display: flex;
+              align-items: center;
+              margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index c3c75f15..71990ad7 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -488,6 +488,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
 
           .signbox {
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index dc7e3929..9d64ac8b 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -333,6 +333,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .fi_input {
             margin-right: 20px;
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 43904a80..22c24f58 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -701,6 +701,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index ec1fa777..34b6b274 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -49,7 +49,7 @@
               <div class="search"></div>
               <div class="btnText">搜索</div>
             </div>
-            <div class="btn btn2" @click="resetInvist">
+            <div class="btn btn2" @click="resetOnline()">
               <div class="search"></div>
               <div class="btnText">重置</div>
             </div>
@@ -241,7 +241,7 @@ export default {
     const handelChangePage = (page, pageSize) => {
       state.currentPage = page;
       state.pageSize = pageSize;
-      getAllInvistText();
+      getAllOnlineText();
     };
     const getTableDate = (tableData) => {
       let data = tableData;
@@ -260,7 +260,7 @@ export default {
       state.tableData = array;
     };
     //获取全部在线信息接口
-    const getAllInvistText = () => {
+    const getAllOnlineText = () => {
       api
         .queryAssessmentDetailList({
           assessmentName: "",
@@ -323,13 +323,13 @@ export default {
       }
     }
     //重置在线信息
-    const resetInvist = () => {
+    const resetOnline = () => {
       state.inputV1 = "";
-      getAllInvistText();
+      getAllOnlineText();
     };
     onMounted(() => {
-      // createInvist();
-      getAllInvistText();
+      // createOnline();
+      getAllOnlineText();
     });
     return {
       ...toRefs(state),
@@ -338,9 +338,10 @@ export default {
       tableDataFunc,
       rowSelection,
       handelChangePage,
+      getAllOnlineText,
       getTableDate,
       updateTask,
-      resetInvist,
+      resetOnline,
     };
   },
 };
@@ -371,6 +372,7 @@ export default {
         .main_items {
           display: flex;
           justify-content: space-between;
+          margin-top: 32px;
           margin-bottom: 12px;
           flex-wrap: wrap;
           .mi_ipts {
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index a56544a7..536a3db6 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -200,7 +200,7 @@
       </div>
   </a-drawer>
 </template>
-  <script>
+<script>
 import { reactive, ref, toRefs } from "vue";
 import {message} from"ant-design-vue";
 import {createExamination,queryExaminationDetailById,updateExamination} from "@/api/indexExam"
@@ -628,7 +628,7 @@ export default {
   },
 };
 </script>
-  <style lang="scss">
+<style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
@@ -659,6 +659,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index 9986004b..671dbed8 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -477,6 +477,7 @@ export default {
         .main_item {
           display: flex;
           align-items: center;
+          margin-top: 32px;
           margin-bottom: 32px;
           .signbox {
             width: 120px;
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index a0e4dbf8..38298648 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -435,6 +435,7 @@ export default {
       .main_item {
         display: flex;
         align-items: center;
+          margin-top: 32px;
         margin-bottom: 32px;
         .signbox {
           width: 120px;
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index bfa79cc6..e8c2d4e6 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -132,7 +132,9 @@
           </div>
           <!-- 添加案例侧弹窗 -->
           <div>
-            <add-case v-model:addcaseVisible="addcasevisible" />
+            <add-case v-model:addcaseVisible="addcasevisible" @changeData="updateTableData" v-model:edit="edit"
+              v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId"
+              v-model:EditCaseId="EditCaseId" />
           </div>
           <!-- 添加案例侧弹窗 -->
           <div class="lin"></div>
@@ -962,6 +964,8 @@ export default {
       EditActiveId: null, //要编辑的活动id
       EditWorkId: null, // 要编辑的作业id
       EditTestId: null, // 要编辑的考试id
+      EditCaseId:null,//要编辑的案例id
+      EditOnlineId:null,//要编辑的在线id
       EditEvalId: null,
       EditInvistId: null,
       EditVoteId: null, //编辑需要投票的id
@@ -1519,8 +1523,10 @@ export default {
     const showDrawerFaceteach = () => {
       state.addfaceteachvisible = true;
     };
-    const showDrawerAddCase = () => {
+    const showDrawerAddCase = (id, eleId) => {
       state.addcasevisible = true;
+      state.EditCaseId = id;
+      state.projectTaskId = eleId;
     };
     const showDrawerAddHomework = (id, eleId) => {
       state.EditWorkId = id;

From f8d1a5c779cd419e022952a643bf430b1ed02c44 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 15 Nov 2022 20:02:20 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                        |    8 +-
 src/api/method.js                       |  203 +++
 src/components/TwoDimensionalCode.vue   |  229 ++-
 src/components/drawers/OwnPower.vue     |  723 +-------
 src/views/learningpath/LearningPath.vue |   10 +-
 src/views/projectcenter/ProjectAdd.vue  | 2152 +++++++++++++----------
 src/views/projectcenter/TaskPage.vue    |   43 +-
 src/views/system/SystemManage.vue       |    4 +-
 8 files changed, 1590 insertions(+), 1782 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 2ccc90d6..1bfecc7f 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-07 17:06:45
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-09 09:32:35
+ * @LastEditTime: 2022-11-15 16:43:26
  * @FilePath: /fe-manage/src/api/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -64,8 +64,8 @@ export const handleProject = (obj) => http.post('/admin/project/handle', obj)
 export const taskStudentList = (obj) => http.post('/admin/project/taskStudentList', obj)
 
 
-
-
-
 //获取讨论信息
 export const getDiscussDetail=(obj)=>http.post('/discuss/getDiscussDetail',obj)
+
+//获取模版列表
+export const getTemplate=(obj)=>http.post('/admin/project/template/list',obj)
diff --git a/src/api/method.js b/src/api/method.js
index 21d43e0c..4fb3d4ff 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -165,9 +165,212 @@ function autoComma(number) {
 const commonData={
 	timeout:50
 }
+
+
+//组织树
+const  organizationalTree= [
+	{
+		title: "京东方",
+		value: "京东方",
+		children: [
+			{
+				title: "产研部",
+				value: "产研部",
+				children: [
+					{
+						title: "产品部",
+						value: "产品部",
+					},
+					{
+						title: "研究部",
+						value: "研究部",
+					},
+					{
+						title: "研究部2",
+						value: "研究部2",
+					},
+					{
+						title: "研究3",
+						value: "研究3",
+					},
+					{
+						title: "研究4",
+						value: "研究4",
+					},
+					{
+						title: "研究部5",
+						value: "研究部5",
+					},
+					{
+						title: "研究部6",
+						value: "研究部6",
+					},
+					{
+						title: "研究部7",
+						value: "研究部7",
+					},
+					{
+						title: "研究部8",
+						value: "研究部8",
+					},
+					{
+						title: "研究部9",
+						value: "研究部9",
+					},
+				],
+			},
+			{
+				title: "二级标题",
+				value: "二级标题",
+				children: [
+					{
+						title: "三级标题",
+						value: "三级标题",
+						children: [
+							{
+								title: "四级标题",
+								value: "四级标题",
+								children: [
+									{
+										title: "五级标题",
+										value: "五级标题",
+										children: [
+											{
+												title: "六级标题",
+												value: "六级标题",
+												children: [
+													{
+														title: "七级标题",
+														value: "七级标题",
+														children: [
+															{
+																title: "八级标题",
+																value: "八级标题",
+																children: [
+																	{
+																		title: "九级标题",
+																		value: "九级标题",
+																		children: [
+																			{
+																				title: "十级标题",
+																				value: "十级标题",
+																				children: [
+																					{
+																						title: "十一级标题",
+																						value: "十一级标题",
+																						children: [
+																							{
+																								title: "十二级标题",
+																								value: "十二级标题",
+																								children: [
+																									{
+																										title:
+																											"十三级标题十三级标题十三级标题十三级标题",
+																										value: "十三级标题",
+																										children: [
+																											{
+																												title:
+																													"十四级标题",
+																												value:
+																													"十四级标题",
+																												children: [
+																													{
+																														title:
+																															"十五级标题",
+																														value:
+																															"十五级标题",
+																														children: [
+																															{
+																																title:
+																																	"十六级标题",
+																																value:
+																																	"十六级标题",
+																																children:
+																																	[
+																																		{
+																																			title:
+																																				"十七级标题",
+																																			value:
+																																				"十七级标题",
+																																			children:
+																																				[
+																																					{
+																																						title:
+																																							"十八级标题",
+																																						value:
+																																							"十八级标题",
+																																						children:
+																																							[
+																																								{
+																																									title:
+																																										"十九级标题",
+																																									value:
+																																										"十九级标题",
+																																									children:
+																																										[
+																																											{
+																																												title:
+																																													"二十级标题二十级标题",
+																																												value:
+																																													"二十级标题二十级标题",
+																																											},
+																																										],
+																																								},
+																																							],
+																																					},
+																																				],
+																																		},
+																																	],
+																															},
+																														],
+																													},
+																												],
+																											},
+																										],
+																									},
+																								],
+																							},
+																						],
+																					},
+																				],
+																			},
+																		],
+																	},
+																],
+															},
+														],
+													},
+												],
+											},
+										],
+									},
+								],
+							},
+						],
+					},
+				],
+			},
+			{
+				title: "人力资源部",
+				value: "人力资源部",
+				children: [
+					{
+						title: "人事部",
+						value: "人事部",
+					},
+					{
+						title: "行政部",
+						value: "行政部",
+					},
+				],
+			},
+		],
+	},
+]
 export {
 	toDate,
 	getWeek,
 	autoComma,
 	commonData,
+	organizationalTree,
 }
\ No newline at end of file
diff --git a/src/components/TwoDimensionalCode.vue b/src/components/TwoDimensionalCode.vue
index 4808d440..170693cf 100644
--- a/src/components/TwoDimensionalCode.vue
+++ b/src/components/TwoDimensionalCode.vue
@@ -7,25 +7,45 @@
       :closable="closableQR"
       wrapClassName="codeModal"
       style="margin-top: 400px"
-      :zIndex="9999"
+      :zIndex="999"
       @cancel="qr_exit"
     >
       <div id="qrcode" class="QR">
         <div class="qr_header"></div>
         <div class="qr_main">
           <div class="qrm_header">
-            <span style="title">{{codeInfo.title?codeInfo.title:''}}</span>
+            <span style="title">{{
+              codeInfo.title ? codeInfo.title : ""
+            }}</span>
             <div class="close_exit" @click="closeCodeModal"></div>
           </div>
-          <div class="qrm_body">
-            <div class="codename">{{codeInfo.name?codeInfo.name:''}}</div>
-            <qrcode-vue
-              :value="codeInfo.url?codeInfo.url:''"
-              :size="qrcodeSize"
-              style="width: 200px; height: 200px"
-            ></qrcode-vue>
+          <div class="downloadCode" style="">
+            <div class="qrm_body">
+              <div class="codename">
+                {{ codeInfo.name ? codeInfo.name : "" }}
+              </div>
+              <qrcode-vue
+                :value="codeInfo.url ? codeInfo.url : ''"
+                :size="qrcodeSize"
+                style="width: 200px; height: 200px"
+              ></qrcode-vue>
+            </div>
+          </div>
+          <div class="codeUrl" :style="{ display: showUrl ? 'flex' : 'none' }">
+            <div class="codeUrlLink">链接</div>
+            <a-input
+              :value="codeInfo.url ? codeInfo.url : ''"
+              disabled
+              class="codeUrlInp"
+            />
+            <a-input
+              :value="codeInfo.url ? codeInfo.url : ''"
+              id="courseUrl"
+              class="codeUrlInp"
+              style="position: absolute; opacity: 0; z-index: -1"
+            />
+            <div @click="copyUrl" class="codeUrlCopy">复制链接</div>
           </div>
-
           <div class="qrm_footer">
             <span style="margin-left: 52px">下载二维码</span>
             <div class="qrmbtn" @click="downloadQr(200)">
@@ -47,7 +67,8 @@
 <script>
 import { reactive, toRefs, watch } from "vue";
 import QrcodeVue from "qrcode.vue";
-// import html2canvas from "html2canvas";
+import html2canvas from "html2canvas";
+import { message } from "ant-design-vue";
 export default {
   name: "TwoDimensionalCode",
   components: {
@@ -64,97 +85,70 @@ export default {
         return {};
       },
     },
-     index: {
+    index: {
+      type: String,
+      default: "",
+    },
+    type: {
       type: String,
       default: "",
     },
   },
   setup(props, ctx) {
     const state = reactive({
-      qrcodeUrl: "https://www.baidu.com/",
       qrcodeSize: 800,
       codeInfo: {},
+      courseUrl: "https://www.baidu.com/",
+      showUrl: false,
     });
 
     //下载二维码图片
     const downloadQr = (num) => {
       state.qrcodeSize = num;
-      // let filename = `${new Date().getTime()}.png`;
-      // let canvas = document.getElementsByTagName("canvas")[0];
-      // let imageUrl = canvas.toDataURL("image/png");
+      html2canvas(
+        document.querySelectorAll(".downloadCode")[Number(props.index)],
+        {
+          useCORS: true, //支持图片跨域
+        }
+      ).then((canvas) => {
+        // console.log("canvas", canvas, canvas.width, canvas.style.width);
+        let filename = `${new Date().getTime()}.png`;
+        let imageUrl = canvas.toDataURL("image/png");
+        let a = document.createElement("a");
+        a.style.display = "none";
+        a.download = filename;
+        a.href = imageUrl;
+        document.body.appendChild(a);
+        a.click();
+      });
+      //           let canvas =document.getElementsByClassName('codeModal')[Number(props.index)].getElementsByTagName('canvas')[0];
+      //           let filename = `${new Date().getTime()}.png`;
+      //           let imageUrl = canvas.toDataURL("image/png");
+      //           let a = document.createElement("a");
+      //           a.style.display = "none";
+      //           a.download = filename;
+      //           a.href = imageUrl;
+      //           document.body.appendChild(a);
+      //           a.click();
+    };
+    //复制链接
+    const copyUrl = () => {
+      // const range = document.createRange(); //创建range对象
+      // 	range.selectNode(document.getElementById('courseUrl')); //获取复制内容的 id 选择器
+      // 	const selection = window.getSelection();  //创建 selection对象
+      // 	if (selection.rangeCount > 0) selection.removeAllRanges(); //如果页面已经有选取了的话，会自动删除这个选区，没有选区的话，会把这个选取加入选区
+      // 	selection.addRange(range); //将range对象添加到selection选区当中，会高亮文本块
+      // 	document.execCommand("Copy"); //复制选中的文字到剪贴板
+      // 	message.success('复制成功')
+      // 	selection.removeRange(range); // 移除选中的元素
 
-      // let canvasBox = document.createElement("canvas");
-      // let ctx = canvasBox.getContext("2d");
-      // var img = new Image();
-      // // 需要添加文字的图片
-      // img.src = imageUrl;
-      // // 等待图片加载完成
-      // img.onload = function () {
-      //   // 将图片添加到canvas
-      //   ctx.drawImage(img, 0, 0, 1240, 2208);
-      //   // 设置字体
-      //   ctx.font = "73px 微软雅黑 bolder";
-      //   // 设置字体颜色
-      //   ctx.fillStyle = "#955f17";
-      //   ctx.textAlign = "center";
-      //   // 添加文字和位置
-      //   ctx.fillText("微信名", 621, 1050);
-
-      //   // 导出为图片
-      //   let url = canvasBox.toDataURL("image/png");
-      //   let a = document.createElement("a");
-      //   a.style.display = "none";
-      //   a.download = filename;
-      //   a.href = url;
-      //   document.body.appendChild(a);
-      //   a.click();
-      // };
-
-      // // let a = document.createElement("a");
-      // // a.style.display = "none";
-      // // a.download = filename;
-      // // a.href = imageUrl;
-      // // document.body.appendChild(a);
-      // // a.click();
-
-      // html2canvas(document.querySelector("#qrcode"), {
-      //   useCORS: true, //支持图片跨域
-      // }).then((canvas) => {
-      //   // var extra_canvas = document.createElement("canvas");
-      //   //                 extra_canvas.setAttribute('width',num);
-      //   //                 extra_canvas.setAttribute('height',num);
-      //   //                 var ctx = extra_canvas.getContext('2d');
-      //   //                 ctx.drawImage(canvas,0,0,num,num);
-      //   //                 let filename = `${new Date().getTime()}.png`;
-      //   //                 var imageUrl = extra_canvas.toDataURL("image/png",1.0);
-
-      //   console.log("canvas", canvas, canvas.width, canvas.style.width);
-
-      //   // //   let ctx = canvas.getContext('2d');
-      //   // //           ctx.drawImage(canvas,0,0,canvas.width, canvas.height);
-      //   // //            canvas.width=num
-      //   // //  canvas.height=num
-      //   // //  canvas.style.width=num+'px'
-      //   // // canvas.style.height=num+'px'
-      //   //   let filename = `${new Date().getTime()}.png`;
-      //   //   let imageUrl = canvas.toDataURL("image/png");
-      //   //   let a = document.createElement("a");
-      //   //   a.style.display = "none";
-      //   //   a.download = filename;
-      //   //   a.href = imageUrl;
-      //   //   document.body.appendChild(a);
-      //   //   a.click();
-      // });
-console.log('document.getElementsByClassName',document.getElementsByClassName('codeModal'),Number(props.index))
-          let canvas =document.getElementsByClassName('codeModal')[Number(props.index)].getElementsByTagName('canvas')[0];
-          let filename = `${new Date().getTime()}.png`;
-          let imageUrl = canvas.toDataURL("image/png");
-          let a = document.createElement("a");
-          a.style.display = "none";
-          a.download = filename;
-          a.href = imageUrl;
-          document.body.appendChild(a);
-          a.click();
+      var input = document.createElement("input"); // 创建input对象
+      input.value = state.codeInfo.url ? state.codeInfo.url : ""; // 设置复制内容
+      document.body.appendChild(input); // 添加临时实例
+      input.select(); // 选择实例内容
+      document.execCommand("Copy"); // 执行复制
+      document.body.removeChild(input); // 删除临时实例
+      message.success("复制成功！");
     };
     const closeCodeModal = () => {
       ctx.emit("update:codevisible", false);
@@ -166,12 +160,20 @@ console.log('document.getElementsByClassName',document.getElementsByClassName('c
         url: "",
       };
       state.codeInfo = Object.assign(obj, props.codeInfo);
-      console.log("codeInfo22222", state.codeInfo,props.index);
+      console.log("codeInfo22222", state.codeInfo, props.index, props.type);
+
+      if (props.type === "签到二维码") {
+        state.showUrl = false;
+        console.log(" state.showUrl", state.showUrl);
+      } else if (props.type === "课程二维码") {
+        state.showUrl = true;
+      }
     });
     return {
       ...toRefs(state),
       downloadQr,
       closeCodeModal,
+      copyUrl,
     };
   },
 };
@@ -229,8 +231,8 @@ console.log('document.getElementsByClassName',document.getElementsByClassName('c
             }
             .qrm_body {
               width: 100%;
-              margin-top: 22px;
-              margin-bottom: 32px;
+              padding-top: 22px;
+              padding-bottom: 32px;
               display: flex;
               flex-direction: column;
               align-items: center;
@@ -242,6 +244,51 @@ console.log('document.getElementsByClassName',document.getElementsByClassName('c
                 margin-bottom: 20px;
               }
             }
+            .codeUrl {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              margin-bottom: 24px;
+              .codeUrlLink {
+                width: 72px;
+                height: 40px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 14px;
+                font-weight: 400;
+                color: #c7cbd2;
+                line-height: 20px;
+                border: 1px solid #c7cbd2;
+                border-right: 0px solid #c7cbd2;
+              }
+              .codeUrlInp {
+                width: 305px;
+                height: 40px;
+                border: 1px solid #c7cbd2;
+              }
+              .ant-input-disabled {
+                background-color: rgba(0, 0, 0, 0) !important;
+              }
+              .ant-input[disabled] {
+                background-color: rgba(0, 0, 0, 0) !important;
+              }
+              .codeUrlCopy {
+                width: 96px;
+                height: 40px;
+                background-color: #388be1;
+                border-radius: 8px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 14px;
+                font-weight: 400;
+                color: #ffffff;
+                line-height: 20px;
+                cursor: pointer;
+                margin-left: 8px;
+              }
+            }
             .qrm_footer {
               display: flex;
               align-items: center;
diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue
index e52e83a2..5ca07e8a 100644
--- a/src/components/drawers/OwnPower.vue
+++ b/src/components/drawers/OwnPower.vue
@@ -121,169 +121,7 @@
                   </div>
                 </div>
               </a-tab-pane>
-              <a-tab-pane key="2" tab="添加组织" force-render>
-                <div
-                  :style="{ height: screenHeight - 235 + 'px' }"
-                  style="overflow-y: auto"
-                >
-                  <div class="tab2">
-                    <div class="nameinp">
-                      <div class="namee">组织：</div>
-                      <a-input
-                        v-model:value="com"
-                        style="width: 230px; height: 40px; border-radius: 8px"
-                        placeholder="请输入组织"
-                      />
-                    </div>
-                    <div class="btns">
-                      <div class="btn1" @click="searchOrg">
-                        <div class="img1">
-                          <img
-                            src="../../assets/images/courseManage/search0.png"
-                          />
-                        </div>
-                        <div class="wz">搜索</div>
-                      </div>
-                      <div class="btn2">
-                        <div class="img2">
-                          <img
-                            src="../../assets/images/courseManage/reset1.png"
-                          />
-                        </div>
-                        <div class="wz">重置</div>
-                      </div>
-                    </div>
-                    <!-- <div class="t1">
-                      <div class="organize">姓名：</div>
-                      <a-input
-                        v-model:value="nameadd"
-                        style="width: 200px; height: 40px; border-radius: 8px"
-                        placeholder="请输入姓名"
-                      />
-                    </div> -->
-                  </div>
-                  <div class="boeTree">
-                    <div class="boeTreeTitle">BOE组织树</div>
-
-                    <a-tree
-                      class="treeMain treeMain2"
-                      :style="{ height: screenHeight - 430 + 'px' }"
-                      dropdownClassName="changetreedropdownboe"
-                      defaultExpandAll
-                      :dropdown-style="{
-                        maxHeight: '600px',
-                      }"
-                      placeholder="BOE组织树"
-                      allow-clear
-                      tree-default-expand-all
-                      :tree-data="treeData"
-                      @select="departmentSelect1"
-                      multiple
-                      v-model:selectedKeys="selectedKeys1"
-                    >
-                      <template #suffixIcon></template>
-                    </a-tree>
-                    <div
-                      class="boeTreeTitle"
-                      style="margin-top: 8px; cursor: pointer"
-                      @click="addOrgModal"
-                    >
-                      确认添加
-                    </div>
-                  </div>
-                </div>
-              </a-tab-pane>
-              <a-tab-pane key="3" tab="受众关联">
-                <div
-                  :style="{ height: screenHeight - 235 + 'px' }"
-                  style="overflow-y: auto"
-                >
-                  <div class="tab1">
-                    <div class="t1">
-                      <!-- <div class="nameinp">
-                        <div class="namee">选择受众：</div>
-                        <div class="select">
-                          <a-select
-                            v-model:value="choosevalue"
-                            style="width: 200px; border-radius: 8px"
-                            placeholder="请选择受众群体"
-                            :options="organizeList1"
-                          />
-                        </div>
-                      </div> -->
-                    </div>
-                    <div class="t1" style="margin-top: 10px">
-                      <div class="organize">受众名称：</div>
-                      <a-input
-                        v-model:value="nameaddd"
-                        style="width: 260px; height: 40px; border-radius: 8px"
-                        placeholder="请输入受众名称"
-                      />
-                    </div>
-                    <div class="btns">
-                      <div class="btn1">
-                        <div class="img1">
-                          <img
-                            src="../../assets/images/courseManage/search0.png"
-                          />
-                        </div>
-                        <div class="wz">搜索</div>
-                      </div>
-                      <div class="btn2">
-                        <div class="img2">
-                          <img
-                            src="../../assets/images/courseManage/reset1.png"
-                          />
-                        </div>
-                        <div class="wz">重置</div>
-                      </div>
-                    </div>
-                  </div>
-
-                  <!-- <div class="line">
-                  <div class="inline">
-                    <div class="left1">
-                      <div class="img"></div>
-                      <div class="text" style="margin-left: 10px">已选择</div>
-                      <div class="text2">2</div>
-                      <div class="text">项</div>
-                      <div class="text3">列表选项总计：</div>
-                      <div class="text4">9条</div>
-                    </div>
-                    <div class="right1">清空</div>
-                  </div>
-                </div> -->
-                  <div class="tableBox tabb" style="margin-top: 16px">
-                    <a-table
-                      style="border: 1px solid #f2f6fe"
-                      :columns="tablecolumns2"
-                      :data-source="tabledata2"
-                      :loading="tableDataTotal === -1 ? true : false"
-                      expandRowByClick="true"
-                      :scroll="{ x: 500 }"
-                      @expand="expandTable"
-                      :pagination="false"
-                      :row-selection="{
-                        columnWidth: 30,
-                        selectedRowKeys: selectedRowKeys2,
-                        onChange: onSelectChange2,
-                      }"
-                    />
-                    <div class="pa" style="margin-top: 20px">
-                      <a-pagination
-                        showSizeChanger="true"
-                        showQuickJumper="true"
-                        hideOnSinglePage="true"
-                        :pageSize="pageSize2"
-                        :current="currentPage2"
-                        :total="tableDataTotal2"
-                        class="pagination"
-                        v-if="tabledata2 > 10"
-                      />
-                    </div>
-                  </div>
-                </div>
-              </a-tab-pane>
+            
             </a-tabs>
           </div>
         </div>
@@ -356,134 +194,7 @@
               </div>
             </div>
           </div>
-          <div class="line"></div>
-          <div class="tit">添加组织</div>
-          <div style="position: relative; min-height: 180px">
-            <div
-              style="position: relative; height: 160px"
-              class="selectedsBox"
-              id="selectedsBox1"
-            >
-              <div class="selecteds" id="selecteds1">
-                <!-- 遍历生成 -->
-                <div
-                  class="chose"
-                  v-for="item in chooseorganization1"
-                  :key="item.key"
-                >
-                  <div>{{ item.value }}</div>
-                  <div class="ch" @click="deleteChoosePeople1(item)"></div>
-                </div>
-              </div>
-            </div>
-            <div
-              class="chose"
-              style="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                font-size: 12px;
-                font-weight: 500;
-                color: #409eff;
-                line-height: 22px;
-              "
-              v-if="showMore1"
-              @click="morePeopleShow1"
-            >
-              <div>
-                查看更多
-                <img
-                  style="width: 10px; height: 12px; margin-top: -2px"
-                  src="../../assets/images/projectadd/go.png"
-                />
-              </div>
-            </div>
-            <div
-              class="chose"
-              style="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                font-size: 12px;
-                font-weight: 500;
-                color: #409eff;
-                line-height: 22px;
-              "
-              v-if="showHidden1"
-              @click="morePeopleHidden1"
-            >
-              <div>
-                收起
-                <img
-                  style="width: 10px; height: 12px; margin-top: -2px"
-                  src="../../assets/images/projectadd/pickUp.png"
-                />
-              </div>
-            </div>
-          </div>
-          <div class="line"></div>
-          <div class="tit">受众关联</div>
-          <div
-            style="position: relative; min-height: 180px; padding-bottom: 40px"
-          >
-            <div style="height: 160px" class="selectedsBox" id="selectedsBox2">
-              <div class="selecteds" id="selecteds2">
-                <!-- 遍历生成 -->
-                <div
-                  class="chose"
-                  v-for="item in relationpeople"
-                  :key="item.key"
-                >
-                  <div>{{ item.name }}</div>
-                  <div class="ch" @click="deleteRelationPeople(item)"></div>
-                </div>
-              </div>
-            </div>
-            <div
-              class="chose"
-              style="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                font-size: 12px;
-                font-weight: 500;
-                color: #409eff;
-                line-height: 22px;
-              "
-              v-if="showMore2"
-              @click="morePeopleShow2"
-            >
-              <div>
-                查看更多
-                <img
-                  style="width: 10px; height: 12px; margin-top: -2px"
-                  src="../../assets/images/projectadd/go.png"
-                />
-              </div>
-            </div>
-            <div
-              class="chose"
-              style="
-                display: flex;
-                justify-content: flex-end;
-                margin-right: 20px;
-                font-size: 12px;
-                font-weight: 500;
-                color: #409eff;
-                line-height: 22px;
-              "
-              v-if="showHidden2"
-              @click="morePeopleHidden2"
-            >
-              <div>
-                收起
-                <img
-                  style="width: 10px; height: 12px; margin-top: -2px"
-                  src="../../assets/images/projectadd/pickUp.png"
-                />
-              </div>
-            </div>
-          </div>
+          
         </div>
       </div>
       <div class="btnn">
@@ -492,44 +203,15 @@
       </div>
     </div>
 
-     <!-- 确认添加部门弹窗 -->
-    <a-modal
-      v-model:visible="showOrgModal"
-      :footer="null"
-      wrapClassName="confirmAddOrg"
-      centered="true"
-    >
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span>提示</span>
-            <div class="close_exit" @click="closeOrgModal"></div>
-          </div>
-          <div class="body">
-            <span>您确定要添加此组织吗</span>
-          </div>
-          <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeOrgModal">
-              <div class="btnText">取消</div>
-            </div>
-            <div class="del_btn btn2" @click="addOrg">
-              <div class="btnText">确定</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
-    <!-- 确认添加部门弹窗 -->
+ 
   </a-drawer>
 </template>
 
 <script>
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
 import elementResizeDetectorMaker from "element-resize-detector";
-import { message } from "ant-design-vue";
-import { toDate } from "../../api/method";
+// import { message } from "ant-design-vue";
+// import { toDate } from "../../api/method";
 export default {
   name: "OwnPower",
   props: {
@@ -885,136 +567,7 @@ export default {
         },
       ],
 
-      //受众关联table数据
-      tabledata2: [
-        {
-          key: 1,
-          name: "学习受众",
-          time: "1668410969",
-          number: "20",
-          type: "普通受众",
-        },
-        {
-          key: 2,
-          name: "案例受众",
-          time: "1668324569",
-          number: "10",
-          type: "普通受众",
-        },
-        {
-          key: 3,
-          name: "学习受众",
-          time: "1668238169",
-          number: "20",
-          type: "普通受众",
-        },
-        {
-          key: 4,
-          name: "显示受众",
-          time: "1668133769",
-          number: "30",
-          type: "普通受众2",
-        },
-        {
-          key: 5,
-          name: "惯例受众",
-          time: "1668047369",
-          number: "50",
-          type: "普通受众",
-        },
-        {
-          key: 6,
-          name: "管理受众",
-          time: "1667960969",
-          number: "20",
-          type: "普通受众",
-        },
-        {
-          key: 7,
-          name: "学习小组受众",
-          time: "1667874569",
-          number: "20",
-          type: "普通受众",
-        },
-        {
-          key: 8,
-          name: "学习受众",
-          time: "1667701769",
-          number: "10",
-          type: "普通受众",
-        },
-        {
-          key: 9,
-          name: "案例受众",
-          time: "1667442569",
-          number: "5",
-          type: "普通受众",
-        },
-        {
-          key: 10,
-          name: "项目受众",
-          time: "1667262569",
-          number: "25",
-          type: "普通受众",
-        },
-      ],
-      tablecolumns2: [
-        {
-          title: "受众名称",
-          dataIndex: "name",
-          key: "name",
-          width: 30,
-          align: "left",
-          className: "h",
-        },
-        {
-          title: "创建时间",
-          dataIndex: "time",
-          key: "time",
-          width: 35,
-          align: "center",
-          className: "h",
-          sorter: {
-            compare: (a, b) => a.time - b.time,
-            multiple: 3,
-          },
-          scopedSlots: { customRender: "action" }, //引入的插槽
-          customRender: (text) => {
-            // console.log(text.record.checked1);
-            return (
-              <div class="racona">
-                <span> {toDate(Number(text.record.time), "Y-M-D h:m:s")}</span>
-              </div>
-            );
-          },
-        },
-        {
-          title: "人数",
-          dataIndex: "number",
-          key: "number",
-          width: 30,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "类型",
-          dataIndex: "type",
-          key: "type",
-          width: 40,
-          align: "center",
-          className: "h",
-        },
-      ],
-      organizeList1: [
-        {
-          value: "产品受众群体",
-          label: "产品受众群体",
-        },
-        {
-          value: "人力资源hrbp",
-          label: "人力资源hrbp",
-        },
-      ],
+     
       //快速选人-------------------------------------
       valueSelectboe: null, //快速选人的选择组织
       choosepeople: [], //总的数组
@@ -1023,23 +576,7 @@ export default {
       showHidden: false, //是否显示收回
       selectedRowKeys: [], //表格选中的key
       //快速选人-------------------------------------
-      //添加组织-------------------------------------
-
-      selectedKeys1: [], //选中部门的key
-      chooseorganization: [], //添加组织的选择组织
-      chooseorganization1: [], //显示到右侧的数组
-      showMore1: false, //是否显示添加组织的查看更多
-      showHidden1: false, //是否显示添加组织的收回
-
-      showOrgModal: false, //确认弹窗
-      //添加组织-------------------------------------
-
-      //受众关联-------------------------------------
-      relationpeople: [], //总的数组
-      showMore2: false, //是否显示快速选人的查看更多
-      showHidden2: false, //是否显示收回
-      selectedRowKeys2: [], //表格选中的key
-      //受众关联-------------------------------------
+     
     });
     const closeDrawer = () => {
       state.activeKey = "1";
@@ -1153,217 +690,7 @@ export default {
 
     // 结束 快速选人------------------------------------------------------------------
 
-    // 开始 添加组织------------------------------------------------------------------
-    //选中部门
-    const departmentSelect1 = (e, k) => {
-      console.log("选中的部门", e, k);
-      if (!k.node.children) {
-        state.selectedKeys1 = e.reverse();
-        if (k.selected) {
-          state.chooseorganization.unshift(k.node);
-        } else {
-          for (let i = 0; i < state.chooseorganization.length; i++) {
-            if (state.chooseorganization[i].key === k.node.key) {
-              state.chooseorganization.splice(i, 1);
-            }
-          }
-        }
-      }
-
-      // console.log("选中的部门2", state.selectedKeys1, state.chooseorganization);
-    };
-    //点击确认添加-判断是否显示确定弹窗
-    const addOrgModal = () => {
-      if (state.chooseorganization.length === 0) {
-        message.destroy();
-        message.warning("请选择部门");
-      } else {
-        state.showOrgModal = true;
-      }
-    };
-    //确定添加
-    const addOrg = () => {
-      console.log("chooseorganization", state.chooseorganization);
-      state.chooseorganization1 = state.chooseorganization;
-      selectedsHeight1();
-      state.showOrgModal = false;
-    };
-    //取消添加
-    const closeOrgModal = () => {
-      state.showOrgModal = false;
-    };
-
-    //单个删除选中的人
-    const deleteChoosePeople1 = (item) => {
-      console.log("item", item);
-      let arr = state.chooseorganization;
-      for (let i = 0; i < arr.length; i++) {
-        if (arr[i].key === item.key) {
-          arr.splice(i, 1);
-        }
-      }
-      state.chooseorganization = arr;
-      let array = state.selectedKeys1;
-      for (let i = 0; i < array.length; i++) {
-        if (array[i] === item.key) {
-          array.splice(i, 1);
-        }
-      }
-      state.selectedKeys1 = array;
-      console.log("state.selectedKeys1", state.selectedKeys1);
-    };
-
-    //根据右侧快速选人高度，判断是否显示更多
-    const selectedsHeight1 = () => {
-      let resize = elementResizeDetectorMaker();
-      resize.listenTo(
-        document.getElementById("ownpower").querySelector("#selecteds1"),
-        function (ele) {
-          console.log("ele", ele.offsetHeight);
-          if (ele.offsetHeight > 160 && !state.showHidden1) {
-            state.showMore1 = true;
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox1").style.overflow = "hidden";
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox1").style.height = "160px";
-          } else if (ele.offsetHeight < 160) {
-            state.showMore1 = false;
-            state.showHidden1 = false;
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox1").style.overflow = "hidden";
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox1").style.height = "160px";
-          }
-        }
-      );
-    };
-    const morePeopleShow1 = () => {
-      state.showMore1 = false;
-      state.showHidden1 = true;
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox1").style.overflow = "";
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox1").style.height = "";
-    };
-    const morePeopleHidden1 = () => {
-      state.showMore1 = true;
-      state.showHidden1 = false;
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox1").style.overflow = "hidden";
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox1").style.height = "160px";
-    };
-    //搜索组织
-    const searchOrg = () => {
-      let treeTitle = document
-        .getElementById("ownpower")
-        .querySelector(".treeMain2")
-        .querySelectorAll(".ant-tree-title");
-      if (state.com) {
-        for (let i = 0; i < treeTitle.length; i++) {
-          if (state.com === treeTitle[i].innerHTML) {
-            document
-              .getElementById("ownpower")
-              .querySelector(".treeMain2")
-              .scrollTo(0, treeTitle[i].offsetTop + 28 * i);
-            return;
-          } else if (i == treeTitle.length - 1) {
-            message.destroy();
-            message.warning("未找到该部门");
-          }
-        }
-      } else {
-        message.destroy();
-        message.warning("请输入组织名称");
-      }
-    };
-    // 结束 添加组织------------------------------------------------------------------
-
-    // 开始 受众关联------------------------------------------------------------------
-
-    //受众关联 选中的数组
-    const onSelectChange2 = (selectedRowKeys, item) => {
-      // console.log("selectedRowKeys changed: ", selectedRowKeys,item);
-      state.selectedRowKeys2 = selectedRowKeys;
-      state.relationpeople = item.reverse();
-      selectedsHeight2();
-    };
-    //单个删除选中的人
-    const deleteChoosePeople2 = (item) => {
-      let arr = state.relationpeople;
-      for (let i = 0; i < arr.length; i++) {
-        if (arr[i].key === item.key) {
-          arr.splice(i, 1);
-        }
-      }
-      state.relationpeople = arr;
-      let array = state.selectedRowKeys2;
-      for (let i = 0; i < array.length; i++) {
-        if (array[i] === item.key) {
-          array.splice(i, 1);
-        }
-      }
-      state.selectedRowKeys2 = array;
-      console.log("");
-    };
-    //根据右侧快速选人高度，判断是否显示更多
-    const selectedsHeight2 = () => {
-      let resize = elementResizeDetectorMaker();
-      resize.listenTo(
-        document.getElementById("ownpower").querySelector("#selecteds2"),
-        function (ele) {
-          console.log("ele", ele.offsetHeight);
-          if (ele.offsetHeight > 160 && !state.showHidden2) {
-            state.showMore2 = true;
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox2").style.overflow = "hidden";
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox2").style.height = "160px";
-          } else if (ele.offsetHeight < 160) {
-            state.showMore2 = false;
-            state.showHidden2 = false;
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox2").style.overflow = "hidden";
-            document
-              .getElementById("ownpower")
-              .querySelector("#selectedsBox2").style.height = "160px";
-          }
-        }
-      );
-    };
-    const morePeopleShow2 = () => {
-      state.showMore2 = false;
-      state.showHidden2 = true;
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox2").style.overflow = "";
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox2").style.height = "";
-    };
-    const morePeopleHidden2 = () => {
-      state.showMore2 = true;
-      state.showHidden2 = false;
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox2").style.overflow = "hidden";
-      document
-        .getElementById("ownpower")
-        .querySelector("#selectedsBox2").style.height = "160px";
-    };
-
-    // 结束 受众关联------------------------------------------------------------------
+  
 
     //全部清除
     const deleteAll = () => {
@@ -1374,30 +701,13 @@ export default {
       state.showHidden = false; //是否显示收回
       state.selectedRowKeys = []; //表格选中的key
       //快速选人-------------------------------------
-      //添加组织-------------------------------------
-
-      state.selectedKeys1 = []; //选中部门的key
-      state.chooseorganization = []; //添加组织的选择组织
-      state.chooseorganization1 = []; //显示到右侧的数组
-      state.showMore1 = false; //是否显示添加组织的查看更多
-      state.showHidden1 = false; //是否显示添加组织的收回
-
-      state.showOrgModal = false; //确认弹窗
-      //添加组织-------------------------------------
-
-      //受众关联-------------------------------------
-      state.relationpeople = []; //总的数组
-      state.showMore2 = false; //是否显示快速选人的查看更多
-      state.showHidden2 = false; //是否显示收回
-      state.selectedRowKeys2 = []; //表格选中的key
-      //受众关联-------------------------------------
+     
     };
     return {
      ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       onSelectChange,
-      onSelectChange2,
       // change,
       departmentSelect,
       deleteChoosePeople,
@@ -1405,23 +715,10 @@ export default {
       morePeopleShow,
       morePeopleHidden,
 
-      departmentSelect1,
-      addOrgModal,
-      addOrg,
-      closeOrgModal,
-      selectedsHeight1,
-      morePeopleShow1,
-      morePeopleHidden1,
-      deleteChoosePeople1,
-
-      selectedsHeight2,
-      morePeopleShow2,
-      morePeopleHidden2,
-      deleteChoosePeople2,
+    
 
       deleteAll,
 
-      searchOrg,
     };
   },
 };
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 6ca6b5d4..0221c0fe 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -38,13 +38,13 @@
           />
         </div>
         <div style="display: flex; margin-bottom: 20px">
-          <div class="btn btn1">
+          <div class="btn btn1" @click="searchLearnPath">
             <div class="search"></div>
-            <div class="btnText" @click="searchLearnPath">搜索</div>
+            <div class="btnText" >搜索</div>
           </div>
-          <div class="btnn btn2">
+          <div class="btnn btn2" @click="resetLearnPath">
             <div class="search"></div>
-            <div class="btnText" @click="resetLearnPath">重置</div>
+            <div class="btnText" >重置</div>
           </div>
         </div>
       </div>
@@ -1349,7 +1349,7 @@ export default {
         .getLearnPath(obj)
         .then((res) => {
           if (res.status === 200) {
-            // console.log("获取路径列表数据", res.data.data);
+            console.log("获取路径列表数据", res.data.data);
             let arr = res.data.data.rows;
             if (
               arr.length === 0 &&
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index e21cafdd..9d48e5f9 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -1,44 +1,73 @@
 <!---- 创建项目页面 --->
 <template>
-	<div class="projectAdd">
-		<div class="header">
-			<span class="title">创建/编辑单层项目</span>
-			<div @click="backPage" style="cursor: pointer;" to="/projectmanage" class="goback">
-				<span class="return"></span><span class="returntext">返回</span>
-			</div>
-		</div>
-		<div class="content">
-			<div class="main">
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目名称</div>
-					</div>
-					<div class="in">
-						<a-input v-model:value="projectName" placeholder="请输入项目名称" show-count :maxlength="30" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">分类</div>
-					</div>
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect" placeholder="四个养成" style="width: 100%" :options="classifyList"
-							@change="classificationChange" allowClear showSearch>
-						</a-select>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">封面图</div>
-					</div>
-					<div class="box" style="
+  <div class="projectAdd">
+    <div class="header">
+      <span class="title">创建/编辑单层项目</span>
+      <div
+        @click="backPage"
+        style="cursor: pointer"
+        to="/projectmanage"
+        class="goback"
+      >
+        <span class="return"></span><span class="returntext">返回</span>
+      </div>
+    </div>
+    <div class="content">
+      <div class="main">
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目名称</div>
+          </div>
+          <div class="in">
+            <a-input
+              v-model:value="projectName"
+              placeholder="请输入项目名称"
+              show-count
+              :maxlength="30"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">分类</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect"
+              placeholder="四个养成"
+              style="width: 100%"
+              :options="classifyList"
+              @change="classificationChange"
+              allowClear
+              showSearch
+            >
+            </a-select>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">封面图</div>
+          </div>
+          <div
+            class="box"
+            style="
               width: 100px;
               height: 100px;
               border: 1px solid rgba(78, 166, 255, 1);
@@ -46,128 +75,205 @@
               cursor: pointer;
               position: relative;
               overflow: hidden;
-            ">
-						<a-upload v-model:file-list="fileList" name="file" list-type="picture-card" class="avatar-uploader"
-							:show-upload-list="false" action="/api/file/upload" :before-upload="beforeUpload" @change="handleChange">
-							<img style="
+            "
+          >
+            <a-upload
+              v-model:file-list="fileList"
+              name="file"
+              list-type="picture-card"
+              class="avatar-uploader"
+              :show-upload-list="false"
+              action="/api/file/upload"
+              :before-upload="beforeUpload"
+              @change="handleChange"
+            >
+              <img
+                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
-                " v-if="imageUrl" :src="imageUrl" alt="avatar" />
-							<div v-else>
-								<!-- <loading-outlined v-if="loading"></loading-outlined> -->
-								<!-- <plus-outlined v-else></plus-outlined> -->
-								<div class="box1"></div>
-								<div class="box2"></div>
-								<!-- <div class="ant-upload-text"></div> -->
-							</div>
-						</a-upload>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目时间</div>
-					</div>
+                "
+                v-if="imageUrl"
+                :src="imageUrl"
+                alt="avatar"
+              />
+              <div v-else>
+                <!-- <loading-outlined v-if="loading"></loading-outlined> -->
+                <!-- <plus-outlined v-else></plus-outlined> -->
+                <div class="box1"></div>
+                <div class="box2"></div>
+                <!-- <div class="ant-upload-text"></div> -->
+              </div>
+            </a-upload>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目时间</div>
+          </div>
 
-					<div class="in">
-						<a-range-picker separator="至" :placeholder="['      开始时间', '        结束时间']" v-model:value="rangevalue"
-							style="width: 100%;  height: 40px; border-radius: 5px" @change="onRangeChange" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目经理</div>
-					</div>
-					<div class="in">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" :value="classifySelect1" mode="multiple" placeholder="请选择项目经理" style="width: 100%" :options="classifyList1"
-							@change="classificationChange1" allowClear showSearch>
-						</a-select>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">资源归属</div>
-					</div>
+          <div class="in">
+            <a-range-picker
+              separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
+              v-model:value="rangevalue"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              @change="onRangeChange"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目经理</div>
+          </div>
+          <div class="in">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              :value="classifySelect1"
+              mode="multiple"
+              placeholder="请选择项目经理"
+              style="width: 100%"
+              :options="classifyList1"
+              @change="classificationChange1"
+              allowClear
+              showSearch
+            >
+            </a-select>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">资源归属</div>
+          </div>
 
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect2" placeholder="自动带出 可修改" :options="classifyList2"
-							@change="classificationChange2" />
-					</div>
-				</div>
-				<div class="name name2">
-					<div class="namebox">
-						<div class="inname" style="margin-top: 13px">项目说明</div>
-					</div>
-					<div class="in">
-						<a-textarea v-model:value="remark" style="height: 80px" placeholder="请输入说明" show-count :maxlength="200" />
-					</div>
-				</div>
-				<div class="name name2">
-					<div class="namebox">
-						<div class="inname">同步学习记录</div>
-					</div>
-					<div class="in">
-						<a-radio @click="changeChecked" v-model:checked="checked"><span style="
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect2"
+              placeholder="自动带出 可修改"
+              :options="classifyList2"
+              @change="classificationChange2"
+            />
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">项目说明</div>
+          </div>
+          <div class="in">
+            <a-textarea
+              v-model:value="remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+            />
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-radio @click="changeChecked" v-model:checked="checked"
+              ><span
+                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                ">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目级别</div>
-					</div>
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect3" :options="classifyList3" @change="classificationChange3"
-							placeholder="集团级/组织级/现地级/部门级" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">培训体系</div>
-					</div>
-					<div class="in select">
-						<a-select :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect4" :options="classifyList4" @change="classificationChange4"
-							placeholder="集团级/组织级/现地级/部门级" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">是否BOEU实施</div>
-					</div>
-					<div class="in">
-						<a-radio @click="changeChecked1" v-model:checked="checked1"><span style="
+                "
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-radio
+            >
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目级别</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect3"
+              :options="classifyList3"
+              @change="classificationChange3"
+              placeholder="集团级/组织级/现地级/部门级"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">培训体系</div>
+          </div>
+          <div class="in select">
+            <a-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect4"
+              :options="classifyList4"
+              @change="classificationChange4"
+              placeholder="集团级/组织级/现地级/部门级"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">是否BOEU实施</div>
+          </div>
+          <div class="in">
+            <a-radio @click="changeChecked1" v-model:checked="checked1"
+              ><span
+                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                ">BOEU实施</span></a-radio>
-					</div>
-				</div>
-				<!-- <div class="name name2">
+                "
+                >BOEU实施</span
+              ></a-radio
+            >
+          </div>
+        </div>
+        <!-- <div class="name name2">
 					<div class="namebox" style="margin-top: 8px">
 						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
 						<div class="inname">附件</div>
@@ -186,904 +292,1050 @@
 						</div>
 					</div>
 				</div> -->
-			</div>
-			<div class="template">
-				<div class="name">
-					<div class="inname" style="width: 50px">模版</div>
-					<div class="in select" style="margin-left: 2px">
-						<a-select v-if="isEdit" disabled="true" :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
-							@change="classificationChange5">
-						</a-select>
-						<a-select v-else :getPopupContainer="
-							(triggerNode) => {
-								return triggerNode.parentNode || document.body;
-							}
-						" v-model:value="classifySelect5" placeholder="请选择模版" :size="size" style="width: 100%" :options="classifyList5"
-							@change="classificationChange5">
-						</a-select>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="footer">
-			<div class="btn">
-				<a-button v-on:click="createProject" type="primary" class="btn1">确定</a-button>
-				<a-button @click="backPage" class="btn2">取消</a-button>
-			</div>
-		</div>
-	</div>
+      </div>
+      <div class="template">
+        <div class="name">
+          <div class="inname" style="width: 50px">模版</div>
+          <div class="in select" style="margin-left: 2px">
+            <a-select
+              v-if="isEdit"
+              disabled="true"
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect5"
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+            >
+            </a-select>
+            <a-select
+              v-else
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect5"
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+              @popupScroll="templateScroll"
+            >
+            </a-select>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="footer">
+      <div class="btn">
+        <a-button v-on:click="createProject" type="primary" class="btn1"
+          >确定</a-button
+        >
+        <a-button @click="backPage" class="btn2">取消</a-button>
+      </div>
+    </div>
+  </div>
 </template>
 <script>
 import { reactive, toRefs, ref } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 import * as api from "../../api/index";
-import { storage } from '../../api/storage';
-import { toDate } from '../../api/method'
+import { storage } from "../../api/storage";
+import { toDate } from "../../api/method";
 
 export default {
-	name: "projectAdd",
-	setup() {
-		// 编辑页面跳转过来时候，自动填充表格
-		const routers = useRoute();
-		const isEdit = ref(false);
-		let peojectID = "";
+  name: "projectAdd",
+  setup() {
+    // 编辑页面跳转过来时候，自动填充表格
+    const routers = useRoute();
+    const isEdit = ref(false);
+    let peojectID = "";
 
-		if (routers.query.projectId) {
-			storage.set("projectAddId", routers.query.projectId);
-			isEdit.value = true;
-			peojectID = routers.query.projectId;
-			// 需要编辑
-			api.getProjectDetail({ projectId: routers.query.projectId }).then(res => {
-				if (res.status == 200 && res.data.code == 200) {
-					let info = res.data.data.projectInfo;
-					console.log(info)
-					// projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-					projectName.value = info.name;
-					state.classifySelect = classifyList.value[1]; // info.category
-					imageUrl.value = info.picUrl;
+    if (routers.query.projectId) {
+      storage.set("projectAddId", routers.query.projectId);
+      isEdit.value = true;
+      peojectID = routers.query.projectId;
+      // 需要编辑
+      api
+        .getProjectDetail({ projectId: routers.query.projectId })
+        .then((res) => {
+          if (res.status == 200 && res.data.code == 200) {
+            let info = res.data.data.projectInfo;
+            console.log(info);
+            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+            projectName.value = info.name;
+            state.classifySelect = classifyList.value[1]; // info.category
+            imageUrl.value = info.picUrl;
 
-					let start = toDate(info.beginTime/1000,'YYYY/MM/DD');
-					let end = toDate(info.endTime/1000,'YYYY/MM/DD');
-					state.rangevalue = [
-						dayjs(start, 'YYYY/MM/DD'),
-						dayjs(end, 'YYYY/MM/DD'),
-					];
+            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+            state.rangevalue = [
+              dayjs(start, "YYYY/MM/DD"),
+              dayjs(end, "YYYY/MM/DD"),
+            ];
 
-					let manageName = info.manager.split(",");
-					let manageValue = info.managerId.split(",");
-					let optionsManage = []
-					for (let i = 0; i < manageName.length; i++) {
-						let obj = {
-							label: manageName[i],
-							value: manageValue[i]
-						}
-						optionsManage.push(obj)
-					}
-					console.log(optionsManage)
-					state.classifySelect1 = optionsManage;
-					state.classifySelect2 = classifyList2.value[info.sourceBelongId - 1];
-					remark.value = info.remark;
-					state.checked = info.boeFlag ? info.boeFlag : false;
-					state.classifySelect3 = classifyList3.value[info.level];
-					state.classifySelect4 = classifyList4.value[info.systemId - 1];
-					state.checked1 = info.boeFlag ? info.boeFlag : false;
-					// fileList1.value = info.attach.split(",");
+            let manageName = info.manager.split(",");
+            let manageValue = info.managerId.split(",");
+            let optionsManage = [];
+            for (let i = 0; i < manageName.length; i++) {
+              let obj = {
+                label: manageName[i],
+                value: manageValue[i],
+              };
+              optionsManage.push(obj);
+            }
+            console.log(optionsManage);
+            state.classifySelect1 = optionsManage;
+            state.classifySelect2 =
+              classifyList2.value[info.sourceBelongId - 1];
+            remark.value = info.remark;
+            state.checked = info.boeFlag ? info.boeFlag : false;
+            state.classifySelect3 = classifyList3.value[info.level];
+            state.classifySelect4 = classifyList4.value[info.systemId - 1];
+            state.checked1 = info.boeFlag ? info.boeFlag : false;
+            // fileList1.value = info.attach.split(",");
 
-					projectType = 1;
-					picUrl  = info.picUrl; 
-					beginTime = Number(info.beginTime/1000);
-					endTime   = Number(info.endTime/1000);
-					manager   = info.manager;
-					managerId  = info.managerId;
-					sourceBelongIdC  = Number(info.sourceBelongId);
-					courseSyncFlag  = info.courseSyncFlag; 
-					levels  = info.level;
-					systemid = info.systemId;
-					boeFlag = info.boeFlag;
-				}
-			}).catch(err => { console.log(err) })
-		} else {
-			if (storage.get("projectAddId")) {
-				isEdit.value = true;
-				peojectID = storage.get("projectAddId");
-				// 需要编辑
-				api.getProjectDetail({ projectId: storage.get("projectAddId") }).then(res => {
-					if (res.status == 200 && res.data.code == 200) {
-						let info = res.data.data.projectInfo;
-						console.log("我是从本地存储获取的id", info)
-						projectName.value = info.name;
-					state.classifySelect = classifyList.value[1]; // info.category
-					imageUrl.value = info.picUrl;
+            projectType = 1;
+            picUrl = info.picUrl;
+            beginTime = Number(info.beginTime / 1000);
+            endTime = Number(info.endTime / 1000);
+            manager = info.manager;
+            managerId = info.managerId;
+            sourceBelongIdC = Number(info.sourceBelongId);
+            courseSyncFlag = info.courseSyncFlag;
+            levels = info.level;
+            systemid = info.systemId;
+            boeFlag = info.boeFlag;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    } else {
+      if (storage.get("projectAddId")) {
+        isEdit.value = true;
+        peojectID = storage.get("projectAddId");
+        // 需要编辑
+        api
+          .getProjectDetail({ projectId: storage.get("projectAddId") })
+          .then((res) => {
+            if (res.status == 200 && res.data.code == 200) {
+              let info = res.data.data.projectInfo;
+              console.log("我是从本地存储获取的id", info);
+              projectName.value = info.name;
+              state.classifySelect = classifyList.value[1]; // info.category
+              imageUrl.value = info.picUrl;
 
-					let start = toDate(info.beginTime/1000,'YYYY/MM/DD');
-					let end = toDate(info.endTime/1000,'YYYY/MM/DD');
-					state.rangevalue = [
-						dayjs(start, 'YYYY/MM/DD'),
-						dayjs(end, 'YYYY/MM/DD'),
-					];
+              let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+              let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+              state.rangevalue = [
+                dayjs(start, "YYYY/MM/DD"),
+                dayjs(end, "YYYY/MM/DD"),
+              ];
 
-					let manageName = info.manager.split(",");
-					let manageValue = info.managerId.split(",");
-					let optionsManage = []
-					for (let i = 0; i < manageName.length; i++) {
-						let obj = {
-							label: manageName[i],
-							value: manageValue[i]
-						}
-						optionsManage.push(obj)
-					}
-					console.log(optionsManage)
-					state.classifySelect1 = optionsManage;
-					state.classifySelect2 = classifyList2.value[info.sourceBelongId - 1];
-					remark.value = info.remark;
-					state.checked = info.boeFlag ? info.boeFlag : false;
-					state.classifySelect3 = classifyList3.value[info.level];
-					state.classifySelect4 = classifyList4.value[info.systemId - 1];
-					state.checked1 = info.boeFlag ? info.boeFlag : false;
+              let manageName = info.manager.split(",");
+              let manageValue = info.managerId.split(",");
+              let optionsManage = [];
+              for (let i = 0; i < manageName.length; i++) {
+                let obj = {
+                  label: manageName[i],
+                  value: manageValue[i],
+                };
+                optionsManage.push(obj);
+              }
+              console.log(optionsManage);
+              state.classifySelect1 = optionsManage;
+              state.classifySelect2 =
+                classifyList2.value[info.sourceBelongId - 1];
+              remark.value = info.remark;
+              state.checked = info.boeFlag ? info.boeFlag : false;
+              state.classifySelect3 = classifyList3.value[info.level];
+              state.classifySelect4 = classifyList4.value[info.systemId - 1];
+              state.checked1 = info.boeFlag ? info.boeFlag : false;
 
-					projectType = 1;
-					picUrl  = info.picUrl; 
-					beginTime = Number(info.beginTime/1000);
-					endTime   = Number(info.endTime/1000);
-					manager   = info.manager;
-					managerId  = info.managerId;
-					sourceBelongIdC  = Number(info.sourceBelongId);
-					courseSyncFlag  = info.courseSyncFlag; 
-					levels  = info.level;
-					systemid = info.systemId;
-					boeFlag = info.boeFlag;
-					}
-				}).catch(err => { console.log(err) })
-			}
-		}
+              projectType = 1;
+              picUrl = info.picUrl;
+              beginTime = Number(info.beginTime / 1000);
+              endTime = Number(info.endTime / 1000);
+              manager = info.manager;
+              managerId = info.managerId;
+              sourceBelongIdC = Number(info.sourceBelongId);
+              courseSyncFlag = info.courseSyncFlag;
+              levels = info.level;
+              systemid = info.systemId;
+              boeFlag = info.boeFlag;
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    }
 
-		const backPage = () => {
-			storage.remove("projectAddId");
-			setTimeout(() => {
-				router.push({
-					path: "/projectmanage"
-				});
-			}, 400);
-		}
+    const backPage = () => {
+      storage.remove("projectAddId");
+      setTimeout(() => {
+        router.push({
+          path: "/projectmanage",
+        });
+      }, 400);
+    };
 
-		const router = useRouter();
-		const state = reactive({
-			classifySelect: null,
-			classifySelectId: null,
-			checked: false,
-			checked1: false,
-			valueE: null,
-			valueE1: null,
-			valueE2: null,
-			classifySelect1: [],
-			classifySelect2: [],
-			classifySelect3: [],
-			classifySelect4: [],
-			rangevalue: []
-		});
+    const router = useRouter();
+    const state = reactive({
+      classifySelect: null,
+      classifySelectId: null,
+      checked: false,
+      checked1: false,
+      valueE: null,
+      valueE1: null,
+      valueE2: null,
+      classifySelect1: [],
+      classifySelect2: [],
+      classifySelect3: [],
+      classifySelect4: [],
+      rangevalue: [],
 
-		const projectName = ref("");
+      currentPage: 1, //当前页
+      tableDataTotal: -1, //模版列表总数
+      pageSize: 10, //每页10条数据
+      totalPages: 0, //总页数
+    });
 
-		const classifyList = ref([
-			{ value: 1, label: "管理者" },
-			{ value: 2, label: "领军者" },
-			{ value: 3, label: "产业人" },
-		]);
+    const projectName = ref("");
 
-		let projectType = "";
+    const classifyList = ref([
+      { value: 1, label: "管理者" },
+      { value: 2, label: "领军者" },
+      { value: 3, label: "产业人" },
+    ]);
 
-		const classificationChange = (value) => {
-			console.log(`selected ${value}`);
-			projectType = value;
-		};
+    let projectType = "";
 
-		function getBase64(img, callback) {
-			const reader = new FileReader();
-			reader.addEventListener("load", () => callback(reader.result));
-			reader.readAsDataURL(img);
-		}
+    const classificationChange = (value) => {
+      console.log(`selected ${value}`);
+      projectType = value;
+    };
 
-		const fileList = ref([]);
-		const fileList1 = ref([]);
-		const loading = ref(false);
-		const imageUrl = ref("");
-		let picUrl = "";
+    function getBase64(img, callback) {
+      const reader = new FileReader();
+      reader.addEventListener("load", () => callback(reader.result));
+      reader.readAsDataURL(img);
+    }
 
-		const handleChange = (info) => {
-			if (info.file.status === "uploading") {
-				loading.value = true;
-				return;
-			}
-			if (info.file.status === "done") {
-				console.log("上传图片返回的信息 %o", info);
-				picUrl = info.file.response.data;
-				// Get this url from response in real world.
-				getBase64(info.file.originFileObj, (base64Url) => {
-					imageUrl.value = base64Url;
-					loading.value = false;
-				});
-			}
-			if (info.file.status === "error") {
-				loading.value = false;
-				message.error("upload error");
-			}
-		};
+    const fileList = ref([]);
+    const fileList1 = ref([]);
+    const loading = ref(false);
+    const imageUrl = ref("");
+    let picUrl = "";
 
-		let uplodaFileCount = false;
+    const handleChange = (info) => {
+      if (info.file.status === "uploading") {
+        loading.value = true;
+        return;
+      }
+      if (info.file.status === "done") {
+        console.log("上传图片返回的信息 %o", info);
+        picUrl = info.file.response.data;
+        // Get this url from response in real world.
+        getBase64(info.file.originFileObj, (base64Url) => {
+          imageUrl.value = base64Url;
+          loading.value = false;
+        });
+      }
+      if (info.file.status === "error") {
+        loading.value = false;
+        message.error("upload error");
+      }
+    };
 
-		let attach = "";
-		let attachData = "";
-		const handleChange1 = (info) => {
-			if (info.file.status === "uploading") {
-				loading.value = true;
-				return;
-			}
-			if (info.file.status === "done") {
-				console.log(
-					"上传附件返回的信息 %o",
-					info,
-					info.fileList.length,
-					uplodaFileCount
-				);
+    let uplodaFileCount = false;
 
-				let attachStr = "";
-				attachData = info.fileList;
-				for (let i = 0; i < attachData.length; i++) {
-					if (attachData.length - 1 == i) {
-						attachStr += attachData[i].response.data;
-					} else {
-						attachStr += attachData[i].response.data + ",";
-					}
-				}
-				console.log(attachStr);
-				attach = attachStr;
+    let attach = "";
+    let attachData = "";
+    const handleChange1 = (info) => {
+      if (info.file.status === "uploading") {
+        loading.value = true;
+        return;
+      }
+      if (info.file.status === "done") {
+        console.log(
+          "上传附件返回的信息 %o",
+          info,
+          info.fileList.length,
+          uplodaFileCount
+        );
 
-				if (info.fileList.length > 5) {
-					uplodaFileCount = true;
-				} else {
-					uplodaFileCount = false;
-				}
-			}
-			if (info.file.status === "error") {
-				loading.value = false;
-				message.error("upload error");
-			}
-		};
+        let attachStr = "";
+        attachData = info.fileList;
+        for (let i = 0; i < attachData.length; i++) {
+          if (attachData.length - 1 == i) {
+            attachStr += attachData[i].response.data;
+          } else {
+            attachStr += attachData[i].response.data + ",";
+          }
+        }
+        console.log(attachStr);
+        attach = attachStr;
 
-		const beforeUpload = (file) => {
-			const isJpgOrPng =
-				file.type === "image/jpeg" || file.type === "image/png";
-			if (!isJpgOrPng) {
-				message.error("You can only upload JPG file!");
-			}
-			const isLt2M = file.size / 1024 / 1024 < 1;
-			if (!isLt2M) {
-				message.error("Image must smaller than 1MB!");
-			}
-			return isJpgOrPng && isLt2M;
-		};
+        if (info.fileList.length > 5) {
+          uplodaFileCount = true;
+        } else {
+          uplodaFileCount = false;
+        }
+      }
+      if (info.file.status === "error") {
+        loading.value = false;
+        message.error("upload error");
+      }
+    };
 
-		const beforeUpload1 = () => {
-			return new Promise((resovle, reject) => {
-				if (uplodaFileCount) {
-					message.info("上传文件数量已达最大数量");
-					return reject(false);
-				}
-				return resovle(true);
-			});
-		};
+    const beforeUpload = (file) => {
+      const isJpgOrPng =
+        file.type === "image/jpeg" || file.type === "image/png";
+      if (!isJpgOrPng) {
+        message.error("You can only upload JPG file!");
+      }
+      const isLt2M = file.size / 1024 / 1024 < 1;
+      if (!isLt2M) {
+        message.error("Image must smaller than 1MB!");
+      }
+      return isJpgOrPng && isLt2M;
+    };
 
-		let beginTime = "";
-		let endTime = "";
-		const dateFormatList = ['YYYY/MM/DD'];
+    const beforeUpload1 = () => {
+      return new Promise((resovle, reject) => {
+        if (uplodaFileCount) {
+          message.info("上传文件数量已达最大数量");
+          return reject(false);
+        }
+        return resovle(true);
+      });
+    };
 
-		const onRangeChange = (value, dateString) => {
-			console.log("Selected Time: ", value);
-			// 项目时间选择函数
-			console.log("Formatted Selected Time: ", dateString);
-			console.log(
-				"Formatted Selected TimeStamp",
-				new Date(dateString[0]).getTime()
-			);
-			beginTime = new Date(dateString[0]).getTime() / 1000;
-			endTime = new Date(dateString[1]).getTime() / 1000;
-		};
+    let beginTime = "";
+    let endTime = "";
+    const dateFormatList = ["YYYY/MM/DD"];
 
-		// 项目经理 后续接口调用
-		const classifyList1 = ref([
-			{ value: 1, label: "李俊国" },
-			{ value: 2, label: "将小米" },
-			{ value: 3, label: "刘孟君" },
-		]);
+    const onRangeChange = (value, dateString) => {
+      console.log("Selected Time: ", value);
+      // 项目时间选择函数
+      console.log("Formatted Selected Time: ", dateString);
+      console.log(
+        "Formatted Selected TimeStamp",
+        new Date(dateString[0]).getTime()
+      );
+      beginTime = new Date(dateString[0]).getTime() / 1000;
+      endTime = new Date(dateString[1]).getTime() / 1000;
+    };
 
-		let manager = "";
-		let managerId = "";
-		const classificationChange1 = (key, options) => {
-			console.log(`selected ${key}`, options);
-			let mstr = "";
-			let midstr = "";
-			for (let i = 0; i < key.length; i++) {
-				if (key.length - 1 !== i) {
-					midstr += key[i] + ",";
-					mstr += classifyList1.value[i].label + ",";
-				} else {
-					midstr += key[i];
-					mstr += classifyList1.value[i].label;
-				}
-			}
-			console.log(mstr, midstr);
-			state.classifySelect1 = options;
-			let newoptions = [];
-			for (let i = 0; i < state.classifySelect1.length; i++) {
-				if (state.classifySelect1[i].value) {
-					newoptions.push(state.classifySelect1[i])
-				}
-			}
-			state.classifySelect1 = newoptions;
-			manager = mstr;
-			managerId = midstr;
-		};
+    // 项目经理 后续接口调用
+    const classifyList1 = ref([
+      { value: 1, label: "李俊国" },
+      { value: 2, label: "将小米" },
+      { value: 3, label: "刘孟君" },
+    ]);
 
-		// 资源归属 sourceBelongId 后续给接口
-		const classifyList2 = ref([
-			{ value: 1, label: "项目一" },
-			{ value: 2, label: "项目二" },
-			{ value: 3, label: "项目三" },
-		]);
+    let manager = "";
+    let managerId = "";
+    const classificationChange1 = (key, options) => {
+      console.log(`selected ${key}`, options);
+      let mstr = "";
+      let midstr = "";
+      for (let i = 0; i < key.length; i++) {
+        if (key.length - 1 !== i) {
+          midstr += key[i] + ",";
+          mstr += classifyList1.value[i].label + ",";
+        } else {
+          midstr += key[i];
+          mstr += classifyList1.value[i].label;
+        }
+      }
+      console.log(mstr, midstr);
+      state.classifySelect1 = options;
+      let newoptions = [];
+      for (let i = 0; i < state.classifySelect1.length; i++) {
+        if (state.classifySelect1[i].value) {
+          newoptions.push(state.classifySelect1[i]);
+        }
+      }
+      state.classifySelect1 = newoptions;
+      manager = mstr;
+      managerId = midstr;
+    };
 
-		let sourceBelongIdC = '';
-		const classificationChange2 = (key) => {
-			console.log(`selected ${key}`, classifyList2);
-			sourceBelongIdC = key;
-		};
+    // 资源归属 sourceBelongId 后续给接口
+    const classifyList2 = ref([
+      { value: 1, label: "项目一" },
+      { value: 2, label: "项目二" },
+      { value: 3, label: "项目三" },
+    ]);
 
-		// 项目级别
-		const classifyList3 = ref([
-			{ value: 1, label: "集团级" },
-			{ value: 2, label: "组织级" },
-			{ value: 3, label: "现地级" },
-			{ value: 4, label: "部门级" },
-		]);
+    let sourceBelongIdC = "";
+    const classificationChange2 = (key) => {
+      console.log(`selected ${key}`, classifyList2);
+      sourceBelongIdC = key;
+    };
 
-		let levels = "";
-		const classificationChange3 = (key) => {
-			console.log(`selected ${key}`, classifyList3);
-			levels = key;
-		};
+    // 项目级别
+    const classifyList3 = ref([
+      { value: 1, label: "集团级" },
+      { value: 2, label: "组织级" },
+      { value: 3, label: "现地级" },
+      { value: 4, label: "部门级" },
+    ]);
 
-		// 培训体系
-		const classifyList4 = ref([
-			{ value: 1, label: "集团级" },
-			{ value: 2, label: "组织级" },
-			{ value: 3, label: "现地级" },
-			{ value: 4, label: "部门级" },
-		]);
+    let levels = "";
+    const classificationChange3 = (key) => {
+      console.log(`selected ${key}`, classifyList3);
+      levels = key;
+    };
 
-		let systemid = "";
-		const classificationChange4 = (key) => {
-			console.log(`selected ${key}`, classifyList4);
-			systemid = key;
-		};
+    // 培训体系
+    const classifyList4 = ref([
+      { value: 1, label: "集团级" },
+      { value: 2, label: "组织级" },
+      { value: 3, label: "现地级" },
+      { value: 4, label: "部门级" },
+    ]);
 
-		// 模版
-		const classifyList5 = ref([
-			{ value: 1, label: "模版一" },
-			{ value: 2, label: "模版二" },
-			{ value: 3, label: "模版三" },
-			{ value: 4, label: "模版四" },
-		]);
-		const classificationChange5 = (key) => {
-			console.log(`selected ${key}`, classifyList5);
-		};
+    let systemid = "";
+    const classificationChange4 = (key) => {
+      console.log(`selected ${key}`, classifyList4);
+      systemid = key;
+    };
 
-		// 项目说明
-		const remark = ref("");
+    // 模版
+    const classifyList5 = ref([
+      // { value: 1, label: "模版一" },
+      // { value: 2, label: "模版二" },
+      // { value: 3, label: "模版三" },
+      // { value: 4, label: "模版四" },
+    ]);
+    const classificationChange5 = (key) => {
+      console.log(`selected ${key}`, classifyList5.value);
+      //获取模版信息
+      let obj = {
+        projectId: Number(key),
+      };
+      api
+        .getProjectDetail(obj)
+        .then((res) => {
+          console.log("获取项目详情", res);
+          if (res.status === 200) {
+            let info = res.data.data.projectInfo;
+            console.log(info);
+            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+            projectName.value = info.name;
+            state.classifySelect = classifyList.value[1]; // info.category
+            imageUrl.value = info.picUrl;
 
-		let courseSyncFlag = 0;
-		const changeChecked = () => {
-			console.log(state.checked);
-			state.checked ? (state.checked = false) : (state.checked = true);
-			courseSyncFlag = state.checked ? 1 : 0;
-		};
+            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
+            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+            state.rangevalue = [
+              dayjs(start, "YYYY/MM/DD"),
+              dayjs(end, "YYYY/MM/DD"),
+            ];
 
-		let boeFlag = 0;
-		const changeChecked1 = () => {
-			console.log(state.checked1);
-			state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
-			boeFlag = state.checked1 ? 1 : 0;
-		};
+            let manageName = info.manager.split(",");
+            let manageValue = info.managerId.split(",");
+            let optionsManage = [];
+            for (let i = 0; i < manageName.length; i++) {
+              let obj = {
+                label: manageName[i],
+                value: manageValue[i],
+              };
+              optionsManage.push(obj);
+            }
+            console.log(optionsManage);
+            state.classifySelect1 = optionsManage;
+            state.classifySelect2 =
+              classifyList2.value[info.sourceBelongId - 1];
+            remark.value = info.remark;
+            state.checked = info.boeFlag ? info.boeFlag : false;
+            state.classifySelect3 = classifyList3.value[info.level];
+            state.classifySelect4 = classifyList4.value[info.systemId - 1];
+            state.checked1 = info.boeFlag ? info.boeFlag : false;
+            // fileList1.value = info.attach.split(",");
 
-		const removeFile = (file) => {
-			const index = fileList1.value.indexOf(file);
-			const newFileList = fileList1.value.slice();
-			newFileList.splice(index, 1);
-			fileList1.value = newFileList;
+            projectType = 1;
+            picUrl = info.picUrl;
+            beginTime = Number(info.beginTime / 1000);
+            endTime = Number(info.endTime / 1000);
+            manager = info.manager;
+            managerId = info.managerId;
+            sourceBelongIdC = Number(info.sourceBelongId);
+            courseSyncFlag = info.courseSyncFlag;
+            levels = info.level;
+            systemid = info.systemId;
+            boeFlag = info.boeFlag;
+          }
+        })
+        .catch((err) => {
+          console.log("获取详情失败", err);
+        });
+    };
+    //获取模版列表
+    const getTemplate = () => {
+      let obj = {
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        // projectId:id?id:''
+      };
+      api
+        .getProjectList(obj)
+        .then((res) => {
+          console.log("获取模版列表", res);
+          state.totalPages = Number(res.data.data.pages);
+          if (res.status === 200) {
+            let arr = res.data.data.rows;
+            let array = classifyList5.value;
+            arr.map((value) => {
+              let obj = {
+                value: value.projectId,
+                label: value.name,
+              };
+              array.push(obj);
+            });
+            classifyList5.value = array;
+          }
+        })
+        .catch((err) => {
+          console.log("获取模版列表失败", err);
+        });
+    };
+    getTemplate();
+    //模版滚动加载信息
+    const templateScroll = (e) => {
+      // console.log("滚动", e, b);
+      const { target } = e;
+      const scrllHeight = target.scrollHeight - target.scrollTop;
+      const clientHeight = target.clientHeight;
+      // console.log("scrllHeight", scrllHeight, clientHeight);
+      if (scrllHeight === 0 && clientHeight === 0) {
+        state.currentPage = 1;
+      } else if (scrllHeight - clientHeight == 0) {
+        // 下拉到底部时
+        if (state.currentPage < state.totalPages) {
+          // 如果滑到底部，则加载下一页
+          state.currentPage++;
+          getTemplate();
+        }
+      }
+    };
 
-			let attachStr = "";
-			if (newFileList.length == 0) {
-				attachStr = "";
-			}
-			for (let i = 0; i < fileList1["value"].length; i++) {
-				console.log(fileList1["value"][i].response.data);
-				if (fileList1["value"].length - 1 == i) {
-					attachStr += fileList1["value"][i].response.data;
-				} else {
-					attachStr += fileList1["value"][i].response.data + ",";
-				}
-			}
-			attach = attachStr;
-		};
+    // 项目说明
+    const remark = ref("");
 
-		const errorMsgs = {
-			name: "请输入项目名称",
-			category: "请选择项目分类",
-			picUrl: "请上传项目封面图",
-			beginTime: "请选择项目开始时间",
-			endTime: "请选择项目结束时间",
-			manager: "请选择项目经理",
-			managerId: "请选择项目经理",
-			sourceBelongId: "请选择资源归属",
-			level: "请填写项目级别",
-			systemId: "请填写项目培训体系",
-			boeFlag: "请选择是否BOE实施"
-		};
-		
-		const createProject = () => {
-			console.log('我是否要编辑项目', isEdit.value)
-			if (isEdit.value) {
-				console.log('我要编辑项目', peojectID)
-				let obj = {
-					projectId: Number(peojectID),
-					name: projectName["value"],
-					category: projectType,
-					picUrl: picUrl,
-					beginTime: beginTime,
-					endTime: endTime,
-					manager: manager,
-					managerId: managerId,
-					sourceBelongId: sourceBelongIdC,
-					remark: remark["value"],
-					courseSyncFlag: courseSyncFlag,
-					level: levels,
-					systemId: systemid,
-					boeFlag: boeFlag,
-					attach: attach,
-					type: 3,
-					templateId: 0,
-					parentId: 0,
-					notice: "",
-					noticeFlag: 0,
-					status: 0,
-				};
+    let courseSyncFlag = 0;
+    const changeChecked = () => {
+      console.log(state.checked);
+      state.checked ? (state.checked = false) : (state.checked = true);
+      courseSyncFlag = state.checked ? 1 : 0;
+    };
 
-				console.log(obj);
+    let boeFlag = 0;
+    const changeChecked1 = () => {
+      console.log(state.checked1);
+      state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
+      boeFlag = state.checked1 ? 1 : 0;
+    };
 
-				for (let i in errorMsgs) {
-					console.log(obj[i]);
-					if (obj[i] === "" || obj[i] === undefined) {
-						message.destroy();
-						message.warning(errorMsgs[i]);
-						return;
-					}
-				}
+    const removeFile = (file) => {
+      const index = fileList1.value.indexOf(file);
+      const newFileList = fileList1.value.slice();
+      newFileList.splice(index, 1);
+      fileList1.value = newFileList;
 
-				api
-					.createProject(obj)
-					.then((res) => {
-						console.log(res);
-						if (res.status == 200 && res.data.code == 200) {
-							message.destroy();
-							message.success("编辑成功");
-							setTimeout(() => {
-								router.push({
-									path: "/projectmanage"
-								});
-							}, 1000);
-						} else {
-							message.destroy();
-							message.error("编辑失败，请检查当前网络状态。");
-						}
-					})
-					.catch((err) => {
-						console.log(err);
-						message.destroy();
-						message.error("编辑失败，请检查当前网络状态。");
-					});
+      let attachStr = "";
+      if (newFileList.length == 0) {
+        attachStr = "";
+      }
+      for (let i = 0; i < fileList1["value"].length; i++) {
+        console.log(fileList1["value"][i].response.data);
+        if (fileList1["value"].length - 1 == i) {
+          attachStr += fileList1["value"][i].response.data;
+        } else {
+          attachStr += fileList1["value"][i].response.data + ",";
+        }
+      }
+      attach = attachStr;
+    };
 
-			} else {
-				let obj = {
-					name: projectName["value"],
-					category: projectType,
-					picUrl: picUrl,
-					beginTime: beginTime,
-					endTime: endTime,
-					manager: manager,
-					managerId: managerId,
-					sourceBelongId: sourceBelongIdC,
-					remark: remark["value"],
-					courseSyncFlag: courseSyncFlag,
-					level: levels,
-					systemId: systemid,
-					boeFlag: boeFlag,
-					attach: attach,
-					type: 3,
-					templateId: 10,
-					parentId: 0,
-					notice: "",
-					noticeFlag: 0,
-					status: 0,
-				};
-				console.log("提交的数据格式 %o", obj);
-				for (let i in errorMsgs) {
-					console.log(obj[i]);
-					if (obj[i] === "" || obj[i] === undefined) {
-						message.destroy();
-						message.warning(errorMsgs[i]);
-						return;
-					}
-				}
+    const errorMsgs = {
+      name: "请输入项目名称",
+      category: "请选择项目分类",
+      picUrl: "请上传项目封面图",
+      beginTime: "请选择项目开始时间",
+      endTime: "请选择项目结束时间",
+      manager: "请选择项目经理",
+      managerId: "请选择项目经理",
+      sourceBelongId: "请选择资源归属",
+      level: "请填写项目级别",
+      systemId: "请填写项目培训体系",
+      boeFlag: "请选择是否BOE实施",
+    };
 
-				api
-					.createProject(obj)
-					.then((res) => {
-						console.log(res);
-						if (res.status == 200 && res.data.code == 200) {
-							message.destroy();
-							message.success("创建成功");
-							setTimeout(() => {
-								router.push({
-									path: "/taskpage",
-									query: { id: res.data.data.projectId },
-								});
-							}, 1000);
-						} else {
-							message.destroy();
-							message.error("创建失败，请检查当前网络状态。");
-						}
-					})
-					.catch((err) => {
-						console.log(err);
-						message.destroy();
-						message.error("创建失败，请检查当前网络状态。");
-					});
-			}
-		};
+    const createProject = () => {
+      console.log("我是否要编辑项目", isEdit.value);
+      if (isEdit.value) {
+        console.log("我要编辑项目", peojectID);
+        let obj = {
+          projectId: Number(peojectID),
+          name: projectName["value"],
+          category: projectType,
+          picUrl: picUrl,
+          beginTime: beginTime,
+          endTime: endTime,
+          manager: manager,
+          managerId: managerId,
+          sourceBelongId: sourceBelongIdC,
+          remark: remark["value"],
+          courseSyncFlag: courseSyncFlag,
+          level: levels,
+          systemId: systemid,
+          boeFlag: boeFlag,
+          attach: attach,
+          type: 3,
+          templateId: 0,
+          parentId: 0,
+          notice: "",
+          noticeFlag: 0,
+          status: 0,
+        };
 
-		return {
-			...toRefs(state),
-			projectName,
-			classifyList,
-			classificationChange,
-			classificationChange1,
-			classificationChange2,
-			classificationChange3,
-			classificationChange4,
-			classificationChange5,
-			fileList,
-			fileList1,
-			loading,
-			imageUrl,
-			handleChange,
-			handleChange1,
-			beforeUpload,
-			beforeUpload1,
-			onRangeChange,
-			classifyList1,
-			classifyList2,
-			classifyList3,
-			classifyList4,
-			classifyList5,
-			remark,
-			changeChecked,
-			changeChecked1,
-			uplodaFileCount,
-			createProject,
-			removeFile,
+        console.log(obj);
 
-			isEdit,
-			backPage,
-			dateFormatList,
-		};
-	},
+        for (let i in errorMsgs) {
+          console.log(obj[i]);
+          if (obj[i] === "" || obj[i] === undefined) {
+            message.destroy();
+            message.warning(errorMsgs[i]);
+            return;
+          }
+        }
+
+        api
+          .createProject(obj)
+          .then((res) => {
+            console.log(res);
+            if (res.status == 200 && res.data.code == 200) {
+              message.destroy();
+              message.success("编辑成功");
+              setTimeout(() => {
+                router.push({
+                  path: "/projectmanage",
+                });
+              }, 1000);
+            } else {
+              message.destroy();
+              message.error("编辑失败，请检查当前网络状态。");
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            message.destroy();
+            message.error("编辑失败，请检查当前网络状态。");
+          });
+      } else {
+        let obj = {
+          name: projectName["value"],
+          category: projectType,
+          picUrl: picUrl,
+          beginTime: beginTime,
+          endTime: endTime,
+          manager: manager,
+          managerId: managerId,
+          sourceBelongId: sourceBelongIdC,
+          remark: remark["value"],
+          courseSyncFlag: courseSyncFlag,
+          level: levels,
+          systemId: systemid,
+          boeFlag: boeFlag,
+          attach: attach,
+          type: 3,
+          templateId: 10,
+          parentId: 0,
+          notice: "",
+          noticeFlag: 0,
+          status: 0,
+        };
+        console.log("提交的数据格式 %o", obj);
+        for (let i in errorMsgs) {
+          console.log(obj[i]);
+          if (obj[i] === "" || obj[i] === undefined) {
+            message.destroy();
+            message.warning(errorMsgs[i]);
+            return;
+          }
+        }
+
+        api
+          .createProject(obj)
+          .then((res) => {
+            console.log(res);
+            if (res.status == 200 && res.data.code == 200) {
+              message.destroy();
+              message.success("创建成功");
+              setTimeout(() => {
+                router.push({
+                  path: "/taskpage",
+                  query: { id: res.data.data.projectId },
+                });
+              }, 1000);
+            } else {
+              message.destroy();
+              message.error("创建失败，请检查当前网络状态。");
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            message.destroy();
+            message.error("创建失败，请检查当前网络状态。");
+          });
+      }
+    };
+
+    return {
+      ...toRefs(state),
+      projectName,
+      classifyList,
+      classificationChange,
+      classificationChange1,
+      classificationChange2,
+      classificationChange3,
+      classificationChange4,
+      classificationChange5,
+      fileList,
+      fileList1,
+      loading,
+      imageUrl,
+      handleChange,
+      handleChange1,
+      beforeUpload,
+      beforeUpload1,
+      onRangeChange,
+      classifyList1,
+      classifyList2,
+      classifyList3,
+      classifyList4,
+      classifyList5,
+      remark,
+      changeChecked,
+      changeChecked1,
+      uplodaFileCount,
+      createProject,
+      removeFile,
+
+      isEdit,
+      backPage,
+      dateFormatList,
+
+      templateScroll,
+    };
+  },
 };
 </script>
 <style lang="scss">
 .projectAdd {
-	width: 100%;
-	// height: inherit;
-	// flex: 1;
-	// flex-shrink: 0;
-	// overflow-y: auto;
+  width: 100%;
+  // height: inherit;
+  // flex: 1;
+  // flex-shrink: 0;
+  // overflow-y: auto;
 
-	.header {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
+  .header {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
 
-		.title {
-			color: #000000;
-			font-size: 18px;
-			//line-height: 36px;
-			padding-top: 30px;
-			padding-left: 37px;
-			//font-weight: 500;
-		}
+    .title {
+      color: #000000;
+      font-size: 18px;
+      //line-height: 36px;
+      padding-top: 30px;
+      padding-left: 37px;
+      //font-weight: 500;
+    }
 
-		.goback {
-			padding-right: 70px;
-			//padding-top: 37px;
-			position: relative;
+    .goback {
+      padding-right: 70px;
+      //padding-top: 37px;
+      position: relative;
 
-			.return {
-				display: inline-block;
-				width: 42px;
-				height: 42px;
-				margin-top: 17px;
-				margin-right: 10px;
-				background-image: url("../../assets/images/projectadd/return.png");
-			}
+      .return {
+        display: inline-block;
+        width: 42px;
+        height: 42px;
+        margin-top: 17px;
+        margin-right: 10px;
+        background-image: url("../../assets/images/projectadd/return.png");
+      }
 
-			.returntext {
-				display: inline-block;
-				position: absolute;
-				top: 27px;
-				color: #4ea6ff;
-				font-size: 14px;
-			}
-		}
-	}
+      .returntext {
+        display: inline-block;
+        position: absolute;
+        top: 27px;
+        color: #4ea6ff;
+        font-size: 14px;
+      }
+    }
+  }
 
-	// 修改 antd upload 样式
-	.ant-upload {
-		border-width: 0px;
-	}
+  // 修改 antd upload 样式
+  .ant-upload {
+    border-width: 0px;
+  }
 
-	.content {
-		display: flex;
+  .content {
+    display: flex;
 
-		.main {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			//justify-content: center;
-			float: left;
-			border-right: 1px solid rgba(153, 155, 163, 0.3);
+    .main {
+      width: 50%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      //justify-content: center;
+      float: left;
+      border-right: 1px solid rgba(153, 155, 163, 0.3);
 
-			.name {
-				width: 78%;
-				// background-color: lightcoral;
-				display: flex;
-				margin-top: 20px;
-				align-items: center;
+      .name {
+        width: 78%;
+        // background-color: lightcoral;
+        display: flex;
+        margin-top: 20px;
+        align-items: center;
 
-				//height: 40px;
-				// border: 1px solid black;
-				.namebox {
-					width: 120px;
-					display: flex;
-					align-items: center;
-					justify-content: flex-end;
-					flex-shrink: 0;
+        //height: 40px;
+        // border: 1px solid black;
+        .namebox {
+          width: 120px;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          flex-shrink: 0;
 
-					.nameimg {
-						width: 10px;
-						height: 10px;
-					}
-				}
+          .nameimg {
+            width: 10px;
+            height: 10px;
+          }
+        }
 
-				.d {
-					margin-top: 8px;
-					font-size: 25px;
-					color: #ff4e4e;
-				}
+        .d {
+          margin-top: 8px;
+          font-size: 25px;
+          color: #ff4e4e;
+        }
 
-				.box {
-					position: relative;
-					margin-left: 14px;
+        .box {
+          position: relative;
+          margin-left: 14px;
 
-					.box1 {
-						position: absolute;
-						left: 50%;
-						top: 50%;
-						width: 50px;
-						margin-left: -25px;
-						margin-top: -5px;
-						border-top: 2px solid rgba(78, 166, 255, 1);
-					}
+          .box1 {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            width: 50px;
+            margin-left: -25px;
+            margin-top: -5px;
+            border-top: 2px solid rgba(78, 166, 255, 1);
+          }
 
-					.box2 {
-						position: absolute;
-						left: 50%;
-						top: 50%;
-						height: 50px;
-						//margin-left: -5px;
-						margin-top: -25px;
-						border-left: 2px solid rgba(78, 166, 255, 1);
-					}
-				}
+          .box2 {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            height: 50px;
+            //margin-left: -5px;
+            margin-top: -25px;
+            border-left: 2px solid rgba(78, 166, 255, 1);
+          }
+        }
 
-				.inname {
-					color: #6f6f6f;
-					font-size: 14px;
-					margin-left: 7px;
-				}
+        .inname {
+          color: #6f6f6f;
+          font-size: 14px;
+          margin-left: 7px;
+        }
 
-				.in {
-					margin-left: 14px;
-					flex: 1;
+        .in {
+          margin-left: 14px;
+          flex: 1;
 
-					// .ant-radio-wrapper {
-					// }
-					.ant-input-textarea-show-count {
-						position: relative;
-						height: 88px;
-					}
+          // .ant-radio-wrapper {
+          // }
+          .ant-input-textarea-show-count {
+            position: relative;
+            height: 88px;
+          }
 
-					.ant-input-textarea-show-count::after {
-						position: absolute;
-						right: 10px;
-						bottom: 0px;
-					}
+          .ant-input-textarea-show-count::after {
+            position: absolute;
+            right: 10px;
+            bottom: 0px;
+          }
 
-					.ant-input {
-						border-radius: 8px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
+          .ant-input {
+            border-radius: 8px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
 
-					.ant-input-affix-wrapper {
-						padding: 0 11px;
-						border-radius: 8px;
-					}
+          .ant-input-affix-wrapper {
+            padding: 0 11px;
+            border-radius: 8px;
+          }
 
-					.ant-select-selector {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
-				}
+          .ant-select-selector {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            // height: 40px;
+          }
+        }
 
-				.filebox {
-					margin-left: 14px;
-					flex: 1;
+        .filebox {
+          margin-left: 14px;
+          flex: 1;
 
-					.fileimg {
-						width: 15px;
-						height: 15px;
-						margin-right: 6px;
-					}
+          .fileimg {
+            width: 15px;
+            height: 15px;
+            margin-right: 6px;
+          }
 
-					.filetext {
-						font-size: 14px;
-						font-weight: 400;
-						color: #4ea6ff;
-						line-height: 36px;
-					}
+          .filetext {
+            font-size: 14px;
+            font-weight: 400;
+            color: #4ea6ff;
+            line-height: 36px;
+          }
 
-					.support {
-						font-size: 14px;
-						font-weight: 400;
-						color: #999ba3;
-						line-height: 36px;
-						margin-top: 8px;
-						word-break: break-all;
-					}
-				}
-			}
+          .support {
+            font-size: 14px;
+            font-weight: 400;
+            color: #999ba3;
+            line-height: 36px;
+            margin-top: 8px;
+            word-break: break-all;
+          }
+        }
+      }
 
-			.name2 {
-				display: flex;
-				align-items: flex-start;
+      .name2 {
+        display: flex;
+        align-items: flex-start;
 
-				.ant-input-textarea {
-					.ant-input {
-						height: 88px;
-					}
-				}
-			}
-		}
+        .ant-input-textarea {
+          .ant-input {
+            height: 88px;
+          }
+        }
+      }
+    }
 
-		.template {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			//justify-content: center;
-			float: right;
+    .template {
+      width: 50%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      //justify-content: center;
+      float: right;
 
-			.name {
-				width: 78%;
-				// background-color: lightcoral;
-				display: flex;
-				margin-top: 20px;
-				align-items: center;
-				height: 40px;
+      .name {
+        width: 78%;
+        // background-color: lightcoral;
+        display: flex;
+        margin-top: 20px;
+        align-items: center;
+        height: 40px;
 
-				// border: 1px solid black;
-				.d {
-					margin-top: 8px;
-					font-size: 25px;
-					color: #ff4e4e;
-				}
+        // border: 1px solid black;
+        .d {
+          margin-top: 8px;
+          font-size: 25px;
+          color: #ff4e4e;
+        }
 
-				.inname {
-					color: #6f6f6f;
-					font-size: 14px;
-					margin-left: 7px;
-					width: 65px;
-				}
+        .inname {
+          color: #6f6f6f;
+          font-size: 14px;
+          margin-left: 7px;
+          width: 65px;
+        }
 
-				.in {
-					margin-left: 14px;
-					width: 81%;
+        .in {
+          margin-left: 14px;
+          width: 81%;
 
-					.ant-input {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
+          .ant-input {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
 
-					.ant-select-selector {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
-				}
-			}
-		}
-	}
+          .ant-select-selector {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
+        }
+      }
+    }
+  }
 
-	.footer {
-		width: 100%;
-		margin-top: 31px;
-		margin-bottom: 14px;
-		padding-bottom: 20px;
+  .footer {
+    width: 100%;
+    margin-top: 31px;
+    margin-bottom: 14px;
+    padding-bottom: 20px;
 
-		.btn {
-			display: flex;
-			justify-content: center;
+    .btn {
+      display: flex;
+      justify-content: center;
 
-			.btn1 {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 100px;
-				height: 40px;
-				border-radius: 8px;
-				background: #409eff;
-				color: #ffffff;
-				margin-right: 14px;
-			}
+      .btn1 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        border-radius: 8px;
+        background: #409eff;
+        color: #ffffff;
+        margin-right: 14px;
+      }
 
-			.btn2 {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 100px;
-				height: 40px;
-				border-radius: 8px;
-				border: 1px solid #409eff;
-				background: #ffffff;
-				color: #409eff;
-			}
-		}
+      .btn2 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        border-radius: 8px;
+        border: 1px solid #409eff;
+        background: #ffffff;
+        color: #409eff;
+      }
+    }
 
-		.text {
-			color: rgba(153, 155, 163, 1);
-			font-size: 14px;
-			margin-left: 223px;
-		}
-	}
+    .text {
+      color: rgba(153, 155, 163, 1);
+      font-size: 14px;
+      margin-left: 223px;
+    }
+  }
 }
 </style>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 6a7c4608..cd27de75 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -419,23 +419,7 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        :style="{
-                          display:
-                            item.type == '6' ||
-                            item.type == '9' ||
-                            item.type == '2'
-                              ? 'flex'
-                              : 'none',
-                        }"
-                        @click="
-                          item.type == '2'
-                            ? showCopyModal(item.type)
-                            : item.type == '6'
-                            ? showzhibModal(item.type)
-                            : item.type == '9'
-                            ? showhuodModal(item.type)
-                            : null
-                        "
+                        @click="showCodeModal"
                       >
                         二维码
                       </div>
@@ -1373,6 +1357,7 @@
       </a-modal>
     </div>
     <!-- 删除弹窗 -->
+
     <!-- 面授管理二维码 -->
     <a-modal
       v-model:visible="copyModal"
@@ -1490,6 +1475,15 @@
     </div>
     <!-- 编辑项目弹窗 -->
     <proj-set v-model:editHs="editHs" v-model:projectId="projectId" />
+
+    <!-- 二维码弹窗 -->
+    <two-dimensional-code
+      v-model:codevisible="codevisible"
+      :codeInfo="codeInfo"
+      index="0"
+      type="课程二维码"
+    />
+    <!-- 二维码弹窗 -->
   </div>
 </template>
 <script>
@@ -1529,6 +1523,7 @@ import { getTask } from "../../api/indexTaskadd";
 import { toDate } from "../../api/method";
 import projSet from "../../components/Modals/projSet";
 import { overview } from "../../api/indexProjStu";
+import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 export default {
   name: "taskPage",
   components: {
@@ -1550,6 +1545,7 @@ export default {
     TaskImpStu,
     projSet,
     NoticeHis,
+    TwoDimensionalCode,
   },
   setup() {
     const state = reactive({
@@ -1664,6 +1660,9 @@ export default {
 
       huodModal: false, //活动二维码弹窗
       allDelete: false, //批量删除弹窗
+
+      codevisible: false, //二维码弹窗
+      codeInfo: null, //二维码信息
       pubproject: false,
       stugroup: false,
       canclestu: false,
@@ -2505,6 +2504,15 @@ export default {
     const showEditProj = () => {
       state.editHs = true;
     };
+    //显示二维码弹窗
+    const showCodeModal = () => {
+      state.codevisible = true;
+      state.codeInfo = {
+        title: "课程二维码",
+        name: "管理者进阶面授课程",
+        url: "https://www.baidu.com/https://www.baidu.com/https://www.baidu.com/https://www.baidu.com/https://www.baidu.com/",
+      };
+    };
 
     //学员管理列表操作
     const studentData = () => {
@@ -3199,6 +3207,7 @@ export default {
       closehuodModal,
       closezhibModal,
 
+      showCodeModal,
       tabsChange,
 
       getTaskList,
diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue
index 215b48f6..7b305020 100644
--- a/src/views/system/SystemManage.vue
+++ b/src/views/system/SystemManage.vue
@@ -91,10 +91,10 @@
   </div>
 
 <div @click="changeCodevisible">显示二维码弹窗</div>
-  <two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" index="0"/>
+  <two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" index="0" type="课程二维码"/>
 
   <div @click="changeCodevisible2">显示二维码弹窗22</div>
-  <two-dimensional-code v-model:codevisible="codevisible2" :codeInfo="codeInfo2" index="1"/>
+  <two-dimensional-code v-model:codevisible="codevisible2" :codeInfo="codeInfo2" index="1" type="签到二维码"/>
 </template>
 <script>
 import { reactive, toRefs } from "vue";

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 4/6] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8A=BD=E5=B1=89?=
 =?UTF-8?q?=E6=A0=B7=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";

From cfac944696ec03cddb3006d6b482dc3f4619ea38 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 16 Nov 2022 09:07:51 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue | 80 +++++++++++++++++++------
 1 file changed, 61 insertions(+), 19 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index e8687d52..63c19be7 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -271,32 +271,17 @@
       </div>
       <div class="main_btns">
         <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn2" @click ="updateFaceTeach">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs} from "vue";
 import SelFacet from "../../components/drawers/SelFacet.vue";
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
-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: "AddFaceteach",
   components: {
@@ -309,6 +294,47 @@ export default {
       type: Boolean,
       default: false,
     },
+    EditEvalId: {
+      // 要编辑的workId
+      type: Number,
+      default: null,
+    },
+    edit: {
+      //  是否为编辑
+      type: Boolean,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: {
+      // 是否是关卡页面触发
+      type: Number,
+      default: null,
+    },
+
+    projectTaskId: {
+      // 要编辑的projectId
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -333,6 +359,9 @@ export default {
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+      if(bool){
+        queryFaceTeach();
+      }
     };
     const showDrawerSelFacet = () => {
       state.selfacetvisible = true;
@@ -353,6 +382,18 @@ export default {
         state.radioV2 = "";
       }
     }
+    //查询面授
+    const queryFaceTeach=()=>{
+
+    }
+     //更新任务列表
+     const updateTask=()=>{
+
+    }
+     //新建或编辑面授
+     const updateFaceTeach=()=>{
+    
+    }
     return {
       ...toRefs(state),
       showDrawerSelFacet,
@@ -360,9 +401,10 @@ export default {
       showDrawerAddTest,
       afterVisibleChange,
       closeDrawer,
-      rowSelection,
       cloradio1,
       cloradio2,
+      updateFaceTeach,
+      updateTask,
       // change,
     };
   },

From 1108dfa0180c88546c1f4302db62bf172c410382 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 16 Nov 2022 09:28:39 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A8=A1=E6=9D=BF=E5=BA=93=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?islevel=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue      |  8 +++---
 src/components/drawers/AddCase.vue        |  8 +++---
 src/components/drawers/AddDiscuss.vue     |  9 ++++---
 src/components/drawers/AddEval.vue        |  8 +++---
 src/components/drawers/AddHomework.vue    |  8 +++---
 src/components/drawers/AddInvist.vue      | 20 +++++++++------
 src/components/drawers/AddLive.vue        |  8 +++---
 src/components/drawers/AddOnline.vue      |  9 ++++---
 src/components/drawers/AddRef.vue         | 10 +++++---
 src/components/drawers/AddTest.vue        |  8 +++---
 src/components/vote/AddVote.vue           |  8 +++---
 src/views/learningpath/LevelAddDetail.vue | 19 +++++++-------
 src/views/projectcenter/TaskAdd.vue       | 30 +++++++++++++++++------
 13 files changed, 96 insertions(+), 57 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 910ebbbd..30b44ff3 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -275,7 +275,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     EditWorkId: { // 要编辑的workId 
@@ -358,7 +358,7 @@ export default {
       }
     };
     const updateTask = (res) => {
-      if(props.isLevel){
+      if(props.isLevel == 1 ){
         RouterEditTask({
             chapterId:props.isactive,
             courseId: res.data.data.activityId,
@@ -373,7 +373,7 @@ export default {
           }).catch(err => {
             console.log("新增关卡任务失败",err);
           })
-      }else{
+      }else if(props.isLevel==2){
         apiTask.addTask({
             courseId: res.data.data.activityId,
             duration: res.data.data.activityDuration,
@@ -389,6 +389,8 @@ export default {
           .catch((err)=> {
             console.log("更新任务列表失败",err);
           })
+      }else if(props.isLevel == 3){
+        console.log("模板库更新更新任务列表");
       }
     }
     //创建活动
diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 1bc0a931..de4d8c9d 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -107,7 +107,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     projectTaskId: { // 要编辑的projectId 
@@ -229,7 +229,7 @@ export default {
     };
     const updateTask = () => {
       console.log("jinlaile=================", state.assessmentName)
-      if (props.isLevel) {
+      if (props.isLevel==1) {
         RouterEditTask({
           chapterId: props.isactive,
           courseId: state.assessmentId,
@@ -248,7 +248,7 @@ export default {
           .catch((err) => {
             console.log(err, 1111);
           });
-      } else {
+      } else if(props.isLevel==2){
         console.log("=========projectTaskId", props.projectTaskId);
         apiTask
           .addTask({
@@ -267,6 +267,8 @@ export default {
           .catch((err) => {
             console.log(err, 111111);
           });
+      }else if(props.isLevel==3){
+        console.log("模板库");
       }
     }
     //重置案例信息
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index abafd842..588fe1b9 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -121,7 +121,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     EditWorkId: { // 要编辑的workId 
@@ -189,8 +189,7 @@ export default {
       }
     };
     const updateTask = (res) => {
-    console.log("jinlaile ========",props.isLevel);
-        if(props.isLevel){
+        if(props.isLevel ==1){
           RouterEditTask({
             chapterId:props.isactive,
             courseId: res.data.data.discussId,
@@ -201,7 +200,7 @@ export default {
           }).then(res => { 
               console.log("新增关卡任务失败",res);
           }).catch(err => {console.log("新增关卡任务失败",err);})
-        }else{
+        }else if(props.isLevel ==2){
         apiTask
         .addTask({
           courseId: res.data.data.discussId,
@@ -215,6 +214,8 @@ export default {
         }).catch(r=>{
           console.log('更新阶段任务失败',r)
         })
+        }else if(props.isLevel ==3){
+          console.log("模板库任务")
         }
     }
     const updateDiscussInfo = () => {
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 04175759..daf6e24b 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -135,7 +135,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     projectTaskId: { // 要编辑的projectId 
@@ -195,7 +195,7 @@ export default {
         });
     }
     const updateTask = (res)=>{
-      if(props.isLevel){
+      if(props.isLevel ==1){
         apitaskadd
             .addTask({
               courseId: res.data.data.evaluationId,
@@ -212,7 +212,7 @@ export default {
             .catch((err) => {
               console.log(err);
             });
-      }else{
+      }else if(props.isLevel ==2){
         RouterEditTask({
                 chapterId: props.isactive,
                 courseId: res.data.data.evaluationId,
@@ -226,6 +226,8 @@ export default {
             }).catch((err) => {
               console.log(err);
             });
+      }else if(props.isLevel ==3){
+          console.log("模板库任务")
       }
     }
     //创建或编辑测评信息
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 5b894725..8c0dbe82 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -161,7 +161,7 @@ export default {
     },
     isLevel: {
       // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     EditWorkId: {
@@ -345,7 +345,7 @@ export default {
     };
     // 新增编辑或新增项目任务
     const updateTask = (res) => {
-      if(props.isLevel){
+      if(props.isLevel==1 ){
         let editObj1 = {
         chapterId: props.isactive,
         courseId: res.data.data.workId,
@@ -364,7 +364,7 @@ export default {
         .catch(() => {
           message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
         });
-      }else{
+      }else if(props.isLevel==2){
         let editObj = {
         courseId: res.data.data.workId,
         name:res.data.data.workName,
@@ -382,6 +382,8 @@ export default {
         .catch(() => {
           message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
         });
+      }else if(props.isLevel==3){
+        console.log("模板库更新更新任务列表");
       }
       
     };
diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index 31374fc8..57fa3d0e 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/src/components/drawers/AddInvist.vue
@@ -98,9 +98,10 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
+  
     projectTaskId: { // 要编辑的projectId 
       type: Number,
       default: null,
@@ -112,7 +113,7 @@ export default {
     isactive: {
       type: Number,
       default: null,
-    }
+    },
   
   },
   setup(props, ctx) {
@@ -147,12 +148,14 @@ export default {
     };
 
     const updateTask =()=>{
-      console.log("jinlaile=================",state.assessment.assessmentName)
-      if(props.isLevel){
+      if(state.assessment==null){
+        return message.warning("请选择评估");
+      }
+      if(props.isLevel ==1){
         RouterEditTask({
               chapterId: props.isactive,
               courseId: state.assessment.assessmentId,
-              name: state.assessment.assessmentName,
+              name:state.assessment.name,
               routerId: props.routerId,
               routerTaskId: props.routerTaskId || 0,
               type: 11,
@@ -167,12 +170,11 @@ export default {
               .catch((err) => {
                 console.log(err, 1111);
               });
-      }else{
-        console.log("=========projectTaskId",props.projectTaskId);
+      }else if(props.isLevel ==2){
         apiTask
             .addTask({
               courseId: state.assessment.assessmentId,
-              name: state.assessment.assessmentName,
+              name:state.assessment.name,
               projectId: props.projectId,
               projectTaskId: props.projectTaskId || 0,
               stageId: props.chooseStageId,
@@ -186,6 +188,8 @@ export default {
             .catch((err) => {
               console.log(err, 111111);
             });
+      }else if(props.isLevel == 3){
+        console.log("模板库更新更新任务列表");
       }
     }
  
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 5fa5b4f1..1906acd2 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -355,7 +355,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     projectTaskId: { // 要编辑的projectId 
@@ -497,7 +497,7 @@ export default {
       return isJpgOrPng && isLt2M;
     };
     const updateTask =(res)=>{
-      if(props.isLevel){
+      if(props.isLevel ==1){
             RouterEditTask({
               chapterId: props.isactive,
               courseId: res.data.data.liveId,
@@ -515,7 +515,7 @@ export default {
               .catch((err) => {
                 console.log(err, 1111);
               });
-          }else{
+          }else if(props.isLevel ==2){
             apiTask
               .addTask({
                 courseId: res.data.data.liveId,
@@ -536,6 +536,8 @@ export default {
                 console.log(err);
               });
          
+          }else if(props.isLevel ==3){
+            console.log("mobnku");
           }
     }
     //创建直播
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 34b6b274..939b00b9 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -141,7 +141,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     projectTaskId: { // 要编辑的projectId 
@@ -281,8 +281,7 @@ export default {
         });
     };
   const updateTask =()=>{
-      console.log("jinlaile=================",state.assessmentName)
-      if(props.isLevel){
+      if(props.isLevel ==1){
         RouterEditTask({
               chapterId: props.isactive,
               courseId: state.assessmentId,
@@ -301,7 +300,7 @@ export default {
               .catch((err) => {
                 console.log(err, 1111);
               });
-      }else{
+      }else if(props.isLevel ==2){
         console.log("=========projectTaskId",props.projectTaskId);
         apiTask
             .addTask({
@@ -320,6 +319,8 @@ export default {
             .catch((err) => {
               console.log(err, 111111);
             });
+      }else if(props.isLevel ==3){
+        console.log("");
       }
     }
     //重置在线信息
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index 81ab5a89..0be363bf 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -131,7 +131,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
 
@@ -183,8 +183,8 @@ export default {
       // message.error("handleFinishFailed");
     };
     const updateTask =(res)=>{
-      console.log("jinlaile=================",res.data.data.linkId,props.isLevel,props.isactive,props.routerId,props.routerTaskId)
-      if(props.isLevel){
+      
+      if(props.isLevel ==1){
         RouterEditTask({
               chapterId: props.isactive,
               courseId: res.data.data.linkId,
@@ -203,7 +203,7 @@ export default {
               .catch((err) => {
                 console.log(err, 1111);
               });
-      }else{
+      }else if(props.isLevel ==2){
         apiTask
             .addTask({
               courseId:res.data.data.linkId,
@@ -221,6 +221,8 @@ export default {
             .catch((err) => {
               console.log(err, 111111);
             });
+      }else if(props.isLevel ==3){
+        console.log("");
       }
     }
     //创建外链
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index c40c93b8..c04ab2be 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -242,7 +242,7 @@ export default {
       default: null,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     projectTaskId: { // 要编辑的projectId 
@@ -481,7 +481,7 @@ export default {
     }
     
     const updateTask = (res) => {
-      if(props.isLevel){
+      if(props.isLevel == 1){
         let editObj1 = {
             "chapterId": props.isactive,
             "courseId": res.data.data.examinationId,
@@ -500,7 +500,7 @@ export default {
             message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
             console.log(` 编辑关卡失败的打印 ${err}`);
           });
-      }else{
+      }else if(props.isLevel ==2){
           let editObj = {
           "courseId": res.data.data.examinationId,
           "duration": 0,
@@ -517,6 +517,8 @@ export default {
         }).catch(() => {
           message.error(`${props.EditTestId? '编辑' : '新增'}阶段任务失败`)
         });
+      }else if(props.isLevel ==3){
+        console.log("");
       }
       
     }
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 198af544..812d5f18 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -175,7 +175,7 @@ export default {
       default: 0,
     },
     isLevel: { // 是否是关卡页面触发
-      type: Boolean,
+      type: Number,
       default: null,
     },
     projectTaskId: { // 要编辑的projectId 
@@ -275,7 +275,7 @@ export default {
       
      }
      const updateToTask =(res)=>{
-      if(props.isLevel){
+      if(props.isLevel ==1){
         RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.voteId,
@@ -293,7 +293,7 @@ export default {
           .catch((err) => {
             console.log(err, 1111);
           });
-      }else{
+      }else if(props.isLevel ==2){
         apiTask
           .addTask({
             courseId:res.data.data.voteId,
@@ -310,6 +310,8 @@ export default {
           .catch((err) => {
             console.log(err, 111111);
           });
+      }else if(props.isLevel ==3){
+        console.log("");
       }
     }
     //修改投票信息接口
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 47e89683..2e720f90 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -243,7 +243,7 @@
           <div>
             <add-homework
               v-model:addhomeworkVisible="addhomeworkvisible"
-              :isLevel="true"
+              :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:isactive="isactive"
               v-model:edit="edit"
@@ -266,7 +266,7 @@
           <div>
             <add-test
               v-model:addtestVisible="addtestvisible"
-              :isLevel="true"
+             :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:isactive="isactive"
               v-model:edit="edit"
@@ -288,7 +288,7 @@
           <div>
             <add-live
               v-model:addliveVisible="addlivevisible"
-              :isLevel="true"
+             :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:isactive="isactive"
               v-model:routerId="routerId"
@@ -310,7 +310,7 @@
           <div>
             <add-ref
               v-model:addrefVisible="addrefvisible"
-              :isLevel="true"
+             :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:isactive="isactive"
               v-model:routerId="routerId"
@@ -333,7 +333,7 @@
             <add-discuss
               v-model:adddiscussVisible="adddiscussvisible"
               @changeData="updateTableData"
-              :isLevel="true"
+             :isLevel="isLevel"
               v-model:isactive="isactive"
               v-model:edit="edit"
               v-model:routerId="routerId"
@@ -354,7 +354,7 @@
           <div>
             <add-active
               v-model:addactiveVisible="addactivevisible"
-              :isLevel="true"
+             :isLevel="isLevel"
               v-model:edit="edit"
               v-model:isactive="isactive"
               @changeData="updateTableData"
@@ -376,7 +376,7 @@
             <div>
               <add-eval
                 v-model:addevalVisible="addevalvisible"
-                :isLevel="true"
+               :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
@@ -399,7 +399,7 @@
             <div>
               <add-invist
                 v-model:addinvistVisible="addinvistvisible"
-                :isLevel="true"
+               :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
@@ -423,7 +423,7 @@
             <div>
               <add-vote
                 v-model:addvoteVisible="addvotevisible"
-                :isLevel="true"
+               :isLevel="isLevel"
                 @changeData="updateTableData"
                 v-model:isactive="isactive"
                 v-model:edit="edit"
@@ -1162,6 +1162,7 @@ export default {
       value2: "",
       selectedRowKeys: [],
       edit: false, //是否点击编辑
+      isLevel:1,//学习路径1项目2模板库3
       gqxy_hs: true,
       isactive: 0,
       projectChecked: null, //项目单选框
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 1916a933..bec00e59 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -100,6 +100,7 @@
             <add-online 
             v-model:addonlineVisible="addonlinevisible" 
             @changeData="updateTableData"
+            :isLevel="isLevel"
               v-model:edit="edit"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -118,7 +119,9 @@
           </div>
           <!-- 添加面授侧弹窗 -->
           <div>
-            <add-faceteach v-model:addfaceteachVisible="addfaceteachvisible" />
+            <add-faceteach v-model:addfaceteachVisible="addfaceteachvisible" 
+            v-model:EditEvalId="EditEvalId"
+            />
           </div>
           <!-- 添加面授侧弹窗 -->
           <div class="lin"></div>
@@ -132,8 +135,13 @@
           </div>
           <!-- 添加案例侧弹窗 -->
           <div>
-            <add-case v-model:addcaseVisible="addcasevisible" @changeData="updateTableData" v-model:edit="edit"
-              v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId"
+            <add-case v-model:addcaseVisible="addcasevisible"
+             @changeData="updateTableData"
+             :isLevel="isLevel"
+              v-model:edit="edit"
+              v-model:projectId="projectId" 
+              v-model:chooseStageId="chooseStageId"
+               v-model:projectTaskId="projectTaskId"
               v-model:EditCaseId="EditCaseId" />
           </div>
           <!-- 添加案例侧弹窗 -->
@@ -151,7 +159,7 @@
             <add-homework
               v-model:addhomeworkVisible="addhomeworkvisible"
               @changeData="updateTableData"
-              :isLevel="false"
+              v-model:isLevel="isLevel"
               v-model:edit="edit"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -174,7 +182,7 @@
             <add-test
               v-model:addtestVisible="addtestvisible"
               @changeData="updateTableData"
-              :isLevel="false"
+              :isLevel="isLevel"
               v-model:edit="edit"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -196,6 +204,7 @@
           <div>
             <add-live
               v-model:addliveVisible="addlivevisible"
+              :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -218,7 +227,7 @@
           <div>
             <add-ref
               v-model:addrefVisible="addrefvisible"
-              :isLevel="false"
+              :isLevel="isLevel"
               @changeData="updateTableData"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
@@ -242,6 +251,7 @@
             <add-discuss
               v-model:adddiscussVisible="adddiscussvisible"
               v-model:edit="edit"
+              :isLevel="isLevel"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
               v-model:EditDiscussId="EditDiscussId"
@@ -267,6 +277,7 @@
               v-model:EditActiveId="EditActiveId"
               v-model:projectTaskId="projectTaskId"
               v-model:edit="edit"
+              :isLevel="isLevel"
               v-model:chooseStageId="chooseStageId"
               @changeData="updateTableData"
             />
@@ -287,6 +298,7 @@
               v-model:addevalVisible="addevalvisible"
               @changeData="updateTableData"
               v-model:edit="edit"
+              :isLevel="isLevel"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
               v-model:projectTaskId="projectTaskId"
@@ -309,6 +321,7 @@
               v-model:addinvistVisible="addinvistvisible"
               @changeData="updateTableData"
               v-model:edit="edit"
+              :isLevel="isLevel"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
               v-model:projectTaskId="projectTaskId"
@@ -331,6 +344,7 @@
                 @changeData="updateTableData"
                 @getData="changeVData"
                 v-model:edit="edit"
+                :isLevel="isLevel"
                 v-model:projectId="projectId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
@@ -879,7 +893,7 @@ 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";s
+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/vote/AddVote.vue";
@@ -953,6 +967,7 @@ export default {
         : null,
       chooseStageId: null,
       edit: false,
+      isLevel:2,//学习路径1项目2模板库3
       // isRefEdit: 1, //外链编辑
       // isLiveEdit: 1, //直播编辑
       isRefEdit: false, //外链编辑
@@ -966,6 +981,7 @@ export default {
       EditTestId: null, // 要编辑的考试id
       EditCaseId:null,//要编辑的案例id
       EditOnlineId:null,//要编辑的在线id
+      EditFaceTeach:null,
       EditEvalId: null,
       EditInvistId: null,
       EditVoteId: null, //编辑需要投票的id