From 07be52e211244677f42b544012ae8f9999821909 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 02:23:32 +0800
Subject: [PATCH 01/21] -- bug

---
 src/components/drawers/AddDiscuss.vue   | 54 ++++++++++++++++++-------
 src/components/drawers/ProjectAudit.vue | 12 +++++-
 2 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index d6dad640..f9aeb8fc 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -57,7 +57,8 @@
             </div>
             <div class="btnbox">
               <a-checkbox v-model:checked="checkedC1" @change="checkRadio"
-              >允许评论</a-checkbox
+              >允许评论
+              </a-checkbox
               >
             </div>
           </div>
@@ -71,12 +72,13 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
+import {reactive, toRefs} from "vue";
 import * as api from "../../api/indexDiscuss";
 import * as apiTask from "../../api/indexTaskadd";
-import { RouterEditTask } from "@/api/indexTask";
-import { message } from "ant-design-vue";
-import { addTempTask } from "../../api/indexTaskadd";
+import {RouterEditTask} from "@/api/indexTask";
+import {message} from "ant-design-vue";
+import {addTempTask} from "../../api/indexTaskadd";
+
 export default {
   name: "AddDiscuss",
   props: {
@@ -170,7 +172,7 @@ export default {
       if (props.edit) {
         //编辑讨
         api
-            .getDiscussDetail({ discussId: props.EditDiscussId })
+            .getDiscussDetail({discussId: props.EditDiscussId})
             .then((res) => {
               //更新讨论信息
               state.inputV1 = res.data.data.discussName;
@@ -178,7 +180,8 @@ export default {
               state.checkedC1 =
                   res.data.data.discussSettings == "true" ? true : false;
             })
-            .catch(() => {});
+            .catch(() => {
+            });
       }
     };
     const afterVisibleChange = (bool) => {
@@ -186,9 +189,9 @@ export default {
         queryDiscuss();
       }
     };
-    const updateTask = (res) => {
+    const updateTask = async (res) => {
       if (props.isLevel == 1) {
-        RouterEditTask({
+        await RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.discussId,
           name: res.data.data.discussName,
@@ -203,7 +206,7 @@ export default {
               //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
             });
       } else if (props.isLevel == 2) {
-        apiTask
+        await apiTask
             .addTask({
               courseId: res.data.data.discussId,
               name: res.data.data.discussName,
@@ -220,7 +223,7 @@ export default {
             });
       } else if (props.isLevel == 3) {
         console.log("");
-        addTempTask({
+        await addTempTask({
           courseId: res.data.data.discussId,
           name: res.data.data.discussName,
           projectTemplateId: props.projectTemplateId,
@@ -251,8 +254,8 @@ export default {
       if (props.edit) {
         api
             .updateDiscuss(obj)
-            .then((res) => {
-              updateTask(res);
+            .then(async (res) => {
+              await updateTask(res);
               closeDrawer();
               ctx.emit("changeData", false);
               message.destroy();
@@ -265,8 +268,8 @@ export default {
       } else {
         api
             .createDiscuss(obj)
-            .then((res) => {
-              updateTask(res);
+            .then(async (res) => {
+              await updateTask(res);
               closeDrawer();
               ctx.emit("changeData", false);
               message.destroy();
@@ -293,6 +296,7 @@ export default {
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
+
 .addrefDrawer {
   .drawerMain {
     .header {
@@ -302,6 +306,7 @@ export default {
       justify-content: space-between;
       align-items: center;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -310,35 +315,43 @@ export default {
         margin-left: 24px;
       }
     }
+
     .contentMain {
       display: flex;
       justify-content: space-between;
+
       .main_left {
         margin-top: 32px;
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
+
         .main_item {
           display: flex;
           align-items: center;
           margin-top: 32px;
           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;
+
             .ant-input {
               height: 100%;
             }
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -351,32 +364,40 @@ export default {
             }
           }
         }
+
         .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;
             }
           }
+
           .textarea {
             width: 423px;
+
             .ant-input {
               width: 100%;
             }
+
             .ant-input-textarea-show-count {
               position: relative;
             }
+
             .ant-input-textarea-show-count::after {
               position: absolute;
               right: 10px;
               bottom: 0px;
             }
+
             .ant-input {
               border-radius: 8px;
             }
@@ -384,6 +405,7 @@ export default {
         }
       }
     }
+
     .main_btns {
       height: 72px;
       width: 100%;
@@ -393,6 +415,7 @@ export default {
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
       .btn1 {
         width: 100px;
         height: 40px;
@@ -402,6 +425,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;
diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
index 8687a8d2..a816e093 100644
--- a/src/components/drawers/ProjectAudit.vue
+++ b/src/components/drawers/ProjectAudit.vue
@@ -114,11 +114,12 @@
 </template>
 
 <script>
-import { toRefs, reactive } from "vue";
+import {toRefs, reactive, onMounted} from "vue";
 import { getTask } from "../../api/indexTaskadd";
 import { toDate } from "../../api/method";
 import { auditView } from "../../api/indexAudit";
 import { message } from "ant-design-vue";
+import * as api1 from "@/api/index1";
 
 export default {
   name: "ProjectAudit",
@@ -284,7 +285,14 @@ export default {
           message.warning("提交失败");
         });
     };
-
+    const getDictList = async (param) => api1.getDict({
+      pageNo: 1,
+      pageSize: 20,
+      setCode: param
+    }).then((res) => res.data.data.rows)
+    onMounted(async () => {
+      state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode }))
+    });
     return {
       ...toRefs(state),
       closeDrawer,

From 8ae00ef4cee54253e2d62a61626cdd498207c19a Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 1 Dec 2022 14:55:31 +0800
Subject: [PATCH 02/21] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js                            |  4 ++--
 src/components/NavTop.vue                    |  7 ++++---
 src/components/drawers/ProjCheckPower.vue    | 19 ++++++++++++-------
 src/components/drawers/ProjectOwn.vue        |  5 ++++-
 src/views/courselibrary/CoursewareManage.vue |  2 +-
 src/views/projectcenter/ProjectAdd.vue       |  5 ++++-
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index 86923900..91f4dd03 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-01 02:45:40
+ * @LastEditTime: 2022-12-01 09:02:04
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -53,7 +53,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        window.open("https://u-pre.boe.com/web/", '_self');
+        // window.open("https://u-pre.boe.com/web/", '_self');
       }
       console.log("api %o", msg);
     }
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 5bdc82ec..18806aaf 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -104,9 +104,10 @@ export default {
           console.log("获取登录信息成功", res);
           if (res.data.code === 200) {
             state.username = res.data.data.realName;
-            state.avatar = res.data.data.avatar
-              ? res.data.data.avatar
-              : require("../assets/images/avatar.png");
+            // state.avatar = res.data.data.avatar
+            //   ? res.data.data.avatar
+            //   : require("../assets/images/avatar.png");
+            state.avatar = require("../assets/images/avatar.png");
           }
         })
         .catch((err) => {
diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue
index bcb8ceb9..f9c3803c 100644
--- a/src/components/drawers/ProjCheckPower.vue
+++ b/src/components/drawers/ProjCheckPower.vue
@@ -792,12 +792,15 @@ export default {
     // 开始 快速选人------------------------------------------------------------------
     //选中部门
     const departmentSelect = (e, k) => {
-      console.log("选中的部门", e, k);
-      state.currentPage = 1;
-      state.selectedKeys = [k.node.key];
-      state.selectOrgId = k.selectedNodes[0].id; //选中的组织id
-      state.selectOrgName = k.selectedNodes[0].name; //选中的组织名称
-      getMember(k.selectedNodes[0].id);
+      if (!k.node.treeChildList) {
+        console.log("选中的部门", e, k);
+        state.currentPage = 1;
+        state.selectedKeys = [k.node.key];
+        state.selectOrgId = k.selectedNodes[0].id; //选中的组织id
+        state.selectOrgName = k.selectedNodes[0].name; //选中的组织名称
+        console.log("treeChildList", k.node.treeChildList);
+        getMember(k.selectedNodes[0].id);
+      }
     };
     //获取学员
     const getMember = async (org) => {
@@ -831,12 +834,14 @@ export default {
     //分页获取学员
     const changePagination = (page) => {
       state.currentPage = page;
+      console.log("1111111");
       getMember(state.selectOrgId);
     };
     //搜索学员
     const handleSearchStu = () => {
       deleteDepSelect();
       state.currentPage2 = 1;
+      console.log("22222");
       getMember();
     };
     //重置
@@ -996,7 +1001,7 @@ export default {
       // if (state.isSearchOrg) {
       //   searchOrg(e[0]);
       // }
-      if (!k.node.children) {
+      if (!k.node.treeChildList) {
         state.selectedKeys1 = e.reverse();
         if (k.selected) {
           state.chooseorganization.unshift(k.node);
diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue
index e09d41ce..2faee1bf 100644
--- a/src/components/drawers/ProjectOwn.vue
+++ b/src/components/drawers/ProjectOwn.vue
@@ -688,7 +688,10 @@ export default {
       if (k.node.treeChildList === null) {
         state.selectedKeys = [k.node.key];
         state.selectDepartment = k.node.name;
-        getPeoples();
+
+        if (!k.node.treeChildList) {
+          getPeoples();
+        }
       }
       // console.log("kkkkkk", k);
       // state.selectedKeys = [k.node.key];
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 71ed0c89..975648c5 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2468,7 +2468,7 @@
           </div>
           <div class="body">
             <div :style="{ display: del_hs ? 'block' : 'none' }">
-              <span>您确定要删除此课程吗</span>
+              <span>您确定要删除此学员吗</span>
             </div>
             <div :style="{ display: copy_hs ? 'block' : 'none' }">
               <span>您确定要复制此课程吗</span>
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index ef227fae..5f04cb82 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -162,6 +162,7 @@
               placeholder="请选择项目经理"
               style="width: 100%"
               :options="classifyList1"
+              :filterOption="false"
               @change="classificationChange1"
               allowClear
               showSearch
@@ -812,7 +813,9 @@ export default {
         .then((res) => {
           if (res.data.code === 200) {
             let arr = res.data.data.rows;
+
             let array = classifyList1.value;
+            console.log("array", array);
             arr.map((value) => {
               let obj = {
                 value: value.id,
@@ -836,7 +839,7 @@ export default {
       if (e) {
         state.searchName = e;
         classifyList1.value = [];
-        getMember();
+        getMember(e);
       }
     };
 

From d52e08444e1fdeff470fe23d46ac8ed7871e619d Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Thu, 1 Dec 2022 16:11:41 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue   | 2 +-
 src/components/drawers/AddDiscuss.vue  | 8 ++++----
 src/components/drawers/AddHomework.vue | 8 ++++----
 src/components/drawers/AddLive.vue     | 8 ++++----
 src/components/drawers/AddProject.vue  | 1 +
 src/components/drawers/AddTest.vue     | 8 ++++----
 src/components/vote/AddVote.vue        | 8 ++++----
 7 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index f6ebf189..5bcf1c47 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -319,7 +319,7 @@ export default {
       state.textV1 = "";
       state.textV2 = "";
       state.time = "";
-      message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+     
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index d6dad640..171ab781 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -251,8 +251,8 @@ export default {
       if (props.edit) {
         api
             .updateDiscuss(obj)
-            .then((res) => {
-              updateTask(res);
+            .then(async(res) => {
+             await updateTask(res);
               closeDrawer();
               ctx.emit("changeData", false);
               message.destroy();
@@ -265,8 +265,8 @@ export default {
       } else {
         api
             .createDiscuss(obj)
-            .then((res) => {
-              updateTask(res);
+            .then(async(res) => {
+             await updateTask(res);
               closeDrawer();
               ctx.emit("changeData", false);
               message.destroy();
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index e4c732cf..ea551f0b 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -304,9 +304,9 @@ export default {
       };
       if (props.EditWorkId > 0) {
         updateWorkTaskUsing(obj)
-          .then((res) => {
+          .then(async(res) => {
             // console.log("添加成功", res);
-            updateTask(res);
+           await updateTask(res);
             ctx.emit("changeData", false);
             closeDrawer();
           })
@@ -316,9 +316,9 @@ export default {
           });
       } else {
         createWorkTask(obj)
-          .then((res) => {
+          .then(async(res) => {
             console.log("添加成功", res);
-            updateTask(res);
+           await updateTask(res);
             ctx.emit("changeData", false);
             closeDrawer();
           })
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 7ca0734e..0acf9c22 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -640,20 +640,20 @@ export default {
       if (props.edit) {
         api
           .updateLiveBroadcastMessage(state.obj)
-          .then((res) => {
+          .then(async(res) => {
             message.destroy();
             message.success("提交成功");
-            updateTask(res);
+           await updateTask(res);
             closeDrawer();
           })
           .catch(() => {});
       } else {
         api
           .createLiveBroadcast(state.obj)
-          .then((res) => {
+          .then(async(res) => {
             message.destroy();
             message.success("提交成功");
-            updateTask(res);
+           await updateTask(res);
             closeDrawer();
           })
           .catch(() => {});
diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index 1d5da783..e1499477 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -477,6 +477,7 @@ export default {
         })
             .then(() => {
               message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+              ctx.emit("changeData", false);
               closeDrawer();
             })
             .catch(() => {
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 5d7a03c7..7aead476 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -727,8 +727,8 @@ export default {
       if (props.edit) {
         // 编辑任务
         updateExamination(obj)
-          .then((res) => {
-            updateTask(res);
+          .then(async(res) => {
+            await updateTask(res);
             closeDrawer();
           })
           .catch(() => {
@@ -737,8 +737,8 @@ export default {
       } else {
         // 创建任务
         createExamination(obj)
-          .then((res) => {
-            updateTask(res);
+          .then(async(res) => {
+            await updateTask(res);
             closeDrawer();
           })
           .catch(() => {
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index e49bb756..7e2a3b8a 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -353,9 +353,9 @@ export default {
       if (props.edit) {
         api
           .editVote(obj)
-          .then((res) => {
+          .then(async(res) => {
             console.log("updte======");
-            updateToTask(res);
+           await updateToTask(res);
             closeDrawer();
             message.destroy();
             message.success("修改投票信息成功")
@@ -367,8 +367,8 @@ export default {
       } else {
         api
           .createVote(obj)
-          .then((res) => {
-            updateToTask(res);
+          .then(async(res) => {
+            await updateToTask(res);
             closeDrawer();
             message.destroy();
             message.success("创建投票信息成功")

From 13e93120699537201757d721cc7b117a4ac97bcd Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 18:50:41 +0800
Subject: [PATCH 04/21] -- bug

---
 src/App.vue                             |  90 ++-
 src/components/drawers/ProjectAudit.vue |   5 +-
 src/store/index.js                      |   8 +
 src/views/projectcenter/ProjectAdd.vue  | 785 ++++++++++++------------
 4 files changed, 459 insertions(+), 429 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 21bd6685..5377c763 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,33 +1,35 @@
 <template>
   <div id="container" v-if="!isLogin">
-    <nav-top />
+    <nav-top/>
     <div style="display: flex">
-      <nav-left />
+      <nav-left/>
       <div style="flex: 1; display: flex; flex-direction: column; width: 0">
-        <open-pages />
-        <bread-crumb />
+        <open-pages/>
+        <bread-crumb/>
         <main>
           <a-config-provider :locale="zhCN">
-            <router-view />
+            <router-view/>
           </a-config-provider>
         </main>
       </div>
     </div>
   </div>
   <div id="container" v-if="isLogin">
-    <router-view />
+    <router-view/>
   </div>
 </template>
 <script>
-import { computed, defineComponent, ref, watch } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { useStore } from "vuex";
+import {computed, defineComponent, ref, watch} from "vue";
+import {useRouter, useRoute} from "vue-router";
+import {useStore} from "vuex";
 import NavLeft from "@/components/NavLeft";
 import NavTop from "@/components/NavTop";
 import OpenPages from "@/components/OpenPages";
 import BreadCrumb from "@/components/BreadCrumb";
 import zhCN from "ant-design-vue/es/locale/zh_CN";
 import * as api from "./api/index1";
+import * as api1 from "@/api/index1";
+
 export default defineComponent({
   components: {
     NavLeft,
@@ -47,37 +49,70 @@ export default defineComponent({
     });
 
     watch(
-      () => route.path,
-      () => {
-        route.path === "/login" && (isLogin.value = true);
-      }
+        () => route.path,
+        () => {
+          route.path === "/login" && (isLogin.value = true);
+        }
     );
 
     const currentRouteName = computed(() => route.name);
 
+    function init() {
+      console.log(store)
+      initDict('faceclassPic')
+      initDict('faceclassClass')
+      initDict('faceclassScene')
+      initDict('projectLevel')
+      initDict('projectSys')
+      getOrgTree()
+    }
+
+
+    async function initDict(key) {
+      let list = localStorage.getItem(key)
+      if (list) {
+        store.commit('SET_DICT', {key, data:JSON.parse(list)});
+        return;
+      }
+      list = await getDictList(key)
+      localStorage.setItem(key, JSON.stringify(list));
+      store.commit('SET_DICT', {key, data:list});
+    }
+
+    const getDictList = (param) => api1.getDict({
+      pageNo: 1,
+      pageSize: 20,
+      setCode: param
+    }).then((res) => res.data.data.rows)
+
     //获取组织树
     const getOrgTree = () => {
+      const orgtreeList = localStorage.getItem("orgtreeList")
+      if (orgtreeList) {
+        store.commit("getOrgtreeList", JSON.parse(orgtreeList));
+        return;
+      }
       let obj = {
         keyWord: "",
         id: -1,
         pageNo: 1,
         pageSize: 20,
       };
-      api
-        .getOrgInfo(obj)
-        .then((res) => {
-          console.log("组织树获取成功", res);
-          if (res.data.code === 200) {
-            // state.treeData = res.data.data;
-            store.commit("getOrgtreeList", res.data.data);
-          }
-        })
-        .catch((err) => {
-          console.log("组织树获取失败", err);
-        });
+      api.getOrgInfo(obj)
+          .then((res) => {
+            console.log("组织树获取成功", res);
+            if (res.data.code === 200) {
+              // state.treeData = res.data.data;
+              localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
+              store.commit("getOrgtreeList", res.data.data);
+            }
+          })
+          .catch((err) => {
+            console.log("组织树获取失败", err);
+          });
     };
 
-    getOrgTree();
+    init();
 
     return {
       isLogin,
@@ -93,7 +128,7 @@ export default defineComponent({
   // font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
   // sans-serif;
   font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
-    Microsoft YaHei, Arial, sans-serif;
+  Microsoft YaHei, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   color: #2c3e50;
@@ -125,6 +160,7 @@ export default defineComponent({
     background: #ffffff;
     box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
   }
+
   // @media screen and (max-width: 1366px) {
   //   .cmMain {
   //     width: 750px;
diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
index a816e093..e863c007 100644
--- a/src/components/drawers/ProjectAudit.vue
+++ b/src/components/drawers/ProjectAudit.vue
@@ -181,6 +181,8 @@ export default {
       noticeFlag: null, //未改
       templateId: null, //未改
       attach: null,
+      calssifyList:[],
+      faceclassScene:[]
     });
 
     const closeDrawer = () => {
@@ -291,7 +293,8 @@ export default {
       setCode: param
     }).then((res) => res.data.data.rows)
     onMounted(async () => {
-      state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode }))
+      state.calssifyList = (await getDictList("faceclassClass")).map(e => ({ label: e.dictName, value: e.dictCode })) //内容
+      state.faceclassScene = (await getDictList("faceclassScene")).map(e => ({ label: e.dictName, value: e.dictCode })) //场景
     });
     return {
       ...toRefs(state),
diff --git a/src/store/index.js b/src/store/index.js
index a10286f2..447b0dd3 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -24,6 +24,11 @@ export default createStore({
     routerId: null,
     projectTemplateId: null,
     orgtreeList: [],
+    faceclassPic: null,
+    faceclassClass: [],
+    faceclassScene: [],
+    projectLevel: [],//项目级别
+    projectSys: [],//培训分类
   },
   getters: {},
   mutations: {
@@ -45,6 +50,9 @@ export default createStore({
     getOrgtreeList(state, data) {
       state.orgtreeList = data
     },
+    SET_DICT(state,{key,data}){
+      state[key] = data
+    },
     SET_projectTemplateId(state, projectTemplateId) {
       state.projectTemplateId = projectTemplateId;
     }
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 5d106d8e..67ddf96a 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -4,10 +4,10 @@
     <div class="header">
       <span class="title">创建/编辑单层项目</span>
       <div
-        @click="backPage"
-        style="cursor: pointer"
-        to="/projectmanage"
-        class="goback"
+          @click="backPage"
+          style="cursor: pointer"
+          to="/projectmanage"
+          class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -17,45 +17,45 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                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"
-              :disabled="viewDetail ? true : false"
+                v-model:value="projectName"
+                placeholder="请输入项目名称"
+                show-count
+                :maxlength="30"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">分类</div>
           </div>
           <div class="in select">
             <a-select
-              :getPopupContainer="
+                :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="classifySelect"
-              placeholder="请选择分类"
-              style="width: 100%"
-              :options="classifyList"
-              @change="classificationChange"
-              allowClear
-              showSearch
-              :disabled="viewDetail ? true : false"
-              :fieldNames="{
+                v-model:value="classifySelect"
+                placeholder="请选择分类"
+                style="width: 100%"
+                :options="classifyList"
+                @change="classificationChange"
+                allowClear
+                showSearch
+                :disabled="viewDetail ? true : false"
+                :fieldNames="{
                 label: 'dictName',
                 value: 'dictCode',
               }"
@@ -66,14 +66,14 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
           <div
-            class="box"
-            style="
+              class="box"
+              style="
               width: 100px;
               height: 100px;
               border: 1px solid rgba(78, 166, 255, 1);
@@ -84,15 +84,15 @@
             "
           >
             <img
-              style="
+                style="
                 width: 100px;
                 height: 100px;
                 margin-bottom: 4px;
                 margin-right: 4px;
               "
-              v-if="imageUrl"
-              :src="imageUrl"
-              alt="avatar"
+                v-if="imageUrl"
+                :src="imageUrl"
+                alt="avatar"
             />
             <!-- <a-upload
               v-model:file-list="fileList"
@@ -126,49 +126,49 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                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"
-              :disabled="viewDetail ? true : false"
+                separator="至"
+                :placeholder="['      开始时间', '        结束时间']"
+                v-model:value="rangevalue"
+                style="width: 100%; height: 40px; border-radius: 5px"
+                @change="onRangeChange"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <a-select
-              :getPopupContainer="
+                :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="classifySelect1"
-              placeholder="请选择项目经理"
-              style="width: 100%"
-              :options="classifyList1"
-              @change="classificationChange1"
-              allowClear
-              showSearch
-              mode="multiple"
-              :disabled="viewDetail ? true : false"
-              @popupScroll="memberScroll"
-              @search="getMember"
+                v-model:value="classifySelect1"
+                placeholder="请选择项目经理"
+                style="width: 100%"
+                :options="classifyList1"
+                @change="classificationChange1"
+                allowClear
+                showSearch
+                mode="multiple"
+                :disabled="viewDetail ? true : false"
+                @popupScroll="memberScroll"
+                @search="getMember"
             >
             </a-select>
           </div>
@@ -176,33 +176,33 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <a-tree-select
-              :getPopupContainer="
+                :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="classifySelect2"
-              style="width: 100%"
-              :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-              placeholder="自动带出 可修改"
-              allow-clear
-              :tree-data="classifyList2"
-              :fieldNames="{
+                v-model:value="projectInfo.sourceBelongId"
+                style="width: 100%"
+                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                placeholder="自动带出 可修改"
+                allow-clear
+                :tree-data="orgtreeList"
+                :fieldNames="{
                 children: 'treeChildList',
                 label: 'name',
                 value: 'id',
               }"
-              :disabled="viewDetail ? true : false"
-              @change="classificationChange2"
-              dropdownClassName="treeDropdown"
+                :disabled="viewDetail ? true : false"
+                @change="classificationChange2"
+                dropdownClassName="treeDropdown"
             >
               <!-- <template #title="{ value: val, title }">
       <b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
@@ -230,12 +230,12 @@
           </div>
           <div class="in">
             <a-textarea
-              v-model:value="remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-              :disabled="viewDetail ? true : false"
+                v-model:value="remark"
+                style="height: 80px"
+                placeholder="请输入说明"
+                show-count
+                :maxlength="200"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -245,97 +245,87 @@
           </div>
           <div class="in">
             <a-radio
-              @click="changeChecked"
-              v-model:checked="checked"
-              :disabled="viewDetail ? true : false"
-              ><span
+                @click="changeChecked"
+                v-model:checked="checked"
+                :disabled="viewDetail ? true : false"
+            ><span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
                 "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-radio
+            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+            ></a-radio
             >
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目级别</div>
           </div>
           <div class="in select">
             <a-select
-              :getPopupContainer="
+                :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="classifySelect3"
-              :options="classifyList3"
-              style="width: 100%"
-              @change="classificationChange3"
-              placeholder="请选择项目级别"
-              :disabled="viewDetail ? true : false"
-              :fieldNames="{
-                label: 'dictName',
-                value: 'dictCode',
-              }"
+                v-model:value="projectInfo.level"
+                :options="classifyList3"
+                style="width: 100%"
+                placeholder="请选择项目级别"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">培训分类</div>
           </div>
           <div class="in select">
             <a-select
-              :getPopupContainer="
+                :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="classifySelect4"
-              :options="classifyList4"
-              style="width: 100%"
-              @change="classificationChange4"
-              placeholder="请选择培训分类"
-              :disabled="viewDetail ? true : false"
-              :fieldNames="{
-                label: 'dictName',
-                value: 'dictCode',
-              }"
+                v-model:value="projectInfo.systemId"
+                :options="systemOption"
+                style="width: 100%"
+                placeholder="请选择培训分类"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                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"
-              :disabled="viewDetail ? true : false"
-              ><span
+                @click="changeChecked1"
+                v-model:checked="checked1"
+                :disabled="viewDetail ? true : false"
+            ><span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
                 "
-                >BOEU实施</span
-              ></a-radio
+            >BOEU实施</span
+            ></a-radio
             >
           </div>
         </div>
@@ -403,7 +393,8 @@
     <div class="footer">
       <div class="btn">
         <a-button v-on:click="createProject" type="primary" class="btn1"
-          >确定</a-button
+        >确定
+        </a-button
         >
         <a-button @click="backPage" class="btn2">取消</a-button>
       </div>
@@ -411,15 +402,16 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, ref, onUnmounted, computed } from "vue";
-import { message } from "ant-design-vue";
-import { useRouter, useRoute } from "vue-router";
+import {reactive, toRefs, ref, onUnmounted, onMounted} from "vue";
+import {message} from "ant-design-vue";
+import {useRouter, useRoute} from "vue-router";
 import dayjs from "dayjs";
 import * as api from "../../api/index";
 import * as api1 from "../../api/index1";
-import { storage } from "../../api/storage";
-import { toDate, scrollLoad } from "../../api/method";
-import { useStore } from "vuex";
+import {storage} from "../../api/storage";
+import {toDate, scrollLoad} from "../../api/method";
+import {useStore} from "vuex";
+
 export default {
   name: "projectAdd",
   setup() {
@@ -445,17 +437,24 @@ export default {
       viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
 
       currentPage1: 1, //项目经理
-      pageSize1: 10, //项目经理
+      pageSize1: 10, //项目经理,
+      orgtreeList: [],
+      projectInfo: {},
+      classifyList3: [],
+      systemOption: []
     });
+
+    onMounted(() => {
+      console.log('onMounted')
+      state.orgtreeList = [...store.state.orgtreeList]
+      state.classifyList3 = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
+      state.systemOption = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
+    })
     //分类列表
     const classifyList = ref([]);
 
     //项目封面
     const imageUrl = ref("");
-    // 项目级别
-    const classifyList3 = ref([
-      // { value: 1, label: "集团级" },
-    ]);
 
     // 培训分类
     const classifyList4 = ref([
@@ -469,42 +468,38 @@ export default {
         setCode: param,
       };
       api1
-        .getDict(obj)
-        .then((res) => {
-          console.log("获取字典成功", res);
-          if (res.status === 200) {
-            if (param === "projectClass") {
-              classifyList.value = res.data.data.rows;
-            }
-            if (param === "projectPic") {
-              if (res.data.data.rows.length > 0) {
-                imageUrl.value = res.data.data.rows[0].dictValue;
-                picUrl = res.data.data.rows[0].dictValue;
+          .getDict(obj)
+          .then((res) => {
+            console.log("获取字典成功", res);
+            if (res.status === 200) {
+              if (param === "projectClass") {
+                classifyList.value = res.data.data.rows;
+              }
+              if (param === "projectPic") {
+                if (res.data.data.rows.length > 0) {
+                  imageUrl.value = res.data.data.rows[0].dictValue;
+                  picUrl = res.data.data.rows[0].dictValue;
+                }
+              }
+
+              if (param === "projectSys") {
+                classifyList4.value = res.data.data.rows;
+              }
+              if (
+                  classifyList.value &&
+                  imageUrl.value &&
+                  classifyList4.value
+              ) {
+                getDictInfo();
               }
             }
-            if (param === "projectLevel") {
-              classifyList3.value = res.data.data.rows;
-            }
-            if (param === "projectSys") {
-              classifyList4.value = res.data.data.rows;
-            }
-            if (
-              classifyList.value &&
-              imageUrl.value &&
-              classifyList3.value &&
-              classifyList4.value
-            ) {
-              getDictInfo();
-            }
-          }
-        })
-        .catch((err) => {
-          console.log("获取字典失败", err);
-        });
+          })
+          .catch((err) => {
+            console.log("获取字典失败", err);
+          });
     };
     getDictList("projectClass");
     getDictList("projectPic");
-    getDictList("projectLevel");
     getDictList("projectSys");
     //获取分类、封面图、项目级别、培训分类---------------字典配置---------------------------
     //分类、封面图、项目级别、培训分类回显
@@ -530,7 +525,6 @@ export default {
 
     const isEdit = ref(false);
     let peojectID = ""; //项目id
-    console.log("store.state.orgtreeList", store.state.orgtreeList);
     const editProject = () => {
       if (routers.query.projectId) {
         storage.set("projectAddId", routers.query.projectId);
@@ -538,98 +532,40 @@ export default {
         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(
-                "classifyList.value.find(item=>item.dictCode===info.category)",
-                classifyList.value.find((item) => {
-                  if (item.dictCode == 11) {
-                    return item.dictName;
-                  }
-                  // return item.dictName;
-                }),
-                classifyList.value,
-                info.category
-              );
-
-              console.log(info);
-              // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-              projectName.value = info.name; //项目名称
-              // state.classifySelect =classifyList.value.find(item=>item.dictCode===info.category) ; // info.category 项目分类
-              state.projectType = 1; //分类选择的id
-
-              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 manageName = info.manager.split(","); //项目经理
-              let manageValue = info.managerId.split(","); //项目经理id数组
-              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(",");
-
-              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") })
+            .getProjectDetail({projectId: routers.query.projectId})
             .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 分类选择的信息
-                state.projectType = 1; //分类选择的id
-                imageUrl.value = info.picUrl;
+                state.projectInfo = info;
+                console.log(
+                    "classifyList.value.find(item=>item.dictCode===info.category)",
+                    classifyList.value.find((item) => {
+                      if (item.dictCode == 11) {
+                        return item.dictName;
+                      }
+                      // return item.dictName;
+                    }),
+                    classifyList.value,
+                    info.category
+                );
 
-                let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
-                let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
+                console.log(info);
+                // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+                projectName.value = info.name; //项目名称
+                // state.classifySelect =classifyList.value.find(item=>item.dictCode===info.category) ; // info.category 项目分类
+                state.projectType = 1; //分类选择的id
+
+                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 manageName = info.manager.split(",");
-                let manageValue = info.managerId.split(",");
+                let manageName = info.manager.split(","); //项目经理
+                let manageValue = info.managerId.split(","); //项目经理id数组
                 let optionsManage = [];
                 for (let i = 0; i < manageName.length; i++) {
                   let obj = {
@@ -640,20 +576,17 @@ export default {
                 }
                 console.log(optionsManage);
                 state.classifySelect1 = optionsManage;
-                state.classifySelect2 =
-                  classifyList2.value[info.sourceBelongId - 1];
+                state.classifySelect2 = info.sourceBelongId
                 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;
-
+                state.orgtreeList.unshift({id: info.sourceBelongId, name: info.sourceBelongName})
                 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;
@@ -663,6 +596,63 @@ export default {
             .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;
+                  state.projectInfo = info;
+                  console.log("我是从本地存储获取的id", info);
+                  projectName.value = info.name;
+                  state.classifySelect = classifyList.value[1]; // info.category 分类选择的信息
+                  state.projectType = 1; //分类选择的id
+                  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 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 = info.sourceBelongId
+                  state.orgtreeList.unshift({id: info.sourceBelongId, name: info.sourceBelongName})
+                  remark.value = info.remark;
+                  state.checked = info.boeFlag ? info.boeFlag : false;
+                  state.classifySelect4 = classifyList4.value[info.systemId - 1];
+                  state.checked1 = info.boeFlag ? info.boeFlag : false;
+
+                  picUrl = info.picUrl;
+                  beginTime = Number(info.beginTime / 1000);
+                  endTime = Number(info.endTime / 1000);
+                  manager = info.manager;
+                  managerId = info.managerId;
+                  courseSyncFlag = info.courseSyncFlag;
+                  levels = info.level;
+                  systemid = info.systemId;
+                  boeFlag = info.boeFlag;
+                }
+              })
+              .catch((err) => {
+                console.log(err);
+              });
         }
       }
     };
@@ -728,10 +718,10 @@ export default {
       }
       if (info.file.status === "done") {
         console.log(
-          "上传附件返回的信息 %o",
-          info,
-          info.fileList.length,
-          uplodaFileCount
+            "上传附件返回的信息 %o",
+            info,
+            info.fileList.length,
+            uplodaFileCount
         );
 
         let attachStr = "";
@@ -760,7 +750,7 @@ export default {
 
     const beforeUpload = (file) => {
       const isJpgOrPng =
-        file.type === "image/jpeg" || file.type === "image/png";
+          file.type === "image/jpeg" || file.type === "image/png";
       if (!isJpgOrPng) {
         message.error("You can only upload JPG file!");
       }
@@ -790,8 +780,8 @@ export default {
       // 项目时间选择函数
       console.log("Formatted Selected Time: ", dateString);
       console.log(
-        "Formatted Selected TimeStamp",
-        new Date(dateString[0]).getTime()
+          "Formatted Selected TimeStamp",
+          new Date(dateString[0]).getTime()
       );
       beginTime = new Date(dateString[0]).getTime() / 1000;
       endTime = new Date(dateString[1]).getTime() / 1000;
@@ -802,29 +792,29 @@ export default {
     const getMember = (e) => {
       console.log("state.classifySelect1", e, state.classifySelect1);
       api1
-        .getMemberInfo({
-          pageNo: state.currentPage1,
-          pageSize: state.pageSize1,
-          keyWord: e ? e : "",
-        })
-        .then((res) => {
-          if (res.data.code === 200) {
-            let arr = res.data.data.rows;
-            let array = classifyList1.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.id,
-                label: value.realName,
-              };
-              array.push(obj);
-            });
-            classifyList1.value = array;
-            console.log("获取学员", res.data, classifyList1.value);
-            // classifyList1.value = res.data.data.rows;
-            // state.tableDataTotal = res.data.data.total;
-            // return res.data.data.rows;
-          }
-        });
+          .getMemberInfo({
+            pageNo: state.currentPage1,
+            pageSize: state.pageSize1,
+            keyWord: e ? e : "",
+          })
+          .then((res) => {
+            if (res.data.code === 200) {
+              let arr = res.data.data.rows;
+              let array = classifyList1.value;
+              arr.map((value) => {
+                let obj = {
+                  value: value.id,
+                  label: value.realName,
+                };
+                array.push(obj);
+              });
+              classifyList1.value = array;
+              console.log("获取学员", res.data, classifyList1.value);
+              // classifyList1.value = res.data.data.rows;
+              // state.tableDataTotal = res.data.data.total;
+              // return res.data.data.rows;
+            }
+          });
     };
     getMember();
 
@@ -870,21 +860,13 @@ export default {
       managerId = midstr;
     };
 
-    // 资源归属 sourceBelongId 后续给接口
-    const classifyList2 = computed(() => {
-      return store.state.orgtreeList ? store.state.orgtreeList : ref([]);
-    });
-
-    let sourceBelongIdC = "";
-    const classificationChange2 = (key) => {
-      console.log(`selected ${key}`, classifyList2);
-      sourceBelongIdC = key;
+    const classificationChange2 = (key, obj) => {
+      state.projectInfo.sourceBelongName = obj[0]
     };
 
     //选择项目级别
     let levels = "";
     const classificationChange3 = (key) => {
-      console.log(`selected ${key}`, classifyList3);
       levels = key;
     };
 
@@ -909,62 +891,60 @@ export default {
         projectTemplateId: Number(key),
       };
       api
-        .getTemplateDetail(obj)
-        .then((res) => {
-          console.log("获取模版详情", res);
-          if (res.status === 200) {
-            let info = res.data.data.projectTemplateInfo;
-            console.log(info);
-            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-            projectName.value = info.name;
-            state.classifySelect = classifyList.value[1]; // info.category  分类选择的信息
-            state.projectType = 1; //分类选择的id
+          .getTemplateDetail(obj)
+          .then((res) => {
+            console.log("获取模版详情", res);
+            if (res.status === 200) {
+              let info = res.data.data.projectTemplateInfo;
+              console.log(info);
+              // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
+              projectName.value = info.name;
+              state.classifySelect = classifyList.value[1]; // info.category  分类选择的信息
+              state.projectType = 1; //分类选择的id
 
-            imageUrl.value = info.picUrl;
+              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);
+              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 = info.sourceBelongId
+              state.orgtreeList.unshift({id: info.sourceBelongId, name: info.sourceBelongName})
+              remark.value = info.remark;
+              state.checked = info.boeFlag ? info.boeFlag : false;
+              state.classifySelect4 = classifyList4.value[info.systemId - 1];
+              state.checked1 = info.boeFlag ? info.boeFlag : false;
+              // fileList1.value = info.attach.split(",");
+
+              picUrl = info.picUrl;
+              beginTime = Number(info.beginTime / 1000);
+              endTime = Number(info.endTime / 1000);
+              manager = info.manager;
+              managerId = info.managerId;
+              courseSyncFlag = info.courseSyncFlag;
+              levels = info.level;
+              systemid = info.systemId;
+              boeFlag = info.boeFlag;
             }
-            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(",");
-
-            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);
-        });
+          })
+          .catch((err) => {
+            console.log("获取详情失败", err);
+          });
     };
     //获取模版列表
     const getTemplate = () => {
@@ -974,26 +954,26 @@ export default {
         // projectId:id?id:''
       };
       api
-        .getTemplate(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.projectTemplateId,
-                label: value.name,
-              };
-              array.push(obj);
-            });
-            classifyList5.value = array;
-          }
-        })
-        .catch((err) => {
-          console.log("获取模版列表失败", err);
-        });
+          .getTemplate(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.projectTemplateId,
+                  label: value.name,
+                };
+                array.push(obj);
+              });
+              classifyList5.value = array;
+            }
+          })
+          .catch((err) => {
+            console.log("获取模版列表失败", err);
+          });
     };
     getTemplate();
     //模版滚动加载模板信息
@@ -1077,11 +1057,12 @@ export default {
           endTime: endTime,
           manager: manager,
           managerId: managerId,
-          sourceBelongId: sourceBelongIdC,
+          sourceBelongId: state.projectInfo.sourceBelongId,
+          sourceBelongName: state.projectInfo.sourceBelongName,
           remark: remark["value"],
           courseSyncFlag: courseSyncFlag,
-          level: levels,
-          systemId: systemid,
+          level: state.projectInfo.level,
+          systemId: state.projectInfo.systemId,
           boeFlag: boeFlag,
           attach: attach,
           type: 3,
@@ -1104,27 +1085,27 @@ export default {
         }
 
         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 {
+            .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("编辑失败，请检查当前网络状态。");
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-            message.destroy();
-            message.error("编辑失败，请检查当前网络状态。");
-          });
+            });
       } else {
         let obj = {
           name: projectName["value"],
@@ -1134,7 +1115,8 @@ export default {
           endTime: endTime,
           manager: manager,
           managerId: managerId,
-          sourceBelongId: sourceBelongIdC,
+          sourceBelongId: state.projectInfo.sourceBelongId,
+          sourceBelongName: state.projectInfo.sourceBelongName,
           remark: remark["value"],
           courseSyncFlag: courseSyncFlag,
           level: levels,
@@ -1159,28 +1141,28 @@ export default {
         }
 
         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 {
+            .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("创建失败，请检查当前网络状态。");
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-            message.destroy();
-            message.error("创建失败，请检查当前网络状态。");
-          });
+            });
       }
     };
 
@@ -1207,8 +1189,6 @@ export default {
       beforeUpload1,
       onRangeChange,
       classifyList1,
-      classifyList2,
-      classifyList3,
       classifyList4,
       classifyList5,
       remark,
@@ -1522,16 +1502,19 @@ export default {
     }
   }
 }
+
 .treeDropdown {
   // width: 240px !important;
   // border-radius: 5px;
   // min-height: 600px !important;
   .ant-select-tree-list-scrollbar {
     width: 5px !important;
+
     .ant-select-tree-list-scrollbar-thumb {
       background-color: #4ea6ff !important;
     }
   }
+
   .ant-select-tree-indent-unit {
     width: 7px !important;
   }

From 131294eb1a1195441891016ddaefabaae69a4865 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Thu, 1 Dec 2022 18:56:42 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=BA=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue      |  5 +-
 src/views/courselibrary/CoursewareManage.vue | 74 +++++++++++++++++---
 2 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 1378c784..1cebe999 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -337,7 +337,10 @@ export default {
       type: Number,
       default: null,
     },
-
+    projectName: {
+      type: String,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const options = ref([]);
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 975648c5..6d438e83 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1870,12 +1870,13 @@
               <span style="margin-right: 3px">完成规则</span>
             </div>
             <div class="b_input">
+            <!--
               <a-checkbox
                 v-model:checked="regisCom"
                 @click="regisCom = !regisCom"
               >
                 <span style="color: #6d7584">报名即完成</span>
-              </a-checkbox>
+              </a-checkbox> -->
               <a-checkbox v-model:checked="signCom" @click="signCom = !signCom">
                 <span style="color: #6d7584">签到即完成</span>
               </a-checkbox>
@@ -2638,7 +2639,7 @@ const columns1 = [
         case "1":
           return "线上";
         case "2":
-          return "线下";
+          return "面授";
       }
     },
   },
@@ -3052,7 +3053,7 @@ export default defineComponent({
     // OwnPower,
     // Corpowerlist,
     Editor,
-    Toolbar,
+    Toolbar,filesList
     // StuAdd,
 
     ProjOwnerShip,
@@ -4458,6 +4459,7 @@ export default defineComponent({
         }
       });
     };
+    //
     const getTea = async () => {
       console.log("获取授课教师信息");
       const item1 = await getMemberInfoApi({
@@ -4525,14 +4527,24 @@ export default defineComponent({
       options4CurId.value = item.teacherId;
       state.qdms_inputV5 = null;
       state.qdms_inputV6 = item.intro;
-      if (item.attach.indexOf(",")) {
+      if(item.attach==""){
+        state.imgList =[];
+      }else{
+        if(item.attach==""){
+
+        }else{
+          if (item.attach.indexOf(",")) {
         const arr = item.attach.split(",");
         arr.forEach((item) => {
           state.imgList.push({ img: item });
         });
-      } else {
-        state.imgList = [{ img: item.attach }];
+        } else {
+          state.imgList = [{ img: item.attach }];
+        }
+        }
+     
       }
+    
       valueHtml.value = item.outline;
 
       getTea();
@@ -4658,7 +4670,7 @@ export default defineComponent({
       getTableDate2();
     };
 
-    const beforeUpload3 = (file) => {
+    const beforeUpload4 = (file) => {
       const fileType = [
         "jpg",
         "jpeg",
@@ -4690,6 +4702,52 @@ export default defineComponent({
       });
       return false;
     };
+    const beforeUpload3 = (file) => {
+      console.log(6765555);
+      console.log(file);
+      const fileType = [
+        "jpg",
+        "jpeg",
+        "png",
+        "gif",
+        "pdf",
+        "ppt",
+        "pptx",
+        "doc",
+        "docx",
+        "xls",
+        "xlsx",
+        "zip",
+      ];
+      if (!fileType.includes(file.name.split(".")[1])) {
+        message.error(
+          "仅支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip格式!"
+        );
+        return false;
+      }
+
+      // let isLt1M = file.size / 10240 / 10240 <= 1;
+      // if (!isLt1M) {
+      //   this.$message.error("图片大小超过10MB!");
+      //   return false;
+      // }
+
+      const formData = new FormData();
+      formData.append("file", file);
+      console.log(file);
+      fileUp(formData).then((res) => {
+        if (res.data.code === 200) {
+          state.filesList.push({
+            img: res.data.data,
+            name: file.name,
+            size: file.size,
+          });
+          console.log(state.imgList);
+          // state.hasImgName = res.data.data;
+        }
+      });
+      return false;
+    };
 
     const handleGuan22 = (item) => {
       console.log(787666);
@@ -5109,7 +5167,7 @@ export default defineComponent({
   box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
   position: absolute;
   left: 50%;
-  top: 50%;
+  top:-100%;
   transform: translate(-50%, -50%);
   .of_header {
     position: absolute;

From a57470855cb2ff63fcc74e4be0a7754567153795 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 18:58:38 +0800
Subject: [PATCH 06/21] -- bug

---
 src/views/projectcenter/ProjectAdd.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 67ddf96a..c682beaa 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -160,6 +160,7 @@
               "
                 v-model:value="classifySelect1"
                 placeholder="请选择项目经理"
+                :filterOption="false"
                 style="width: 100%"
                 :options="classifyList1"
                 @change="classificationChange1"
@@ -168,7 +169,7 @@
                 mode="multiple"
                 :disabled="viewDetail ? true : false"
                 @popupScroll="memberScroll"
-                @search="getMember"
+                @search="searchMember"
             >
             </a-select>
           </div>
@@ -818,6 +819,16 @@ export default {
     };
     getMember();
 
+    //搜索学员
+    const searchMember = (e) => {
+      console.log("eee", e);
+      if (e) {
+        state.searchName = e;
+        classifyList1.value = [];
+        getMember(e);
+      }
+    };
+
     //学员滚动加载信息
     const memberScroll = (e) => {
       // console.log("滚动", e, b);
@@ -1205,6 +1216,7 @@ export default {
       templateScroll,
       memberScroll,
       getMember,
+      searchMember
     };
   },
 };

From 3be7c9b06ab471f81c60daf09d54438affa84257 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Thu, 1 Dec 2022 19:37:36 +0800
Subject: [PATCH 07/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 56 ++------------------
 1 file changed, 5 insertions(+), 51 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 6d438e83..3eeb4c35 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1870,13 +1870,12 @@
               <span style="margin-right: 3px">完成规则</span>
             </div>
             <div class="b_input">
-            <!--
               <a-checkbox
                 v-model:checked="regisCom"
                 @click="regisCom = !regisCom"
               >
                 <span style="color: #6d7584">报名即完成</span>
-              </a-checkbox> -->
+              </a-checkbox>
               <a-checkbox v-model:checked="signCom" @click="signCom = !signCom">
                 <span style="color: #6d7584">签到即完成</span>
               </a-checkbox>
@@ -3053,7 +3052,7 @@ export default defineComponent({
     // OwnPower,
     // Corpowerlist,
     Editor,
-    Toolbar,filesList
+    Toolbar,
     // StuAdd,
 
     ProjOwnerShip,
@@ -3978,6 +3977,7 @@ export default defineComponent({
       state.qdms_inputV6 = "";
       state.imgList = [];
       valueHtml.value = "";
+      state.fileList =[];
     };
     const handlePush = (param) => {
       console.log("state.imgList");
@@ -4459,7 +4459,6 @@ export default defineComponent({
         }
       });
     };
-    //
     const getTea = async () => {
       console.log("获取授课教师信息");
       const item1 = await getMemberInfoApi({
@@ -4530,10 +4529,7 @@ export default defineComponent({
       if(item.attach==""){
         state.imgList =[];
       }else{
-        if(item.attach==""){
-
-        }else{
-          if (item.attach.indexOf(",")) {
+        if (item.attach.indexOf(",")) {
         const arr = item.attach.split(",");
         arr.forEach((item) => {
           state.imgList.push({ img: item });
@@ -4541,8 +4537,6 @@ export default defineComponent({
         } else {
           state.imgList = [{ img: item.attach }];
         }
-        }
-     
       }
     
       valueHtml.value = item.outline;
@@ -4670,41 +4664,7 @@ export default defineComponent({
       getTableDate2();
     };
 
-    const beforeUpload4 = (file) => {
-      const fileType = [
-        "jpg",
-        "jpeg",
-        "png",
-        "gif",
-        "pdf",
-        "ppt",
-        "pptx",
-        "doc",
-        "docx",
-        "xls",
-        "xlsx",
-        "zip",
-      ];
-      if (!fileType.includes(file.name.split(".")[1])) {
-        message.error(
-          "仅支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip格式!"
-        );
-        return false;
-      }
-
-      const formData = new FormData();
-      formData.append("file", file);
-      console.log(file);
-      fileUp(formData).then((res) => {
-        if (res.data.code === 200) {
-          state.filesList.push(res.data.data);
-        }
-      });
-      return false;
-    };
     const beforeUpload3 = (file) => {
-      console.log(6765555);
-      console.log(file);
       const fileType = [
         "jpg",
         "jpeg",
@@ -4726,18 +4686,12 @@ export default defineComponent({
         return false;
       }
 
-      // let isLt1M = file.size / 10240 / 10240 <= 1;
-      // if (!isLt1M) {
-      //   this.$message.error("图片大小超过10MB!");
-      //   return false;
-      // }
-
       const formData = new FormData();
       formData.append("file", file);
       console.log(file);
       fileUp(formData).then((res) => {
         if (res.data.code === 200) {
-          state.filesList.push({
+          state.fileList.push({
             img: res.data.data,
             name: file.name,
             size: file.size,

From 755a20b407a277c59bfecb503be43fe1b3194526 Mon Sep 17 00:00:00 2001
From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com>
Date: Thu, 1 Dec 2022 21:27:04 +0800
Subject: [PATCH 08/21] =?UTF-8?q?fix:=E7=BC=96=E8=BE=91=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9=E5=8E=9F=E6=9D=A5?=
 =?UTF-8?q?=E7=9A=84=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOnline.vue | 13 ++++++++++++-
 src/views/projectcenter/TaskAdd.vue  |  4 +++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index ac68ed22..1d587c4d 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -270,7 +270,17 @@ export default {
     };
     const onSelectChange = (selectedRowKeys,selectedRows) => {
         state.selectedRowKeys = selectedRowKeys;
-        state.addOnlineList = selectedRows
+        state.addOnlineList = selectedRows;
+        if( props.edit && selectedRows.length > 0 ){
+          selectedRows.map((value)=>{
+            if(value.courseId == props.EditOnlineId){
+              message.destroy()
+              message.error('选项相同，请重新选择')
+              state.selectedRowKeys = []
+              state.addOnlineList = []
+            }
+          })
+        }
     };
     //清空所选
     const clearLine = () => {
@@ -294,6 +304,7 @@ export default {
             teacher:value.teacher,
             sysCreateBy:value.sysCreateBy,
             overtime:"",
+            courseId: Number(value.onlineClassesId),
           };
           array.push(obj);
         }
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index ecac38ad..cd06b826 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1210,6 +1210,7 @@ export default {
             taskList: value.taskList,
             value: value.stageId,
             label: value.name,
+            courseId: value.courseId ? value.courseId : null
           };
           array.push(obj);
         }
@@ -1661,6 +1662,7 @@ export default {
         "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
     });
     const showDrawerOnline = (id, eleId) => {
+      console.log('id, eleId',id, eleId);
       state.addonlinevisible = true;
       state.EditOnlineId = id;
       state.projectTaskId = eleId;
@@ -1835,7 +1837,7 @@ export default {
     //编辑的按钮
     const decideType = (type, id, eleId) => {
       state.edit = true;
-      console.log(type, id);
+      console.log(type, id, eleId);
       if (type == "外链") {
         showDrawerAddRef(id, eleId);
       } else if (type == "直播") {

From b24b0ce0d09fce5226a2677047013c642a9b4a3c Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Thu, 1 Dec 2022 22:19:36 +0800
Subject: [PATCH 09/21] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=BA=93=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue      |   1 +
 src/views/courselibrary/CoursewareManage.vue | 196 ++++++++++++++++---
 2 files changed, 172 insertions(+), 25 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 1cebe999..f9a553eb 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -345,6 +345,7 @@ export default {
   setup(props, ctx) {
     const options = ref([]);
     const state = reactive({
+      loading:false,
       selfacetvisible: false,
       addhomeworkvisible: false,
       addtestvisible: false,
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 3eeb4c35..55d24069 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -613,7 +613,7 @@
                     :key="index"
                   >
                     <div class="file_img">
-                      <img :src="item.img" />
+                   
                     </div>
                     <div class="file_detail">
                       <!-- <div class="file_name">
@@ -1786,6 +1786,8 @@
             <div class="select fitems">
               <a-range-picker
                 style="width: 440px; height: 40px; border-radius: 8px"
+                :show-time="{ format: 'HH:mm' }"
+                format="YYYY-MM-DD HH:mm"
                 v-model:value="xjkkinputV3"
                 separator="至"
                 :placeholder="['        开始时间', '        结束时间']"
@@ -1870,12 +1872,13 @@
               <span style="margin-right: 3px">完成规则</span>
             </div>
             <div class="b_input">
+            <!--
               <a-checkbox
                 v-model:checked="regisCom"
                 @click="regisCom = !regisCom"
               >
                 <span style="color: #6d7584">报名即完成</span>
-              </a-checkbox>
+              </a-checkbox> -->
               <a-checkbox v-model:checked="signCom" @click="signCom = !signCom">
                 <span style="color: #6d7584">签到即完成</span>
               </a-checkbox>
@@ -1926,6 +1929,61 @@
               </span>
             </div>
           </div>
+          <div class="mbl_items12">
+                  <div
+                    class="i12_box1"
+                    v-for="(item, index) in filesList"
+                    :key="index"
+                  >
+                    <div class="file_img">
+                     
+                    </div>
+                    <div class="file_detail">
+                      <!-- <div class="file_name">
+                        <span style="color: #6f6f6f">{{ item.name }}</span>
+                      </div> -->
+                      <!-- 条件渲染 s -->
+                      <!-- <div class="file_size">
+                        <span style="color: #999ba3">{{ item.size }}</span>
+                      </div> -->
+                      <div class="file_updata">
+                        <div class="updatabox">
+                          <div class="updatacolor"></div>
+                          <div class="updataxq">上传完成</div>
+                          <!-- <div class="updatacolor2"></div>
+                          <div class="updataxq2">上传失败</div> -->
+                          <!-- <div class="updatacolor3"></div>
+                          <div class="updataxq3">正在上传</div> -->
+                        </div>
+                        <div class="upjd">
+                          <span style="margin: auto 5px">100%</span>
+                        </div>
+                      </div>
+                      <!-- 条件渲染 e -->
+                    </div>
+                    <div class="file_operation">
+                      <div class="fobox">
+                        <span style="color: #4ea6ff" @click="handleDel2(index)">
+                          删除
+                        </span>
+                      </div>
+                      <!-- <div class="fobox">
+                        <span style="color: #4ea6ff">重传</span>
+                      </div>
+                      <div class="fobox">
+                        <span style="color: #4ea6ff">取消</span>
+                      </div> -->
+                      <!-- <div class="fobox">
+                        <span style="color: #4ea6ff; margin-right: 5px">
+                          暂停
+                        </span>
+                      </div>
+                      <div class="fobox">
+                        <span style="color: #4ea6ff">取消</span>
+                      </div> -->
+                    </div>
+                  </div>
+                </div>
           <div class="items_btn">
             <div class="cstm_btn btn5">
               <div class="btnText" @click="handleCancelStu">取消</div>
@@ -3308,6 +3366,7 @@ export default defineComponent({
       addStudentList: null, //选中列表
 
       newCourseName: null, //新建开课名称
+      addLoading:false,
     });
 
     const showStuAdd = () => {
@@ -3445,6 +3504,9 @@ export default defineComponent({
     const handleDel = (index) => {
       state.imgList.splice(index, 1);
     };
+    const handleDel2 = (index) => {
+      state.fileList.splice(index, 1);
+    };
 
     // 渲染列表1操作
     const getTableDate = async () => {
@@ -3980,6 +4042,7 @@ export default defineComponent({
       state.fileList =[];
     };
     const handlePush = (param) => {
+       state.addLoading = true;
       console.log("state.imgList");
       console.log(state.imgList);
       let files = "";
@@ -4021,6 +4084,7 @@ export default defineComponent({
           getTableDate();
           ft_exit();
           rest();
+           state.addLoading = false;
           // console.log("res.data", res.data);
           if (param === "review") {
             //新建时点击审核按钮
@@ -4048,6 +4112,7 @@ export default defineComponent({
       state.cstm_hs = true;
     };
     const handleCancelStu = () => {
+      
       state.cstm_hs = false;
       state.kk_eidt = false;
       state.xjkkradioV1 = "";
@@ -4060,12 +4125,16 @@ export default defineComponent({
       state.checked4 = false;
     };
     const handleSureStu = () => {
+      state.addLoading = false;
       let startTime,
         endTime = 0;
       if (state.xjkkinputV3) {
         startTime = parseInt(state.xjkkinputV3[0].$d.getTime() / 1000);
         endTime = parseInt(state.xjkkinputV3[1].$d.getTime() / 1000);
       }
+      let t=state.signCom?"1,":"0,";
+      let p= state.comLeave?"1":"0";
+      let type = t.concat(p);
       const postData = {
         offcourseId: state.offcourseId,
         offcoursePlanId: state.offcoursePlanId, //开课ID,不传代表新增
@@ -4074,13 +4143,7 @@ export default defineComponent({
         applyFlag: state.checked1 ? 1 : 0,
         attach: state.filesList.length ? state.filesList.join(",") : "",
         beginTime: startTime,
-        completeType: state.regisCom
-          ? "1,"
-          : "0," + state.signCom
-          ? "1,"
-          : "0," + state.comLeave
-          ? "1"
-          : "0",
+        completeType:type,   
         endTime: endTime,
         evalFlag: state.checked4 ? 1 : 0,
         name: state.xjkkinputV1,
@@ -4100,10 +4163,12 @@ export default defineComponent({
         return false;
       }
       editPlan(postData).then((res) => {
+        state.addLoading = false;
         if (res.data.code === 200) {
           getTableDate3();
           handleCancelStu();
           rest();
+         
         }
       });
     };
@@ -4124,20 +4189,14 @@ export default defineComponent({
       state.checked1 = item.applyFlag === 1 ? true : false;
       state.filesList = item.attach ? item.attach.split(",") : [];
       state.xjkkinputV3 = [
-        dayjs(item.beginTime, "YYYY/MM/DD"),
-        dayjs(item.endTime, "YYYY/MM/DD"),
+        dayjs(item.beginTime, "YYYY-MM-DD HH:mm:ss"),
+        dayjs(item.endTime, "YYYY-MM-DD HH:mm:ss"),
       ];
       options4CurId.value = item.teacherId;
-      (state.regisCom = item.completeType.split(",")[0] == 1 ? true : false),
-        (state.signCom = item.completeType.split(",")[1] == 1 ? true : false),
-        (state.comLeave = item.completeType.split(",")[2] == 1 ? true : false),
-        (state.completeType = state.regisCom
-          ? "1,"
-          : "0," + state.signCom
-          ? "1,"
-          : "0," + state.comLeave
-          ? "1"
-          : "0"),
+     // (state.regisCom = item.completeType.split(",")[0] == "1" ? true : false),
+        (state.signCom = item.completeType.split(",")[0] == "1" ? true : false),
+        (state.comLeave = item.completeType.split(",")[1] == "1" ? true : false),
+       
         (state.checked4 = item.evalFlag === 1 ? true : false);
       state.xjkkinputV1 = item.name;
       if (item.signFlag === 1) {
@@ -4691,12 +4750,12 @@ export default defineComponent({
       console.log(file);
       fileUp(formData).then((res) => {
         if (res.data.code === 200) {
-          state.fileList.push({
+          state.filesList.push({
             img: res.data.data,
             name: file.name,
             size: file.size,
           });
-          console.log(state.imgList);
+          console.log(state.filesList);
           // state.hasImgName = res.data.data;
         }
       });
@@ -4856,6 +4915,7 @@ export default defineComponent({
       getdateToTimeFn,
       handlePostSure,
       handleDeleteKaike,
+      handleDel2,
       handelEditStu,
       handelGuan,
       beforeUpload3,
@@ -5261,7 +5321,7 @@ export default defineComponent({
   box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
   position: absolute;
   left: 50%;
-  top: 10%;
+  top: -100%;
   transform: translate(-50%, -50%);
   .cst_header {
     position: absolute;
@@ -5337,6 +5397,92 @@ export default defineComponent({
         }
       }
     }
+    .mbl_items12 {
+                width: 440px;
+                margin-left: 100px;
+                .i12_box1 {
+                  display: flex;
+                  align-items: center;
+                  padding: 17px 0px 17px 21px;
+                  border: 1px solid #eff4fc;
+                  border-radius: 8px;
+                  margin-bottom: 10px;
+                  .file_img {
+                    width: 27px;
+                    height: 32px;
+                     background-image: url(@/assets/images/coursewareManage/imgs.png);
+                    margin-right: 22px;
+                    img {
+                      width: 100%;
+                      height: 100%;
+                    }
+                  }
+                  .file_detail {
+                    width: 250px;
+                    margin-right: 21px;
+                    .file_updata {
+                      display: flex;
+                      align-items: center;
+                      .updatabox {
+                        position: relative;
+                        width: 230px;
+                        height: 5px;
+                        background-color: rgba(192, 192, 192, 0.25);
+                        border-radius: 3px;
+                        .updatacolor {
+                          position: absolute;
+                          left: 0;
+                          width: 100%;
+                          height: 5px;
+                          background-color: #57c887;
+                          border-radius: 3px;
+                        }
+                        .updatacolor2 {
+                          position: absolute;
+                          left: 0;
+                          width: 80%;
+                          height: 5px;
+                          background-color: #ff7474;
+                          border-radius: 3px;
+                        }
+                        .updatacolor3 {
+                          position: absolute;
+                          left: 0;
+                          width: 60%;
+                          height: 5px;
+                          background-color: #388be1;
+                          border-radius: 3px;
+                        }
+                        .updataxq {
+                          position: absolute;
+                          right: 2px;
+                          top: -30px;
+                          color: #57c887;
+                        }
+                        .updataxq2 {
+                          position: absolute;
+                          right: 2px;
+                          top: -30px;
+                          color: #ff7474;
+                        }
+                        .updataxq3 {
+                          position: absolute;
+                          right: 2px;
+                          top: -30px;
+                          color: #388be1;
+                        }
+                      }
+                    }
+                  }
+                  .file_operation {
+                    display: flex;
+                    .fobox {
+                      margin-right: 5px;
+                      cursor: pointer;
+                    }
+                  }
+                }
+              }
     .items_fj {
       margin-bottom: 1px;
     }
@@ -6073,7 +6219,7 @@ export default defineComponent({
                   .file_img {
                     width: 27px;
                     height: 32px;
-                    // background-image: url(@/assets/images/coursewareManage/imgs.png);
+                     background-image: url(@/assets/images/coursewareManage/imgs.png);
                     margin-right: 22px;
                     img {
                       width: 100%;

From c1842cd0e1430a840cd4565e4d381ae33c05757b Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 2 Dec 2022 10:01:48 +0800
Subject: [PATCH 10/21] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue      | 290 +++++++++++-----------
 src/components/drawers/AddDiscuss.vue     | 160 ++++++------
 src/components/drawers/AddLive.vue        |  28 ++-
 src/views/learningpath/LearningPath.vue   |   1 +
 src/views/learningpath/LevelAdd.vue       |  14 +-
 src/views/learningpath/LevelAddDetail.vue |  17 +-
 6 files changed, 262 insertions(+), 248 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index f6ebf189..e54cd8d3 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -1,19 +1,19 @@
 <template>
   <a-drawer
-      :visible="addactiveVisible"
-      class="drawerStyle addactiveDrawer"
-      width="80%"
-      title="添加活动"
-      placement="right"
-      @after-visible-change="afterVisibleChange"
+    :visible="addactiveVisible"
+    class="drawerStyle addactiveDrawer"
+    width="80%"
+    title="添加活动"
+    placement="right"
+    @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">{{ edit ? "编辑" : "添加" }}活动</div>
         <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
         />
       </div>
       <div class="contentMain">
@@ -22,18 +22,18 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
                 />
               </div>
               <span style="margin-right: 3px">活动名称：</span>
             </div>
             <div class="btnbox">
               <a-input
-                  v-model:value="inputV1"
-                  style="width: 424px; height: 32px"
-                  placeholder="请输入活动名称"
-                  maxlength="20"
+                v-model:value="inputV1"
+                style="width: 424px; height: 32px"
+                placeholder="请输入活动名称"
+                maxlength="20"
               />
             </div>
           </div>
@@ -41,18 +41,18 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
                 />
               </div>
               <span style="margin-right: 3px">活动公告：</span>
             </div>
             <div class="textarea">
               <a-textarea
-                  v-model:value="textV1"
-                  placeholder="请输入活动公告"
-                  allow-clear
-                  maxlength="150"
+                v-model:value="textV1"
+                placeholder="请输入活动公告"
+                allow-clear
+                maxlength="150"
               />
             </div>
           </div>
@@ -62,10 +62,10 @@
             </div>
             <div class="textarea">
               <a-textarea
-                  v-model:value="textV2"
-                  placeholder="请输入活动说明"
-                  allow-clear
-                  maxlength="150"
+                v-model:value="textV2"
+                placeholder="请输入活动说明"
+                allow-clear
+                maxlength="150"
               />
             </div>
           </div>
@@ -73,17 +73,17 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
                 />
               </div>
               <span style="margin-right: 3px">活动时间：</span>
             </div>
             <div class="btnbox">
               <a-range-picker
-                  style="width: 424px"
-                  v-model:value="time"
-                  :placeholder="['      开始时间', '        结束时间']"
+                style="width: 424px"
+                v-model:value="time"
+                :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
           </div>
@@ -91,23 +91,23 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
                 />
               </div>
               <span style="margin-right: 3px">活动时长：</span>
             </div>
             <div class="btnbox">
               <a-input-number
-                  :min="0"
-                  :precision="0"
-                  style="
+                :min="0"
+                :precision="0"
+                style="
                   width: 388px;
                   height: 32px;
                   border-radius: 8px;
                   overflow: hidden;
                 "
-                  v-model:value="inputV2"
+                v-model:value="inputV2"
               />
               <span style="margin-left: 5px">分钟</span>
             </div>
@@ -116,17 +116,17 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
                 />
               </div>
               <span style="margin-right: 3px">活动地址：</span>
             </div>
             <div class="btnbox">
               <a-input
-                  v-model:value="inputV3"
-                  style="width: 424px; height: 32px"
-                  placeholder="请输入活动地址"
+                v-model:value="inputV3"
+                style="width: 424px; height: 32px"
+                placeholder="请输入活动地址"
               />
             </div>
           </div>
@@ -144,42 +144,42 @@
                 <div class="timerbox">
                   <span>开始前：</span>
                   <a-input-number
-                      :min="0"
-                      :max="30"
-                      :precision="0"
-                      style="
+                    :min="0"
+                    :max="30"
+                    :precision="0"
+                    style="
                       width: 88px;
                       height: 32px;
                       border-radius: 8px;
                       overflow: hidden;
                     "
-                      v-model:value="inputV4"
+                    v-model:value="inputV4"
                   />
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
                 <div class="timerbox">
                   <span>开始后：</span>
                   <a-input-number
-                      :min="0"
-                      :max="30"
-                      :precision="0"
-                      style="
+                    :min="0"
+                    :max="30"
+                    :precision="0"
+                    style="
                       width: 88px;
                       height: 32px;
                       border-radius: 8px;
                       overflow: hidden;
                     "
-                      v-model:value="inputV5"
+                    v-model:value="inputV5"
                   />
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
               </div>
-              <div class="qdqtbox">
+              <!-- <div class="qdqtbox">
                 <div class="qtbtn">
                   <div class="btntext">签退</div>
                 </div>
-              </div>
-              <div class="setbox">
+              </div> -->
+              <!-- <div class="setbox">
                 <div class="timerbox">
                   <span>结束前：</span>
                   <a-input-number
@@ -198,7 +198,7 @@
                   >分钟（提前签退则记为早退）</span
                   >
                 </div>
-              </div>
+              </div> -->
             </div>
           </div>
           <div class="main_item">
@@ -208,13 +208,12 @@
             <div class="btnbox">
               <a-radio-group v-model:value="radioV1">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
-                >仅签到
-                </a-radio
-                >
-                <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
+                  >仅签到
+                </a-radio>
+                <!-- <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
                 >签到、签退全部完成
                 </a-radio
-                >
+                > -->
               </a-radio-group>
             </div>
           </div>
@@ -228,11 +227,11 @@
   </a-drawer>
 </template>
 <script>
-import {reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 import * as api from "../../api/indexActivity";
 import * as apiTask from "../../api/indexTaskadd";
-import {RouterEditTask} from "@/api/indexTask";
-import {message} from "ant-design-vue";
+import { RouterEditTask } from "@/api/indexTask";
+import { message } from "ant-design-vue";
 import dayjs from "dayjs";
 
 export default {
@@ -319,7 +318,7 @@ export default {
       state.textV1 = "";
       state.textV2 = "";
       state.time = "";
-      message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+      // message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
@@ -338,29 +337,28 @@ export default {
       state.time = "";
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
-    }
+    };
     const queryActive = () => {
       api
-          .getActivity(props.EditActiveId)
-          .then((res) => {
-            //更新讨论信息
-            state.inputV1 = res.data.data.activityName;
-            state.textV1 = res.data.data.activityNotice;
-            state.textV2 = res.data.data.activityExplain;
-            state.inputV2 = res.data.data.activityDuration;
-            state.inputV3 = res.data.data.activityAddress;
-            state.inputV5 = res.data.data.afterSignIn;
-            state.inputV6 = res.data.data.signOutTime;
-            state.inputV4 = res.data.data.beforeSignIn;
-            state.radioV1 = Number(res.data.data.standardSettings);
+        .getActivity(props.EditActiveId)
+        .then((res) => {
+          //更新讨论信息
+          state.inputV1 = res.data.data.activityName;
+          state.textV1 = res.data.data.activityNotice;
+          state.textV2 = res.data.data.activityExplain;
+          state.inputV2 = res.data.data.activityDuration;
+          state.inputV3 = res.data.data.activityAddress;
+          state.inputV5 = res.data.data.afterSignIn;
+          state.inputV6 = res.data.data.signOutTime;
+          state.inputV4 = res.data.data.beforeSignIn;
+          state.radioV1 = Number(res.data.data.standardSettings);
 
-            state.time = [
-              dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"),
-              dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"),
-            ];
-          })
-          .catch(() => {
-          });
+          state.time = [
+            dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"),
+            dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"),
+          ];
+        })
+        .catch(() => {});
     };
     const afterVisibleChange = (bool) => {
       if (bool && props.edit) {
@@ -383,49 +381,47 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 9,
         })
-            .then(() => {
-              //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
-            })
-            .catch(() => {
-              //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-            });
+          .then(() => {
+            //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+          })
+          .catch(() => {
+            //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+          });
       } else if (props.isLevel == 2) {
         await apiTask
-            .addTask({
-              courseId: res.data.data.activityId,
-              duration: res.data.data.activityDuration,
-              name: res.data.data.activityName,
-              projectId: props.projectId,
-              projectTaskId: props.projectTaskId || 0,
-              stageId: props.chooseStageId || 0,
-              type: 9,
-            })
-            .then(() => {
-              //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-            })
-            .catch(() => {
-              //////message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-            });
+          .addTask({
+            courseId: res.data.data.activityId,
+            duration: res.data.data.activityDuration,
+            name: res.data.data.activityName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId || 0,
+            type: 9,
+          })
+          .then(() => {
+            //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+          })
+          .catch(() => {
+            //////message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+          });
       } else if (props.isLevel == 3) {
         await apiTask
-            .addTempTask({
-              courseId: res.data.data.activityId,
-              duration: res.data.data.activityDuration,
-              name: res.data.data.activityName,
-              projectTemplateId: props.projectTemplateId,
-              projectTaskId: props.projectTaskId || 0,
-              stageId: props.chooseStageId || 0,
-              type: 9,
-            })
-            .then(() => {
-              ctx.emit("changeData", false);
-              //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-            })
-            .catch(() => {
-              //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-            });
-
-
+          .addTempTask({
+            courseId: res.data.data.activityId,
+            duration: res.data.data.activityDuration,
+            name: res.data.data.activityName,
+            projectTemplateId: props.projectTemplateId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId || 0,
+            type: 9,
+          })
+          .then(() => {
+            ctx.emit("changeData", false);
+            //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+          })
+          .catch(() => {
+            //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+          });
       }
     };
     //创建活动
@@ -469,33 +465,33 @@ export default {
       if (props.edit) {
         //更新编辑活动信息
         api
-            .updateActivity(obj)
-            .then(async (res) => {
-              closeDrawer();
-              await updateTask(res);
-              ctx.emit("changeData", false);
-              message.destroy();
-              message.success("更新成功");
-            })
-            .catch(() => {
-              message.destroy();
-              message.error("更新失败");
-            });
+          .updateActivity(obj)
+          .then(async (res) => {
+            closeDrawer();
+            await updateTask(res);
+            ctx.emit("changeData", false);
+            message.destroy();
+            message.success("更新成功");
+          })
+          .catch(() => {
+            message.destroy();
+            message.error("更新失败");
+          });
       } else {
         //新建活动信息
         api
-            .createActivity(obj)
-            .then(async (res) => {
-              message.destroy();
-              message.success("创建成功");
-              closeDrawer();
-              await updateTask(res);
-              ctx.emit("changeData", false);
-            })
-            .catch(() => {
-              message.destroy();
-              message.error("创建失败");
-            });
+          .createActivity(obj)
+          .then(async (res) => {
+            message.destroy();
+            message.success("创建成功");
+            closeDrawer();
+            await updateTask(res);
+            ctx.emit("changeData", false);
+          })
+          .catch(() => {
+            message.destroy();
+            message.error("创建失败");
+          });
       }
     };
 
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index d6dad640..c9caa44e 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -1,18 +1,18 @@
 <template>
   <a-drawer
-      :visible="adddiscussVisible"
-      class="drawerStyle addrefDrawer"
-      width="80%"
-      placement="right"
-      @after-visible-change="afterVisibleChange"
+    :visible="adddiscussVisible"
+    class="drawerStyle addrefDrawer"
+    width="80%"
+    placement="right"
+    @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">{{ edit ? "编辑" : "添加" }}讨论</div>
         <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
         />
       </div>
       <div class="contentMain">
@@ -21,19 +21,19 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
                 />
               </div>
               <span style="margin-right: 3px">讨论名称：</span>
             </div>
             <div class="btnbox">
               <a-input
-                  v-model:value="inputV1"
-                  style="width: 424px; height: 32px"
-                  placeholder="请输入讨论名称"
-                  show-count
-                  :maxlength="20"
+                v-model:value="inputV1"
+                style="width: 424px; height: 32px"
+                placeholder="请输入讨论名称"
+                show-count
+                :maxlength="20"
               />
             </div>
           </div>
@@ -43,11 +43,11 @@
             </div>
             <div class="textarea">
               <a-textarea
-                  v-model:value="textV1"
-                  placeholder="请输入讨论说明"
-                  allow-clear
-                  show-count
-                  :maxlength="200"
+                v-model:value="textV1"
+                placeholder="请输入讨论说明"
+                allow-clear
+                show-count
+                :maxlength="200"
               />
             </div>
           </div>
@@ -57,7 +57,7 @@
             </div>
             <div class="btnbox">
               <a-checkbox v-model:checked="checkedC1" @change="checkRadio"
-              >允许评论</a-checkbox
+                >允许评论</a-checkbox
               >
             </div>
           </div>
@@ -170,15 +170,15 @@ export default {
       if (props.edit) {
         //编辑讨
         api
-            .getDiscussDetail({ discussId: props.EditDiscussId })
-            .then((res) => {
-              //更新讨论信息
-              state.inputV1 = res.data.data.discussName;
-              state.textV1 = res.data.data.discussExplain;
-              state.checkedC1 =
-                  res.data.data.discussSettings == "true" ? true : false;
-            })
-            .catch(() => {});
+          .getDiscussDetail({ discussId: props.EditDiscussId })
+          .then((res) => {
+            //更新讨论信息
+            state.inputV1 = res.data.data.discussName;
+            state.textV1 = res.data.data.discussExplain;
+            state.checkedC1 =
+              res.data.data.discussSettings == "true" ? true : false;
+          })
+          .catch(() => {});
       }
     };
     const afterVisibleChange = (bool) => {
@@ -196,28 +196,28 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 8,
         })
-            .then(() => {
-              //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
-            })
-            .catch(() => {
-              //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-            });
+          .then(() => {
+            //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+          })
+          .catch(() => {
+            //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+          });
       } else if (props.isLevel == 2) {
         apiTask
-            .addTask({
-              courseId: res.data.data.discussId,
-              name: res.data.data.discussName,
-              projectId: props.projectId,
-              projectTaskId: props.projectTaskId || 0,
-              stageId: props.chooseStageId || 0,
-              type: 8,
-            })
-            .then(() => {
-              //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
-            })
-            .catch(() => {
-              //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-            });
+          .addTask({
+            courseId: res.data.data.discussId,
+            name: res.data.data.discussName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId || 0,
+            type: 8,
+          })
+          .then(() => {
+            //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+          })
+          .catch(() => {
+            //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+          });
       } else if (props.isLevel == 3) {
         console.log("");
         addTempTask({
@@ -228,12 +228,12 @@ export default {
           stageId: props.chooseStageId || 0,
           type: 8,
         })
-            .then(() => {
-              //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
-            })
-            .catch(() => {
-              //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-            });
+          .then(() => {
+            //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+          })
+          .catch(() => {
+            //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+          });
       }
     };
     const updateDiscussInfo = () => {
@@ -250,32 +250,32 @@ export default {
       };
       if (props.edit) {
         api
-            .updateDiscuss(obj)
-            .then((res) => {
-              updateTask(res);
-              closeDrawer();
-              ctx.emit("changeData", false);
-              message.destroy();
-              message.success("创建讨论成功");
-            })
-            .catch(() => {
-              message.destroy();
-              message.error("创建讨论失败");
-            });
+          .updateDiscuss(obj)
+          .then((res) => {
+            updateTask(res);
+            closeDrawer();
+            ctx.emit("changeData", false);
+            message.destroy();
+            message.success("创建讨论成功");
+          })
+          .catch(() => {
+            message.destroy();
+            message.error("创建讨论失败");
+          });
       } else {
         api
-            .createDiscuss(obj)
-            .then((res) => {
-              updateTask(res);
-              closeDrawer();
-              ctx.emit("changeData", false);
-              message.destroy();
-              message.success("创建讨论成功");
-            })
-            .catch(() => {
-              message.destroy();
-              message.error("创建讨论失败");
-            });
+          .createDiscuss(obj)
+          .then((res) => {
+            updateTask(res);
+            closeDrawer();
+            ctx.emit("changeData", false);
+            message.destroy();
+            message.success("创建讨论成功");
+          })
+          .catch(() => {
+            message.destroy();
+            message.error("创建讨论失败");
+          });
       }
     };
     return {
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 7ca0734e..7f5f4396 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -262,10 +262,10 @@
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
               </div>
-              <div class="qdqtbox">
+              <!-- <div class="qdqtbox">
                 <div class="qtbtn"><div class="btntext">签退</div></div>
-              </div>
-              <div class="setbox">
+              </div> -->
+              <!-- <div class="setbox">
                 <div class="timerbox">
                   <span>结束前：</span>
                   <a-input-number
@@ -275,14 +275,16 @@
                     style="
                       width: 88px;
                       height: 32px;
-                      border-radius: 8px;overflow: hidden; "
+                      border-radius: 8px;
+                      overflow: hidden;
+                    "
                     v-model:value="inputV8"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px"
                     >分钟（提前签退则记为早退）</span
                   >
                 </div>
-              </div>
+              </div> -->
             </div>
           </div>
           <div class="main_item">
@@ -292,9 +294,9 @@
             <div class="btnbox">
               <a-radio-group v-model:value="radioV1">
                 <a-radio :value="1" @click="cloradio1">仅签到</a-radio>
-                <a-radio :value="2" @click="cloradio1"
+                <!-- <a-radio :value="2" @click="cloradio1"
                   >签到、签退全部完成</a-radio
-                >
+                > -->
               </a-radio-group>
             </div>
           </div>
@@ -305,7 +307,7 @@
             <div class="btnbox">
               <a-checkbox
                 v-model:checked="switchC2"
-                @onclick="(switchC2 = !switchC2)"
+                @onclick="switchC2 = !switchC2"
                 >学员请假后记为任务完成</a-checkbox
               >
             </div>
@@ -448,7 +450,7 @@ export default {
       state.switchC1 = "";
       state.imageUrl = "";
       state.needEval = false;
-      state.switchC2=false;
+      state.switchC2 = false;
       ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
@@ -498,7 +500,7 @@ export default {
           //state.= res.data.data
           state.assessmentId = res.data.data.assessmentId;
           state.imageUrl = res.data.data.liveCover;
-          state.switchC2 = res.data.data.otherSettings==1?true:false;
+          state.switchC2 = res.data.data.otherSettings == 1 ? true : false;
         })
         .catch(() => {
           //message.error(`查询失败`);
@@ -629,10 +631,10 @@ export default {
         liveId: props.edit ? props.EditLiveId : 0,
         liveLink: state.inputV4,
         liveName: state.inputV1,
-        livePlayback: state.switchC1? "1" : "0",
+        livePlayback: state.switchC1 ? "1" : "0",
         livePlaybackLink: state.switchC1 ? state.inputV5 : "",
         liveTeacherId: state.inputV3,
-        otherSettings: state.switchC2?"1":"0", //1或0
+        otherSettings: state.switchC2 ? "1" : "0", //1或0
         signOutTime: state.inputV8,
         standardSettings: state.radioV1, //1或2
         isEvaluate: state.needEval ? "1" : "0",
@@ -745,7 +747,7 @@ export default {
       queryMember();
       state.fetching = false;
     }, 300);
-    const handleChange2 = (value,label) => {
+    const handleChange2 = (value, label) => {
       console.log(`selected ${value}`);
       state.inputV3 = value;
       state.memberValue = label;
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 3f1685be..cf9b7db6 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -1526,6 +1526,7 @@ export default {
 
     //获取路径图详细信息
     const getLearnPathInfo = (item) => {
+      console.log("item", item);
       state.out1 = true;
       state.pathName = item.manager;
       state.pathBg = "";
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 68036b7f..0e666b69 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -564,7 +564,7 @@
                 <a-input
                   v-model:value="gatenamee"
                   style="width: 270px; height: 40px; border-radius: 8px"
-                  placeholder="关卡名称"
+                  placeholder="请输入姓名"
                 />
                 <div class="btns" @click="searchLevel">
                   <div class="btn btn1">
@@ -1649,7 +1649,7 @@ export default {
     //获取学员列表
     const getStudent = () => {
       let obj = {
-        name: "",
+        name: state.gatenamee,
         pageNo: state.currentPage,
         pageSize: 10,
         routerId: state.routerId,
@@ -1985,10 +1985,12 @@ export default {
       });
     };
     const searchLevel = () => {
-      const result = state.tableData.filter(
-        (item) => item.cur == state.gatenamee
-      );
-      state.tableData = result;
+      // const result = state.tableData.filter(
+      //   (item) => item.cur == state.gatenamee
+      // );
+      // state.tableData = result;
+      state.currentPage = 1;
+      getStudent();
     };
     const resetLevel = () => {
       state.gatenamee = "";
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 14021391..26bdc873 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -640,7 +640,16 @@
                         </div>
                       </div>
                     </div>
-                    <div style="width: 120px; text-align: center">
+                    <div
+                      style="
+                        width: 120px;
+                        text-align: center;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                      "
+                      :title="element.creater"
+                    >
                       {{ element.creater }}
                     </div>
                     <div style="width: 120px; text-align: center">
@@ -1415,9 +1424,11 @@ export default {
             item["value"] = item.chapterId;
             item["label"] = item.name;
           });
+          console.log("路径图详情", res);
           if (state.level.length > 0) {
             let chapter = localStorage.getItem("chapterId");
-            if (chapter !== "null") {
+            // console.log("chapter", chapter, chapter !== "null");
+            if (chapter) {
               dataAssignment(chapter); //用哪个的任务表
               state.isactive = chapter; //哪个亮
             } else {
@@ -1593,6 +1604,7 @@ export default {
       document.getElementsByTagName("main")[0].style.background = "#ffffff";
       document.getElementsByTagName("main")[0].style.boxShadow =
         "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
+      localStorage.removeItem("chapterId");
     });
     const changebgc = (chapterId) => {
       state.isactive = chapterId;
@@ -1729,6 +1741,7 @@ export default {
           chapterId: state.removeStageId,
           routerTaskIdList: state.selectRow,
         };
+        console.log("移动关卡obj", obj);
         api
           .moveTask(obj)
           .then((res) => {

From ba20216f1a2aad479a74f193fdd28c231fa85337 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Fri, 2 Dec 2022 14:56:37 +0800
Subject: [PATCH 11/21] =?UTF-8?q?fix(BUG:63):=E5=AD=A6=E4=B9=A0=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=9B=BE-=E7=BC=96=E8=BE=91=E9=A1=B9=E7=9B=AE-Table?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=9B=9E=E6=98=BE=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddProject.vue | 334 +++++++++++++++-----------
 1 file changed, 199 insertions(+), 135 deletions(-)

diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index e1499477..2fe4de16 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -1,21 +1,12 @@
 <template>
-  <a-drawer
-      :visible="addprojvisible"
-      class="drawerStyle addonlineDrawer"
-      width="80%"
-      title="添加在线"
-      placement="right"
-      @after-visible-change="afterVisibleChange"
-  >
+  <a-drawer :visible="addprojvisible" class="drawerStyle addonlineDrawer" 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"
-        />
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer" />
       </div>
       <div class="contentMain">
         <div class="main_items">
@@ -23,31 +14,22 @@
             <div class="mii_ipt">
               <div class="ipt_name">项目名称：</div>
               <div class="fi_input">
-                <a-input
-                    v-model:value="inputV1"
-                    style="width: 240px; height: 40px; border-radius: 8px"
-                    placeholder="请输入项目名称"
-                />
+                <a-input v-model:value="inputV1" style="width: 240px; height: 40px; border-radius: 8px"
+                  placeholder="请输入项目名称" />
               </div>
             </div>
             <div class="mii_ipt">
               <div class="ipt_name">项目经理：</div>
               <div class="fi_input">
-                <a-input
-                    v-model:value="inputV2"
-                    style="width: 240px; height: 40px; border-radius: 8px"
-                    placeholder="请输入项目经理"
-                />
+                <a-input v-model:value="inputV2" style="width: 240px; height: 40px; border-radius: 8px"
+                  placeholder="请输入项目经理" />
               </div>
             </div>
             <div class="mii_ipt">
               <div class="ipt_name">创建人：</div>
               <div class="fi_input">
-                <a-input
-                    v-model:value="inputV3"
-                    style="width: 240px; height: 40px; border-radius: 8px"
-                    placeholder="请输入创建人"
-                />
+                <a-input v-model:value="inputV3" style="width: 240px; height: 40px; border-radius: 8px"
+                  placeholder="请输入创建人" />
               </div>
             </div>
           </div>
@@ -66,50 +48,30 @@
           <div class="mntc_left">
             <div class="notice_icon"></div>
             <div v-if="selectedRows.length == 0">
-              <span class="title"
-              >已选择
+              <span class="title">已选择
                 <span class="data" style="color: #4ea6ff">{{ 0 }}</span>
-                条</span
-              >
+                条</span>
             </div>
             <div v-else>
               <div>
-                <span class="title"
-                >已选择
+                <span class="title">已选择
                   <span class="data" style="color: #4ea6ff">{{
                       selectedRows.length
-                    }}</span>
-                  条&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span
-                >
-                <span class="title"
-                >名称：
-                  <span
-                      class="data"
-                      style="color: #4ea6ff; margin-right: 15px"
-                  >{{ selectedRows[0].name }}</span
-                  >
+                  }}</span>
+                  条&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                <span class="title">名称：
+                  <span class="data" style="color: #4ea6ff; margin-right: 15px">{{ selectedRows[0].name }}</span>
                 </span>
-                <span class="title"
-                >项目经理：
-                  <span
-                      class="data"
-                      style="color: #4ea6ff; margin-right: 15px"
-                  >{{ selectedRows[0].manager }}</span
-                  >
+                <span class="title">项目经理：
+                  <span class="data" style="color: #4ea6ff; margin-right: 15px">{{ selectedRows[0].manager }}</span>
                 </span>
-                <span class="title"
-                >创建人：
-                  <span
-                      class="data"
-                      style="color: #4ea6ff; margin-right: 15px"
-                  >{{ selectedRows[0].creater }}</span
-                  >
+                <span class="title">创建人：
+                  <span class="data" style="color: #4ea6ff; margin-right: 15px">{{ selectedRows[0].creater }}</span>
                 </span>
-                <span class="title"
-                >创建时间：
+                <span class="title">创建时间：
                   <span class="data" style="color: #4ea6ff">{{
                       selectedRows[0].time
-                    }}</span>
+                  }}</span>
                 </span>
               </div>
               <!-- <div v-else>
@@ -141,38 +103,30 @@
         <div class="">
           <div class="drawerbox">
             <!-- 添加的时候显示多选的表 -->
-            <a-table
-                v-if="!edit"
-                :columns="tableDataFunc()"
-                :data-source="drawertableData"
-                :row-selection="{
-                selectedRowKeys: selectedRowKeys,
-                onChange: onSelectChange,
-              }"
-                :loading="tableDataTotal === -1 ? true : false"
-                :scroll="{ x: 700 }"
-                @expand="expandTable"
-                :pagination="false"
-            >
+            <a-table v-if="!edit" :columns="tableDataFunc()" :data-source="drawertableData" :row-selection="{
+              selectedRowKeys: selectedRowKeys,
+              onChange: onSelectChange,
+            }" :loading="tableDataTotal === -1 ? true : false" :scroll="{ x: 700 }" @expand="expandTable"
+              :pagination="false">
             </a-table>
             <!-- 编辑的时候显示单选的表 -->
-            <a-table
-                v-else
-                :columns="tableDataFunc()"
-                :data-source="drawertableData"
-                :row-selection="{
-                selectedRowKeys: selectedRowKeys,
-                onChange: onSelectChange,
-                type: 'radio',
-              }"
-                :loading="tableDataTotal === -1 ? true : false"
-                :scroll="{ x: 700 }"
-                @expand="expandTable"
-                :pagination="false"
-            >
+            <a-table v-else :columns="tableDataFunc()" :data-source="drawertableData" :row-selection="{
+              selectedRowKeys: selectedRowKeys,
+              onChange: onSelectChange,
+              type: 'radio',
+            }" :loading="tableDataTotal === -1 ? true : false" :scroll="{ x: 700 }" @expand="expandTable"
+              :pagination="false">
             </a-table>
           </div>
         </div>
+        <div class="tableBox">
+          <div class="pa">
+            <a-pagination v-if="(tableDataTotal > 1)" showSizeChanger="true" showQuickJumper="true"
+              hideOnSinglePage="true" :pageSize="pageSize" v-model:current="currentPage" :total="tableDataTotal"
+              class="pagination" @change="changePagination"
+              style="display:flex;justify-content:center;margin-top:12px;margin-bottom:12px;" />
+          </div>
+        </div>
       </div>
       <div class="main_btns">
         <button @click="closeDrawer" class="btn1">取消</button>
@@ -180,13 +134,7 @@
       </div>
     </div>
     <!-- 有重复添加的项目时的弹窗 -->
-    <a-modal
-        v-model:visible="sameModal"
-        :footer="null"
-        :closable="sameCopy"
-        wrapClassName="sameModal"
-        centered="true"
-    >
+    <a-modal v-model:visible="sameModal" :footer="null" :closable="sameCopy" wrapClassName="sameModal" centered="true">
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -212,9 +160,9 @@
   </a-drawer>
 </template>
 <script>
-import {reactive, toRefs} from "vue";
-import {RouterEditTask} from "@/api/indexTask";
-import {message} from "ant-design-vue";
+import { reactive, toRefs } from "vue";
+import { RouterEditTask } from "@/api/indexTask";
+import { message } from "ant-design-vue";
 import * as apiProj from "../../api/index.js";
 import dayjs from "dayjs";
 
@@ -329,7 +277,12 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:addprojvisible", false);
       ctx.emit("update:edit", false);
-
+      state.currentPage = 1
+      state.tableDataTotal = 0
+      state.drawertableData = []
+      state.inputV1 = ""
+      state.inputV2 = ""
+      state.inputV3 = ""
       state.selectedRows = [];
       state.selectedRowKeys = [];
     };
@@ -350,7 +303,7 @@ export default {
       // ajax request after empty completing
       setTimeout(() => {
         state.loading = false;
-        state.selectedRowKeys = [];
+
       }, 1000);
     };
     // const onSelectChange = (selectedRowKeys, selectedRows) => {
@@ -364,35 +317,106 @@ export default {
     const resetProjectList = () => {
       state.inputV1 = "";
       state.inputV2 = "";
-      state.inputV1 = "";
+      state.inputV3 = "";
       getAllProjText();
     };
 
+    //翻页
+    const changePagination = (page) => {
+      state.currentPage = page;
+      getAllProjText();
+      // console.log("翻页", page, pageSize);
+    };
+
+    // 点击编辑默认选中
+    const defaultValueOption = () => {
+      if (props.edit) {
+        state.drawertableData = []
+        state.selectedRowKeys = [props.EditProjectId];
+        getCurrentPage();
+      }
+    }
+
+    // 获取所有，确定分页位置
+    const getCurrentPage = () => {
+      apiProj
+        .getProjectList({
+          createName: state.inputV1,
+          manager: state.inputV2,
+          name: state.inputV3,
+          pageNo: 1,
+          pageSize: 10000,
+          status: 3
+        })
+        .then((res) => {
+          // let arr = res.data.data.rows;
+          if (res.status === 200) {
+            console.log('all - project - info', res.data.data)
+
+            let allarr = res.data.data.rows
+            let isHav = true
+            for (let i = 0; i < allarr.length; i++) {
+              if (allarr[i].projectId == props.EditProjectId) {
+                isHav = false
+                state.currentPage = Math.ceil((i + 1) / 10);
+                console.log('sdadasd', state.currentPage)
+                getAllProjText()
+                return
+              }
+            }
+            if (isHav) {
+              getAllProjText()
+              state.currentPage = 1;
+            }
+            // state.drawertableData = getTableDate(arr);
+            // state.tableDataTotal = res.data.data.total
+          }
+        })
+        .catch(() => {
+          message.destroy();
+          //message.error("获取全部项目信息接口失败");
+        });
+    }
+
     //获取全部项目信息接口
     const getAllProjText = () => {
-      apiProj
-          .getProjectList({
-            createName: state.inputV1,
-            manager: state.inputV2,
-            name: state.inputV3,
-            pageNo: state.currentPage,
-            pageSize: state.pageSize,
-            status: state.status,
-          })
-          .then((res) => {
-            let arr = res.data.data.rows;
-            if (res.status === 200) {
-              state.drawertableData = getTableDate(arr);
-            }
-          })
-          .catch(() => {
-            message.destroy();
-            //message.error("获取全部项目信息接口失败");
-          });
-    };
-    const afterVisibleChange = (bool) => {
 
-      if (bool) {
+      console.log("搜索的参数信息", {
+        createName: state.inputV3,
+        manager: state.inputV2,
+        name: state.inputV1,
+        pageNo: state.currentPage,
+        pageSize: state.pageSize,
+        status: 3
+      })
+
+      apiProj
+        .getProjectList({
+          createName: state.inputV3,
+          manager: state.inputV2,
+          name: state.inputV1,
+          pageNo: state.currentPage,
+          pageSize: state.pageSize,
+          status: 3
+        })
+        .then((res) => {
+          let arr = res.data.data.rows;
+          if (res.status === 200) {
+            console.log('all - project - info', res.data.data)
+            state.drawertableData = getTableDate(arr);
+            state.tableDataTotal = res.data.data.total
+          }
+        })
+        .catch(() => {
+          message.destroy();
+          //message.error("获取全部项目信息接口失败");
+        });
+    };
+    const afterVisibleChange = () => {
+
+      if (props.edit) {
+        defaultValueOption();
+      } else {
         getAllProjText();
       }
     };
@@ -424,6 +448,7 @@ export default {
             manager: value.manager,
             time: dayjs(value.createTime).format("YYYY-MM-DD"),
             children: value.subList ? getTableDate(value.subList) : [],
+            creater: value.createName,
           };
           array.push(obj);
         }
@@ -475,14 +500,14 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 13,
         })
-            .then(() => {
-              message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
-              ctx.emit("changeData", false);
-              closeDrawer();
-            })
-            .catch(() => {
-              message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-            });
+          .then(() => {
+            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            ctx.emit("changeData", false);
+            closeDrawer();
+          })
+          .catch(() => {
+            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+          });
       }
     };
     const onSelectChange = (selectedRowKeys, selectRow) => {
@@ -526,6 +551,8 @@ export default {
       showSameModal,
       closeSameModal,
       sureSameModal,
+      changePagination,
+      getCurrentPage
     };
   },
 };
@@ -556,6 +583,7 @@ export default {
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
           border-radius: 4px;
+
           // position: absolute;
           // left: 50%;
           // top: 10%;
@@ -564,10 +592,8 @@ export default {
             position: absolute;
             width: calc(100%);
             height: 68px;
-            background: linear-gradient(
-                    rgba(78, 166, 255, 0.2) 0%,
-                    rgba(78, 166, 255, 0) 100%
-            );
+            background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%);
           }
 
           .del_main {
@@ -663,6 +689,7 @@ export default {
 
 .addrefDrawer {
   .drawerMain {
+
     // .main_notice {
     //   display: flex;
     //   justify-content: space-between;
@@ -798,6 +825,43 @@ export default {
           }
         }
       }
+
+      .tableBox {
+        // margin: 20px 38px 30px;
+        margin: 10px 35px 0px 35px;
+
+        th.h {
+          background-color: #eff4fc !important;
+        }
+
+        .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
+          background: #f6f9fd;
+        }
+      }
+
+      .tableBox {
+        padding-bottom: 20px;
+
+        .pa {
+          // position: absolute;
+          // bottom: 20px;
+          // left: 0;
+          width: 100%;
+          // height: 20px;
+          // background-color: red;
+          display: flex;
+          justify-content: center;
+
+          // margin-bottom: 10px;
+          // position: absolute;
+          // bottom: -40px;
+          .pagination {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+        }
+      }
     }
 
     .main_btns {

From 746518bcb30265a972539e0397e85997f51841ee Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Fri, 2 Dec 2022 15:05:19 +0800
Subject: [PATCH 12/21] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=90=9C=E7=B4=A2=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddProject.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index 2fe4de16..48a0cd5a 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -121,7 +121,7 @@
         </div>
         <div class="tableBox">
           <div class="pa">
-            <a-pagination v-if="(tableDataTotal > 1)" showSizeChanger="true" showQuickJumper="true"
+            <a-pagination v-if="(tableDataTotal > 10)" showSizeChanger="true" showQuickJumper="true"
               hideOnSinglePage="true" :pageSize="pageSize" v-model:current="currentPage" :total="tableDataTotal"
               class="pagination" @change="changePagination"
               style="display:flex;justify-content:center;margin-top:12px;margin-bottom:12px;" />
@@ -336,7 +336,7 @@ export default {
         getCurrentPage();
       }
     }
-
+    // TODO 这里后续需要给接口或者改动
     // 获取所有，确定分页位置
     const getCurrentPage = () => {
       apiProj

From 90051c0e62d8018933d2ed2eda4c6f541e9c2288 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 2 Dec 2022 15:07:19 +0800
Subject: [PATCH 13/21] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                               |  92 ++++++------
 src/store/index.js                        |   5 +-
 src/views/learningpath/LearningPath.vue   | 171 +++++++++++++---------
 src/views/learningpath/LevelAdd.vue       |   3 +-
 src/views/learningpath/LevelAddDetail.vue |   9 +-
 5 files changed, 161 insertions(+), 119 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index fb74000f..623a12dd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,27 +1,27 @@
 <template>
   <div id="container" v-if="!isLogin">
-    <nav-top/>
+    <nav-top />
     <div style="display: flex">
-      <nav-left/>
+      <nav-left />
       <div style="flex: 1; display: flex; flex-direction: column; width: 0">
-        <open-pages/>
-        <bread-crumb/>
+        <open-pages />
+        <bread-crumb />
         <main>
           <a-config-provider :locale="zhCN">
-            <router-view/>
+            <router-view />
           </a-config-provider>
         </main>
       </div>
     </div>
   </div>
   <div id="container" v-if="isLogin">
-    <router-view/>
+    <router-view />
   </div>
 </template>
 <script>
-import {computed, defineComponent, ref, watch} from "vue";
-import {useRouter, useRoute} from "vue-router";
-import {useStore} from "vuex";
+import { computed, defineComponent, ref, watch } from "vue";
+import { useRouter, useRoute } from "vue-router";
+import { useStore } from "vuex";
 import NavLeft from "@/components/NavLeft";
 import NavTop from "@/components/NavTop";
 import OpenPages from "@/components/OpenPages";
@@ -49,45 +49,48 @@ export default defineComponent({
     });
 
     watch(
-        () => route.path,
-        () => {
-          route.path === "/login" && (isLogin.value = true);
-        }
+      () => route.path,
+      () => {
+        route.path === "/login" && (isLogin.value = true);
+      }
     );
 
     const currentRouteName = computed(() => route.name);
 
     function init() {
-      console.log(store)
-      initDict('faceclassPic')
-      initDict('faceclassClass')
-      initDict('faceclassScene')
-      initDict('projectLevel')
-      initDict('projectSys')
-      getOrgTree()
+      console.log(store);
+      initDict("faceclassPic");
+      initDict("faceclassClass");
+      initDict("faceclassScene");
+      initDict("projectLevel");
+      initDict("projectSys");
+      initDict("pathmapPic");
+      getOrgTree();
     }
 
-
     async function initDict(key) {
-      let list = localStorage.getItem(key)
+      let list = localStorage.getItem(key);
       if (list) {
-        store.commit('SET_DICT', {key, data:JSON.parse(list)});
+        store.commit("SET_DICT", { key, data: JSON.parse(list) });
         return;
       }
-      list = await getDictList(key)
+      list = await getDictList(key);
       localStorage.setItem(key, JSON.stringify(list));
-      store.commit('SET_DICT', {key, data:list});
+      store.commit("SET_DICT", { key, data: list });
     }
 
-    const getDictList = (param) => api1.getDict({
-      pageNo: 1,
-      pageSize: 20,
-      setCode: param
-    }).then((res) => res.data.data.rows)
+    const getDictList = (param) =>
+      api1
+        .getDict({
+          pageNo: 1,
+          pageSize: 20,
+          setCode: param,
+        })
+        .then((res) => res.data.data.rows);
 
     //获取组织树
     const getOrgTree = () => {
-      const orgtreeList = localStorage.getItem("orgtreeList")
+      const orgtreeList = localStorage.getItem("orgtreeList");
       if (orgtreeList) {
         store.commit("getOrgtreeList", JSON.parse(orgtreeList));
         return;
@@ -98,18 +101,19 @@ export default defineComponent({
         pageNo: 1,
         pageSize: 20,
       };
-      api.getOrgInfo(obj)
-          .then((res) => {
-            console.log("组织树获取成功", res);
-            if (res.data.code === 200) {
-              // state.treeData = res.data.data;
-              localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
-              store.commit("getOrgtreeList", res.data.data);
-            }
-          })
-          .catch((err) => {
-            console.log("组织树获取失败", err);
-          });
+      api
+        .getOrgInfo(obj)
+        .then((res) => {
+          console.log("组织树获取成功", res);
+          if (res.data.code === 200) {
+            // state.treeData = res.data.data;
+            localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
+            store.commit("getOrgtreeList", res.data.data);
+          }
+        })
+        .catch((err) => {
+          console.log("组织树获取失败", err);
+        });
     };
 
     init();
@@ -128,7 +132,7 @@ export default defineComponent({
   // font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
   // sans-serif;
   font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
-  Microsoft YaHei, Arial, sans-serif;
+    Microsoft YaHei, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   color: #2c3e50;
diff --git a/src/store/index.js b/src/store/index.js
index 447b0dd3..1e92f749 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-09 09:26:26
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-26 20:20:03
+ * @LastEditTime: 2022-12-02 14:09:43
  * @FilePath: /fe-manage/src/store/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -29,6 +29,7 @@ export default createStore({
     faceclassScene: [],
     projectLevel: [],//项目级别
     projectSys: [],//培训分类
+    pathmapPic: [],//学习路径背景图
   },
   getters: {},
   mutations: {
@@ -50,7 +51,7 @@ export default createStore({
     getOrgtreeList(state, data) {
       state.orgtreeList = data
     },
-    SET_DICT(state,{key,data}){
+    SET_DICT(state, { key, data }) {
       state[key] = data
     },
     SET_projectTemplateId(state, projectTemplateId) {
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index cf9b7db6..38ee96d8 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -867,7 +867,7 @@ export default {
       state.editPathId = null;
     };
     const chooseImg = (item) => {
-      // console.log(item);
+      console.log(item);
       state.pathBgId = item.dictCode;
       state.pathBg = item.dictValue;
     };
@@ -1148,7 +1148,7 @@ export default {
                         onClick={() => {
                           // console.log("text.record", text.record);
 
-                          getLearnPathInfo(text.record);
+                          getLearnPathInfo(text.record.id);
                         }}
                       >
                         编辑
@@ -1409,8 +1409,8 @@ export default {
     };
     const selectorganization = (e, v) => {
       console.log("eee", e, v);
-      state.organizationSelectName = e;
-      state.organizationSelectId = v.id;
+      state.organizationSelectName = v[0];
+      state.organizationSelectId = e;
     };
     //创建学习路径图
     const createLearnPath = () => {
@@ -1429,37 +1429,42 @@ export default {
       state.lpLoading = true;
       let obj = {
         name: state.pathName,
-        picUrl: "",
         remark: state.pathIntro,
         status: 0,
+        organizationId: state.organizationSelectId,
+        organizationName: state.organizationSelectName,
+        picUrl: state.pathBg,
       };
       api
         .createLearnPath(obj)
         .then((res) => {
-          let chapterObj = {
-            name: "关卡一",
-            remark: "",
-            routerId: res.data.data.routerId,
-          };
-          //创建关卡
-          api
-            .editChapter(chapterObj)
-            .then((chapterRes) => {
-              console.log("关卡创建成功", chapterRes);
-              setTimeout(() => {
-                console.log("创建成功", res);
-                message.destroy();
-                message.success("创建成功");
-                state.lpLoading = false;
-                state.currentPage = 1;
-                router.push("/leveladd");
-                storage.set("routerId", res.data.data.routerId);
-                // getLearnPath();
-              }, commonData.timeout);
-            })
-            .catch((chapterErr) => {
-              console.log("关卡创建失败", chapterErr);
-            });
+          console.log("创建学习路径成功", res);
+          if (res.data.code === 200) {
+            let chapterObj = {
+              name: "关卡一",
+              remark: "",
+              routerId: res.data.data.routerId,
+            };
+            //创建关卡
+            api
+              .editChapter(chapterObj)
+              .then((chapterRes) => {
+                console.log("关卡创建成功", chapterRes);
+                setTimeout(() => {
+                  console.log("创建成功", res);
+                  message.destroy();
+                  message.success("创建成功");
+                  state.lpLoading = false;
+                  state.currentPage = 1;
+                  router.push("/leveladd");
+                  storage.set("routerId", res.data.data.routerId);
+                  // getLearnPath();
+                }, commonData.timeout);
+              })
+              .catch((chapterErr) => {
+                console.log("关卡创建失败", chapterErr);
+              });
+          }
         })
         .catch((err) => {
           console.log("创建失败", err);
@@ -1525,23 +1530,36 @@ export default {
     };
 
     //获取路径图详细信息
-    const getLearnPathInfo = (item) => {
-      console.log("item", item);
+    const getLearnPathInfo = (id) => {
+      // console.log("编辑学习路径图id", id);
+      //获取学习路径详情
+      api
+        .getRouterDetail(id)
+        .then((res) => {
+          if (res.data.code === 200) {
+            let detail = res.data.data.routerInfo;
+            // console.log("获取详情成功", detail);
+            state.pathName = detail.name;
+            state.pathBg = detail.picUrl;
+            state.pathBgId = "";
+            state.organizationSelectName = detail.organizationName;
+            state.organizationSelectId = detail.organizationId;
+            state.pathIntro = detail.remark;
+            state.editPathId = id;
+            // console.log("state.imgData", state.imgData);
+            let arr = state.imgData;
+            for (let i = 0; i < arr.length; i++) {
+              // console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
+              if (arr[i].dictValue === state.pathBg) {
+                state.pathBgId = arr[i].dictCode;
+              }
+            }
+          }
+        })
+        .catch((err) => {
+          console.log("获取详情失败", err);
+        });
       state.out1 = true;
-      state.pathName = item.manager;
-      state.pathBg = "";
-      state.pathBgId = "";
-      state.organizationSelectName = null;
-      state.organizationSelectId = null;
-      state.pathIntro = item.remark;
-      state.editPathId = item.id;
-      console.log("state.imgData", state.imgData);
-      let arr = state.imgData;
-      for (let i = 0; i < arr.length; i++) {
-        if (arr[i].dictCode === state.pathBgId) {
-          state.pathBgId = arr[i].dictValue;
-        }
-      }
     };
     //编辑学习路径图
     const editLearnPath = () => {
@@ -1557,12 +1575,21 @@ export default {
         message.destroy();
         return message.warning("请选择背景图");
       }
+      // state.pathName = detail.name;
+      //     state.pathBg = detail.picUrl;
+      //     state.pathBgId = "";
+      //     state.organizationSelectName = detail.organizationName;
+      //     state.organizationSelectId = detail.organizationId;
+      //     state.pathIntro = detail.remark;
+      //     state.editPathId = id;
       // state.createLoading = true;
       let obj = {
         routerId: state.editPathId,
         name: state.pathName,
-        picUrl: "",
+        picUrl: state.pathBg,
         remark: state.pathIntro,
+        organizationName: state.organizationSelectName,
+        organizationId: state.organizationSelectId,
         status: 0,
       };
       api
@@ -1642,30 +1669,30 @@ export default {
     //     }
     //     choiceEvaluation()
 
-    //字典获取路径图背景
-    const getDictList = (param) => {
-      let obj = {
-        pageNo: 1,
-        pageSize: 20,
-        setCode: param,
-      };
-      api
-        .getDict(obj)
-        .then((res) => {
-          console.log("获取字典成功", res);
-          if (res.status === 200) {
-            if (param === "pathmapPic") {
-              if (res.data.data.rows.length > 0) {
-                state.imgData = [res.data.data.rows[0]];
-              }
-            }
-          }
-        })
-        .catch((err) => {
-          console.log("获取字典失败", err);
-        });
-    };
-    getDictList("pathmapPic");
+    // //字典获取路径图背景
+    // const getDictList = (param) => {
+    //   let obj = {
+    //     pageNo: 1,
+    //     pageSize: 20,
+    //     setCode: param,
+    //   };
+    //   api
+    //     .getDict(obj)
+    //     .then((res) => {
+    //       console.log("获取字典成功", res);
+    //       if (res.status === 200) {
+    //         if (param === "pathmapPic") {
+    //           if (res.data.data.rows.length > 0) {
+    //             state.imgData = [res.data.data.rows[0]];
+    //           }
+    //         }
+    //       }
+    //     })
+    //     .catch((err) => {
+    //       console.log("获取字典失败", err);
+    //     });
+    // };
+    // getDictList("pathmapPic");
     //显示更多路径背景弹窗
     const showLearnBgMore = () => {
       state.learnBgMore = true;
@@ -1677,6 +1704,10 @@ export default {
     onMounted(() => {
       // console.log("执行");
       getLearnPath();
+      if (store.state.pathmapPic.length > 0) {
+        console.log("store.state.pathmapPic", store.state.pathmapPic);
+        state.imgData = [store.state.pathmapPic[0]];
+      }
     });
     //添加权限
     watch(
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 0e666b69..2ac43dc7 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -3,7 +3,7 @@
     <div class="addhead">
       <div class="leftimg">
         <!-- <img class="img" :src="picUrl" /> -->
-        <img class="img" src="../../assets/images/leveladd/1.png" />
+        <img class="img" :src="picUrl" />
       </div>
       <div class="imgfor">
         <div class="forz">{{ styTitle }}</div>
@@ -1855,6 +1855,7 @@ export default {
     };
     const reget = () => {
       GetRouterDetail(state.routerId).then((res) => {
+        // console.log("获取路径图详情", res);
         state.styTitle = res.data.data.routerInfo.name;
         state.cretime = toDate(
           res.data.data.routerInfo.createTime / 1000,
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 26bdc873..71e868cd 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -174,7 +174,7 @@
           <div class="filt">
             <div class="le">
               <div class="leftimg">
-                <img class="img" src="../../assets/images/leveladd/1.png" />
+                <img class="img" :src="picUrl" />
               </div>
               <div class="imgfor">
                 <div class="forz">{{ styTitle }}</div>
@@ -964,7 +964,7 @@
         <div class="header">
           <div class="inhe">
             <div class="mod"></div>
-            <div class="tz">选择任务移动到阶段</div>
+            <div class="tz">选择任务移动到关卡</div>
           </div>
         </div>
         <div class="mid">
@@ -1201,6 +1201,8 @@ export default {
 
       unlockModeVisible: false, //切换模式抽屉
       chooseProjectList: null, //选择的阶段下的任务列表
+
+      curLevel: null, //选择移动到的关卡名称
     });
 
     const showModal = (element) => {
@@ -1755,6 +1757,7 @@ export default {
             console.log("移动失败", err);
           });
         state.visiblene = false;
+        state.curLevel = null;
       }
     };
     //编辑的按钮
@@ -1825,10 +1828,12 @@ export default {
     };
     const closeChangeModal = () => {
       state.visiblene = false;
+      state.curLevel = null;
     };
     const handleChangeStage = (value, option) => {
       console.log("阶段改变", value, option);
       state.removeStageId = option.chapterId;
+      state.curLevel = option.name;
     };
 
     //显示切换模式抽屉

From 54031306de47dc828f6326574644005e20f41daa Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 2 Dec 2022 16:24:42 +0800
Subject: [PATCH 14/21] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                               |    2 +
 src/api/indexAudit.js                     |    3 +
 src/components/project/OrgClass.vue       |   62 +
 src/components/project/ProjectClass.vue   |   48 +
 src/components/project/ProjectLevel.vue   |   45 +
 src/components/project/ProjectManager.vue |  104 +
 src/components/project/TrainClass.vue     |   44 +
 src/views/examine/ProjectReviewedN.vue    |   38 +-
 src/views/projectcenter/ProjectAdd.vue    | 1081 +------
 src/views/projectcenter/ProjectManage.vue | 3415 +++++----------------
 10 files changed, 1204 insertions(+), 3638 deletions(-)
 create mode 100644 src/components/project/OrgClass.vue
 create mode 100644 src/components/project/ProjectClass.vue
 create mode 100644 src/components/project/ProjectLevel.vue
 create mode 100644 src/components/project/ProjectManager.vue
 create mode 100644 src/components/project/TrainClass.vue

diff --git a/src/App.vue b/src/App.vue
index 623a12dd..314c66b3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -65,6 +65,8 @@ export default defineComponent({
       initDict("projectLevel");
       initDict("projectSys");
       initDict("pathmapPic");
+      initDict('projectClass')
+      initDict('projectPic')
       getOrgTree();
     }
 
diff --git a/src/api/indexAudit.js b/src/api/indexAudit.js
index 71d314b7..773045e9 100644
--- a/src/api/indexAudit.js
+++ b/src/api/indexAudit.js
@@ -6,6 +6,9 @@ export const list = (obj) => http.post('/admin/offcourse/list', obj)
 //获取待审核项目列表
 export const projlist = (obj) => http.post('/admin/project/list', obj)
 
+//获取待审核项目列表
+export const auditlist = (obj) => http.post('/admin/project/auditlist', obj)
+
 //获取已审核项目列表
 export const listView = (obj) => http.post('/admin/project/listView', obj)
 
diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
new file mode 100644
index 00000000..d0a197c9
--- /dev/null
+++ b/src/components/project/OrgClass.vue
@@ -0,0 +1,62 @@
+<template>
+  <a-tree-select
+      v-model:value="id"
+      style="width: 100%"
+      :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+      placeholder="自动带出 可修改"
+      allow-clear
+      :tree-data="options"
+      :fieldNames="{
+                children: 'treeChildList',
+                label: 'name',
+                value: 'id',
+              }"
+      :disabled="viewDetail ? true : false"
+      @change="change"
+      dropdownClassName="treeDropdown"
+  >
+  </a-tree-select>
+</template>
+<script>
+import {onMounted, reactive, toRefs, watch} from "vue";
+import {useStore} from "vuex";
+
+export default {
+  name: "OrgClass",
+
+  props: {
+    modelValue: {
+      type: Number,
+    },
+    name: {
+      type: String,
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+  },
+  setup(props, ctx) {
+    const store = useStore();
+
+    const state = reactive({
+      options: [],
+      id: props.value
+    });
+    watch(state.id, () => {
+      ctx.emit('update:modelValue', state.id)
+    })
+    onMounted(() => {
+      state.options = [{id: props.modelValue, name: props.name}, ...store.state.orgtreeList]
+    })
+    function change(key, obj) {
+      ctx.emit('update:name', obj[0])
+    }
+
+    return {
+      ...toRefs(state),
+      change
+    };
+  },
+};
+</script>
diff --git a/src/components/project/ProjectClass.vue b/src/components/project/ProjectClass.vue
new file mode 100644
index 00000000..e659034f
--- /dev/null
+++ b/src/components/project/ProjectClass.vue
@@ -0,0 +1,48 @@
+<!-- 评估管理-创建评估页面 -->
+<template>
+  <a-select
+      v-model:value="id"
+      placeholder="请选择分类"
+      style="width: 100%"
+      :options="options"
+      allowClear
+      :disabled="disabled"
+  >
+  </a-select>
+</template>
+<script>
+import {onMounted, reactive, toRefs, watch} from "vue";
+import {useStore} from "vuex";
+
+export default {
+  name: "ProjectClass",
+
+  props: {
+    modelValue: {
+      type: Number,
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+  },
+  setup(props, ctx) {
+    const store = useStore();
+
+    const state = reactive({
+      options: [],
+      id: props.modelValue
+    });
+    watch(state.id,()=>{
+      ctx.emit('update:modelValue',state.id)
+    })
+
+    onMounted(() => {
+      state.options = store.state.projectClass.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
+    })
+    return {
+      ...toRefs(state),
+    };
+  },
+};
+</script>
diff --git a/src/components/project/ProjectLevel.vue b/src/components/project/ProjectLevel.vue
new file mode 100644
index 00000000..87f724f1
--- /dev/null
+++ b/src/components/project/ProjectLevel.vue
@@ -0,0 +1,45 @@
+<template>
+  <a-select
+      v-model:value="id"
+      :options="options"
+      style="width: 100%"
+      placeholder="请选择项目级别"
+      :disabled="disabled"
+  />
+</template>
+<script>
+import {onMounted, reactive, toRefs, watch} from "vue";
+import {useStore} from "vuex";
+
+export default {
+  name: "ProjectClass",
+
+  props: {
+    modelValue: {
+      type: Number,
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+  },
+  setup(props, ctx) {
+    const store = useStore();
+
+    const state = reactive({
+      options: [],
+      id: props.modelValue
+    });
+    watch(state.id, () => {
+      ctx.emit('update:modelValue', state.id)
+    })
+
+    onMounted(() => {
+      state.options = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
+    })
+    return {
+      ...toRefs(state),
+    };
+  },
+};
+</script>
diff --git a/src/components/project/ProjectManager.vue b/src/components/project/ProjectManager.vue
new file mode 100644
index 00000000..52fbc59f
--- /dev/null
+++ b/src/components/project/ProjectManager.vue
@@ -0,0 +1,104 @@
+<template>
+  <a-select
+      v-model:value="managerArray"
+      placeholder="请选择项目经理"
+      :filterOption="false"
+      style="width: 100%"
+      :options="options"
+      allowClear
+      showSearch
+      mode="multiple"
+      :disabled="disabled"
+      @popupScroll="memberScroll"
+      @search="searchMember"
+      @change="change"
+  >
+    <template v-if="loading" #notFoundContent>
+      <a-spin size="small"/>
+    </template>
+  </a-select>
+</template>
+<script>
+import {reactive, toRefs, watch} from "vue";
+import {scrollLoad} from "@/api/method";
+import * as api1 from "@/api/index1";
+
+export default {
+  name: "ProjectClass",
+
+  props: {
+    value: {
+      type: Number,
+    },
+    name: {
+      type: Number,
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      options: [],
+      managerArray: [],
+      memberParam: {keyWord: '', pageNo: 1, pageSize: 10},
+      loading: false,
+      init: false
+    });
+
+    watch(() => state.memberParam, getMember)
+    watch(() => props.value, init)
+
+    function getMember() {
+      state.loading = true
+      api1.getMemberInfo(state.memberParam).then((res) => {
+        const list = res.data.data.rows.filter(e => !props.value?.includes(e.id + '')).map(e => ({
+          label: e.realName,
+          value: e.id
+        }));
+        state.options.push(...list)
+        state.loading = false
+      });
+
+    }
+
+    const memberScroll = (e) => {
+      let num = scrollLoad(e);
+      if (num === 2) {
+        // 如果滑到底部，则加载下一页
+        state.memberParam.pageNo++;
+      }
+    };
+
+    //搜索学员
+    const searchMember = (keyWord) => {
+      keyWord && (state.memberParam = {keyWord, pageNo: 1, pageSize: 10});
+    };
+
+    function init() {
+      if (props.value && props.name) {
+        const arrManager = props.name.split(',')
+        const arrManagerId = props.value.split(',')
+        state.managerArray = arrManagerId
+        state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
+        state.init = true
+        getMember()
+      }
+    }
+
+    function change(e, l) {
+      console.log('change')
+      ctx.emit('update:value', e.join(','))
+      ctx.emit('update:name', l.map(t => t.label).join(','))
+    }
+
+    return {
+      ...toRefs(state),
+      searchMember,
+      memberScroll,
+      change
+    };
+  },
+};
+</script>
diff --git a/src/components/project/TrainClass.vue b/src/components/project/TrainClass.vue
new file mode 100644
index 00000000..af14081c
--- /dev/null
+++ b/src/components/project/TrainClass.vue
@@ -0,0 +1,44 @@
+<template>
+  <a-select
+      v-model:value="id"
+      :options="options"
+      style="width: 100%"
+      placeholder="请选择分类"
+      :disabled="disabled"
+  />
+</template>
+<script>
+import {onMounted, reactive, toRefs, watch} from "vue";
+import {useStore} from "vuex";
+
+export default {
+  name: "TrainClass",
+
+  props: {
+    modelValue: {
+      type: Number,
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+  },
+  setup(props, ctx) {
+    const store = useStore();
+
+    const state = reactive({
+      options: [],
+      id: props.modelValue
+    });
+    watch(state.id, () => {
+      ctx.emit('update:modelValue', state.id)
+    })
+    onMounted(() => {
+      state.options = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
+    })
+    return {
+      ...toRefs(state),
+    };
+  },
+};
+</script>
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index d609602d..ea7dd151 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -37,10 +37,10 @@
                   margin-right: 14px;
                 " placeholder="请输入创建人" />
             </div>
-            <div class="inpbox1">
-              <a-range-picker v-model:value="valueDate" style="border-radius: 8px; height: 40px; margin-left: 5px"
-                :placeholder="['      开始时间', '        结束时间']" @change="rankTimeChange" />
-            </div>
+<!--            <div class="inpbox1">-->
+<!--              <a-range-picker v-model:value="valueDate" style="border-radius: 8px; height: 40px; margin-left: 5px"-->
+<!--                :placeholder="['      开始时间', '        结束时间']" @change="rankTimeChange" />-->
+<!--            </div>-->
           </div>
         </div>
         <div class="tmplh_btn">
@@ -73,10 +73,10 @@
   </div>
 </template>
 <script>
-import { onMounted, reactive, toRefs } from "vue";
+import {onMounted, reactive, toRefs} from "vue";
 import ProjectAudit from "../../components/drawers/ProjectAudit";
-import { projlist } from "../../api/indexAudit";
-import { toDate } from "@/api/method";
+import {auditlist} from "../../api/indexAudit";
+
 export default {
   name: "ProjectViewedN",
   components: { ProjectAudit },
@@ -106,8 +106,8 @@ export default {
       columns1: [
         {
           title: "序号",
-          dataIndex: "number",
-          key: "number",
+          dataIndex: "projectId",
+          key: "projectId",
           align: "center",
         },
         {
@@ -135,17 +135,18 @@ export default {
           dataIndex: "status",
           key: "status",
           align: "center",
+          customRender: ()=><div>待审核</div>,
         },
         {
           title: "创建人",
-          dataIndex: "creater",
-          key: "creater",
+          dataIndex: "createName",
+          key: "createName",
           align: "center",
         },
         {
           title: "创建时间",
-          dataIndex: "time",
-          key: "time",
+          dataIndex: "createTime",
+          key: "createTime",
           align: "center",
         },
 
@@ -163,7 +164,7 @@ export default {
                     showProjAudit(
                       value.record.projectId,
                       value.record.createId,
-                      value.record.creater
+                      value.record.createName
                     );
                   }}
                 >
@@ -194,12 +195,13 @@ export default {
         pageSize: state.pageSize,
         status: 1,
       };
-      projlist(objn)
+      auditlist(objn)
         .then((res) => {
           console.log("获取待审核项目成功", res);
           let result = res.data.data;
           state.total = result.total;
-          setProjList(result.rows);
+          state.tableData1 = result.rows
+          // setProjList(result.rows);
         })
         .catch((err) => {
           console.log("获取待审核项目失败", err);
@@ -232,7 +234,7 @@ export default {
                           ? "拒绝"
                           : "-",
             creater: item.createName,
-            time: toDate(item.createTime, "Y-M-D h-m"),
+            time: item.createTime,
             projectId: item.projectId,
             createId: item.createId,
           };
@@ -260,7 +262,7 @@ export default {
                           ? "拒绝"
                           : "-",
             creater: item.createName,
-            time: toDate(item.createTime, "Y-M-D h-m"),
+            time: item.createTime,
             projectId: item.projectId,
             createId: item.createId,
             children: item.subList ? setProjList(item.subList) : [],
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index c682beaa..dabb8383 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -2,7 +2,7 @@
 <template>
   <div class="projectAdd">
     <div class="header">
-      <span class="title">创建/编辑单层项目</span>
+      <span class="title">{{ projectInfo.parentId ? '编辑' : '创建' }}项目</span>
       <div
           @click="backPage"
           style="cursor: pointer"
@@ -14,6 +14,20 @@
     </div>
     <div class="content">
       <div class="main">
+        <div class="name" v-if="projectInfo.parentName">
+          <div class="namebox">
+            <img
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目归属</div>
+          </div>
+          <div class="in">
+            <div style="color: #c7cbd2; font-size: 14px; margin-left: 15px">
+              {{ projectInfo.parentName }}
+            </div>
+          </div>
+        </div>
         <div class="name">
           <div class="namebox">
             <img
@@ -24,7 +38,7 @@
           </div>
           <div class="in">
             <a-input
-                v-model:value="projectName"
+                v-model:value="projectInfo.name"
                 placeholder="请输入项目名称"
                 show-count
                 :maxlength="30"
@@ -41,26 +55,7 @@
             <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
-                :disabled="viewDetail ? true : false"
-                :fieldNames="{
-                label: 'dictName',
-                value: 'dictCode',
-              }"
-            >
-            </a-select>
+            <ProjectClass v-model:value="projectInfo.category"></ProjectClass>
           </div>
         </div>
         <div class="name">
@@ -72,16 +67,20 @@
             <div class="inname">封面图</div>
           </div>
           <div
-              class="box"
+              :class="`box ${projectInfo.picUrl == src?'active':''}`"
               style="
               width: 100px;
               height: 100px;
-              border: 1px solid rgba(78, 166, 255, 1);
               border-radius: 5px;
               cursor: pointer;
               position: relative;
               overflow: hidden;
             "
+              v-for="(src,index) in projectPic"
+              :key="index"
+              @click="()=>{
+                projectInfo.picUrl = src
+              }"
           >
             <img
                 style="
@@ -90,37 +89,9 @@
                 margin-bottom: 4px;
                 margin-right: 4px;
               "
-                v-if="imageUrl"
-                :src="imageUrl"
+                :src="src"
                 alt="avatar"
             />
-            <!-- <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"
-              :disabled="viewDetail ? true : false"
-            >
-              <img
-                style="
-                  width: 100px;
-                  height: 100px;
-                  margin-bottom: 4px;
-                  margin-right: 4px;
-                "
-                v-if="imageUrl"
-                :src="imageUrl"
-                alt="avatar"
-              />
-              <div v-else>
-                <div class="box1"></div>
-                <div class="box2"></div>
-              </div>
-            </a-upload> -->
           </div>
         </div>
         <div class="name">
@@ -136,9 +107,10 @@
             <a-range-picker
                 separator="至"
                 :placeholder="['      开始时间', '        结束时间']"
-                v-model:value="rangevalue"
+                v-model:value="projectInfo.rangeTime"
                 style="width: 100%; height: 40px; border-radius: 5px"
-                @change="onRangeChange"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
+                @change="timeChange"
                 :disabled="viewDetail ? true : false"
             />
           </div>
@@ -152,26 +124,7 @@
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
-            <a-select
-                :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-                v-model:value="classifySelect1"
-                placeholder="请选择项目经理"
-                :filterOption="false"
-                style="width: 100%"
-                :options="classifyList1"
-                @change="classificationChange1"
-                allowClear
-                showSearch
-                mode="multiple"
-                :disabled="viewDetail ? true : false"
-                @popupScroll="memberScroll"
-                @search="searchMember"
-            >
-            </a-select>
+            <ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"></ProjectManager>
           </div>
         </div>
         <div class="name">
@@ -184,45 +137,7 @@
           </div>
 
           <div class="in select">
-            <a-tree-select
-                :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-                v-model:value="projectInfo.sourceBelongId"
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                placeholder="自动带出 可修改"
-                allow-clear
-                :tree-data="orgtreeList"
-                :fieldNames="{
-                children: 'treeChildList',
-                label: 'name',
-                value: 'id',
-              }"
-                :disabled="viewDetail ? true : false"
-                @change="classificationChange2"
-                dropdownClassName="treeDropdown"
-            >
-              <!-- <template #title="{ value: val, title }">
-      <b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
-      <template v-else>{{ title }}</template>
-    </template> -->
-            </a-tree-select>
-            <!-- <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect2"
-              placeholder="自动带出 可修改"
-              :options="classifyList2"
-              @change="classificationChange2"
-              :field-names="{ label: 'name', value: 'id', options: 'children' }"
-              :disabled="viewDetail ? true : false"
-            /> -->
+            <OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName"></OrgClass>
           </div>
         </div>
         <div class="name name2">
@@ -231,7 +146,7 @@
           </div>
           <div class="in">
             <a-textarea
-                v-model:value="remark"
+                v-model:value="projectInfo.remark"
                 style="height: 80px"
                 placeholder="请输入说明"
                 show-count
@@ -245,9 +160,10 @@
             <div class="inname">同步学习记录</div>
           </div>
           <div class="in">
-            <a-radio
-                @click="changeChecked"
-                v-model:checked="checked"
+            <a-switch
+                v-model:checked="projectInfo.courseSyncFlag"
+                :checkedValue="1"
+                :unCheckedValue="0"
                 :disabled="viewDetail ? true : false"
             ><span
                 style="
@@ -256,8 +172,7 @@
                   font-size: 14px;
                 "
             >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-            ></a-radio
-            >
+            ></a-switch>
           </div>
         </div>
         <div class="name">
@@ -269,18 +184,7 @@
             <div class="inname">项目级别</div>
           </div>
           <div class="in select">
-            <a-select
-                :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-                v-model:value="projectInfo.level"
-                :options="classifyList3"
-                style="width: 100%"
-                placeholder="请选择项目级别"
-                :disabled="viewDetail ? true : false"
-            />
+            <ProjectLevel v-model:value="projectInfo.level"></ProjectLevel>
           </div>
         </div>
         <div class="name">
@@ -292,18 +196,7 @@
             <div class="inname">培训分类</div>
           </div>
           <div class="in select">
-            <a-select
-                :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-                v-model:value="projectInfo.systemId"
-                :options="systemOption"
-                style="width: 100%"
-                placeholder="请选择培训分类"
-                :disabled="viewDetail ? true : false"
-            />
+            <TrainClass v-model:value="projectInfo.systemId"></TrainClass>
           </div>
         </div>
         <div class="name">
@@ -315,81 +208,41 @@
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
-            <a-radio
-                @click="changeChecked1"
-                v-model:checked="checked1"
+            <a-switch
+                v-model:checked="projectInfo.boeFlag"
+                :checkedValue="1"
+                :unCheckedValue="0"
                 :disabled="viewDetail ? true : false"
-            ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-            >BOEU实施</span
-            ></a-radio
-            >
+            ></a-switch>
           </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>
-					</div>
-					<div class="filebox">
-						<div>
-							<img v-if="fileList1.length < 6" class="fileimg" src="../../assets/images/projectadd/enclosure.png" />
-							<a-upload :disabled="fileList1.length > 5" :before-upload="beforeUpload1" v-model:file-list="fileList1"
-								@remove="removeFile" name="file" action="/api/file/upload" :headers="headers" @change="handleChange1">
-								<span v-if="fileList1.length > 5" class="filetext">上传数量已经达到最大值</span>
-								<span v-else class="filetext">上传附件</span>
-							</a-upload>
-						</div>
-						<div class="support">
-							支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
-						</div>
-					</div>
-				</div> -->
       </div>
-      <!-- 2022-11-30注释 后面放开 -->
-      <!-- <div class="template">
+      <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="
+                :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"
+                v-model:value="classifySelect5"
+                placeholder="请选择模版"
+                :size="size"
+                style="width: 100%"
+                :options="classifyList5"
+                @change="classificationChange5"
+                @popupScroll="templateScroll"
+                :fieldNames="{
+                label: 'name',
+                value: 'projectTemplateId',
+              }"
             >
             </a-select>
           </div>
         </div>
-      </div> -->
+      </div>
     </div>
     <div class="footer">
       <div class="btn">
@@ -403,593 +256,102 @@
   </div>
 </template>
 <script>
-import {reactive, toRefs, ref, onUnmounted, onMounted} from "vue";
+import {onMounted, reactive, toRefs, watch} from "vue";
 import {message} from "ant-design-vue";
-import {useRouter, useRoute} from "vue-router";
-import dayjs from "dayjs";
+import {useRoute, useRouter} from "vue-router";
 import * as api from "../../api/index";
-import * as api1 from "../../api/index1";
-import {storage} from "../../api/storage";
-import {toDate, scrollLoad} from "../../api/method";
 import {useStore} from "vuex";
+import ProjectClass from "@/components/project/ProjectClass";
+import TrainClass from "@/components/project/TrainClass";
+import OrgClass from "@/components/project/OrgClass";
+import ProjectManager from "@/components/project/ProjectManager";
+import ProjectLevel from "@/components/project/ProjectLevel";
+import {scrollLoad} from "@/api/method";
 
 export default {
   name: "projectAdd",
+  components: {
+    ProjectManager,
+    ProjectLevel,
+    ProjectClass,
+    TrainClass,
+    OrgClass
+  },
   setup() {
     const store = useStore();
-    // 编辑页面跳转过来时候，自动填充表格
     const routers = useRoute();
     const router = useRouter();
     const state = reactive({
-      classifySelect: null, //分类选择信息
-      projectType: null, //分类选择的id
-      checked: false, //同步学习记录
-      checked1: false, //BOEU实施
-      classifySelect1: [], //选中项目经理名称数组
-      classifySelect2: null, //选中的资源归属信息
-      classifySelect3: null, //选中的项目级别信息
-      classifySelect4: null, //选中的培训分类信息
-      rangevalue: [], //项目时间
-
       currentPage: 1, //当前页
       tableDataTotal: -1, //模版列表总数
       pageSize: 10, //每页10条数据
       totalPages: 0, //总页数
-      viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
-
-      currentPage1: 1, //项目经理
-      pageSize1: 10, //项目经理,
-      orgtreeList: [],
+      viewDetail: null,
       projectInfo: {},
-      classifyList3: [],
-      systemOption: []
+      projectPic: [],
+      memberParam: {
+        pageNo: 1,
+        pageSize: 10,
+        keyWord: "",
+      },
+      classifyList5: []
     });
 
     onMounted(() => {
-      console.log('onMounted')
-      state.orgtreeList = [...store.state.orgtreeList]
-      state.classifyList3 = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
-      state.systemOption = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
+      state.projectPic = store.state.projectPic.map(e => e.dictValue)
+      state.viewDetail = routers.query.viewDetail
+      getProjectInfo()
+      getTemplate()
     })
-    //分类列表
-    const classifyList = ref([]);
 
-    //项目封面
-    const imageUrl = ref("");
+    watch(routers.query, () => {
+      state.projectInfo.projectId = routers.query.projectId
+      state.projectInfo.parentName = routers.query.parentName
+      state.projectInfo.parentId = routers.query.parentId
+    })
 
-    // 培训分类
-    const classifyList4 = ref([
-      // { value: 1, label: "集团级" },
-    ]);
-    //获取分类、封面图、项目级别、培训分类-----------字典配置-------------------------------
-    const getDictList = (param) => {
-      let obj = {
-        pageNo: 1,
-        pageSize: 20,
-        setCode: param,
-      };
-      api1
-          .getDict(obj)
-          .then((res) => {
-            console.log("获取字典成功", res);
-            if (res.status === 200) {
-              if (param === "projectClass") {
-                classifyList.value = res.data.data.rows;
-              }
-              if (param === "projectPic") {
-                if (res.data.data.rows.length > 0) {
-                  imageUrl.value = res.data.data.rows[0].dictValue;
-                  picUrl = res.data.data.rows[0].dictValue;
-                }
-              }
 
-              if (param === "projectSys") {
-                classifyList4.value = res.data.data.rows;
-              }
-              if (
-                  classifyList.value &&
-                  imageUrl.value &&
-                  classifyList4.value
-              ) {
-                getDictInfo();
-              }
-            }
-          })
-          .catch((err) => {
-            console.log("获取字典失败", err);
-          });
-    };
-    getDictList("projectClass");
-    getDictList("projectPic");
-    getDictList("projectSys");
-    //获取分类、封面图、项目级别、培训分类---------------字典配置---------------------------
-    //分类、封面图、项目级别、培训分类回显
-    const getDictInfo = () => {
-      if (routers.query.projectId) {
-        // console.log("classifyList", classifyList.value, state.projectType);
-        //         //分类
-        //         let arr=classifyList.value
-        //         for(let i=0;i<arr.length;i++){
-        // if(arr[i].){
-        // }
-        //         }
-        //    state.classifySelect: null, //分类选择信息
-        // state.projectType: null, //分类选择的id
-        //imageUrl.value //封面图
-        //levels.value //项目级别
-        //state.classifySelect3 //项目级别
-        //state.classifySelect4 //培训分类
-        //systemid.value //培训分类id
+    function getProjectInfo() {
+      if (!routers.query.projectId) {
+        state.projectInfo = {parentName: routers.query.parentName, parentId: routers.query.parentId}
+        return
       }
-    };
-    //分类、封面图、项目级别、培训分类回显
-
-    const isEdit = ref(false);
-    let peojectID = ""; //项目id
-    const editProject = () => {
-      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;
-                state.projectInfo = info;
-                console.log(
-                    "classifyList.value.find(item=>item.dictCode===info.category)",
-                    classifyList.value.find((item) => {
-                      if (item.dictCode == 11) {
-                        return item.dictName;
-                      }
-                      // return item.dictName;
-                    }),
-                    classifyList.value,
-                    info.category
-                );
-
-                console.log(info);
-                // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-                projectName.value = info.name; //项目名称
-                // state.classifySelect =classifyList.value.find(item=>item.dictCode===info.category) ; // info.category 项目分类
-                state.projectType = 1; //分类选择的id
-
-                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 manageName = info.manager.split(","); //项目经理
-                let manageValue = info.managerId.split(","); //项目经理id数组
-                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 = info.sourceBelongId
-                remark.value = info.remark;
-                state.checked = info.boeFlag ? info.boeFlag : false;
-                state.classifySelect4 = classifyList4.value[info.systemId - 1];
-                state.checked1 = info.boeFlag ? info.boeFlag : false;
-                state.orgtreeList.unshift({id: info.sourceBelongId, name: info.sourceBelongName})
-                picUrl = info.picUrl;
-                beginTime = Number(info.beginTime / 1000);
-                endTime = Number(info.endTime / 1000);
-                manager = info.manager;
-                managerId = info.managerId;
-                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;
-                  state.projectInfo = info;
-                  console.log("我是从本地存储获取的id", info);
-                  projectName.value = info.name;
-                  state.classifySelect = classifyList.value[1]; // info.category 分类选择的信息
-                  state.projectType = 1; //分类选择的id
-                  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 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 = info.sourceBelongId
-                  state.orgtreeList.unshift({id: info.sourceBelongId, name: info.sourceBelongName})
-                  remark.value = info.remark;
-                  state.checked = info.boeFlag ? info.boeFlag : false;
-                  state.classifySelect4 = classifyList4.value[info.systemId - 1];
-                  state.checked1 = info.boeFlag ? info.boeFlag : false;
-
-                  picUrl = info.picUrl;
-                  beginTime = Number(info.beginTime / 1000);
-                  endTime = Number(info.endTime / 1000);
-                  manager = info.manager;
-                  managerId = info.managerId;
-                  courseSyncFlag = info.courseSyncFlag;
-                  levels = info.level;
-                  systemid = info.systemId;
-                  boeFlag = info.boeFlag;
-                }
-              })
-              .catch((err) => {
-                console.log(err);
-              });
-        }
-      }
-    };
-    editProject();
+      api.getProjectDetail({projectId: routers.query.projectId}).then(res => {
+        state.projectInfo = res.data.data.projectInfo
+        state.projectInfo.rangeTime = [state.projectInfo.beginTime, state.projectInfo.endTime]
+        state.projectInfo.parentName = routers.query.parentName
+      })
+    }
 
     const backPage = () => {
-      storage.remove("projectAddId");
-      setTimeout(() => {
-        router.push({
-          path: "/projectmanage",
-        });
-      }, 400);
+      router.back()
     };
 
-    const projectName = ref(""); //项目名称
-
     //选择分类
     const classificationChange = (value) => {
       console.log(`selected ${value}`);
       state.projectType = value; //分类选择的id
     };
 
-    function getBase64(img, callback) {
-      const reader = new FileReader();
-      reader.addEventListener("load", () => callback(reader.result));
-      reader.readAsDataURL(img);
-    }
 
-    const fileList = ref([]);
-    const fileList1 = ref([]);
-    const loading = ref(false);
-
-    let picUrl = ""; //项目封面
-
-    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 uplodaFileCount = false;
-
-    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 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;
-
-        if (info.fileList.length > 5) {
-          uplodaFileCount = true;
-        } else {
-          uplodaFileCount = false;
-        }
-      }
-      if (info.file.status === "error") {
-        loading.value = false;
-        message.error("upload error");
-      }
-    };
-
-    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;
-    };
-
-    const beforeUpload1 = () => {
-      return new Promise((resovle, reject) => {
-        if (uplodaFileCount) {
-          message.info("上传文件数量已达最大数量");
-          return reject(false);
-        }
-        return resovle(true);
-      });
-    };
-
-    let beginTime = "";
-    let endTime = "";
-    const dateFormatList = ["YYYY/MM/DD"];
-
-    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;
-    };
-    // 项目经理 后续接口调用
-    const classifyList1 = ref([]);
-    //获取学员
-    const getMember = (e) => {
-      console.log("state.classifySelect1", e, state.classifySelect1);
-      api1
-          .getMemberInfo({
-            pageNo: state.currentPage1,
-            pageSize: state.pageSize1,
-            keyWord: e ? e : "",
-          })
-          .then((res) => {
-            if (res.data.code === 200) {
-              let arr = res.data.data.rows;
-              let array = classifyList1.value;
-              arr.map((value) => {
-                let obj = {
-                  value: value.id,
-                  label: value.realName,
-                };
-                array.push(obj);
-              });
-              classifyList1.value = array;
-              console.log("获取学员", res.data, classifyList1.value);
-              // classifyList1.value = res.data.data.rows;
-              // state.tableDataTotal = res.data.data.total;
-              // return res.data.data.rows;
-            }
-          });
-    };
-    getMember();
-
-    //搜索学员
-    const searchMember = (e) => {
-      console.log("eee", e);
-      if (e) {
-        state.searchName = e;
-        classifyList1.value = [];
-        getMember(e);
-      }
-    };
-
-    //学员滚动加载信息
-    const memberScroll = (e) => {
-      // console.log("滚动", e, b);
-      let num = scrollLoad(e);
-      if (num === 1) {
-        state.currentPage1 = 1;
-      } else if (num === 2) {
-        // 如果滑到底部，则加载下一页
-        state.currentPage1++;
-        getMember();
-      }
-    };
-
-    //选择处理项目经理
-    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 classificationChange2 = (key, obj) => {
-      state.projectInfo.sourceBelongName = obj[0]
-    };
-
-    //选择项目级别
-    let levels = "";
-    const classificationChange3 = (key) => {
-      levels = key;
-    };
-
-    //选择培训分类
-    let systemid = "";
-    const classificationChange4 = (key) => {
-      console.log(`selected ${key}`, classifyList4);
-      systemid = key;
-    };
-
-    // 模版
-    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 = {
-        projectTemplateId: Number(key),
-      };
-      api
-          .getTemplateDetail(obj)
-          .then((res) => {
-            console.log("获取模版详情", res);
-            if (res.status === 200) {
-              let info = res.data.data.projectTemplateInfo;
-              console.log(info);
-              // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-              projectName.value = info.name;
-              state.classifySelect = classifyList.value[1]; // info.category  分类选择的信息
-              state.projectType = 1; //分类选择的id
-
-              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 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 = info.sourceBelongId
-              state.orgtreeList.unshift({id: info.sourceBelongId, name: info.sourceBelongName})
-              remark.value = info.remark;
-              state.checked = info.boeFlag ? info.boeFlag : false;
-              state.classifySelect4 = classifyList4.value[info.systemId - 1];
-              state.checked1 = info.boeFlag ? info.boeFlag : false;
-              // fileList1.value = info.attach.split(",");
-
-              picUrl = info.picUrl;
-              beginTime = Number(info.beginTime / 1000);
-              endTime = Number(info.endTime / 1000);
-              manager = info.manager;
-              managerId = info.managerId;
-              courseSyncFlag = info.courseSyncFlag;
-              levels = info.level;
-              systemid = info.systemId;
-              boeFlag = info.boeFlag;
-            }
-          })
-          .catch((err) => {
-            console.log("获取详情失败", err);
-          });
+    const classificationChange5 = (key, option) => {
+      state.projectInfo = option
+      state.projectInfo.parentName = routers.query.parentName
     };
     //获取模版列表
     const getTemplate = () => {
       let obj = {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
-        // projectId:id?id:''
       };
-      api
-          .getTemplate(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.projectTemplateId,
-                  label: value.name,
-                };
-                array.push(obj);
-              });
-              classifyList5.value = array;
-            }
-          })
-          .catch((err) => {
-            console.log("获取模版列表失败", err);
-          });
+      api.getTemplate(obj).then((res) => {
+        state.totalPages = Number(res.data.data.pages);
+        state.classifyList5 = res.data.data.rows
+      })
     };
-    getTemplate();
+
     //模版滚动加载模板信息
     const templateScroll = (e) => {
-      // console.log("滚动", e, b);
       let num = scrollLoad(e);
       if (num === 1) {
         state.currentPage = 1;
@@ -1000,47 +362,6 @@ export default {
       }
     };
 
-    // 项目说明
-    const remark = ref("");
-
-    //同步学习记录------------------------------------
-    let courseSyncFlag = 0;
-    const changeChecked = () => {
-      console.log(state.checked);
-      state.checked ? (state.checked = false) : (state.checked = true);
-      courseSyncFlag = state.checked ? 1 : 0;
-    };
-    //同步学习记录------------------------------------
-    //BOEU实施--------------------------------------
-    let boeFlag = 0;
-    const changeChecked1 = () => {
-      console.log(state.checked1);
-      state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
-      boeFlag = state.checked1 ? 1 : 0;
-    };
-    //BOEU实施--------------------------------------
-
-    const removeFile = (file) => {
-      const index = fileList1.value.indexOf(file);
-      const newFileList = fileList1.value.slice();
-      newFileList.splice(index, 1);
-      fileList1.value = newFileList;
-
-      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 errorMsgs = {
       name: "请输入项目名称",
       category: "请选择项目分类",
@@ -1052,171 +373,48 @@ export default {
       sourceBelongId: "请选择资源归属",
       level: "请填写项目级别",
       systemId: "请填写项目培训体系",
-      boeFlag: "请选择是否BOE实施",
     };
 
+    function timeChange(e) {
+      if (e && e.length === 2) {
+        state.projectInfo.beginTime = e[0]
+        state.projectInfo.endTime = e[1]
+      }
+    }
+
+    function validate(obj, errorMsgs) {
+      for (let i in errorMsgs) {
+        if (!obj[i]) {
+          message.destroy();
+          message.warning(errorMsgs[i]);
+          return false;
+        }
+      }
+      return true;
+    }
+
     const createProject = () => {
-      console.log("我是否要编辑项目", isEdit.value);
-      if (isEdit.value) {
-        console.log("我要编辑项目", peojectID);
-        let obj = {
-          projectId: Number(peojectID),
-          name: projectName["value"],
-          category: state.projectType, //分类选择的id
-          picUrl: picUrl,
-          beginTime: beginTime,
-          endTime: endTime,
-          manager: manager,
-          managerId: managerId,
-          sourceBelongId: state.projectInfo.sourceBelongId,
-          sourceBelongName: state.projectInfo.sourceBelongName,
-          remark: remark["value"],
-          courseSyncFlag: courseSyncFlag,
-          level: state.projectInfo.level,
-          systemId: state.projectInfo.systemId,
-          boeFlag: boeFlag,
-          attach: attach,
-          type: 3,
-          templateId: 0,
-          parentId: 0,
-          notice: "",
-          noticeFlag: 0,
-          status: 0,
-        };
-
-        console.log(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: "/projectmanage",
-                  });
-                }, 1000);
-              } else {
-                message.destroy();
-                message.error("编辑失败，请检查当前网络状态。");
-              }
-            })
-            .catch((err) => {
-              console.log(err);
-              message.destroy();
-              message.error("编辑失败，请检查当前网络状态。");
-            });
-      } else {
-        let obj = {
-          name: projectName["value"],
-          category: state.projectType, //分类选择的id
-          picUrl: picUrl,
-          beginTime: beginTime,
-          endTime: endTime,
-          manager: manager,
-          managerId: managerId,
-          sourceBelongId: state.projectInfo.sourceBelongId,
-          sourceBelongName: state.projectInfo.sourceBelongName,
-          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("创建失败，请检查当前网络状态。");
-            });
+      console.log("保存", state.projectInfo);
+      if (!validate(state.projectInfo, errorMsgs)) {
+        return;
       }
+      state.projectInfo.type = 3
+      api.createProject(state.projectInfo).then(() => {
+            message.destroy();
+            message.success("编辑成功");
+            router.back()
+          }
+      )
     };
 
-    onUnmounted(() => {
-      storage.remove("projectAddId");
-    });
     return {
       ...toRefs(state),
-      projectName,
-      classifyList,
+      timeChange,
       classificationChange,
-      classificationChange1,
-      classificationChange2,
-      classificationChange3,
-      classificationChange4,
       classificationChange5,
-      fileList,
-      fileList1,
-      loading,
-      imageUrl,
-      handleChange,
-      handleChange1,
-      beforeUpload,
-      beforeUpload1,
-      onRangeChange,
-      classifyList1,
-      classifyList4,
-      classifyList5,
-      remark,
-      changeChecked,
-      changeChecked1,
-      uplodaFileCount,
       createProject,
-      removeFile,
-
-      isEdit,
       backPage,
-      dateFormatList,
-
-      templateScroll,
-      memberScroll,
-      getMember,
-      searchMember
+      templateScroll
     };
   },
 };
@@ -1272,6 +470,10 @@ export default {
     border-width: 0px;
   }
 
+  .active {
+    border: 1px solid rgba(78, 166, 255, 1);
+  }
+
   .content {
     display: flex;
 
@@ -1316,6 +518,7 @@ export default {
           position: relative;
           margin-left: 14px;
 
+
           .box1 {
             position: absolute;
             left: 50%;
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 15e46838..83498eea 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -6,58 +6,55 @@
       <div class="filterItems">
         <div class="select">
           <a-input
-            v-model:value="sProjectName"
-            style="width: 270px; height: 40px; border-radius: 8px"
-            placeholder="请输入项目名称"
-            @change="sProjectNameChange"
-            allowClear
-            showSearch
+              v-model:value="searchParam.name"
+              style="width: 270px; height: 40px; border-radius: 8px"
+              placeholder="请输入项目名称"
+              @change="sProjectNameChange"
+              allowClear
+              showSearch
           >
           </a-input>
         </div>
         <div class="select">
           <a-input
-            v-model:value="sProjectOrder"
-            style="width: 270px; height: 40px; border-radius: 8px"
-            placeholder="请输入项目经理"
-            @change="sProjectOrderChange"
-            allowClear
-            showSearch
+              v-model:value="searchParam.manager"
+              style="width: 270px; height: 40px; border-radius: 8px"
+              placeholder="请输入项目经理"
+              @change="sProjectOrderChange"
+              allowClear
+              showSearch
           >
           </a-input>
         </div>
         <div class="select">
           <a-input
-            v-model:value="sProjectCreate"
-            style="width: 270px; height: 40px; border-radius: 8px"
-            placeholder="请输入项目创建人"
-            @change="sProjectCreateChange"
-            allowClear
-            showSearch
+              v-model:value="searchParam.createName"
+              style="width: 270px; height: 40px; border-radius: 8px"
+              placeholder="请输入项目创建人"
+              @change="sProjectCreateChange"
+              allowClear
+              showSearch
           >
           </a-input>
         </div>
-        <!-- 2022-11-30注释 后面放开 -->
-        <!-- <div class="select">
+        <div class="select">
           <a-select
-            v-model:value="sProjectState"
-            style="width: 270px"
-            placeholder="请选择状态"
-            :options="sProjectStateList"
-            @change="sProjectStateChange"
-            allowClear
-            showSearch
+              v-model:value="searchParam.status"
+              style="width: 270px"
+              placeholder="请选择状态"
+              :options="sProjectStateList"
+              allowClear
+              showSearch
           ></a-select>
-        </div> -->
-        <div class="select">
-          <a-date-picker
-            v-model:value="sProjectTime"
-            @change="sProjectTimeChange"
-            type="date"
-            placeholder="创建时间"
-            style="width: 270px"
-          />
         </div>
+        <!--        <div class="select">-->
+        <!--          <a-date-picker-->
+        <!--              v-model:value="searchParam.createTime"-->
+        <!--              type="date"-->
+        <!--              placeholder="创建时间"-->
+        <!--              style="width: 270px"-->
+        <!--          />-->
+        <!--        </div>-->
         <div style="display: flex; margin-bottom: 20px">
           <div class="btnn btn1" @click="searchSubmit">
             <div class="search"></div>
@@ -80,40 +77,26 @@
     <!-- 表格 -->
     <div class="tableBox">
       <a-table
-        :columns="columns"
-        :data-source="tableData"
-        :loading="tableDataTotal === -1 ? true : false"
-        :scroll="{ x: 700 }"
-        @expand="expandTable"
-        :pagination="false"
+          :columns="columns"
+          :data-source="tableData"
+          :loading="tableDataTotal === -1 ? true : false"
+          :scroll="{ x: 700 }"
+          @expand="expandTable"
+          :pagination="false"
       >
-        <!-- <template #bodyCell="{ column }">
-          <template v-if="column.key === 'operation'">
-            <div class="operation">
-              <span>编辑</span>
-              <span style="margin-left: 21px">授权</span>
-              <span style="margin-left: 21px">创建子项目</span>
-              <span style="margin-left: 21px" class="more">
-                <span>更多</span>
-                <div class="moreArrow"></div>
-                <div class="moreItems"></div>
-              </span>
-            </div>
-          </template>
-        </template> -->
       </a-table>
       <div class="tableBox">
         <div class="pa">
           <a-pagination
-            v-if="tableDataTotal > 10"
-            showSizeChanger="true"
-            showQuickJumper="true"
-            hideOnSinglePage="true"
-            :pageSize="pageSize"
-            v-model:current="currentPage"
-            :total="tableDataTotal"
-            class="pagination"
-            @change="changePagination"
+              v-if="tableDataTotal > 10"
+              showSizeChanger="true"
+              showQuickJumper="true"
+              hideOnSinglePage="true"
+              :pageSize="pageSize"
+              v-model:current="searchParam.pageNo"
+              :total="tableDataTotal"
+              class="pagination"
+              @change="changePagination"
           />
         </div>
       </div>
@@ -122,18 +105,18 @@
     <!-- 无项目 -->
     <div class="tableBox" style="display: none">
       <div
-        class="taskbox"
-        @click="showModal1"
-        style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
+          class="taskbox"
+          @click="showModal1"
+          style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
       >
         <div class="leftt">
-          <img src="../../assets/images/taskpage/left2.png" />
+          <img src="../../assets/images/taskpage/left2.png"/>
         </div>
         <div class="photo">
-          <img src="../../assets/images/projectadd/nopro.png" />
+          <img src="../../assets/images/projectadd/nopro.png"/>
         </div>
         <div class="rightt">
-          <img src="../../assets/images/taskpage/right2.png" />
+          <img src="../../assets/images/taskpage/right2.png"/>
         </div>
         <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
           创建项目
@@ -141,21 +124,21 @@
         <div class="centermain">点击创建项目任务</div>
       </div>
     </div>
-    <!-- 创建子项目弹窗 -->
+    <!-- 创建多层项目弹窗 -->
     <div>
       <a-modal
-        v-model:visible="sonproject"
-        :title="null"
-        @ok="closeModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="sonproject"
-        width="764px"
-        height="356px"
+          v-model:visible="doublepro"
+          :title="null"
+          @ok="closeModal2"
+          :footer="null"
+          :closable="false"
+          wrapClassName="doublepro"
+          width="624px"
+          height="476px"
       >
         <div
-          class="modalHeader"
-          style="
+            class="modalHeader"
+            style="
             width: 100%;
             height: 68px;
             display: flex;
@@ -165,53 +148,157 @@
         >
           <div class="headerLeft" style="margin-left: 32px">
             <span class="headerLeftText" style="font-size: 16px"
-              >请选择项目类别</span
+            >{{ projectInfo.projectId ? '编辑' : '创建' }}多层项目</span
+            >
+          </div>
+          <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
+            <img
+                style="width: 22px; height: 22px"
+                src="../../assets/images/basicinfo/close22.png"
+            />
+          </div>
+        </div>
+        <div class="modalMain">
+          <div style="margin-left: 40px; margin-top: 40px;width:78%" v-if="projectInfo.parentName">
+            <span style="color: #000000; font-size: 14px">项目归属：</span>
+            <span style="color: #999999; font-size: 14px; margin-left: 10px">{{ projectInfo.parentName }}</span>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                  style="width: 10px; height: 10px"
+                  src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">项目名称:</div>
+            <div class="in">
+              <a-input
+                  v-model:value="projectInfo.name"
+                  show-count
+                  :maxlength="30"
+                  placeholder="请输入项目名称"
+                  style="border-radius: 8px"
+              />
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                  style="width: 10px; height: 10px"
+                  src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">分类:</div>
+            <div class="in select">
+              <ProjectClass v-model:value="projectInfo.category"></ProjectClass>
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                  style="width: 10px; height: 10px"
+                  src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">项目经理:</div>
+            <div class="in">
+              <ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"></ProjectManager>
+            </div>
+          </div>
+          <div class="name">
+            <div class="star" style="margin-top: -4px">
+              <img
+                  style="width: 10px; height: 10px"
+                  src="../../assets/images/basicinfo/asterisk.png"
+              />
+            </div>
+            <div class="inname">资源归属:</div>
+            <div class="in select">
+              <OrgClass v-model:value="projectInfo.sourceBelongId"
+                        v-model:name="projectInfo.sourceBelongName"></OrgClass>
+            </div>
+          </div>
+          <div class="pubtn">
+            <a-button class="pubtn1" @click="closeModal2">取消</a-button>
+            <a-button class="pubtn2" @click="createStoreyProject"
+            >确定
+            </a-button
+            >
+          </div>
+        </div>
+      </a-modal>
+    </div>
+    <!-- 创建多层项目弹窗 -->
+    <div>
+      <a-modal
+          v-model:visible="sonproject"
+          :title="null"
+          @ok="closeModal"
+          :footer="null"
+          :closable="false"
+          wrapClassName="sonproject"
+          width="764px"
+          height="356px"
+      >
+        <div
+            class="modalHeader"
+            style="
+            width: 100%;
+            height: 68px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+          "
+        >
+          <div class="headerLeft" style="margin-left: 32px">
+            <span class="headerLeftText" style="font-size: 16px"
+            >请选择项目类别1</span
             >
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
             <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
+                style="width: 22px; height: 22px"
+                src="../../assets/images/basicinfo/close22.png"
             />
           </div>
         </div>
         <div class="modalMain">
           <div
-            @click="createChildProject"
-            class="taskbox"
-            style="
+              @click="createChildProject"
+              class="taskbox"
+              style="
               margin-right: 24px;
               background: linear-gradient(180deg, #ddeaff 0%, #f0f8fe 100%);
             "
           >
             <div class="leftt">
-              <img src="../../assets/images/taskpage/left2.png" />
+              <img src="../../assets/images/taskpage/left2.png"/>
             </div>
             <div class="photo">
-              <img src="../../assets/images/taskpage/picture4.png" />
+              <img src="../../assets/images/taskpage/picture4.png"/>
             </div>
             <div class="rightt">
-              <img src="../../assets/images/taskpage/right2.png" />
+              <img src="../../assets/images/taskpage/right2.png"/>
             </div>
             <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
               单层子项目
             </div>
           </div>
           <div
-            class="taskbox"
-            @click="showModal3"
-            style="
+              class="taskbox"
+              @click="showModal3"
+              style="
               background: linear-gradient(180deg, #fef3dd 0%, #fffaf0 100%);
             "
           >
             <div class="leftt">
-              <img src="../../assets/images/taskpage/left1.png" />
+              <img src="../../assets/images/taskpage/left1.png"/>
             </div>
             <div class="photo">
-              <img src="../../assets/images/taskpage/picture5.png" />
+              <img src="../../assets/images/taskpage/picture5.png"/>
             </div>
             <div class="rightt">
-              <img src="../../assets/images/taskpage/right1.png" />
+              <img src="../../assets/images/taskpage/right1.png"/>
             </div>
             <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
               多层子项目
@@ -225,18 +312,18 @@
     <div>
       <div>
         <a-modal
-          v-model:visible="estabish"
-          :title="null"
-          @ok="closeModal1"
-          :footer="null"
-          :closable="false"
-          wrapClassName="estabish"
-          width="638px"
-          height="468px"
+            v-model:visible="estabish"
+            :title="null"
+            @ok="closeModal1"
+            :footer="null"
+            :closable="false"
+            wrapClassName="estabish"
+            width="638px"
+            height="468px"
         >
           <div
-            class="modalHeader"
-            style="
+              class="modalHeader"
+              style="
               width: 100%;
               height: 68px;
               display: flex;
@@ -246,35 +333,35 @@
           >
             <div class="headerLeft" style="margin-left: 32px">
               <span class="headerLeftText" style="font-size: 16px"
-                >请选择项目类别</span
+              >请选择项目类别</span
               >
             </div>
             <div
-              style="cursor: pointer; margin-right: 32px"
-              @click="closeModal1"
+                style="cursor: pointer; margin-right: 32px"
+                @click="closeModal1"
             >
               <img
-                style="width: 22px; height: 22px"
-                src="../../assets/images/basicinfo/close22.png"
+                  style="width: 22px; height: 22px"
+                  src="../../assets/images/basicinfo/close22.png"
               />
             </div>
           </div>
           <div class="modalMain">
-            <router-link to="/projectadd">
+            <router-link :to="`/projectadd?parentId=${projectInfo.parentId}&parentName=${projectInfo.parentName}`">
               <div
-                class="taskbox"
-                style="
+                  class="taskbox"
+                  style="
                   background: linear-gradient(180deg, #ddeaff 0%, #f0f8fe 100%);
                 "
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left2.png" />
+                  <img src="../../assets/images/taskpage/left2.png"/>
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture6.png" />
+                  <img src="../../assets/images/taskpage/picture6.png"/>
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right2.png" />
+                  <img src="../../assets/images/taskpage/right2.png"/>
                 </div>
                 <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                   单层项目
@@ -285,21 +372,21 @@
               </div>
             </router-link>
             <div
-              class="taskbox"
-              @click="showModal2"
-              style="
+                class="taskbox"
+                @click="showModal2"
+                style="
                 margin-bottom: 40px;
                 background: linear-gradient(180deg, #e5f6ec 0%, #eef9f3 100%);
               "
             >
               <div class="leftt">
-                <img src="../../assets/images/taskpage/left3.png" />
+                <img src="../../assets/images/taskpage/left3.png"/>
               </div>
               <div class="photo">
-                <img src="../../assets/images/taskpage/picture7.png" />
+                <img src="../../assets/images/taskpage/picture7.png"/>
               </div>
               <div class="rightt">
-                <img src="../../assets/images/taskpage/right3.png" />
+                <img src="../../assets/images/taskpage/right3.png"/>
               </div>
               <div class="centerbox1" style="color: rgba(93, 201, 136, 1)">
                 多层项目
@@ -313,545 +400,14 @@
       </div>
     </div>
     <!-- 创建项目弹窗 -->
-    <!-- 创建多层项目弹窗 -->
-    <div>
-      <a-modal
-        v-model:visible="doublepro"
-        :title="null"
-        @ok="closeModal2"
-        :footer="null"
-        :closable="false"
-        wrapClassName="doublepro"
-        width="624px"
-        height="476px"
-      >
-        <div
-          class="modalHeader"
-          style="
-            width: 100%;
-            height: 68px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
-          <div class="headerLeft" style="margin-left: 32px">
-            <span class="headerLeftText" style="font-size: 16px"
-              >创建多层项目</span
-            >
-          </div>
-          <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
-            <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
-            />
-          </div>
-        </div>
-        <div class="modalMain">
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">项目名称:</div>
-            <div class="in">
-              <a-input
-                v-model:value="value1"
-                show-count
-                :maxlength="30"
-                placeholder="请输入项目名称"
-                style="border-radius: 8px"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">分类:</div>
-            <div class="in select">
-              <a-select
-                v-model:value="value2"
-                placeholder="请选择分类"
-                :options="classifyList"
-                @change="classificationChange"
-                style="border-radius: 8px; height: 40px"
-                :fieldNames="{
-                  label: 'dictName',
-                  value: 'dictCode',
-                }"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">项目经理:</div>
-            <div class="in">
-              <a-select
-                v-model:value="value3"
-                mode="multiple"
-                placeholder="请选择项目经理"
-                :options="classifyList1"
-                @change="classificationChange1"
-                style="border-radius: 8px; height: 40px"
-                @popupScroll="memberScroll"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">资源归属:</div>
-            <div class="in select">
-              <a-tree-select
-                v-model:value="value5"
-                placeholder="请选择资源归属"
-                :options="classifyList5"
-                :tree-data="classifyList5"
-                @change="classificationChange5"
-                style="border-radius: 8px; height: 40px"
-                :fieldNames="{
-                  children: 'treeChildList',
-                  label: 'name',
-                  value: 'id',
-                }"
-              >
-              </a-tree-select>
-            </div>
-          </div>
-          <div class="pubtn">
-            <a-button class="pubtn1" @click="closeModal2">取消</a-button>
-            <a-button class="pubtn2" @click="createStoreyProject"
-              >确定</a-button
-            >
-          </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 创建多层项目弹窗 -->
-    <!-- 编辑多层项目弹窗 - start -->
-    <div>
-      <a-modal
-        v-model:visible="eddoublepro"
-        :title="null"
-        @ok="closeModal2"
-        :footer="null"
-        :closable="false"
-        wrapClassName="doublepro"
-        width="624px"
-        height="476px"
-      >
-        <div
-          class="modalHeader"
-          style="
-            width: 100%;
-            height: 68px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
-          <div class="headerLeft" style="margin-left: 32px">
-            <span class="headerLeftText" style="font-size: 16px"
-              >编辑多层项目</span
-            >
-          </div>
-          <div
-            style="cursor: pointer; margin-right: 32px"
-            @click="closeeditModal2"
-          >
-            <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
-            />
-          </div>
-        </div>
-        <div class="modalMain">
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">项目名称:</div>
-            <div class="in">
-              <a-input
-                v-model:value="edvalue1"
-                @change="edclassificationChangeName"
-                show-count
-                :maxlength="30"
-                placeholder="请输入项目名称"
-                style="border-radius: 8px"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">分类:</div>
-            <div class="in select">
-              <a-select
-                v-model:value="edvalue2"
-                placeholder="请选择分类"
-                :options="classifyList"
-                @change="edclassificationChange"
-                style="border-radius: 8px; height: 40px"
-                :fieldNames="{
-                  label: 'dictName',
-                  value: 'dictCode',
-                }"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">项目经理:</div>
-            <div class="in">
-              <a-select
-                v-model:value="edvalue3"
-                mode="multiple"
-                placeholder="请选择项目经理"
-                :options="classifyList1"
-                @change="edclassificationChange1"
-                style="border-radius: 8px; height: 40px"
-                @popupScroll="memberScroll"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">资源归属:</div>
-            <div class="in select">
-              <a-tree-select
-                v-model:value="edvalue5"
-                placeholder="请选择资源归属"
-                :options="classifyList5"
-                :tree-data="classifyList5"
-                @change="edclassificationChange5"
-                style="border-radius: 8px; height: 40px"
-                :fieldNames="{
-                  children: 'treeChildList',
-                  label: 'name',
-                  value: 'id',
-                }"
-              >
-              </a-tree-select>
-            </div>
-          </div>
-          <div class="pubtn">
-            <a-button class="pubtn1" @click="closeeditModal2">取消</a-button>
-            <a-button class="pubtn2" @click="editStoreyProject">确定</a-button>
-          </div>
-        </div>
-      </a-modal>
-    </div>
     <!-- 编辑多层项目弹窗 - end -->
-    <!-- 创建多层子项目弹窗 -->
-    <div>
-      <a-modal
-        v-model:visible="doublesonpro"
-        :title="null"
-        @ok="closeModal3"
-        :footer="null"
-        :closable="false"
-        wrapClassName="doublesonpro"
-        width="624px"
-        height="476px"
-      >
-        <div
-          class="modalHeader"
-          style="
-            width: 100%;
-            height: 68px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
-          <div class="headerLeft" style="margin-left: 32px">
-            <span class="headerLeftText" style="font-size: 16px"
-              >创建多层子项目</span
-            >
-          </div>
-          <div style="cursor: pointer; margin-right: 32px" @click="closeModal3">
-            <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
-            />
-          </div>
-        </div>
-        <div class="modalMain">
-          <div style="margin-left: 40px; margin-top: 40px">
-            <span style="color: #000000; font-size: 14px">项目归属：</span>
-            <span style="color: #999999; font-size: 14px; margin-left: 10px">{{
-              currentProjectName
-            }}</span>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">子项目名称:</div>
-            <div class="in">
-              <a-input
-                v-model:value="value6"
-                placeholder="请输入项目名称"
-                style="border-radius: 8px; height: 40px"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">分类:</div>
-            <div class="in select">
-              <a-select
-                v-model:value="value7"
-                @change="classificationChange2"
-                :options="classifyList2"
-                placeholder="请选择分类"
-                style="border-radius: 8px; height: 40px"
-                :fieldNames="{
-                  label: 'dictName',
-                  value: 'dictCode',
-                }"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">子项目经理:</div>
-            <div class="in">
-              <a-select
-                v-model:value="value8"
-                mode="multiple"
-                @change="classificationChange3"
-                :options="classifyList3"
-                placeholder="自动带出 可编辑"
-                style="border-radius: 8px; height: 40px"
-                @popupScroll="memberScroll"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">资源归属:</div>
-            <div class="in select">
-              <a-tree-select
-                v-model:value="value9"
-                placeholder="请选择资源归属"
-                :options="classifyList4"
-                :tree-data="classifyList4"
-                @change="classificationChange4"
-                style="border-radius: 8px; height: 40px"
-                :fieldNames="{
-                  children: 'treeChildList',
-                  label: 'name',
-                  value: 'id',
-                }"
-              >
-              </a-tree-select>
-            </div>
-          </div>
-          <div class="pubtn">
-            <a-button class="pubtn1" @click="closeModal3">取消</a-button>
-            <a-button class="pubtn2" @click="createChildsProject"
-              >确定</a-button
-            >
-          </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 创建多层子项目弹窗 -->
-    <!-- 编辑多层子项目弹窗 start-->
-    <div>
-      <a-modal
-        v-model:visible="eddoublesonpro"
-        :title="null"
-        @ok="closeModal3"
-        :footer="null"
-        :closable="false"
-        wrapClassName="doublesonpro"
-        width="624px"
-        height="476px"
-      >
-        <div
-          class="modalHeader"
-          style="
-            width: 100%;
-            height: 68px;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
-          <div class="headerLeft" style="margin-left: 32px">
-            <span class="headerLeftText" style="font-size: 16px"
-              >编辑多层子项目</span
-            >
-          </div>
-          <div
-            style="cursor: pointer; margin-right: 32px"
-            @click="closeeditModal3"
-          >
-            <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
-            />
-          </div>
-        </div>
-        <div class="modalMain">
-          <div style="margin-left: 40px; margin-top: 40px">
-            <span style="color: #000000; font-size: 14px">项目归属：</span>
-            <span style="color: #999999; font-size: 14px; margin-left: 10px">{{
-              currentEdProjectName
-            }}</span>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">子项目名称:</div>
-            <div class="in">
-              <a-input
-                v-model:value="edvalue6"
-                @change="edclassificationChange6"
-                placeholder="请输入项目名称"
-                style="border-radius: 8px; height: 40px"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">分类:</div>
-            <div class="in select">
-              <a-select
-                v-model:value="edvalue7"
-                @change="edclassificationChange2"
-                :options="classifyList2"
-                placeholder="请选择分类"
-                style="border-radius: 8px; height: 40px"
-                :fieldNames="{
-                  label: 'dictName',
-                  value: 'dictCode',
-                }"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">子项目经理:</div>
-            <div class="in">
-              <a-select
-                v-model:value="edvalue8"
-                mode="multiple"
-                @change="edclassificationChange3"
-                :options="classifyList3"
-                placeholder="自动带出 可编辑"
-                style="border-radius: 8px; height: 40px"
-                @popupScroll="memberScroll"
-              />
-            </div>
-          </div>
-          <div class="name">
-            <div class="star" style="margin-top: -4px">
-              <img
-                style="width: 10px; height: 10px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <div class="inname">资源归属:</div>
-            <div class="in select">
-              <a-tree-select
-                v-model:value="edvalue9"
-                placeholder="请选择资源归属"
-                :options="classifyList4"
-                :tree-data="classifyList4"
-                @change="edclassificationChange4"
-                style="border-radius: 8px; height: 40px"
-                :fieldNames="{
-                  children: 'treeChildList',
-                  label: 'name',
-                  value: 'id',
-                }"
-              >
-              </a-tree-select>
-            </div>
-          </div>
-          <div class="pubtn">
-            <a-button class="pubtn1" @click="closeeditModal3">取消</a-button>
-            <a-button class="pubtn2" @click="editChildsProject">确定</a-button>
-          </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 编辑多层子项目弹窗 end -->
     <!-- 复制路径弹窗 -->
     <a-modal
-      v-model:visible="copyModal"
-      :footer="null"
-      :closable="closeCopy"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="copyModal"
+        :footer="null"
+        :closable="closeCopy"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -877,11 +433,11 @@
     </a-modal>
     <!-- 结束项目弹窗 -->
     <a-modal
-      v-model:visible="stopModal"
-      :footer="null"
-      :closable="closeStop"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="stopModal"
+        :footer="null"
+        :closable="closeStop"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -910,11 +466,11 @@
     </a-modal>
     <!-- 删除项目弹窗 -->
     <a-modal
-      v-model:visible="deleteModal"
-      :footer="null"
-      :closable="closeDelete"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="deleteModal"
+        :footer="null"
+        :closable="closeDelete"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -940,11 +496,11 @@
     </a-modal>
     <!-- 存为模版弹窗 -->
     <a-modal
-      v-model:visible="startModal"
-      :footer="null"
-      :closable="closeStart"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="startModal"
+        :footer="null"
+        :closable="closeStart"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -970,17 +526,17 @@
     </a-modal>
     <!-- 发布弹窗 -->
     <a-modal
-      v-model:visible="projectPub"
-      :title="null"
-      :footer="null"
-      :closable="false"
-      wrapClassName="projectPub"
-      width="679px"
-      height="437px"
+        v-model:visible="projectPub"
+        :title="null"
+        :footer="null"
+        :closable="false"
+        wrapClassName="projectPub"
+        width="679px"
+        height="437px"
     >
       <div
-        class="modalHeader"
-        style="
+          class="modalHeader"
+          style="
           width: 100%;
           height: 68px;
           display: flex;
@@ -990,21 +546,21 @@
       >
         <div class="headerLeft" style="margin-left: 32px">
           <span style="width: 15px; height: 15px"
-            ><img src="../../assets/images/taskpage/pub.png"
+          ><img src="../../assets/images/taskpage/pub.png"
           /></span>
           <span
-            class="headerLeftText"
-            style="font-size: 16px; margin-left: 10px"
-            >项目发布</span
+              class="headerLeftText"
+              style="font-size: 16px; margin-left: 10px"
+          >项目发布</span
           >
         </div>
         <div
-          style="cursor: pointer; margin-right: 32px"
-          @click="closeProjectPub"
+            style="cursor: pointer; margin-right: 32px"
+            @click="closeProjectPub"
         >
           <img
-            style="width: 22px; height: 22px"
-            src="../../assets/images/basicinfo/close22.png"
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
           />
         </div>
       </div>
@@ -1046,11 +602,11 @@
     </a-modal>
     <!-- 撤回路径弹窗 -->
     <a-modal
-      v-model:visible="backModal"
-      :footer="null"
-      :closable="closeBack"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="backModal"
+        :footer="null"
+        :closable="closeBack"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1077,11 +633,11 @@
     </a-modal>
     <!-- 创建项目提示框 -->
     <a-modal
-      v-model:visible="reminderModal"
-      :footer="null"
-      :closable="closeBack"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="reminderModal"
+        :footer="null"
+        :closable="closeBack"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1106,11 +662,11 @@
     </a-modal>
     <!-- 项目提交审核弹窗 -->
     <a-modal
-      v-model:visible="reviewModal"
-      :footer="null"
-      :closable="false"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="reviewModal"
+        :footer="null"
+        :closable="false"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1137,11 +693,11 @@
     </a-modal>
     <!-- 项目撤回审核弹窗 -->
     <a-modal
-      v-model:visible="recallReviewModal"
-      :footer="null"
-      :closable="false"
-      wrapClassName="CopyModal"
-      centered="true"
+        v-model:visible="recallReviewModal"
+        :footer="null"
+        :closable="false"
+        wrapClassName="CopyModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1169,57 +725,61 @@
 
     <!-- 授权名单抽屉 -->
     <proj-power-list
-      v-model:ProjPvisible="ProjPvisible"
-      :selectProjectId="selectProjectId"
-      classify="project"
+        v-model:ProjPvisible="ProjPvisible"
+        :selectProjectId="selectProjectId"
+        classify="project"
     />
     <!-- 归属权抽屉 -->
     <proj-owner-ship
-      v-model:ProjOwnervisible="ProjOwnervisible"
-      :selectProjectId="selectProjectId"
-      classify="project"
+        v-model:ProjOwnervisible="ProjOwnervisible"
+        :selectProjectId="selectProjectId"
+        classify="project"
     />
     <!-- 查看权抽屉 -->
     <proj-check-ship
-      v-model:ProjCheckvisible="ProjCheckvisible"
-      :selectProjectId="selectProjectId"
-      v-model:addAuthList="addAuthList"
-      :authClassify="authClassify"
-      classify="project"
+        v-model:ProjCheckvisible="ProjCheckvisible"
+        :selectProjectId="selectProjectId"
+        v-model:addAuthList="addAuthList"
+        :authClassify="authClassify"
+        classify="project"
     />
     <!-- 管理权抽屉 -->
     <proj-check-ship
-      v-model:ProjCheckvisible="ProjCheckvisible"
-      :selectProjectId="selectProjectId"
-      v-model:addAuthList="addAuthList"
-      :authClassify="authClassify"
-      classify="project"
+        v-model:ProjCheckvisible="ProjCheckvisible"
+        :selectProjectId="selectProjectId"
+        v-model:addAuthList="addAuthList"
+        :authClassify="authClassify"
+        classify="project"
     />
   </div>
 </template>
 <script>
-import { reactive, toRefs, onMounted, ref, watch, computed } from "vue";
-import { message } from "ant-design-vue";
-import { useRouter } from "vue-router";
+import {reactive, toRefs, ref, watch} from "vue";
+import {message} from "ant-design-vue";
+import {useRouter} from "vue-router";
 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
-// import ProjManageShip from "../../components/drawers/ProjManagePower";
 import * as api from "../../api/index";
 import * as api1 from "../../api/index1";
-import { toDate, scrollLoad } from "../../api/method";
-import { storage } from "../../api/storage";
-import { useStore } from "vuex";
+import {toDate} from "../../api/method";
+import {storage} from "../../api/storage";
+import ProjectManager from "@/components/project/ProjectManager";
+import ProjectClass from "@/components/project/ProjectClass";
+import OrgClass from "@/components/project/OrgClass";
+
 export default {
   name: "projectManage",
   components: {
     ProjOwnerShip,
     ProjPowerList,
     ProjCheckShip,
+    ProjectManager,
+    ProjectClass,
+    OrgClass
     // ProjManageShip
   },
   setup() {
-    const store = useStore();
     const state = reactive({
       projectName: null,
       selectTime: null,
@@ -1281,217 +841,51 @@ export default {
 
       currentPage1: 1, //项目经理分页
       pageSize1: 10,
+      projectInfo: {},
+      projectClass: [],
+      managerList: [],
+      managerLoading: false,
+      memberParam: {
+        pageNo: 1,
+        pageSize: 10,
+        keyWord: "",
+      },
+      searchParam: {
+        pageNo: 1,
+        pageSize: 10,
+      }
     });
     // 数据接入 - start -
     const router = useRouter();
-    // 搜索数据
-    const sProjectName = ref("");
-    const sProjectOrder = ref("");
-    const sProjectCreate = ref("");
-    const sProjectState = ref([]);
-    const sProjectTime = ref("");
 
     const sProjectStateList = ref([
-      { value: 0, label: "草稿" },
-      { value: 1, label: "进行中" },
-      { value: 2, label: "未开始" },
-      { value: 3, label: "已结束" },
+      {value: 0, label: "草稿"},
+      {value: 1, label: "审核中"},
+      {value: 2, label: "审核通过"},
+      {value: 3, label: "已发布"},
+      {value: -2, label: "未通过"},
     ]);
 
-    let name = "";
-    const sProjectNameChange = (key) => {
-      console.log("项目名称", key.target.value);
-      name = key.target.value;
-    };
-    let managerid = "";
-    const sProjectOrderChange = (key) => {
-      console.log("项目经理", key.target.value);
-      managerid = key.target.value;
-    };
-
-    let createpeople = "";
-    const sProjectCreateChange = (key) => {
-      console.log("项目创建人", key.target.value);
-      createpeople = key.target.value;
-    };
-
-    let status = "";
-    const sProjectStateChange = (key) => {
-      console.log("项目状态", key);
-      status = key;
-    };
-
-    let beginTime = "";
-    let endTime = "";
-    const sProjectTimeChange = (key, value) => {
-      console.log("项目时间", key);
-      console.log("项目时间", value);
-      console.log(new Date("2019-10-08 18:22:37").getTime());
-      beginTime = Math.ceil(
-        new Date(value + " " + "00:00:00").getTime() / 1000
-      );
-      endTime = Math.ceil(new Date(value + " " + "23:59:59").getTime() / 1000);
-    };
-
     const searchReset = () => {
-      sProjectName.value = "";
-      sProjectOrder.value = "";
-      sProjectCreate.value = "";
-      sProjectState.value = null;
-      sProjectTime.value = null;
-      createpeople = "";
-      name = "";
-      beginTime = "";
-      endTime = "";
-      status = null;
-      managerid = "";
-      state.currentPage = 1;
-      getTableDate();
+      state.searchParam = {pageNo: 1, pageSize: 10}
+      getTableDate()
     };
 
     const searchSubmit = () => {
-      console.log("点击了搜索");
-      state.currentPage = 1;
-      const obj = {
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-        beginTime: beginTime,
-        endTime: endTime,
-        status: status,
-        name: name,
-        manager: managerid,
-        createName: createpeople,
-      };
-      let searchList = [];
-      for (let i in obj) {
-        if (obj[i] !== "") {
-          if (obj[i] !== null) {
-            searchList.push(1);
-          } else {
-            searchList.push(0);
-          }
-        } else {
-          searchList.push(0);
+      state.searchParam.pageNo = 1
+      getTableDate()
+    };
+
+    function validate(obj, errorMsgs) {
+      for (let i in errorMsgs) {
+        if (!obj[i]) {
+          message.destroy();
+          message.warning(errorMsgs[i]);
+          return false;
         }
       }
-      if (searchList.toString().indexOf("1") == -1) {
-        message.destroy();
-        message.warning("请输入搜索条件后进行搜索");
-      }
-      console.log("搜索的数据筛选条件", obj, searchList.toString());
-
-      getTableDate(obj);
-    };
-
-    // 项目分类
-    const classifyList = ref([
-      // { value: 1, label: "管理者" },
-    ]);
-
-    const classifyList1 = ref([
-      { value: 1, label: "李俊国" },
-      { value: 2, label: "将小米" },
-      { value: 3, label: "刘孟君" },
-    ]);
-
-    const value1 = ref("");
-    const value2 = ref([]);
-    const value3 = ref([]);
-    const value4 = ref("");
-    const value5 = ref(null);
-
-    const edvalue1 = ref("");
-    const edvalue2 = ref([]);
-    const edvalue3 = ref([]);
-    const edvalue4 = ref("");
-    const edvalue5 = ref([]);
-
-    let edname = "";
-    const edclassificationChangeName = (key) => {
-      console.log(key);
-      edname = key.target.value;
-    };
-
-    let edcategory = 0;
-    const edclassificationChange = (key) => {
-      console.log(key);
-      edcategory = key;
-    };
-
-    let edmanage = "";
-    let edmanageid = "";
-    const edclassificationChange1 = (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);
-      edvalue3.value = options;
-      let newoptions = [];
-      for (let i = 0; i < edvalue3.value.length; i++) {
-        if (edvalue3.value[i].value) {
-          newoptions.push(edvalue3.value[i]);
-        }
-      }
-      edvalue3.value = newoptions;
-      edmanage = mstr;
-      edmanageid = midstr;
-    };
-
-    let edsource = "";
-    const edclassificationChange5 = (key) => {
-      console.log(key);
-      edsource = key;
-    };
-
-    // const classifyList5 = ref([
-    //   // { value: 1, label: "项目一" },
-    // ]);
-    // 资源归属 sourceBelongId 后续给接口
-    const classifyList5 = computed(() => {
-      return store.state.orgtreeList ? store.state.orgtreeList : ref([]);
-    });
-    let sourceBelongId = 0;
-    const classificationChange5 = (key) => {
-      console.log(`selected ${key}`);
-      sourceBelongId = key;
-    };
-
-    let type = "";
-    const classificationChange = (key) => {
-      console.log(`selected ${key}`);
-      // console.log(classifyList.value[key - 1].label);
-      type = key;
-    };
-
-    let manager = "";
-    let managerId = "";
-
-    const classificationChange1 = (key) => {
-      console.log(`selected ${key}`, classifyList1);
-      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);
-      manager = mstr;
-      managerId = midstr;
-    };
+      return true;
+    }
 
     // 创建多层项目
     const createStoreyProject = () => {
@@ -1502,160 +896,32 @@ export default {
         manager: "请选择项目经理",
         sourceBelongId: "请选择资源归属",
       };
-
-      let obj = {
-        attach: "",
-        beginTime: 0,
-        boeFlag: 0,
-        category: type,
-        courseSyncFlag: 0,
-        endTime: 0,
-        level: 0,
-        manager: manager,
-        managerId: managerId,
-        name: value1.value,
-        notice: "",
-        noticeFlag: 0,
-        parentId: 0,
-        picUrl: "",
-        projectId: 0,
-        remark: "",
-        sourceBelongId: sourceBelongId,
-        status: 0,
-        systemId: 0,
-        templateId: 0,
-        type: 1,
-      };
-
-      console.log("创建多层项目提交的数据格式", obj);
-      for (let i in errorMsgs) {
-        console.log(obj[i]);
-        if (obj[i] === "" || obj[i] === undefined) {
-          message.destroy();
-          message.warning(errorMsgs[i]);
-          return;
-        }
+      if (!validate(state.projectInfo, errorMsgs)) {
+        return;
       }
-
-      api
-        .createProject(obj)
-        .then((res) => {
-          console.log(res);
-          if (res.status == 200 && res.data.code == 200) {
-            // 创建成功 隐藏弹出框
-            value1.value = "";
-            type = "";
-            manager = "";
-            managerId = "";
-            sourceBelongId = "";
-            value2.value = [];
-            value3.value = [];
-            value4.value = "";
-            value5.value = [];
-            state.doublepro = false;
-            message.destroy();
-            message.success("创建成功");
-            state.currentPage = 1;
-            getTableDate();
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-          message.destroy();
-          message.error("创建失败，请检查当前网络状态。");
-        });
-    };
+      api.createProject(state.projectInfo).then(() => {
+        state.doublepro = false;
+        message.destroy();
+        message.success("创建成功");
+        state.currentPage = 1;
+        getTableDate();
+      })
+    }
     // 取消按钮 清空输入的数据
     const closeModal2 = () => {
-      value1.value = "";
-      type = "";
-      manager = "";
-      managerId = "";
-      sourceBelongId = "";
-      value2.value = [];
-      value3.value = [];
-      value4.value = "";
-      value5.value = "";
+      state.projectInfo = {}
+      // value1.value = "";
+      // type = "";
+      // manager = "";
+      // managerId = "";
+      // sourceBelongId = "";
+      // value2.value = [];
+      // value3.value = [];
+      // value4.value = "";
+      // value5.value = "";
       state.doublepro = false;
     };
-    console.log(edmanage, edmanageid);
     // 编辑多层项目
-    const editStoreyProject = () => {
-      // 查询下项目信息
-      api
-        .getProjectDetail({ projectId: Number(state.dcProjectID) })
-        .then((res) => {
-          console.log(res);
-          let obj = {
-            attach: res.data.data.projectInfo.attach,
-            beginTime: Number(res.data.data.projectInfo.beginTime) / 1000,
-            boeFlag: res.data.data.projectInfo.boeFlag,
-            category: edcategory
-              ? edcategory
-              : res.data.data.projectInfo.category,
-            courseSyncFlag: res.data.data.projectInfo.courseSyncFlag,
-            endTime: Number(res.data.data.projectInfo.endTime) / 1000,
-            level: res.data.data.projectInfo.level,
-            manager: edmanage
-              ? edmanage.toString(",")
-              : res.data.data.projectInfo.manager,
-            managerId: edmanageid
-              ? edmanageid.toString(",")
-              : res.data.data.projectInfo.managerId,
-            name: edname ? edname : res.data.data.projectInfo.name,
-            notice: res.data.data.projectInfo.notice,
-            noticeFlag: res.data.data.projectInfo.noticeFlag,
-            parentId: res.data.data.projectInfo.parentId,
-            picUrl: res.data.data.projectInfo.picUrl,
-            projectId: state.dcProjectID
-              ? Number(state.dcProjectID)
-              : res.data.data.projectInfo.projectId,
-            remark: res.data.data.projectInfo.remark,
-            sourceBelongId: edsource
-              ? edsource
-              : res.data.data.projectInfo.sourceBelongId,
-            status: res.data.data.projectInfo.status,
-            systemId: res.data.data.projectInfo.systemId,
-            templateId: "",
-            type: res.data.data.projectInfo.type,
-          };
-          if (
-            obj.name !== "" ||
-            obj.category !== "" ||
-            obj.manager !== "" ||
-            obj.sourceBelongId !== ""
-          ) {
-            console.log("我需要编辑");
-            console.log(obj);
-            api
-              .createProject(obj)
-              .then((res) => {
-                console.log(res);
-                if (res.status == 200 && res.data.code == 200) {
-                  state.eddoublepro = false;
-                  message.destroy();
-                  message.success("编辑成功");
-                  getTableDate();
-                }
-              })
-              .catch((err) => {
-                console.log(err);
-                state.eddoublepro = false;
-                message.destroy();
-                message.error("编辑失败，请检查当前网络状态。");
-              });
-          } else {
-            state.eddoublepro = false;
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-          state.eddoublepro = false;
-          message.destroy();
-          message.error("编辑失败，请检查当前网络状态。");
-        });
-    };
-
     const closeeditModal2 = () => {
       state.eddoublepro = false;
     };
@@ -1672,343 +938,16 @@ export default {
       });
     };
 
-    // 创建多层子项目
-    const value6 = ref("");
-    const value7 = ref([]);
-    const value8 = ref([]);
-    const value9 = ref([]);
-
-    const classifyList2 = ref([
-      // { value: 1, label: "管理者" },
-    ]);
-
-    let categoryT = "";
-    const classificationChange2 = (key) => {
-      console.log(`selected ${key}`);
-      categoryT = key;
-    };
-
-    const classifyList3 = ref([
-      // { value: 1, label: "李俊国" },
-    ]);
-
-    let managerT = "";
-    let managerIdT = "";
-    const classificationChange3 = (key) => {
-      console.log(`selected ${key}`);
-      console.log(`selected ${key}`, classifyList3);
-      let mstr = "";
-      let midstr = "";
-      for (let i = 0; i < key.length; i++) {
-        if (key.length - 1 !== i) {
-          midstr += key[i] + ",";
-          mstr += classifyList3.value[i].label + ",";
-        } else {
-          midstr += key[i];
-          mstr += classifyList3.value[i].label;
-        }
-      }
-      console.log(mstr, midstr);
-      managerT = mstr;
-      managerIdT = midstr;
-    };
-    // 资源归属 sourceBelongId 后续给接口
-    const classifyList4 = computed(() => {
-      return store.state.orgtreeList ? store.state.orgtreeList : ref([]);
-    });
-
-    let sourceBelongIdT = "";
-    const classificationChange4 = (key) => {
-      console.log(`selected ${key}`);
-      sourceBelongIdT = key;
-    };
 
     // 取消按钮 清空数据
     const closeModal3 = () => {
-      value6.value = "";
-      categoryT = "";
-      managerT = "";
-      managerIdT = "";
-      sourceBelongIdT = "";
-      value7.value = [];
-      value8.value = [];
-      value9.value = [];
       state.doublesonpro = false;
     };
 
-    const createChildsProject = () => {
-      const errorMsgs = {
-        name: "请输入子项目名称",
-        category: "请选择子项目分类",
-        manager: "请选择子项目经理",
-        sourceBelongId: "请选择资源归属",
-      };
-
-      let obj = {
-        attach: "",
-        beginTime: 0,
-        boeFlag: 0,
-        category: categoryT,
-        courseSyncFlag: 0,
-        endTime: 0,
-        level: 0,
-        manager: managerT,
-        managerId: managerIdT,
-        name: value6.value,
-        notice: "",
-        noticeFlag: 0,
-        parentId: state.currentProjectId,
-        picUrl: "",
-        projectId: 0,
-        remark: "",
-        sourceBelongId: sourceBelongIdT,
-        status: 0,
-        systemId: 0,
-        templateId: 0,
-        type: 2,
-      };
-
-      console.log("创建多层子项目提交的数据格式", 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) {
-            value6.value = "";
-            categoryT = "";
-            managerT = "";
-            managerIdT = "";
-            sourceBelongIdT = "";
-            value7.value = [];
-            value8.value = [];
-            value9.value = [];
-            state.doublesonpro = false;
-            message.destroy();
-            message.success("创建成功");
-            state.currentPage = 1;
-            getTableDate();
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-          message.destroy();
-          message.error("创建失败，请检查当前网络状态。");
-        });
-    };
-
-    // 编辑多层子项目
-    const edvalue6 = ref("");
-    const edvalue7 = ref([]);
-    const edvalue8 = ref([]);
-    const edvalue9 = ref("");
-
-    let editChildrensName = "";
-    const edclassificationChange6 = (key) => {
-      console.log(key);
-      editChildrensName = key.target.value;
-    };
-
-    let editChildrensCategory = "";
-    const edclassificationChange2 = (key) => {
-      console.log(key);
-      editChildrensCategory = key;
-    };
-
-    let editChildrensManege = "";
-    let editChildrensManegeId = "";
-
-    const edclassificationChange3 = (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);
-      edvalue8.value = options;
-      let newoptions = [];
-      for (let i = 0; i < edvalue8.value.length; i++) {
-        if (edvalue8.value[i].value) {
-          newoptions.push(edvalue8.value[i]);
-        }
-      }
-      edvalue8.value = newoptions;
-      editChildrensManege = mstr;
-      editChildrensManegeId = midstr;
-    };
-
-    let editChildrensSource = "";
-    const edclassificationChange4 = (key) => {
-      console.log(key);
-      editChildrensSource = key;
-    };
-
-    // 编辑多层子项目
-    const editChildsProject = () => {
-      api
-        .getProjectDetail({
-          projectId: Number(state.currentEditChildrensProjectId),
-        })
-        .then((res) => {
-          let obj = {
-            attach: res.data.data.projectInfo.attach,
-            beginTime: Number(res.data.data.projectInfo.beginTime) / 1000,
-            boeFlag: res.data.data.projectInfo.boeFlag,
-            category: editChildrensCategory
-              ? Number(editChildrensCategory)
-              : res.data.data.projectInfo.category,
-            courseSyncFlag: res.data.data.projectInfo.courseSyncFlag,
-            endTime: Number(res.data.data.projectInfo.endTime) / 1000,
-            level: res.data.data.projectInfo.level,
-            manager: editChildrensManege
-              ? editChildrensManege.toString(",")
-              : res.data.data.projectInfo.manager,
-            managerId: editChildrensManegeId
-              ? editChildrensManegeId.toString(",")
-              : res.data.data.projectInfo.managerId,
-            name: editChildrensName
-              ? editChildrensName
-              : res.data.data.projectInfo.name,
-            notice: res.data.data.projectInfo.notice,
-            noticeFlag: res.data.data.projectInfo.noticeFlag,
-            parentId: res.data.data.projectInfo.parentId,
-            picUrl: res.data.data.projectInfo.picUrl,
-            projectId: state.currentEditChildrensProjectId
-              ? Number(state.currentEditChildrensProjectId)
-              : res.data.data.projectInfo.projectId,
-            remark: res.data.data.projectInfo.remark,
-            sourceBelongId: editChildrensSource
-              ? Number(editChildrensSource)
-              : res.data.data.projectInfo.sourceBelongId,
-            status: res.data.data.projectInfo.status,
-            systemId: res.data.data.projectInfo.systemId,
-            templateId: "",
-            type: res.data.data.projectInfo.type,
-          };
-          if (
-            obj.name !== "" ||
-            obj.manager !== "" ||
-            obj.category !== "" ||
-            obj.sourceBelongId !== ""
-          ) {
-            console.log("编辑多层子项目传递的参数", obj);
-            api
-              .createProject(obj)
-              .then((ress) => {
-                console.log(ress);
-                if (ress.status == 200 && ress.data.code == 200) {
-                  state.eddoublesonpro = false;
-                  message.destroy();
-                  message.success("编辑成功");
-                  getTableDate();
-                }
-              })
-              .catch((err) => {
-                console.log(err);
-                state.eddoublesonpro = false;
-                message.destroy();
-                message.error("编辑失败，请检查当前网络状态。");
-              });
-          } else {
-            state.eddoublesonpro = false;
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-          state.eddoublesonpro = false;
-          message.destroy();
-          message.error("编辑失败，请检查当前网络状态。");
-        });
-    };
-
     const closeeditModal3 = () => {
       state.eddoublesonpro = false;
     };
 
-    //获取分类、封面图、项目级别、培训分类-----------字典配置-------------------------------
-    const getDictList = (param) => {
-      let obj = {
-        pageNo: 1,
-        pageSize: 20,
-        setCode: param,
-      };
-      api1
-        .getDict(obj)
-        .then((res) => {
-          console.log("获取字典成功", res);
-          if (res.status === 200) {
-            if (param === "projectClass") {
-              classifyList.value = res.data.data.rows;
-              classifyList2.value = res.data.data.rows;
-            }
-          }
-        })
-        .catch((err) => {
-          console.log("获取字典失败", err);
-        });
-    };
-    getDictList("projectClass");
-    // getDictList("projectLevel");
-    // getDictList("projectSys");
-    //获取分类、封面图、项目级别、培训分类---------------字典配置---------------------------
-
-    //获取学员
-    const getMember = () => {
-      api1
-        .getMemberInfo({
-          pageNo: state.currentPage1,
-          pageSize: state.pageSize1,
-          keyWord: "",
-        })
-        .then((res) => {
-          if (res.data.code === 200) {
-            let arr = res.data.data.rows;
-            let array = classifyList1.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.id,
-                label: value.realName,
-              };
-              array.push(obj);
-            });
-            classifyList1.value = array;
-            classifyList3.value = array;
-            console.log("获取学员", res.data);
-            // classifyList1.value = res.data.data.rows;
-            // state.tableDataTotal = res.data.data.total;
-            // return res.data.data.rows;
-          }
-        });
-    };
-    getMember();
-    //学员滚动加载信息
-    const memberScroll = (e) => {
-      // console.log("滚动", e, b);
-      let num = scrollLoad(e);
-      if (num === 1) {
-        state.currentPage1 = 1;
-      } else if (num === 2) {
-        // 如果滑到底部，则加载下一页
-        state.currentPage1++;
-        getMember();
-      }
-    };
-
     //打开发布弹窗
     const showProjectPub = (object) => {
       state.projectPub = true;
@@ -2017,18 +956,18 @@ export default {
       state.releaseProjectTime = object.time;
       console.log("object", object);
       api
-        .getProjectCount(object.projectId)
-        .then((res) => {
-          if (res.status === 200) {
-            console.log("获取关卡、任务、学员统计数据", res.data);
-            state.projectStudentsNum = res.data.students;
-            state.projectStages = res.data.stages;
-            state.projectTasks = res.data.tasks;
-          }
-        })
-        .catch((err) => {
-          console.log("err", err);
-        });
+          .getProjectCount(object.projectId)
+          .then((res) => {
+            if (res.status === 200) {
+              console.log("获取关卡、任务、学员统计数据", res.data);
+              state.projectStudentsNum = res.data.students;
+              state.projectStages = res.data.stages;
+              state.projectTasks = res.data.tasks;
+            }
+          })
+          .catch((err) => {
+            console.log("err", err);
+          });
       // //获取学员总数
       // let obj = {
       //   pageNo: 0,
@@ -2058,17 +997,17 @@ export default {
         type: 4,
       };
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("发布成功", res);
-          message.destroy();
-          message.success("发布成功");
-          state.projectPub = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("发布失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("发布成功", res);
+            message.destroy();
+            message.success("发布成功");
+            state.projectPub = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("发布失败", err);
+          });
     };
     //关闭发布弹窗
     const closeProjectPub = () => {
@@ -2086,17 +1025,17 @@ export default {
         type: -4,
       };
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("撤回成功", res);
-          message.destroy();
-          message.success("撤回成功");
-          state.backModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("撤回失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("撤回成功", res);
+            message.destroy();
+            message.success("撤回成功");
+            state.backModal = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("撤回失败", err);
+          });
     };
     //关闭撤回弹窗
     const closeBackModal = () => {
@@ -2114,17 +1053,17 @@ export default {
         type: -1,
       };
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("结束成功", res);
-          message.destroy();
-          message.success("已结束");
-          state.stopModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("结束失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("结束成功", res);
+            message.destroy();
+            message.success("已结束");
+            state.stopModal = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("结束失败", err);
+          });
     };
     //关闭结束弹窗
     const closeStopModal = () => {
@@ -2142,17 +1081,17 @@ export default {
         type: -2,
       };
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("删除成功", res);
-          message.destroy();
-          message.success("删除成功");
-          state.deleteModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("删除失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("删除成功", res);
+            message.destroy();
+            message.success("删除成功");
+            state.deleteModal = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("删除失败", err);
+          });
     };
     //关闭删除弹窗
     const closeDeleteModal = () => {
@@ -2169,18 +1108,13 @@ export default {
         projectId: state.templateProjectId,
         type: 1,
       };
-      api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("模版保存成功", res);
-          message.destroy();
-          message.success("模版保存成功");
-          state.startModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("模版保存失败", err);
-        });
+      api.handleProject(obj).then((res) => {
+        console.log("模版保存成功", res);
+        message.destroy();
+        message.success("模版保存成功");
+        state.startModal = false;
+        getTableDate();
+      })
     };
     //关闭存为模版弹窗
     const closeStartModal = () => {
@@ -2201,18 +1135,16 @@ export default {
         projectId: state.copyProjectId,
         type: 2,
       };
-      api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("复制成功", res);
-          message.destroy();
-          message.success("复制成功");
-          state.copyModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("复制失败", err);
-        });
+      api.handleProject(obj).then((res) => {
+        console.log("复制成功", res);
+        message.destroy();
+        message.success("复制成功");
+        state.copyModal = false;
+        getTableDate();
+      })
+          .catch((err) => {
+            console.log("复制失败", err);
+          });
     };
 
     //打开提交审核弹窗
@@ -2228,17 +1160,17 @@ export default {
       };
       console.log("提交审核obj", obj);
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("提交成功", res);
-          message.destroy();
-          message.success("提交成功");
-          state.reviewModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("提交失败", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("提交成功", res);
+            message.destroy();
+            message.success("提交成功");
+            state.reviewModal = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("提交失败", err);
+          });
     };
     //关闭提交审核弹窗
     const closeReviewModal = () => {
@@ -2258,31 +1190,23 @@ export default {
       };
       console.log("撤回成功obj", obj);
       api
-        .handleProject(obj)
-        .then((res) => {
-          console.log("撤回成功", res);
-          message.destroy();
-          message.success("撤回成功");
-          state.recallReviewModal = false;
-          getTableDate();
-        })
-        .catch((err) => {
-          console.log("撤回成功", err);
-        });
+          .handleProject(obj)
+          .then((res) => {
+            console.log("撤回成功", res);
+            message.destroy();
+            message.success("撤回成功");
+            state.recallReviewModal = false;
+            getTableDate();
+          })
+          .catch((err) => {
+            console.log("撤回成功", err);
+          });
     };
     //关闭提交审核弹窗
     const closeRecallReviewModal = () => {
       state.recallReviewModal = false;
     };
 
-    // 数据接入 - end -
-
-    onMounted(() => {
-      // console.log("执行");
-    });
-    const selectProjectName = (value, index) => {
-      console.log("value", value, index);
-    };
     const expandTable = (e, a) => {
       // console.log("惦记了");
       console.log("e", e, a);
@@ -2321,26 +1245,26 @@ export default {
         align: "center",
         customRender: (value) => {
           return (
-            <div>
-              {value.record.status == 0 ||
-              value.record.status == 1 ||
-              value.record.status == 2 ||
-              value.record.status == -2
-                ? "草稿"
-                : value.record.status == 3 &&
-                  Number(value.record.beginTime) <
+              <div>
+                {value.record.status == 0 ||
+                value.record.status == 1 ||
+                value.record.status == 2 ||
+                value.record.status == -2
+                    ? "草稿"
+                    : value.record.status == 3 &&
+                    Number(value.record.beginTime) <
                     Math.ceil(new Date().getTime() / 1000)
-                ? "进行中"
-                : value.record.status == 3 &&
-                  Number(value.record.beginTime) >
-                    Math.ceil(new Date().getTime() / 1000) &&
-                  value.record.type !== 1 &&
-                  value.record.type !== 2
-                ? "未开始"
-                : value.record.status == -1
-                ? "已结束"
-                : "-"}
-            </div>
+                        ? "进行中"
+                        : value.record.status == 3 &&
+                        Number(value.record.beginTime) >
+                        Math.ceil(new Date().getTime() / 1000) &&
+                        value.record.type !== 1 &&
+                        value.record.type !== 2
+                            ? "未开始"
+                            : value.record.status == -1
+                                ? "已结束"
+                                : "-"}
+              </div>
           );
         },
       },
@@ -2361,21 +1285,21 @@ export default {
         align: "center",
         customRender: (value) => {
           return (
-            <div>
-              {value.record.type !== 3
-                ? "-"
-                : value.record.status == 0
-                ? "未审核"
-                : value.record.status == 1
-                ? "审核中"
-                : value.record.status == 2 ||
-                  value.record.status == 3 ||
-                  value.record.status == -1
-                ? "已审核"
-                : value.record.status == -2
-                ? "未通过"
-                : "-"}
-            </div>
+              <div>
+                {value.record.type !== 3
+                    ? "-"
+                    : value.record.status == 0
+                        ? "未审核"
+                        : value.record.status == 1
+                            ? "审核中"
+                            : value.record.status == 2 ||
+                            value.record.status == 3 ||
+                            value.record.status == -1
+                                ? "已审核"
+                                : value.record.status == -2
+                                    ? "未通过"
+                                    : "-"}
+              </div>
           );
         },
       },
@@ -2385,9 +1309,6 @@ export default {
         key: "createTime",
         width: 180,
         align: "center",
-        customRender: (value) => {
-          return <div>{toDate(value.record.createTime, "Y-M-D h:m:s")}</div>;
-        },
       },
       {
         title: "操作",
@@ -2398,1059 +1319,228 @@ export default {
         fixed: "right",
         customRender: (value) => {
           // console.log("value", value.record.type, value.record.status);
-          return value.record.type === 1 ? (
-            value.record.status === 0 ||
-            value.record.status === 1 ||
-            value.record.status === 2 ||
-            value.record.status === -2 ? (
-              <div class="operation">
-                <span
-                  onClick={() => {
-                    state.eddoublepro = true;
-                    console.log("多层项目编辑");
-                    state.dcProjectID = value.record.projectId;
-                    edvalue1.value = value.record.name;
-                    {
-                      /* edvalue2.value =  classifyList[value.record.category] */
-                    }
-                    edvalue2.value = classifyList.value[0];
-                    edvalue3.value = value.record.manager.split();
-                    edvalue4.value = "1,2";
-                    edvalue5.value = classifyList5.value[0];
-                  }}
-                  style="cursor:pointer;"
-                  class="operation1"
+          return <div className="operation">
+            {value.record.status === 0 || value.record.status === -2 ? <span
+                    onClick={() => {
+                      if (value.record.type === 1 || value.record.type === 2) {
+                        state.doublepro = true;
+                        state.projectInfo = value.record
+                      } else {
+                        console.log(value.record)
+                        router.push({
+                          path: '/projectadd', query: {
+                            projectId: value.record.projectId,
+                            parentId: value.record.parentId,
+                            parentName: value.record.parentName
+                          }
+                        })
+                      }
+                    }}
+                    style="cursor:pointer;"
+                    className="operation1"
                 >
                   编辑
                 </span>
-                <div class="tableSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="授权"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    <a-select-option value="权限名单" label="权限名单">
-                      <div
-                        onClick={() => {
-                          showProjPrower(value.record.projectId);
-                        }}
-                      >
-                        权限名单
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="归属权" label="归属权">
-                      <div
-                        onClick={() => {
-                          console.log("点击了111");
-                          showProjOwner(value.record.projectId);
-                        }}
-                      >
-                        归属权
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="查看权" label="查看权">
-                      <div
-                        onClick={() => {
-                          console.log("点击了111");
-                          showProjCheck(value.record.projectId);
-                        }}
-                      >
-                        查看权
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="管理权" label="管理权">
-                      <div
-                        onClick={() => {
-                          showProjManage(value.record.projectId);
-                        }}
-                      >
-                        管理权
-                      </div>
-                    </a-select-option>
-                  </a-select>
-                </div>
+                : ''}
+            {(value.record.status === 0 || value.record.status === -2) && value.record.type !== 1 ?
                 <span
-                  class="operation3"
-                  style="cursor: pointer"
-                  onClick={() => {
-                    state.currentProjectId = value.record.projectId;
-                    state.currentProjectName = value.record.name;
-                    state.sonproject = true;
-                  }}
+                    onClick={() => {
+                      showReviewModal(value.record.projectId);
+                    }}
+                    style="cursor:pointer"
+                    class="operation3"
                 >
-                  创建子项目
-                </span>
-                <div class="tableSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="更多"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    {/**
-2022-11-30注释 后面放开
-
-<a-select-option value="复制" label="复制">
-                      <div
-                        onClick={() => {
-                          showCopyModal(value.record.projectId);
-                        }}
-                      >
-                        复制
-                      </div>
-                    </a-select-option>
-*/}
-
-                    <a-select-option value="删除" label="删除">
-                      <div
-                        onClick={() => {
-                          showDeleteModal(value.record.projectId);
-                        }}
-                      >
-                        删除
-                      </div>
-                    </a-select-option>
-                  </a-select>
-                </div>
-              </div>
-            ) : value.record.status === 3 ? (
-              <div class="operation">
-                <span class="operation1">查看</span>
-                <div class="tableSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="授权"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    <a-select-option value="权限名单" label="权限名单">
-                      <div
-                        onClick={() => {
-                          showProjPrower(value.record.projectId);
-                        }}
-                      >
-                        权限名单
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="归属权" label="归属权">
-                      <div
-                        onClick={() => {
-                          console.log("点击了111");
-                          showProjOwner(value.record.projectId);
-                        }}
-                      >
-                        归属权
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="查看权" label="查看权">
-                      <div
-                        onClick={() => {
-                          console.log("点击了111");
-                          showProjCheck(value.record.projectId);
-                        }}
-                      >
-                        查看权
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="管理权" label="管理权">
-                      <div
-                        onClick={() => {
-                          showProjManage(value.record.projectId);
-                        }}
-                      >
-                        管理权
-                      </div>
-                    </a-select-option>
-                  </a-select>
-                </div>
+                            提交审核
+                          </span>
+                : ''}
+            {value.record.status === 1 && value.record.type !== 1 ?
                 <span
-                  class="operation3"
-                  // onClick={() => {
-                  // 	showCopyModal(value.record.projectId);
-                  // }}
-                ></span>
-
-                <div class="tableSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="更多"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    {/* 
-										2022-11-30注释 后面放开
-                     <a-select-option value="复制" label="复制">
-                      <div
-                        onClick={() => {
-                          showCopyModal(value.record.projectId);
-                        }}
-                      >
-                        复制
-                      </div>
-                    </a-select-option>
-                    
-                    */}
-                  </a-select>
-                </div>
-              </div>
-            ) : value.record.status === -1 ? (
-              <div class="operation">
-                <span class="operation1">查看</span>
-                <div class="tableSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="授权"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    <a-select-option value="权限名单" label="权限名单">
-                      <div
-                        onClick={() => {
-                          showProjPrower(value.record.projectId);
-                        }}
-                      >
-                        权限名单
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="归属权" label="归属权">
-                      <div
-                        onClick={() => {
-                          console.log("点击了111");
-                          showProjOwner(value.record.projectId);
-                        }}
-                      >
-                        归属权
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="查看权" label="查看权">
-                      <div
-                        onClick={() => {
-                          console.log("点击了111");
-                          showProjCheck(value.record.projectId);
-                        }}
-                      >
-                        查看权
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="管理权" label="管理权">
-                      <div
-                        onClick={() => {
-                          showProjManage(value.record.projectId);
-                        }}
-                      >
-                        管理权
-                      </div>
-                    </a-select-option>
-                  </a-select>
-                </div>
-                <span
-                  class="operation3"
-                  // onClick={() => {
-                  // 	showCopyModal(value.record.projectId);
-                  // }}
-                ></span>
-                <div class="tableSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="更多"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    {/* 
-										2022-11-30注释 后面放开
-                     <a-select-option value="复制" label="复制">
-                      <div
-                        onClick={() => {
-                          showCopyModal(value.record.projectId);
-                        }}
-                      >
-                        复制
-                      </div>
-                    </a-select-option>
-                     */}
-
-                    <a-select-option value="删除" label="删除">
-                      <div
-                        onClick={() => {
-                          showDeleteModal(value.record.projectId);
-                        }}
-                      >
-                        删除
-                      </div>
-                    </a-select-option>
-                  </a-select>
-                </div>
-              </div>
-            ) : (
-              <div></div>
-            )
-          ) : value.record.type === 2 ? (
-            value.record.status === 0 ||
-            value.record.status === 1 ||
-            value.record.status === 2 ||
-            value.record.status === -2 ? (
-              <div class="operation">
-                <span
-                  onClick={() => {
-                    console.log("多层子项目编辑", value);
-                    state.currentEdProjectName = value.record.paraentName;
-                    state.currentEditChildrensProjectId =
-                      value.record.projectId;
-                    state.eddoublesonpro = true;
-
-                    edvalue6.value = value.record.name;
-                    edvalue7.value = classifyList.value[0];
-                    edvalue8.value = value.record.manager.split();
-                    edvalue9.value = classifyList5.value[0];
-                  }}
-                  style="cursor:pointer;"
-                  class="operation1"
+                    onClick={() => {
+                      showRecallReviewModal(value.record.projectId);
+                    }}
+                    style="cursor:pointer"
+                    class="operation3"
                 >
-                  编辑
-                </span>
-                <div class="tableSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="授权"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    <a-select-option value="权限名单" label="权限名单">
-                      <div
-                        onClick={() => {
-                          showProjPrower(value.record.projectId);
-                        }}
-                      >
-                        权限名单
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="归属权" label="归属权">
-                      <div
-                        onClick={() => {
-                          console.log("点击了111");
-                          showProjOwner(value.record.projectId);
-                        }}
-                      >
-                        归属权
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="查看权" label="查看权">
-                      <div
-                        onClick={() => {
-                          console.log("点击了111");
-                          showProjCheck(value.record.projectId);
-                        }}
-                      >
-                        查看权
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="管理权" label="管理权">
-                      <div
-                        onClick={() => {
-                          showProjManage(value.record.projectId);
-                        }}
-                      >
-                        管理权
-                      </div>
-                    </a-select-option>
-                  </a-select>
-                </div>
-                <div
-                  onClick={() => {
-                    router.push({
-                      path: "/classadd",
-                      query: {
+                            撤回审核
+                          </span> : ''}
+            {value.record.status === 2 ?
+                <span
+                    onClick={() => {
+                      console.log("value.record", value.record);
+                      let beginTime = value.record.beginTime
+                          ? toDate(value.record.beginTime, "Y/M/D")
+                          : "";
+                      let endTime = value.record.beginTime
+                          ? toDate(value.record.endTime, "Y/M/D")
+                          : "";
+                      let time =
+                          beginTime && endTime ? beginTime + "-" + endTime : "";
+                      let obj = {
                         projectId: value.record.projectId,
                         name: value.record.name,
-                      },
-                    });
-                  }}
-                  style={{ cursor: "pointer" }}
-                  to="/classadd"
-                  class="operation3"
+                        time: time,
+                      };
+                      showProjectPub(obj);
+                    }}
+                    style="cursor:pointer"
+                    class="operation3"
                 >
-                  创建班级
-                </div>
-                <div class="tableSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="更多"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    {/* 
-										2022-11-30注释 后面放开
-                      <a-select-option value="复制" label="复制">
-                      <div
-                        onClick={() => {
-                          showCopyModal(value.record.projectId);
-                        }}
-                      >
-                        复制
-                      </div>
-                    </a-select-option>
-                     */}
-
-                    <a-select-option value="删除" label="删除">
-                      <div
-                        onClick={() => {
-                          showDeleteModal(value.record.projectId);
-                        }}
-                      >
-                        删除
-                      </div>
-                    </a-select-option>
-                  </a-select>
-                </div>
-              </div>
-            ) : value.record.status === 3 ? (
-              <div class="operation">
-                <span class="operation1">查看</span>
-                <div class="tableSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="授权"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    <a-select-option value="权限名单" label="权限名单">
-                      <div
-                        onClick={() => {
-                          showProjPrower(value.record.projectId);
-                        }}
-                      >
-                        权限名单
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="归属权" label="归属权">
-                      <div
-                        onClick={() => {
-                          console.log("点击了111");
-                          showProjOwner(value.record.projectId);
-                        }}
-                      >
-                        归属权
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="查看权" label="查看权">
-                      <div
-                        onClick={() => {
-                          console.log("点击了111");
-                          showProjCheck(value.record.projectId);
-                        }}
-                      >
-                        查看权
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="管理权" label="管理权">
-                      <div
-                        onClick={() => {
-                          showProjManage(value.record.projectId);
-                        }}
-                      >
-                        管理权
-                      </div>
-                    </a-select-option>
-                  </a-select>
-                </div>
-
-                <router-link to="/classadd" class="operation3">
-                  创建班级
-                </router-link>
-                <div class="tableSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="更多"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    {/* 
-										2022-11-30注释 后面放开
-                     <a-select-option value="复制" label="复制">
-                      <div
-                        onClick={() => {
-                          showCopyModal(value.record.projectId);
-                        }}
-                      >
-                        复制
-                      </div>
-                    </a-select-option>
-                     */}
-                  </a-select>
-                </div>
-              </div>
-            ) : value.record.status === -1 ? (
-              <div class="operation">
-                <span class="operation1">查看</span>
-                <div class="tableSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="授权"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    <a-select-option value="权限名单" label="权限名单">
-                      <div
-                        onClick={() => {
-                          showProjPrower(value.record.projectId);
-                        }}
-                      >
-                        权限名单
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="归属权" label="归属权">
-                      <div
-                        onClick={() => {
-                          console.log("点击了111");
-                          showProjOwner(value.record.projectId);
-                        }}
-                      >
-                        归属权
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="查看权" label="查看权">
-                      <div
-                        onClick={() => {
-                          console.log("点击了111");
-                          showProjCheck(value.record.projectId);
-                        }}
-                      >
-                        查看权
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="管理权" label="管理权">
-                      <div
-                        onClick={() => {
-                          showProjManage(value.record.projectId);
-                        }}
-                      >
-                        管理权
-                      </div>
-                    </a-select-option>
-                  </a-select>
-                </div>
-                <span class="operation3"></span>
-                <div class="tableSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="更多"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    {/* 
-										2022-11-30注释 后面放开
-                      <a-select-option value="复制" label="复制">
-                      <div
-                        onClick={() => {
-                          showCopyModal(value.record.projectId);
-                        }}
-                      >
-                        复制
-                      </div>
-                    </a-select-option>
-                     */}
-
-                    <a-select-option value="删除" label="删除">
-                      <div
-                        onClick={() => {
-                          showDeleteModal(value.record.projectId);
-                        }}
-                      >
-                        删除
-                      </div>
-                    </a-select-option>
-                  </a-select>
-                </div>
-              </div>
-            ) : (
-              <div></div>
-            )
-          ) : (
-            <div class="operation">
-              {value.record.status === 0 ? (
-                <span
-                  onClick={() => {
-                    console.log("单层子项目的编辑");
-                    console.log(value);
-
-                    {
-                      /* 判断是班级\单层项目\单层子项目 */
-                    }
-                    if (value.record.parentId == "0") {
-                      router.push({
-                        path: "/projectadd",
-                        query: {
-                          projectId: value.record.projectId,
-                          name: value.record.name,
-                        },
-                      });
-                    } else {
-                      if (value.record.isbj) {
-                        router.push({
-                          path: "/classadd",
-                          query: {
-                            projectId: value.record.projectId,
-                            name: value.record.paraentName,
-                            edit: 0,
-                          },
-                        });
-                      } else {
-                        router.push({
-                          path: "/sonproject",
-                          query: {
-                            projectId: value.record.projectId,
-                            name: value.record.paraentName,
-                            edit: 0,
-                          },
-                        });
-                      }
-                    }
-                  }}
-                  style="cursor:pointer;"
-                  class="operation1"
-                >
-                  编辑
-                </span>
-              ) : (
-                <span class="operation1"></span>
-                //  <span
-                //   onClick={() => {
-                //     console.log("单层子项目的编辑");
-                //     console.log(value);
-
-                //     {
-                //       /* 判断是班级\单层项目\单层子项目 */
-                //     }
-                //     if (value.record.parentId == "0") {
-                //       router.push({
-                //         path: "/projectadd",
-                //         query: {
-                //           projectId: value.record.projectId,
-                //           name: value.record.name,
-                //            viewDetail:1,
-                //         },
-                //       });
-                //     } else {
-                //       if (value.record.isbj) {
-                //         router.push({
-                //           path: "/classadd",
-                //           query: {
-                //             projectId: value.record.projectId,
-                //             name: value.record.paraentName,
-                //             edit: 0,
-                //             viewDetail:1,
-                //           },
-                //         });
-                //       } else {
-                //         router.push({
-                //           path: "/sonproject",
-                //           query: {
-                //             projectId: value.record.projectId,
-                //             name: value.record.paraentName,
-                //             edit: 0,
-                //             viewDetail:1,
-                //           },
-                //         });
-                //       }
-                //     }
-                //   }}
-                //   style="cursor:pointer;"
-                //   class="operation1"
-                // >
-                //   查看
-                // </span>
-              )}
-              <div class="tableSelect">
-                <a-select
+                      发布
+                    </span>
+                : ''}
+            <div className="tableSelect">
+              <a-select
                   style="width: 50px"
                   value="授权"
                   // options={state.projectNameList}
                   dropdownClassName="tabledropdown"
-                >
-                  <a-select-option value="权限名单" label="权限名单">
-                    <div
+              >
+                <a-select-option value="权限名单" label="权限名单">
+                  <div
                       onClick={() => {
                         showProjPrower(value.record.projectId);
                       }}
-                    >
-                      权限名单
-                    </div>
-                  </a-select-option>
-                  <a-select-option value="归属权" label="归属权">
-                    <div
+                  >
+                    权限名单
+                  </div>
+                </a-select-option>
+                <a-select-option value="归属权" label="归属权">
+                  <div
                       onClick={() => {
                         console.log("点击了111");
                         showProjOwner(value.record.projectId);
                       }}
-                    >
-                      归属权
-                    </div>
-                  </a-select-option>
-                  <a-select-option value="查看权" label="查看权">
-                    <div
+                  >
+                    归属权
+                  </div>
+                </a-select-option>
+                <a-select-option value="查看权" label="查看权">
+                  <div
                       onClick={() => {
                         console.log("点击了111");
                         showProjCheck(value.record.projectId);
                       }}
-                    >
-                      查看权
-                    </div>
-                  </a-select-option>
-                  <a-select-option value="管理权" label="管理权">
-                    <div
+                  >
+                    查看权
+                  </div>
+                </a-select-option>
+                <a-select-option value="管理权" label="管理权">
+                  <div
                       onClick={() => {
                         showProjManage(value.record.projectId);
                       }}
-                    >
-                      管理权
-                    </div>
-                  </a-select-option>
-                </a-select>
-              </div>
-              {value.record.status === 0 || value.record.status === -2 ? (
-                <span
-                  onClick={() => {
-                    showReviewModal(value.record.projectId);
-                  }}
-                  style="cursor:pointer"
-                  class="operation3"
-                >
-                  提交审核
-                </span>
-              ) : value.record.status === 1 ? (
-                <span
-                  onClick={() => {
-                    showRecallReviewModal(value.record.projectId);
-                  }}
-                  style="cursor:pointer"
-                  class="operation3"
-                >
-                  撤回审核
-                </span>
-              ) : value.record.status === 2 ? (
-                <span
-                  onClick={() => {
-                    console.log("value.record", value.record);
-                    let beginTime = value.record.beginTime
-                      ? toDate(value.record.beginTime, "Y/M/D")
-                      : "";
-                    let endTime = value.record.beginTime
-                      ? toDate(value.record.endTime, "Y/M/D")
-                      : "";
-                    let time =
-                      beginTime && endTime ? beginTime + "-" + endTime : "";
-                    let obj = {
-                      projectId: value.record.projectId,
-                      name: value.record.name,
-                      time: time,
-                    };
-                    showProjectPub(obj);
-                  }}
-                  style="cursor:pointer"
-                  class="operation3"
-                >
-                  发布
-                </span>
-              ) : (
-                <span class="operation3"></span>
-              )}
-              <div class="tableSelect">
-                {value.record.status === 0 ||
-                value.record.status === 2 ||
-                value.record.status === -2 ? (
-                  <a-select
-                    style="width: 50px"
-                    value="更多"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
                   >
-                    {/* 
-										2022-11-30注释 后面放开
-                       <a-select-option value="复制" label="复制">
-                      <div
-                        onClick={() => {
-                          showCopyModal(value.record.projectId);
-                        }}
-                      >
-                        复制
-                      </div>
-                    </a-select-option>
-                     */}
-
-                    <a-select-option value="删除" label="删除">
-                      <div
-                        onClick={() => {
-                          showDeleteModal(value.record.projectId);
-                        }}
-                      >
-                        删除
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="存为模版" label="存为模版">
-                      <div
-                        onClick={() => {
-                          showStartModal(value.record.projectId);
-                        }}
-                      >
-                        存为模版
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="基础信息" label="基础信息">
-                      <div
-                        onClick={() => {
-                          router.push({
-                            path: "/taskpage",
-                          });
-                          storage.set("projectId", value.record.projectId);
-                        }}
-                      >
-                        基础信息
-                      </div>
-                    </a-select-option>
-                  </a-select>
-                ) : value.record.status === 3 ||
-                  (value.record.status == 3 &&
-                    Number(value.record.beginTime) >
-                      Math.ceil(new Date().getTime() / 1000)) ? (
-                  <a-select
-                    style="width: 50px"
-                    value="更多"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    {/* 
-										2022-11-30注释 后面放开
-                      <a-select-option value="复制" label="复制">
-                      <div
-                        onClick={() => {
-                          showCopyModal(value.record.projectId);
-                        }}
-                      >
-                        复制
-                      </div>
-                    </a-select-option>
-                     */}
-
-                    <a-select-option value="存为模版" label="存为模版">
-                      <div
-                        onClick={() => {
-                          showStartModal(value.record.projectId);
-                        }}
-                      >
-                        存为模版
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="结束" label="结束">
-                      <div
-                        onClick={() => {
-                          showStopModal(value.record.projectId);
-                        }}
-                      >
-                        结束
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="撤回" label="撤回">
-                      <div
-                        onClick={() => {
-                          showBackModal(value.record.projectId);
-                        }}
-                      >
-                        撤回
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="基础信息" label="基础信息">
-                      <div
-                        onClick={() => {
-                          router.push({
-                            path: "/taskpage",
-                          });
-                          storage.set("projectId", value.record.projectId);
-                        }}
-                      >
-                        基础信息
-                      </div>
-                    </a-select-option>
-                  </a-select>
-                ) : value.record.status === -1 ? (
-                  <a-select
-                    style="width: 50px"
-                    value="更多"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    <a-select-option value="存为模版" label="存为模版">
-                      <div
-                        onClick={() => {
-                          showStartModal(value.record.projectId);
-                        }}
-                      >
-                        存为模版
-                      </div>
-                    </a-select-option>
-                    {/* 
-										2022-11-30注释 后面放开
-                     <a-select-option value="复制" label="复制">
-                      <div
-                        onClick={() => {
-                          showCopyModal(value.record.projectId);
-                        }}
-                      >
-                        复制
-                      </div>
-                    </a-select-option>
-                     */}
-
-                    <a-select-option value="删除" label="删除">
-                      <div
-                        onClick={() => {
-                          showDeleteModal(value.record.projectId);
-                        }}
-                      >
-                        删除
-                      </div>
-                    </a-select-option>
-                    <a-select-option value="基础信息" label="基础信息">
-                      <div
-                        onClick={() => {
-                          router.push({
-                            path: "/taskpage",
-                          });
-                          storage.set("projectId", value.record.projectId);
-                        }}
-                      >
-                        基础信息
-                      </div>
-                      {/**
-											<router-link to="/taskpage">基础信息</router-link>
-											*/}
-                    </a-select-option>
-                  </a-select>
-                ) : value.record.status === 1 ? (
-                  <a-select
-                    style="width: 50px"
-                    value="更多"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-                    <a-select-option value="存为模版" label="存为模版">
-                      <div
-                        onClick={() => {
-                          showStartModal(value.record.projectId);
-                        }}
-                      >
-                        存为模版
-                      </div>
-                    </a-select-option>
-                    {/* 
-										2022-11-30注释 后面放开
-                      <a-select-option value="复制" label="复制">
-                      <div
-                        onClick={() => {
-                          showCopyModal(value.record.projectId);
-                        }}
-                      >
-                        复制
-                      </div>
-                    </a-select-option>
-                     */}
-
-                    <a-select-option value="基础信息" label="基础信息">
-                      <div
-                        onClick={() => {
-                          router.push({
-                            path: "/taskpage",
-                          });
-                          storage.set("projectId", value.record.projectId);
-                        }}
-                      >
-                        基础信息
-                      </div>
-                      {/**
-											<router-link to="/taskpage">基础信息</router-link>
-											*/}
-                    </a-select-option>
-                  </a-select>
-                ) : (
-                  <div></div>
-                )}
-              </div>
+                    管理权
+                  </div>
+                </a-select-option>
+              </a-select>
             </div>
-          );
-        },
-      },
+            {value.record.type === 1 ? <span
+                className="operation3"
+                style="cursor: pointer"
+                onClick={() => {
+                  state.projectInfo = {parentName: value.record.name, parentId: value.record.projectId,type:2};
+                  state.reminderModal = true;
+                }}
+            >
+              创建子项目
+              </span> : ''}
+            {value.record.type === 2 ? <span
+                className="operation3"
+                style="cursor: pointer"
+                onClick={() => {
+                  router.push({
+                    path: '/projectadd', query: {
+                      parentId: value.record.projectId,
+                      parentName: value.record.name
+                    }
+                  })
+                }}
+            >
+              创建班级
+              </span> : ''}
+            <div className="tableSelect">
+              <a-select
+                  style="width: 50px"
+                  value="更多"
+                  // options={state.projectNameList}
+                  dropdownClassName="tabledropdown"
+              >
+                <a-select-option value="复制" label="复制">
+                  <div
+                      onClick={() => {
+                        showCopyModal(value.record.projectId);
+                      }}
+                  >
+                    复制
+                  </div>
+                </a-select-option>
+                <a-select-option value="删除" label="删除">
+                  <div
+                      onClick={() => {
+                        showDeleteModal(value.record.projectId);
+                      }}
+                  >
+                    删除
+                  </div>
+                </a-select-option>
+                {value.record.status === 3 || value.record.status === 2 ?
+                    <a-select-option value="存为模版" label="存为模版">
+                      <div
+                          onClick={() => {
+                            showStartModal(value.record.projectId);
+                          }}
+                      >
+                        存为模版
+                      </div>
+                    </a-select-option> : ''}
+                {value.record.status === 3 || value.record.status === 2 ?
+                    <a-select-option value="基础信息" label="基础信息">
+                      <div
+                          onClick={() => {
+                            router.push({
+                              path: "/taskpage",
+                            });
+                            storage.set("projectId", value.record.projectId);
+                          }}
+                      >
+                        基础信息
+                      </div>
+                    </a-select-option> : ''}
+              </a-select>
+            </div>
+          </div>
+        }
+      }
     ]);
 
-    const getTableDate = (pagedata) => {
-      let obj = {
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-      };
-      api
-        .getProjectList(pagedata ? pagedata : obj)
-        .then((res) => {
-          console.log(res);
-          if (res.status == 200 && res.data.code == 200) {
-            state.tableDataTotal = Number(res.data.data.total);
-            let data = res.data.data.rows;
-            // let data = state.tableData;
-            if (
-              data.length === 0 &&
-              res.data.data.total > 0 &&
-              state.currentPage > 1
-            ) {
-              state.currentPage = state.currentPage - 1;
-              getTableDate();
-            }
-            console.log("1266", data);
-            data.map((value) => {
-              // console.log("value %o", value);
-              if (value.type == 1) {
-                value.children = value.subList;
-                value.key = value.projectId;
+    const getTableDate = () => api.getProjectList(state.searchParam).then((res) => {
+      console.log(res);
+      state.tableDataTotal = Number(res.data.data.total);
+      const data = res.data.data.rows;
+      initDataSublist('', data)
+      console.log(data)
+      tableData.value = data;
+      console.log("tableData", tableData);
+    });
 
-                value.children.map((data) => {
-                  if (data.type == 2) {
-                    data.children = data.subList;
-                    data.key = data.projectId;
-                    // 传递给多层子项目项目归属名字
-                    data.paraentName = value.name;
-                    data.subList.map((data2) => {
-                      data2.paraentName = value.name + "/" + data.name;
-                      data2.isbj = "class";
-                      storage.set("isbj", data.projectId);
-                      // console.log(data2.paraentName, "conme");
-                      storage.set("pN", data2.paraentName);
-                    });
-                    // console.log("lalallalaa", data);
-                  } else {
-                    data.paraentName = value.name;
-                  }
-                });
-              }
-
-              // console.log("map-value", value.subList, value.children);
-            });
-            tableData.value = data;
-            console.log("tableData", tableData);
-          }
+    function initDataSublist(parentName, data) {
+      if (data && data.length) {
+        data.forEach(e => {
+          e.parentName = parentName
+          e.key = e.projectId
+          initDataSublist(e.name, e.subList)
+          e.subList && e.subList.length && (e.children = e.subList)
         })
-        .catch((err) => {
-          console.log(err);
-        });
-    };
+      }
+    }
+
     getTableDate();
 
     // 翻页
     const changePagination = (page) => {
-      console.log(page);
-      state.currentPage = page;
-      let pagedata = {
-        pageNo: page,
-        pageSize: state.pageSize,
-      };
-      getTableDate(pagedata);
-      // getLearnPath();
+      state.searchParam.pageNo = page
+      getTableDate()
     };
 
     const showModal = () => {
@@ -3461,6 +1551,7 @@ export default {
     };
 
     const showModal1 = () => {
+      state.projectInfo = {}
       state.reminderModal = true;
     };
     const closeModal1 = () => {
@@ -3506,38 +1597,35 @@ export default {
     };
 
     //添加权限
-    watch(
-      () => state.addAuthList,
-      (res) => {
-        console.log("res", res, state.addAuthList);
-        let obj = {
-          type: 2,
-          tag:
-            state.authClassify === 1 ? 3 : state.authClassify === 2 ? 4 : null,
-          opt: 3,
-          deptList: res[1],
-          groupList: res[2],
-          refId: state.selectProjectId,
-          pageNo: 20,
-          pageSize: 1,
-          studentList: res[0],
-          keyWord: "",
-        };
-        console.log("obj", obj);
-        api1
-          .optionAuthPerm(obj)
-          .then((res) => {
-            console.log("添加授权成功", res);
-            message.success("添加授权成功");
-          })
-          .catch((err) => {
-            console.log("添加授权失败", err);
-          });
-      }
-    );
+    watch(() => state.addAuthList, (res) => {
+          console.log("res", res, state.addAuthList);
+          let obj = {
+            type: 2,
+            tag:
+                state.authClassify === 1 ? 3 : state.authClassify === 2 ? 4 : null,
+            opt: 3,
+            deptList: res[1],
+            groupList: res[2],
+            refId: state.selectProjectId,
+            pageNo: 20,
+            pageSize: 1,
+            studentList: res[0],
+            keyWord: "",
+          };
+          console.log("obj", obj);
+          api1
+              .optionAuthPerm(obj)
+              .then((res) => {
+                console.log("添加授权成功", res);
+                message.success("添加授权成功");
+              })
+              .catch((err) => {
+                console.log("添加授权失败", err);
+              });
+        }
+    )
     return {
       ...toRefs(state),
-      selectProjectName,
       expandTable,
       showModal,
       closeModal,
@@ -3573,67 +1661,12 @@ export default {
       tableData,
       columns,
       createStoreyProject,
-      classifyList,
-      classifyList1,
-      classifyList2,
-      classifyList3,
-      classifyList4,
-      classifyList5,
-      classificationChange,
-      classificationChange1,
-      classificationChange2,
-      classificationChange3,
-      classificationChange4,
-      classificationChange5,
       changePagination,
-      value1,
-      value2,
-      value3,
-      value4,
-      value5,
-      value6,
-      value7,
-      value8,
-      value9,
-
-      edvalue1,
-      edvalue2,
-      edvalue3,
-      edvalue4,
-      edvalue5,
-      edvalue6,
-      edvalue7,
-      edvalue8,
-      edvalue9,
-
-      edclassificationChange2,
-      edclassificationChange3,
-      edclassificationChange4,
-      edclassificationChange6,
-
-      sProjectName,
-      sProjectOrder,
-      sProjectCreate,
-      sProjectState,
-      sProjectTime,
       sProjectStateList,
-      sProjectNameChange,
-      sProjectOrderChange,
-      sProjectCreateChange,
-      sProjectStateChange,
-      sProjectTimeChange,
       searchReset,
       searchSubmit,
       createChildProject,
-      createChildsProject,
-
-      editStoreyProject,
       closeeditModal2,
-      edclassificationChangeName,
-      edclassificationChange,
-      edclassificationChange1,
-      edclassificationChange5,
-      editChildsProject,
       closeeditModal3,
       releaseProject,
       showProjectPub,
@@ -3644,12 +1677,12 @@ export default {
       copyProject,
       closeReminderModal,
       okReminderModal,
-      memberScroll,
     };
   },
-};
+}
+;
 </script>
-<style  lang="scss">
+<style lang="scss">
 .projectManage {
   width: 100%;
   height: 100%;
@@ -3915,9 +1948,9 @@ export default {
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
-          0deg,
-          rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
+                0deg,
+                rgba(78, 166, 255, 0) 0%,
+                rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -4015,9 +2048,9 @@ export default {
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
-          0deg,
-          rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
+                0deg,
+                rgba(78, 166, 255, 0) 0%,
+                rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -4116,9 +2149,9 @@ export default {
 
       .modalHeader {
         background: linear-gradient(
-          0deg,
-          rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
+                0deg,
+                rgba(78, 166, 255, 0) 0%,
+                rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -4183,9 +2216,9 @@ export default {
 
       .modalHeader {
         background: linear-gradient(
-          0deg,
-          rgba(78, 166, 255, 0) 0%,
-          rgba(78, 166, 255, 0.2) 100%
+                0deg,
+                rgba(78, 166, 255, 0) 0%,
+                rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -4296,8 +2329,8 @@ export default {
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
+                    rgba(78, 166, 255, 0.2) 0%,
+                    rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -4391,16 +2424,19 @@ export default {
     }
   }
 }
+
 .projectPub {
   .ant-modal {
     .ant-modal-body {
       padding: 0;
+
       .modalHeader {
         background: linear-gradient(
-          rgba(78, 166, 255, 0.2) 0%,
-          rgba(78, 166, 255, 0) 100%
+                rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%
         );
       }
+
       .modalMain {
         .projectname {
           color: rgba(79, 81, 86, 1);
@@ -4410,33 +2446,39 @@ export default {
           font-weight: 500;
           text-align: center;
         }
+
         .projecttime {
           margin-left: 221px;
+
           .timeti {
             color: rgba(153, 155, 163, 1);
             font-size: 14px;
             line-height: 36px;
           }
+
           .timeme {
             color: rgba(79, 81, 86, 1);
             font-size: 14px;
             line-height: 36px;
           }
         }
+
         .projectbox {
           margin-top: 26px;
           display: flex;
           justify-content: center;
+
           .promessage {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-              180deg,
-              rgba(254, 243, 221, 1),
-              rgba(255, 250, 240, 1)
+                    180deg,
+                    rgba(254, 243, 221, 1),
+                    rgba(255, 250, 240, 1)
             );
             border-radius: 10px;
             margin-right: 7px;
+
             .messageme {
               color: rgba(255, 182, 78, 1);
               font-size: 14px;
@@ -4444,21 +2486,24 @@ export default {
               margin-top: 17px;
               margin-left: 30px;
             }
+
             .messagege {
               color: rgba(153, 155, 163, 1);
               font-size: 14px;
               margin-left: 30px;
             }
           }
+
           .stumessage {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-              180deg,
-              rgba(221, 234, 255, 1),
-              rgba(240, 248, 254, 1)
+                    180deg,
+                    rgba(221, 234, 255, 1),
+                    rgba(240, 248, 254, 1)
             );
             border-radius: 10px;
+
             .messageme1 {
               color: rgba(78, 166, 255, 1);
               font-size: 14px;
@@ -4466,6 +2511,7 @@ export default {
               margin-top: 17px;
               margin-left: 30px;
             }
+
             .messagege1 {
               color: rgba(153, 155, 163, 1);
               font-size: 14px;
@@ -4473,26 +2519,32 @@ export default {
             }
           }
         }
+
         .send {
           margin-top: 30px;
           margin-left: 61px;
+
           .sendtext {
             margin-left: 11px;
             color: rgba(109, 117, 132, 1);
             font-size: 14px;
           }
         }
+
         .ckb {
           margin-top: 20px;
           margin-left: 62px;
+
           .sendpeo {
             color: rgba(109, 117, 132, 1);
             font-size: 14px;
           }
+
           .ant-checkbox-inner {
             border-radius: 4px;
           }
         }
+
         .pubtn {
           display: flex;
           justify-content: center;
@@ -4511,6 +2563,7 @@ export default {
             align-items: center;
             background: rgba(255, 255, 255, 1);
           }
+
           .pubtn2 {
             width: 100px;
             height: 40px;

From 11d21944df8d8c1bfa8aa6081866c772a9ae4332 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 2 Dec 2022 17:01:30 +0800
Subject: [PATCH 15/21] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ProjCheckPower.vue |   6 +
 src/components/drawers/ProjectOwn.vue     | 237 +---------------------
 src/views/learningpath/LevelAdd.vue       |  35 ++--
 src/views/learningpath/LevelAddDetail.vue |  16 +-
 src/views/projectcenter/TaskAdd.vue       |  70 ++++---
 5 files changed, 76 insertions(+), 288 deletions(-)

diff --git a/src/components/drawers/ProjCheckPower.vue b/src/components/drawers/ProjCheckPower.vue
index f9c3803c..509b156e 100644
--- a/src/components/drawers/ProjCheckPower.vue
+++ b/src/components/drawers/ProjCheckPower.vue
@@ -100,6 +100,7 @@
                           title: 'name',
                           value: 'name',
                         }"
+                        v-model:expandedKeys="expandedKeys"
                       >
                         <template #suffixIcon></template>
                       </a-tree>
@@ -201,6 +202,7 @@
                         title: 'name',
                         value: 'name',
                       }"
+                      v-model:expandedKeys="expandedKeys"
                     >
                       <template #suffixIcon></template>
                     </a-tree>
@@ -754,12 +756,16 @@ export default {
       //受众关联-------------------------------------
 
       selectAllArr: null, //所有选中
+
+      expandedKeys: [], //展开的节点
     });
 
     const closeDrawer = () => {
       state.activeKey = "1";
       ctx.emit("update:ProjCheckvisible", false);
       deleteAll();
+      // console.log("expandedKeys", state.expandedKeys);
+      state.expandedKeys = [];
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
diff --git a/src/components/drawers/ProjectOwn.vue b/src/components/drawers/ProjectOwn.vue
index 2faee1bf..18c218ae 100644
--- a/src/components/drawers/ProjectOwn.vue
+++ b/src/components/drawers/ProjectOwn.vue
@@ -244,241 +244,9 @@ export default {
       nameadd: "",
       nameaddd: "",
       com: "",
-      openKeys: [2, 13, 32],
+      openKeys: [],
       //组织树
-      treeData: [
-        {
-          key: 1,
-          title: "京东方",
-          value: "京东方",
-          children: [
-            {
-              key: 2,
-              title: "产研部",
-              value: "产研部",
-              children: [
-                {
-                  key: 3,
-                  title: "产品部",
-                  value: "产品部",
-                },
-                {
-                  key: 4,
-                  title: "研究部",
-                  value: "研究部",
-                },
-                {
-                  key: 5,
-                  title: "研究部2",
-                  value: "研究部2",
-                },
-                {
-                  key: 6,
-                  title: "研究3",
-                  value: "研究3",
-                },
-                {
-                  key: 7,
-                  title: "研究4",
-                  value: "研究4",
-                },
-                {
-                  key: 8,
-                  title: "研究部5",
-                  value: "研究部5",
-                },
-                {
-                  key: 9,
-                  title: "研究部6",
-                  value: "研究部6",
-                },
-                {
-                  key: 10,
-                  title: "研究部7",
-                  value: "研究部7",
-                },
-                {
-                  key: 11,
-                  title: "研究部8",
-                  value: "研究部8",
-                },
-                {
-                  key: 12,
-                  title: "研究部9",
-                  value: "研究部9",
-                },
-              ],
-            },
-            {
-              key: 13,
-              title: "二级标题",
-              value: "二级标题",
-              children: [
-                {
-                  key: 14,
-                  title: "三级标题",
-                  value: "三级标题",
-                  children: [
-                    {
-                      key: 15,
-                      title: "四级标题",
-                      value: "四级标题",
-                      children: [
-                        {
-                          key: 16,
-                          title: "五级标题",
-                          value: "五级标题",
-                          children: [
-                            {
-                              key: 17,
-                              title: "六级标题",
-                              value: "六级标题",
-                              children: [
-                                {
-                                  key: 18,
-                                  title: "七级标题",
-                                  value: "七级标题",
-                                  children: [
-                                    {
-                                      key: 19,
-                                      title: "八级标题",
-                                      value: "八级标题",
-                                      children: [
-                                        {
-                                          key: 20,
-                                          title: "九级标题",
-                                          value: "九级标题",
-                                          children: [
-                                            {
-                                              key: 21,
-                                              title: "十级标题",
-                                              value: "十级标题",
-                                              children: [
-                                                {
-                                                  key: 22,
-                                                  title: "十一级标题",
-                                                  value: "十一级标题",
-                                                  children: [
-                                                    {
-                                                      key: 23,
-                                                      title: "十二级标题",
-                                                      value: "十二级标题",
-                                                      children: [
-                                                        {
-                                                          key: 24,
-                                                          title:
-                                                            "十三级标题十三级标题十三级标题十三级标题",
-                                                          value: "十三级标题",
-                                                          children: [
-                                                            {
-                                                              key: 25,
-                                                              title:
-                                                                "十四级标题",
-                                                              value:
-                                                                "十四级标题",
-                                                              children: [
-                                                                {
-                                                                  key: 26,
-                                                                  title:
-                                                                    "十五级标题",
-                                                                  value:
-                                                                    "十五级标题",
-                                                                  children: [
-                                                                    {
-                                                                      key: 27,
-                                                                      title:
-                                                                        "十六级标题",
-                                                                      value:
-                                                                        "十六级标题",
-                                                                      children:
-                                                                        [
-                                                                          {
-                                                                            key: 28,
-                                                                            title:
-                                                                              "十七级标题",
-                                                                            value:
-                                                                              "十七级标题",
-                                                                            children:
-                                                                              [
-                                                                                {
-                                                                                  key: 29,
-                                                                                  title:
-                                                                                    "十八级标题",
-                                                                                  value:
-                                                                                    "十八级标题",
-                                                                                  children:
-                                                                                    [
-                                                                                      {
-                                                                                        key: 30,
-                                                                                        title:
-                                                                                          "十九级标题",
-                                                                                        value:
-                                                                                          "十九级标题",
-                                                                                        children:
-                                                                                          [
-                                                                                            {
-                                                                                              key: 31,
-                                                                                              title:
-                                                                                                "二十级标题二十级标题",
-                                                                                              value:
-                                                                                                "二十级标题二十级标题",
-                                                                                            },
-                                                                                          ],
-                                                                                      },
-                                                                                    ],
-                                                                                },
-                                                                              ],
-                                                                          },
-                                                                        ],
-                                                                    },
-                                                                  ],
-                                                                },
-                                                              ],
-                                                            },
-                                                          ],
-                                                        },
-                                                      ],
-                                                    },
-                                                  ],
-                                                },
-                                              ],
-                                            },
-                                          ],
-                                        },
-                                      ],
-                                    },
-                                  ],
-                                },
-                              ],
-                            },
-                          ],
-                        },
-                      ],
-                    },
-                  ],
-                },
-              ],
-            },
-            {
-              key: 32,
-              title: "人力资源部",
-              value: "人力资源部",
-              children: [
-                {
-                  key: 33,
-                  title: "人事部",
-                  value: "人事部",
-                },
-                {
-                  key: 34,
-                  title: "行政部",
-                  value: "行政部",
-                },
-              ],
-            },
-          ],
-        },
-      ],
+      treeData: [],
       //快速选人的table
       tabledata: [
         // {
@@ -543,6 +311,7 @@ export default {
     const closeDrawer = () => {
       state.activeKey = "1";
       ctx.emit("update:ProjOwnervisible", false);
+      state.openKeys = [];
     };
 
     const afterVisibleChange = (bool) => {
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 2ac43dc7..0a540617 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -139,7 +139,7 @@
               </div>
               <div
                 class="taskbox"
-                @click="showModal"
+                @click="showPub"
                 style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)"
               >
                 <div class="leftt">
@@ -1078,7 +1078,9 @@
         <div class="projectbox">
           <div class="promessage">
             <div class="messageme">路径信息</div>
-            <div class="messagege">当前路径共0个关卡，0个任务</div>
+            <div class="messagege">
+              当前路径共{{ routeChapters }}个关卡，{{ routeTasks }}个任务
+            </div>
           </div>
           <div class="stumessage">
             <div class="messageme1">学员信息</div>
@@ -1255,6 +1257,8 @@ export default {
       dcopyModal: false, //复制弹窗
       closeBack: false,
       routeStudentsNum: null,
+      routeChapters: null,
+      routeTasks: null,
       dcloseCopy: false,
       dicloseCopy: false,
       stopModal: false, //结束弹窗
@@ -1733,7 +1737,9 @@ export default {
           message.destroy();
           message.success("发布成功");
           state.pub = false;
+          state.nodata = false;
           // getLearnPath();
+
           reget();
         })
         .catch((err) => {
@@ -1744,33 +1750,19 @@ export default {
     const showPub = () => {
       state.pub = true;
       // state.releasePathId = routerId;
-      //获取学员总数
-      let obj = {
-        pageNo: 0,
-        pageSize: 0,
-        routerId: state.routerId,
-      };
       api
-        .getStudent(obj)
+        .getLearnCount(state.routerId)
         .then((res) => {
           if (res.status === 200) {
-            // console.log("res", res.data.data);
-            state.routeStudentsNum = res.data.data.total;
+            // console.log("获取关卡、任务、学员统计数据", res.data);
+            state.routeStudentsNum = res.data.students;
+            state.routeChapters = res.data.chapters;
+            state.routeTasks = res.data.tasks;
           }
         })
         .catch((err) => {
           console.log("err", err);
         });
-
-      //获取学习路径详细信息
-      // api
-      //   .getRouterDetail(routerId)
-      //   .then((res) => {
-      //     console.log("学习路径详情", res);
-      //   })
-      //   .catch((err) => {
-      //     console.log("学习路径详情获取错误", err);
-      //   });
     };
     //显示撤回弹窗
     const showBackModal = () => {
@@ -1794,6 +1786,7 @@ export default {
           message.success("撤回成功");
           state.backModal = false;
           reget();
+          state.nodata = true;
         })
         .catch((err) => {
           console.log("撤回失败", err);
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 71e868cd..8a05bf87 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -524,7 +524,7 @@
                 </div>
                 <div class="btn btn2">
                   <div class="imgIcon"></div>
-                  <div class="btnText" @click="showDeleteALLModal">
+                  <div class="btnText" @click="showDeleteALLModal(1)">
                     批量删除
                   </div>
                 </div>
@@ -785,7 +785,7 @@
                   <button class="addx" @click="showAddStu">添加学员</button>
                   <!-- 点击抽屉组件在LevelAdd，此处没添加showAddStu、showImpStu -->
                   <button class="addd" @click="showImpStu">导入学员</button>
-                  <button class="addd" @click="showDeleteALLModal">
+                  <button class="addd" @click="showDeleteALLModal(2)">
                     批量删除
                   </button>
                 </div>
@@ -907,7 +907,9 @@
             <div class="close_exit" @click="delete_exit"></div>
           </div>
           <div class="body">
-            <span>请确认是否批量删除学员</span>
+            <span
+              >请确认是否批量删除{{ deleteType === 1 ? "任务" : "学员" }}</span
+            >
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1">
@@ -1203,6 +1205,8 @@ export default {
       chooseProjectList: null, //选择的阶段下的任务列表
 
       curLevel: null, //选择移动到的关卡名称
+
+      deleteType: null, //批量删除学员/任务 1：任务 2：学员
     });
 
     const showModal = (element) => {
@@ -1618,12 +1622,14 @@ export default {
     const gqxy_hShow = () => {
       state.gqxy_hs = !state.gqxy_hs;
     };
-    const showDeleteALLModal = () => {
+    const showDeleteALLModal = (type) => {
       state.deleteAll = true;
+      state.deleteType = type;
     };
     const delete_exit = () => {
       state.deleteAll = false;
       deletecTaskAll();
+      state.deleteType = null;
     };
     const showDeleteModal = (id) => {
       state.deleteID = id;
@@ -1751,6 +1757,8 @@ export default {
             message.destroy();
             message.success("移动成功");
             localStorage.setItem("chapterId", state.chooseChapterId);
+            state.selectRow = []; //选择行
+            state.selectAll = 0; //0：未选择，1：全选，2：部分选择
             getDetail();
           })
           .catch((err) => {
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 866384f2..dc3b891f 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -586,7 +586,17 @@
                           </div>
                         </div>
                       </div>
-                      <div style="width: 120px; text-align: center">
+                      <div
+                        style="
+                          width: 120px;
+                          text-align: center;
+                          text-align: center;
+                          overflow: hidden;
+                          text-overflow: ellipsis;
+                          white-space: nowrap;
+                        "
+                        :title="element.creater"
+                      >
                         {{ element.creater }}
                       </div>
                       <div style="width: 120px; text-align: center">
@@ -1127,7 +1137,7 @@ export default {
       voteId: "", //删除投票id
       deleteID: "",
       selectRow: [], //选择行
-      curLevel: [], //阶段名称
+      curLevel: null, //阶段名称
       selectAll: 0, //0：未选择，1：全选，2：部分选择
 
       updateStageID: null, //编辑阶段id
@@ -1209,7 +1219,7 @@ export default {
             taskList: value.taskList,
             value: value.stageId,
             label: value.name,
-            courseId: value.courseId ? value.courseId : null
+            courseId: value.courseId ? value.courseId : null,
           };
           array.push(obj);
         }
@@ -1365,7 +1375,7 @@ export default {
               let stage = localStorage.getItem("stageId")
                 ? localStorage.getItem("stageId")
                 : null;
-      
+
               // console.log("stage",Object.prototype.toString.call(stage))
               getStageData(res.data.data.stageList);
               if (stage != null) {
@@ -1373,49 +1383,48 @@ export default {
                 let stageList = res.data.data.stageList; //阶段数组
                 let result = stageList.find((item) => item.stageId == stage);
                 console.log("又找到了", result);
-                if(result!=null){
+                if (result != null) {
                   getTableData(result.taskList);
-                }else{
-                   //没有选中的阶段时，获取全部的任务
+                } else {
+                  //没有选中的阶段时，获取全部的任务
                   console.log(stage);
                   let stageList = res.data.data.stageList; //阶段数组
-                  if(stageList!=null){
+                  if (stageList != null) {
                     let taskListAll;
                     stageList.forEach((item) => {
-                      taskListAll=[...item.taskList];
+                      taskListAll = [...item.taskList];
                     });
-                    console.log("taskListAll",taskListAll);
+                    console.log("taskListAll", taskListAll);
                     getTableData(taskListAll);
                   }
                 }
-                
-              } else{
+              } else {
                 console.log(stage);
-                  let stageList = res.data.data.stageList; //阶段数组
-                  if(stageList!=null){
-                    let taskListAll;
-                    stageList.forEach((item) => {
-                      taskListAll=[...item.taskList];
-                    });
-                    console.log("taskListAll",taskListAll);
-                    getTableData(taskListAll);
-                  }
+                let stageList = res.data.data.stageList; //阶段数组
+                if (stageList != null) {
+                  let taskListAll;
+                  stageList.forEach((item) => {
+                    taskListAll = [...item.taskList];
+                  });
+                  console.log("taskListAll", taskListAll);
+                  getTableData(taskListAll);
+                }
               }
               // 每次都获取了第一条taskList
               // let arr = res.data.data.stageList[0].taskList;
               // console.log("任务列表", stage, arr);
               // getTableData(arr);
             }
-            //获取阶段列表
+            // //获取阶段列表
             let stagearr = res.data.data.stageList;
-            let arrlist = state.curLevel;
+            // let arrlist = state.curLevel;
             console.log(stagearr, 111111);
             if (stagearr.length > 0) {
               getStageData(stagearr);
-              stagearr.map((value) => {
-                console.log(value);
-                arrlist.push(value);
-              });
+              // stagearr.map((value) => {
+              //   console.log(value);
+              //   // arrlist.push(value);
+              // });
             }
             //给阶段id赋初始值
             let stageid = localStorage.getItem("stageId")
@@ -1489,8 +1498,11 @@ export default {
               console.log("移动成功", res);
               message.destroy();
               message.success("移动成功");
+              state.selectRow = []; //选择行
+              state.selectAll = 0; //0：未选择，1：全选，2：部分选择
               console.log(state.removeStageId);
               getTask();
+
               localStorage.setItem("stageId", state.chooseStageId);
             })
             .catch((err) => {
@@ -1636,7 +1648,7 @@ export default {
           console.log("删除阶段成功", res);
           message.success("删除阶段成功");
           closeDeleteStage();
-          localStorage.setItem("stageId", "") 
+          localStorage.setItem("stageId", "");
           getTask();
         })
         .catch((err) => {
@@ -1661,7 +1673,7 @@ export default {
         "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
     });
     const showDrawerOnline = (id, eleId) => {
-      console.log('id, eleId',id, eleId);
+      console.log("id, eleId", id, eleId);
       state.addonlinevisible = true;
       state.EditOnlineId = id;
       state.projectTaskId = eleId;

From c246418ef4979a839dd18ca704e91a8863bb1d87 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Fri, 2 Dec 2022 17:04:43 +0800
Subject: [PATCH 16/21] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=AF=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddTest.vue           |   2 +-
 src/views/courselibrary/CoursewareManage.vue | 118 +++++++++++++++----
 2 files changed, 99 insertions(+), 21 deletions(-)

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 7aead476..4d548e56 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -666,7 +666,7 @@ export default {
       state.paperName = "";
     };
     const queryTest = () => {
-      // state.addLoading = true;
+       state.addLoading = true;
       queryExaminationDetailById({ examinationId: props.EditTestId })
         .then((res) => {
           formState.examinationName = res.data.data.examinationName;
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 55d24069..6d65c93b 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -690,7 +690,9 @@
                 <div class="btnText" @click="ft_exit">取消</div>
               </div>
               <div class="btn btn6">
-                <div class="btnText" @click="handlePush">确定</div>
+                <div v-if="(isEdit==0)" class="btnText" @click="handlePush">确定</div>
+                <div v-if="isEdit==1" class="btnText">已保存</div>
+    
               </div>
               <div class="btn btn6">
                 <div class="btnText" @click="reviewClick">提交审核</div>
@@ -1989,7 +1991,10 @@
               <div class="btnText" @click="handleCancelStu">取消</div>
             </div>
             <div class="cstm_btn btn6">
-              <div class="btnText" @click="handleSureStu">确定</div>
+              <div v-if="addLoading" class="btnText" >保存中</div>
+              <div v-else class="btnText" @click="handleSureStu">确定</div>
+               
+               
             </div>
           </div>
         </div>
@@ -2483,6 +2488,7 @@
               <div class="btnText" @click="agreereject_exit">取消</div>
             </div>
             <div class="qrm_btn btn2">
+            
               <div class="btnText" @click="handleAgreeTrue">确定</div>
             </div>
           </div>
@@ -2540,7 +2546,10 @@
               <div class="btnText" @click="delete_exit1">取消</div>
             </div>
             <div class="del_btn btn2">
-              <div class="btnText" @click="handleDeleteExit">确定</div>
+             
+              <div v-if="addLoading" class="btnText" >保存中...</div>
+              <div v-else class="btnText" @click="handleDeleteExit">确定</div>
+             
             </div>
           </div>
         </div>
@@ -2599,6 +2608,11 @@
       classify="course"
     />
   </div>
+ 
+  <div class="aeLoading" :style="{display: addLoading ? 'flex' : 'none'}" >
+      <a-spin :spinning="addLoading" tip="保存中..." />
+    </div>
+
 </template>
 <script>
 import {
@@ -3123,9 +3137,12 @@ export default defineComponent({
   },
   setup() {
     const state = reactive({
+      addLoading:false,
       currentPlanItem: {},
-
+      teacherId:null,
+      teacher:null,
       selectedRowKeys7: [],
+      isEdit:0,
 
       //列表表格
       tableData1: [
@@ -3366,7 +3383,7 @@ export default defineComponent({
       addStudentList: null, //选中列表
 
       newCourseName: null, //新建开课名称
-      addLoading:false,
+      
     });
 
     const showStuAdd = () => {
@@ -3717,10 +3734,13 @@ export default defineComponent({
     const rest = () => {
       options4CurName.value = "";
       options4CurId.value = "";
+      state.teacher =null;
+      state.teacherId =null;
     };
     const handleChangeTea1 = (val) => {
       console.log(787877);
       console.log(val);
+     
       rest();
       getTea();
     };
@@ -4018,6 +4038,7 @@ export default defineComponent({
       for (const keyName of checkList) {
         if (!keyName) {
           count++;
+         
         }
       }
       return count ? false : true;
@@ -4041,8 +4062,11 @@ export default defineComponent({
       valueHtml.value = "";
       state.fileList =[];
     };
+    //保存面授课
     const handlePush = (param) => {
-       state.addLoading = true;
+       //state.isEdit = 1;
+     
+       console.log("========",state.addLoading);
       console.log("state.imgList");
       console.log(state.imgList);
       let files = "";
@@ -4053,6 +4077,8 @@ export default defineComponent({
       }
       files = files.slice(0, files.length - 1);
       console.log(files);
+      let tid = (state.teacherId==null)?(state.qdms_inputV5 ? state.qdms_inputV5 : null):state.teacherId;
+      console.log("state.teacherId==null",state.teacherId==null,"state.qdms_inputV5",state.qdms_inputV5,"state.teacherId",state.teacherId,"tid",tid);
       const postData = {
         offcourseId: state.offcourseId, //不传代表新增
         name: state.qdms_inputV1,
@@ -4062,23 +4088,29 @@ export default defineComponent({
         categoryId: state.fen_lei,
         sceneId: state.chang_jin,
         tips: state.tags_val ? state.tags_val.join(",") : null,
-        teacherId: state.qdms_inputV5 ? state.qdms_inputV5 : null, //?
+        teacherId:tid, //?
         intro: state.qdms_inputV6,
         attach: files,
         outline: valueHtml.value,
+        //teacherId:state.teacherId ,
       };
+      console.log("===",state.teacherId,"hha",state.qdms_inputV5);
       console.log("postData");
       console.log(postData);
       const checkList = [
         postData.name,
-        postData.picUrl,
+   
         postData.targetUser,
         postData.categoryId,
         postData.teacherId,
       ];
       if (!checkVal(checkList)) {
-        return false;
+        message.destroy();
+        return message.error("请输入必填项");
+      }else{
+        state.addLoading = true;
       }
+      
       edit(postData).then((res) => {
         if (res.data.code === 200) {
           getTableDate();
@@ -4108,7 +4140,7 @@ export default defineComponent({
     };
     const createkk = () => {
       getTea();
-
+      state.offcoursePlanId =null;
       state.cstm_hs = true;
     };
     const handleCancelStu = () => {
@@ -4124,8 +4156,9 @@ export default defineComponent({
       state.checked1 = false;
       state.checked4 = false;
     };
+    //保存开课
     const handleSureStu = () => {
-      state.addLoading = false;
+     
       let startTime,
         endTime = 0;
       if (state.xjkkinputV3) {
@@ -4149,7 +4182,8 @@ export default defineComponent({
         name: state.xjkkinputV1,
         signFlag: state.xjkkradioV1 === 0 ? 1 : 0, //是否允许未报名的签到:1是0否
         // signWordFlag: state.xjkkradioV1 === 1 ? 1 : 0, //签到是否需要口令:1是0否
-        teacherId: state.xjkkinputV4 ? state.xjkkinputV4 : 1,
+        teacherId: state.xjkkinputV4 ? state.xjkkinputV4 : "",
+        teacher:options4CurName.value,
       };
       console.log(postData);
       const checkList = [
@@ -4160,19 +4194,24 @@ export default defineComponent({
         postData.teacherId,
       ];
       if (!checkVal(checkList)) {
-        return false;
+        message.destroy();
+        return message.error("请输入必填项");
+      }else{
+        state.addLoading = true;
+        console.log("state.addLoading ",state.addLoading );
       }
       editPlan(postData).then((res) => {
-        state.addLoading = false;
         if (res.data.code === 200) {
           getTableDate3();
           handleCancelStu();
-          rest();
-         
+          rest(); 
         }
       });
+      state.addLoading = false;
     };
+    //编辑开课
     const handelEditStu = async (itm) => {
+     
       console.log(itm);
       state.offcourseId = itm.offcourseId;
       state.offcoursePlanId = itm.offcoursePlanId;
@@ -4271,17 +4310,21 @@ export default defineComponent({
       state.ftQR_hs = false;
       state.ftsQR_hs = false;
       state.vipftQR_hs = false;
+      state.addLoading =false;
     };
     const rg_exit = () => {
       state.rg_hs = false;
+      state.addLoading =false;
     };
     const graduate_exit = () => {
       state.graduate_hs = false;
+      state.addLoading =false;
     };
     const agreereject_exit = () => {
       state.agreereject_hs = false;
       state.agreestudy_hs = false;
       state.rejectstudy_hs = false;
+      state.addLoading =false;
     };
     const delete_exit1 = () => {
       state.delete_hs = false;
@@ -4290,6 +4333,7 @@ export default defineComponent({
       state.nouse_hs = false;
       state.rg_hs = false;
       state.graduate_hs = false;
+      state.addLoading =false;
     };
     const handleRejectExit = (itm, type) => {
       if (type === "1") {
@@ -4342,7 +4386,9 @@ export default defineComponent({
         delete_exit1();
       }
     };
+    //确认复制
     const handleAgreeTrue = async () => {
+     
       if (state.agreestudy_hs) {
         handleStudent({
           offcoursePlanId: state.offcoursePlanId,
@@ -4352,6 +4398,7 @@ export default defineComponent({
         });
         getTableDate2();
         delete_exit1();
+        state.addLoading =false;
       }
       if (state.rejectstudy_hs) {
         handleStudent({
@@ -4362,9 +4409,13 @@ export default defineComponent({
         });
         getTableDate2();
         delete_exit1();
+       
       }
     };
+    //确认复制课程
     const handleDeleteExit = async () => {
+      state.addLoading =true;
+     
       if (state.del_hs) {
         console.log(11111111);
         if (state.offcourseId && state.offcoursePlanId && state.studentId) {
@@ -4388,7 +4439,7 @@ export default defineComponent({
           console.log(3333333);
           handle({
             offcourseId: state.offcourseId,
-            type: 1,
+            type: -1,
           }).then((res) => {
             if (res.data.code === 200) {
               getTableDate();
@@ -4396,6 +4447,7 @@ export default defineComponent({
             }
           });
         }
+        
       }
       if (state.copy_hs) {
         console.log(2222222);
@@ -4422,6 +4474,7 @@ export default defineComponent({
             signFlag: item.signFlag, //是否允许未报名的签到:1是0否
             //signWordFlag: item.signWordFlag, //签到是否需要口令:1是0否
             teacherId: item.teacherId,
+            teacher:item.teacher,
           };
           console.log(obj);
           editPlan(obj).then((res) => {
@@ -4452,12 +4505,14 @@ export default defineComponent({
             intro: item.intro,
             attach: item.attach,
             outline: item.outline,
+            teacher:item.teacher,
           };
           edit(postData).then((res) => {
             if (res.data.code === 200) {
               getTableDate();
               delete_exit1();
               rest();
+           
             }
           });
         }
@@ -4477,6 +4532,7 @@ export default defineComponent({
           });
         }
       }
+     
     };
     const handleDeleteKaike = (value) => {
       state.offcoursePlanId = value.offcoursePlanId;
@@ -4518,8 +4574,12 @@ export default defineComponent({
         }
       });
     };
+    //获取教师
     const getTea = async () => {
       console.log("获取授课教师信息");
+      options4CurName.value =state.teacher;
+      options4CurId.value =state.teacherId;
+
       const item1 = await getMemberInfoApi({
         pageNo: state.currentPageTea1,
         pageSize: state.pageSizeTea1,
@@ -4542,9 +4602,14 @@ export default defineComponent({
           if (state.offcoursePlanId && state.offcourseId) {
             options4CurName.value = item.realName;
             state.xjkkinputV4 = item.realName;
+            state.teacherId = item.id;
+         
           } else if (state.offcourseId) {
             options4CurName.value = item.realName;
             state.qdms_inputV5 = item.realName;
+            state.teacher = item.realName;
+            state.teacherId =item.id;
+            console.log("那个老师",item);
           }
         }
         newArr.push({
@@ -4556,7 +4621,10 @@ export default defineComponent({
       console.log("options4.value");
       console.log(options4.value);
     };
+    //编辑面授课
     const handleEdit = async (itm, type) => {
+      
+      state.isEdit = 0;
       console.log(45555);
       console.log(itm);
       if (type === "1") {
@@ -4581,9 +4649,9 @@ export default defineComponent({
       state.fen_lei = String(item.categoryId);
       state.chang_jin = String(item.sceneId);
       state.tags_val = item.tips ? item.tips.split(",") : [];
-      // state.qdms_inputV5 = item.teacherId;
-      options4CurId.value = item.teacherId;
-      state.qdms_inputV5 = null;
+      //state.qdms_inputV5 = item.teacherId;
+      state.teacher = item.teacher;
+      state.teacherId = item.teacherId;
       state.qdms_inputV6 = item.intro;
       if(item.attach==""){
         state.imgList =[];
@@ -4806,6 +4874,11 @@ export default defineComponent({
       }
     };
     const submitReview = (id) => {
+      state.addLoading =true;
+
+      if(id==""){
+        return message.error("请先完成保存");
+      }
       let obj = {
         offcourseId: id ? id : state.offcourseId,
         type: 1,
@@ -4817,6 +4890,8 @@ export default defineComponent({
           ft_exit();
           rest();
           getTableDate();
+          state.addLoading =false;
+
         }
       });
     };
@@ -5023,6 +5098,9 @@ export default defineComponent({
 });
 </script>
 <style lang="scss">
+.aeLoading{
+  z-index: 10000;
+}
 .courseManage {
   width: 100%;
   height: 100%;

From 835f2b9cabdac102eaf7292264dfb608743abd50 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 2 Dec 2022 17:13:18 +0800
Subject: [PATCH 17/21] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E4=BB=A5=E5=8F=8A=E5=A2=9E=E5=8A=A0token=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue       | 6 +++---
 src/api/config.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 314c66b3..e9e32c22 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -43,7 +43,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.10------------");
+    console.log("版本0.11------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
@@ -65,8 +65,8 @@ export default defineComponent({
       initDict("projectLevel");
       initDict("projectSys");
       initDict("pathmapPic");
-      initDict('projectClass')
-      initDict('projectPic')
+      initDict("projectClass");
+      initDict("projectPic");
       getOrgTree();
     }
 
diff --git a/src/api/config.js b/src/api/config.js
index 91f4dd03..57832244 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-01 09:02:04
+ * @LastEditTime: 2022-12-02 17:12:37
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -53,7 +53,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        // window.open("https://u-pre.boe.com/web/", '_self');
+        window.open("https://u-pre.boe.com/web/", '_self');
       }
       console.log("api %o", msg);
     }

From f84bfdf87b4ae400d484d6805aa2c76f4ebbdb72 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 2 Dec 2022 17:16:25 +0800
Subject: [PATCH 18/21] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ProjectManager.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/project/ProjectManager.vue b/src/components/project/ProjectManager.vue
index 52fbc59f..c741101e 100644
--- a/src/components/project/ProjectManager.vue
+++ b/src/components/project/ProjectManager.vue
@@ -19,7 +19,7 @@
   </a-select>
 </template>
 <script>
-import {reactive, toRefs, watch} from "vue";
+import {onMounted, reactive, toRefs, watch} from "vue";
 import {scrollLoad} from "@/api/method";
 import * as api1 from "@/api/index1";
 
@@ -48,7 +48,11 @@ export default {
     });
 
     watch(() => state.memberParam, getMember)
-    watch(() => props.value, init)
+    watch(props , init)
+
+    onMounted(() => {
+      console.log('onMounted')
+    })
 
     function getMember() {
       state.loading = true
@@ -83,8 +87,10 @@ export default {
         state.managerArray = arrManagerId
         state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
         state.init = true
-        getMember()
+      } else {
+        state.options = []
       }
+      getMember()
     }
 
     function change(e, l) {

From 5e4c479c8e61e13fb127c60f5d5bd649b41eba23 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 2 Dec 2022 17:18:49 +0800
Subject: [PATCH 19/21] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ProjectManager.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/project/ProjectManager.vue b/src/components/project/ProjectManager.vue
index c741101e..ad40e399 100644
--- a/src/components/project/ProjectManager.vue
+++ b/src/components/project/ProjectManager.vue
@@ -48,7 +48,7 @@ export default {
     });
 
     watch(() => state.memberParam, getMember)
-    watch(props , init)
+    watch(props, init)
 
     onMounted(() => {
       console.log('onMounted')
@@ -88,6 +88,7 @@ export default {
         state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
         state.init = true
       } else {
+        state.managerArray = []
         state.options = []
       }
       getMember()

From cb4423575e905db1a232c1cfed58a129a3eb0acc Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Fri, 2 Dec 2022 17:19:06 +0800
Subject: [PATCH 20/21] =?UTF-8?q?fix(BUG:51):=E6=8A=95=E7=A5=A8=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E9=99=90=E5=88=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/vote/AddVote.vue | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 7e2a3b8a..ef50165a 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -73,8 +73,8 @@
               <span style="margin-right: 3px">基础投票数：</span>
             </div>
             <div class="btnbox">
-              <a-upload @change="handleChange" :multiple="true" :max-count="1" action="/manageApi/vote/baseVoteupload"
-                v-model:file-list="fileList">
+              <a-upload @change="handleChange" :before-upload="beforeUpload" :multiple="true" :max-count="1"
+                action="/manageApi/vote/baseVoteupload" v-model:file-list="fileList">
                 <button class="xkbtn">点击上传</button></a-upload>
               <div v-if="voteCount > 0"><a-tag color="processing"> <span style="font-size:14px;line-height: 33px;">{{
                   voteCount
@@ -218,7 +218,23 @@ export default {
 
     };
 
+    // 限制文件格式上传
+    const beforeUpload = (obj) => {
+      console.log(obj)
+    }
+
     const handleChange = info => {
+      console.log(info.file.type, info.file.type.indexOf('sheet'))
+      if (info.file.type.indexOf('sheet') == -1) {
+        message.destroy()
+        message.error("请上传正确的文件格式")
+
+        console.log(state.fileList)
+
+        state.fileList = []
+        return
+      }
+
       let resFileList = [...info.fileList];
 
 
@@ -353,9 +369,9 @@ export default {
       if (props.edit) {
         api
           .editVote(obj)
-          .then(async(res) => {
+          .then(async (res) => {
             console.log("updte======");
-           await updateToTask(res);
+            await updateToTask(res);
             closeDrawer();
             message.destroy();
             message.success("修改投票信息成功")
@@ -367,7 +383,7 @@ export default {
       } else {
         api
           .createVote(obj)
-          .then(async(res) => {
+          .then(async (res) => {
             await updateToTask(res);
             closeDrawer();
             message.destroy();
@@ -401,6 +417,7 @@ export default {
       queryStem,
       closeStem,
       handleChange,
+      beforeUpload,
       log,
     };
   },

From 7d39bc93fb2f1858bb502df07dd156b0d5a8722e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 2 Dec 2022 17:33:31 +0800
Subject: [PATCH 21/21] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/ProjectManager.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/project/ProjectManager.vue b/src/components/project/ProjectManager.vue
index ad40e399..766d61d4 100644
--- a/src/components/project/ProjectManager.vue
+++ b/src/components/project/ProjectManager.vue
@@ -52,6 +52,7 @@ export default {
 
     onMounted(() => {
       console.log('onMounted')
+      init()
     })
 
     function getMember() {
@@ -81,17 +82,17 @@ export default {
     };
 
     function init() {
-      if (props.value && props.name) {
+      if (!props.value) {
+        state.managerArray = []
+        return;
+      }
+      if (props.value !== state.managerArray.join(',')) {
         const arrManager = props.name.split(',')
         const arrManagerId = props.value.split(',')
         state.managerArray = arrManagerId
         state.options = arrManager.map((e, i) => ({label: e, value: arrManagerId[i]}))
-        state.init = true
-      } else {
-        state.managerArray = []
-        state.options = []
+        getMember()
       }
-      getMember()
     }
 
     function change(e, l) {