From 27403d149f7139eb79ff477fa2857689208af143 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 30 Nov 2022 23:34:54 +0800
Subject: [PATCH 01/28] =?UTF-8?q?--=20=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue | 329 +++++++++++++++------------
 1 file changed, 180 insertions(+), 149 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index ce655baf..f6ebf189 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>
@@ -136,62 +136,66 @@
             </div>
             <div class="kqszbox">
               <div class="qdqtbox">
-                <div class="qdbtn"><div class="btntext">签到</div></div>
+                <div class="qdbtn">
+                  <div class="btntext">签到</div>
+                </div>
               </div>
               <div class="setbox">
                 <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="qtbtn"><div class="btntext">签退</div></div>
+                <div class="qtbtn">
+                  <div class="btntext">签退</div>
+                </div>
               </div>
               <div class="setbox">
                 <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="inputV6"
+                      v-model:value="inputV6"
                   />
                   <span style="color: #999999; margin-left: 8px"
-                    >分钟（提前签退则记为早退）</span
+                  >分钟（提前签退则记为早退）</span
                   >
                 </div>
               </div>
@@ -204,10 +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
                 >
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
-                  >签到、签退全部完成</a-radio
+                >签到、签退全部完成
+                </a-radio
                 >
               </a-radio-group>
             </div>
@@ -222,11 +228,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 {
@@ -282,7 +288,7 @@ export default {
       type: Number,
       default: null,
     },
-    projectTemplateId:{
+    projectTemplateId: {
       type: Number,
       default: null,
     },
@@ -335,25 +341,26 @@ export default {
     }
     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) {
@@ -365,9 +372,9 @@ export default {
         state.radioV1 = "";
       }
     };
-    const updateTask = (res) => {
+    const updateTask = async (res) => {
       if (props.isLevel == 1) {
-        RouterEditTask({
+        await RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.activityId,
           duration: res.data.data.activityDuration,
@@ -376,49 +383,49 @@ 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) {
-        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 ? "编辑" : "新增"}阶段任务失败`);
-          });
+        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 ? "编辑" : "新增"}阶段任务失败`);
+            });
       } else if (props.isLevel == 3) {
-        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 ? "编辑" : "新增"}阶段任务失败`);
-          });
+        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 ? "编辑" : "新增"}阶段任务失败`);
+            });
+
 
-       
       }
     };
     //创建活动
@@ -462,33 +469,33 @@ export default {
       if (props.edit) {
         //更新编辑活动信息
         api
-          .updateActivity(obj)
-          .then((res) => {
-            closeDrawer();
-            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((res) => {
-            message.destroy();
-            message.success("创建成功");
-            closeDrawer();
-            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("创建失败");
+            });
       }
     };
 
@@ -507,6 +514,7 @@ export default {
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
+
 .addactiveDrawer {
   .drawerMain {
     .header {
@@ -516,6 +524,7 @@ export default {
       justify-content: space-between;
       align-items: center;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -524,40 +533,49 @@ export default {
         margin-left: 24px;
       }
     }
+
     .contentMain {
       display: flex;
       justify-content: space-between;
+
       .ant-input {
         height: 88px;
         width: 384px;
         border-radius: 8px;
       }
+
       .ant-picker {
         border-radius: 8px;
       }
+
       .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;
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -570,24 +588,29 @@ 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;
             }
           }
+
           .kqszbox {
             .qdqtbox {
               margin-left: 5px;
               cursor: pointer;
             }
+
             .qdbtn,
             .qtbtn {
               width: 75px;
@@ -598,15 +621,18 @@ export default {
               display: flex;
               align-items: center;
               justify-content: center;
+
               .btntext {
                 color: #387df7;
               }
             }
+
             .setbox {
               display: flex;
               flex-wrap: wrap;
               margin-top: 10px;
               margin-bottom: 24px;
+
               .timerbox {
                 margin-top: 6px;
                 margin-right: 32px;
@@ -616,10 +642,12 @@ export default {
               }
             }
           }
+
           .btnbox2 {
             display: flex;
             flex-direction: column;
             justify-content: flex-start;
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -636,6 +664,7 @@ export default {
         }
       }
     }
+
     .main_btns {
       height: 72px;
       width: 100%;
@@ -645,6 +674,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;
@@ -654,6 +684,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;

From eb1721d263d99ffa224692d6da4db834862293f8 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Wed, 30 Nov 2022 23:41:35 +0800
Subject: [PATCH 02/28] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8A=95=E7=A5=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexVote.js            |   2 +-
 src/components/vote/AddVote.vue | 324 ++++++++++++++++----------------
 2 files changed, 159 insertions(+), 167 deletions(-)

diff --git a/src/api/indexVote.js b/src/api/indexVote.js
index 9cacddc1..0f91f1bb 100644
--- a/src/api/indexVote.js
+++ b/src/api/indexVote.js
@@ -82,7 +82,7 @@ export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', o
 //上传组件
 export const fileUp = (obj) => http.post('/file/upload', obj, qs.stringify({ obj }));
 //根据题干ID获取投票任务
-export const queryVoteDetailById = (obj) => http.post('/vote/queryVoteDetailById', obj)
+export const queryVoteDetailById = (voteID) => http.post(`/vote/queryVoteDetailById?voteId=${voteID}`)
 
 // 测试方法
 // import * as api from '../../api/index'
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 5aa04497..e49bb756 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -1,83 +1,54 @@
 <template>
-  <a-drawer
-    :visible="addvoteVisible"
-    class="drawerStyle addvoteDrawer"
-    width="80%"
-    title="添加投票"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
-  >
+  <a-drawer :visible="addvoteVisible" class="drawerStyle addvoteDrawer" 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_left">
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
+                <img 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"
-              />
+              <a-input v-model:value="inputV1" style="width: 424px; height: 32px" placeholder="请输入投票名称"
+                maxlength="20" />
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span>创建投票：</span>
             </div>
             <div class="btnbox">
-              <button
-                class="xkbtn"
-           
-                @click="showDrawerCreVote"
-              >
-              {{ ballotId ? "编辑" : "添加" }}投票
-               
+              <button class="xkbtn" @click="showDrawerCreVote">
+                {{ ballotId ? "编辑" : "添加" }}投票
+
               </button>
-              <div v-if = "ballotId>0">
-              <a-tag  closable   color="processing" @close="log">
-            <span style="font-size:14px;line-height: 33px;" >删除投票</span>
-            </a-tag></div>
+              <div v-if="ballotId > 0">
+                <a-tag closable color="processing" @close="log">
+                  <span style="font-size:14px;line-height: 33px;">删除投票</span>
+                </a-tag>
+              </div>
               <div>
-            <CreateVote
-              v-model:createVoteVisible="createVoteVisible"
-              v-model:ballotId="ballotId"
-              v-model:editChild="editChild"
-            />
-          </div>
-              <button
-                class="xkbtn"
-                :style="{ display: creVote ? 'block' : 'none' }"
-                @click="showDrawerCreVote"
-              >
+                <CreateVote v-model:createVoteVisible="createVoteVisible" v-model:ballotId="ballotId"
+                  v-model:editChild="editChild" />
+              </div>
+              <button class="xkbtn" :style="{ display: creVote ? 'block' : 'none' }" @click="showDrawerCreVote">
                 编辑投票
               </button>
               <div :style="{ display: creVote ? 'block' : 'none' }">
                 <div class="fileTigan">
-                  <span style="color: #388be1">{{ballotName}}</span>
+                  <span style="color: #388be1">{{ ballotName }}</span>
                   <div class="delBox" @click="dleVoteStem()"></div>
                 </div>
               </div>
@@ -85,11 +56,7 @@
 
             <!-- 创建投票侧弹窗 -->
             <div>
-              <create-vote
-                v-model:crevoteVisible="crevotevisible"
-                @getData="getStemId"
-                v-model:ballotId="ballotId"
-              />
+              <create-vote v-model:crevoteVisible="crevotevisible" @getData="getStemId" v-model:ballotId="ballotId" />
             </div>
             <!-- 创建投票侧弹窗 -->
           </div>
@@ -98,11 +65,7 @@
               <span style="margin-right: 3px">起止时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker
-                style="width: 424px"
-                v-model:value="time"
-                :placeholder="['      开始时间', '        结束时间']"
-              />
+              <a-range-picker style="width: 424px" v-model:value="time" :placeholder="['      开始时间', '        结束时间']" />
             </div>
           </div>
           <div class="main_item">
@@ -110,15 +73,12 @@
               <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"
-              >
-              <button class="xkbtn">点击上传</button></a-upload>
-          <div v-if="voteCount > 0"><a-tag color="processing"> <span style="font-size:14px;line-height: 33px;" >{{voteCount}}票</span></a-tag></div>
+              <a-upload @change="handleChange" :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
+              }}票</span></a-tag></div>
             </div>
           </div>
           <div class="main_item" style="margin-top: -25px">
@@ -132,12 +92,7 @@
               <span style="margin-right: 3px">投票说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea
-                v-model:value="textV1"
-                placeholder="请输入投票说明"
-                allow-clear
-                maxlength="150"
-              />
+              <a-textarea v-model:value="textV1" placeholder="请输入投票说明" allow-clear maxlength="150" />
             </div>
           </div>
         </div>
@@ -150,7 +105,7 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 import CreateVote from "./CreateVote.vue";
 import * as api from "../../api/indexVote";
 import { message } from "ant-design-vue";
@@ -206,7 +161,7 @@ export default {
       type: Number,
       default: null,
     },
-    projectTemplateId:{
+    projectTemplateId: {
       type: Number,
       default: null,
     }
@@ -219,101 +174,101 @@ export default {
       textV1: "",
       createVoteVisible: false,
       time: undefined,
-      startTime:"",
-      endTime:"",
+      startTime: "",
+      endTime: "",
       basevote: "",
       ascriptionId: "",
       voteStemId: null,
-      EditVoteId:"",
-      voteStemName:"",
+      EditVoteId: "",
+      voteStemName: "",
       ballotName: "",
       editStem: false,  //编辑状态
       ballotId: 0, //题干id
       optionId: "", //删除，修改选项id
-      addStemVisible:false, //
-      editChild:false,
+      addStemVisible: false, //
+      editChild: false,
       fileList: [],
-      voteCount:null,
-      projectTemplateId:null,
-     
+      voteCount: null,
+      projectTemplateId: null,
+
     });
     const closeDrawer = () => {
-        state.inputV1 = "",
+      state.inputV1 = "",
         state.textV1 = "",
         state.time = undefined,
         state.basevote = "",
-        state.ballotId ="", 
-      ctx.emit("update:addvoteVisible", false);
+        state.ballotId = "",
+        ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
-      if(props.edit&&bool){
+      if (props.edit && bool) {
         queryVoteInfo();
       }
       state.projectTemplateId = props.projectTemplateId;
-      console.log("projectTemplateId visible====",state.projectTemplateId);
-       
+      console.log("projectTemplateId visible====", state.projectTemplateId);
+
     };
 
 
     const showDrawerCreVote = () => {
       state.createVoteVisible = true;
       state.editChild = props.edit;
-      
+
 
     };
 
     const handleChange = info => {
       let resFileList = [...info.fileList];
 
-    
-     resFileList.map(file => {
+
+      resFileList.map(file => {
         if (file.response) {
           // Component will show file.url as link
           file.url = file.response.url;
-          console.log("file========",file);
-          console.log("file========",file.response);
+          console.log("file========", file);
+          console.log("file========", file.response);
           state.voteCount = file.response.data;
         }
-       
+
       });
       //fileList.value = resFileList;
     };
- 
+
     //删除题干信息接口
     const dleVoteStem = () => {
-      api.deleteVoteStem({voteStemId:state.ballotId})
+      api.deleteVoteStem({ voteStemId: state.ballotId })
         .then(() => {
           message.success('删除题干信息成功')
-          
-      })
+
+        })
     }
 
     //根据投票id获取投票信息
-     const queryVoteInfo = ()=>{
-    
-      api.queryVoteDetailById({voteId:props.EditVoteId})
-       .then((res)=>{
-        console.log('获取投票信息成功',res);
-        state.inputV1 = res.data.data.voteName;
-        state.textV1 = res.data.data.voteExplain;
-        state.baseVote = res.data.data.baseVote;
-        state.ascriptionId = res.data.data.ascriptionId;
-        state.ballotId = res.data.data.ballotId;
-        state.time = [
+    const queryVoteInfo = () => {
+
+      api.queryVoteDetailById(props.EditVoteId)
+        .then((res) => {
+          console.log('获取投票信息成功', res);
+          state.inputV1 = res.data.data.voteName;
+          state.textV1 = res.data.data.voteExplain;
+          state.baseVote = res.data.data.baseVote;
+          state.ascriptionId = res.data.data.ascriptionId;
+          state.ballotId = res.data.data.ballotId;
+          state.time = [
             dayjs(res.data.data.voteStartTime, "YYYY-MM-DD"),
             dayjs(res.data.data.voteEndTime, "YYYY-MM-DD"),
           ];
-       })
-       .catch((err)=>{
-         console.log('获取投票信息失败',err);
-       });
-       
-      
-     }
-     const updateToTask =(res)=>{
-      console.log("props.isLevel=====",props.isLevel);
-      if(props.isLevel ==1){
+        })
+        .catch((err) => {
+          console.log('获取投票信息失败', err);
+        });
+
+
+    }
+    const updateToTask = (res) => {
+      console.log("props.isLevel=====", props.isLevel);
+      if (props.isLevel == 1) {
         RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.voteId,
@@ -325,15 +280,15 @@ export default {
           .then(() => {
             //message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
             ctx.emit("changeData", false);
-            state.addLoading = false;               
+            state.addLoading = false;
           })
-          .catch(( ) => {
+          .catch(() => {
             //message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
           });
-      }else if(props.isLevel ==2){
+      } else if (props.isLevel == 2) {
         apiTask
           .addTask({
-            courseId:res.data.data.voteId,
+            courseId: res.data.data.voteId,
             name: res.data.data.voteName,
             projectId: props.projectId,
             projectTaskId: props.projectTaskId || 0,
@@ -342,13 +297,13 @@ export default {
           })
           .then(() => {
             //message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`)
-            ctx.emit("changeData", false);   
+            ctx.emit("changeData", false);
           })
           .catch(() => {
             ////message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`)
           });
-      }else if (props.isLevel == 3) {
-      
+      } else if (props.isLevel == 3) {
+
         addTempTask({
           courseId: res.data.data.voteId,
           name: res.data.data.voteName,
@@ -371,7 +326,7 @@ export default {
       if (!state.inputV1) {
         message.destroy();
         return message.info("请输入投票名称");
-      } 
+      }
       if (!state.ballotId) {
         message.destroy();
         return message.info("请创建题干信息");
@@ -380,50 +335,50 @@ export default {
       if (state.basevote == "") {
         state.basevote = 1;
       }
-      if(state.time != undefined){
+      if (state.time != undefined) {
         state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
         state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD");
       }
 
       let obj = {
-        voteId: props.edit?props.EditVoteId : 0,
+        voteId: props.edit ? props.EditVoteId : 0,
         voteName: state.inputV1,
         voteStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
         voteEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
         ballotId: state.ballotId,
         baseVote: state.basevote,
-        voteExplain: state.textV1, 
-       
+        voteExplain: state.textV1,
+
       }
-      if(props.edit){
+      if (props.edit) {
         api
-        .editVote(obj)
-        .then((res) => {
-          console.log("updte======");
-          updateToTask(res);
-          closeDrawer();
-          message.destroy();
-          message.success("修改投票信息成功")
-        })
-        .catch(() => {
-          message.destroy();
-          message.error("修改投票信息失败")
-        })
-      }else{
+          .editVote(obj)
+          .then((res) => {
+            console.log("updte======");
+            updateToTask(res);
+            closeDrawer();
+            message.destroy();
+            message.success("修改投票信息成功")
+          })
+          .catch(() => {
+            message.destroy();
+            message.error("修改投票信息失败")
+          })
+      } else {
         api
-        .createVote(obj)
-        .then((res) => {
-          updateToTask(res);
-          closeDrawer();
-          message.destroy();
-          message.success("创建投票信息成功")
-        })
-        .catch(() => {
-          message.destroy();
-          message.error("创建投票信息失败")
-        })
+          .createVote(obj)
+          .then((res) => {
+            updateToTask(res);
+            closeDrawer();
+            message.destroy();
+            message.success("创建投票信息成功")
+          })
+          .catch(() => {
+            message.destroy();
+            message.error("创建投票信息失败")
+          })
       }
-      
+
     }
     const queryStem = () => {
       state.addStemVisible = true;
@@ -432,7 +387,7 @@ export default {
       state.addStemVisible = false;
     };
     const log = e => {
-      state.ballotId=null;
+      state.ballotId = null;
       console.log(e);
     };
     return {
@@ -456,13 +411,16 @@ export default {
   .ant-modal {
     width: 424px !important;
     height: 258px !important;
+
     .ant-modal-content {
       width: 424px !important;
       height: 258px !important;
+
       .ant-modal-body {
         width: 424px !important;
         height: 258px !important;
         padding: 0 !important;
+
         .delete {
           z-index: 999;
           width: 424px;
@@ -470,24 +428,26 @@ export default {
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
           border-radius: 4px;
+
           .del_header {
             position: absolute;
             width: calc(100%);
             height: 40px;
-            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 {
             width: 100%;
             position: relative;
+
             .header {
               display: flex;
               align-items: center;
               padding-top: 20px;
               padding-left: 26px;
               font-size: 16px;
+
               .icon {
                 width: 16px;
                 height: 16px;
@@ -495,6 +455,7 @@ export default {
                 background-image: url(@/assets/images/coursewareManage/QR.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -505,6 +466,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -513,6 +475,7 @@ export default {
               align-items: center;
               flex-direction: column;
               position: relative;
+
               .back {
                 position: absolute;
                 top: 30px;
@@ -521,10 +484,12 @@ export default {
                 color: #666666;
               }
             }
+
             .del_btnbox {
               display: flex;
               margin: 30px auto;
               justify-content: center;
+
               .del_btn {
                 width: 100px;
                 height: 40px;
@@ -535,17 +500,20 @@ export default {
                 justify-content: center;
                 flex-shrink: 0;
                 cursor: pointer;
+
                 .btnText {
                   font-size: 14px;
                   font-weight: 400;
                   line-height: 40px;
                 }
               }
+
               .btn1 {
                 border: 1px solid rgba(64, 158, 255, 1);
                 color: #4ea6ff;
                 margin-right: 14px;
               }
+
               .btn2 {
                 background-color: #4ea6ff;
                 color: #ffffff;
@@ -557,9 +525,11 @@ export default {
     }
   }
 }
+
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
+
 .addvoteDrawer {
   .drawerMain {
     .header {
@@ -569,6 +539,7 @@ export default {
       justify-content: space-between;
       align-items: center;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -577,31 +548,38 @@ export default {
         margin-left: 24px;
       }
     }
+
     .contentMain {
       display: flex;
       justify-content: space-between;
+
       .main_left {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
         margin-top: 32px;
+
         .main_item {
           display: flex;
           align-items: center;
           margin-bottom: 32px;
+
           .signbox {
             width: 120px;
             display: flex;
             justify-content: end;
             align-items: center;
+
             .sign {
               margin-right: 5px;
             }
           }
+
           .btnbox {
             display: flex;
             flex: 1;
             align-items: center;
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -613,14 +591,17 @@ export default {
               color: #fff;
               margin-right: 10px;
             }
+
             .fileTigan {
               display: flex;
               align-items: center;
               padding: 3px 5px;
               background-color: rgba(42, 103, 209, 0.4);
+
               span {
                 margin-right: 5px;
               }
+
               .delBox {
                 width: 13px;
                 height: 13px;
@@ -631,28 +612,34 @@ 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;
             }
           }
+
           .kqszbox {
             .qdqtbox {
               margin-left: 56px;
             }
+
             .setbox {
               display: flex;
               flex-wrap: wrap;
               margin-top: 10px;
               margin-bottom: 24px;
+
               .timerbox {
                 margin-top: 6px;
                 margin-right: 32px;
@@ -662,10 +649,12 @@ export default {
               }
             }
           }
+
           .btnbox2 {
             display: flex;
             flex-direction: column;
             justify-content: flex-start;
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -682,6 +671,7 @@ export default {
         }
       }
     }
+
     .main_btns {
       height: 72px;
       width: 100%;
@@ -691,6 +681,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;
@@ -700,6 +691,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;

From 4e7f47034fe5d30b7fa5b9d34a57c1f61068cc31 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 30 Nov 2022 23:41:37 +0800
Subject: [PATCH 03/28] =?UTF-8?q?--=20=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddDiscuss.vue | 160 +++++++++++++-------------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index c9caa44e..d6dad640 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 {

From e3b5aa9546fec44faea2b8cb4296e739eb06a903 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 30 Nov 2022 23:41:47 +0800
Subject: [PATCH 04/28] =?UTF-8?q?--=20=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddEval.vue | 270 ++++++++++++++++-------------
 1 file changed, 146 insertions(+), 124 deletions(-)

diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index af7c910f..5eb59a79 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -1,19 +1,19 @@
 <template>
   <a-drawer
-    :visible="addevalVisible"
-    class="drawerStyle addevalDrawer"
-    width="80%"
-    title="添加测评"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
+      :visible="addevalVisible"
+      class="drawerStyle addevalDrawer"
+      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,8 +41,8 @@
             <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>
@@ -53,11 +53,11 @@
               </button>
               <span style="margin-left: 10px">
                 <a-tag
-                  class="tag-style"
-                  v-if="evaluationTypeName !== ''"
-                  :closable="true"
-                  @close="delTag"
-                  >{{ evaluationTypeName }}</a-tag
+                    class="tag-style"
+                    v-if="evaluationTypeName !== ''"
+                    :closable="true"
+                    @close="delTag"
+                >{{ evaluationTypeName }}</a-tag
                 >
               </span>
             </div>
@@ -68,10 +68,10 @@
             </div>
             <div class="btnbox">
               <a-range-picker
-                style="width: 424px"
-                v-model:value="time"
-                format="YYYY-MM-DD HH:mm:ss"
-                :placeholder="['      开始时间', '        结束时间']"
+                  style="width: 424px"
+                  v-model:value="time"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
           </div>
@@ -81,10 +81,10 @@
             </div>
             <div class="textarea">
               <a-textarea
-                v-model:value="description"
-                placeholder="请输入测评说明"
-                style="width: 424px; height: 120px"
-                allowClear
+                  v-model:value="description"
+                  placeholder="请输入测评说明"
+                  style="width: 424px; height: 120px"
+                  allowClear
               />
             </div>
           </div>
@@ -96,9 +96,9 @@
       </div>
     </div>
     <EvList
-      v-model:EvalListVisible="EvalListVisible"
-      v-model:evaluationTypeName="evaluationTypeName"
-      @getEvListData="checkFinish"
+        v-model:EvalListVisible="EvalListVisible"
+        v-model:evaluationTypeName="evaluationTypeName"
+        @getEvListData="checkFinish"
     />
     <!-- <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
       <a-spin :spinning="addLoading" tip="添加中..." />
@@ -106,15 +106,16 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
+import {reactive, toRefs} from "vue";
 // import { useRouter } from "vue-router";
 import EvList from "./EvList.vue";
 import * as api from "../../api/indexEval";
 import * as apitaskadd from "../../api/indexTaskadd";
-import { message } from "ant-design-vue";
-import { RouterEditTask } from "@/api/indexTask";
+import {message} from "ant-design-vue";
+import {RouterEditTask} from "@/api/indexTask";
 import dayjs from "dayjs";
-import { addTempTask } from "../../api/indexTaskadd";
+import {addTempTask} from "../../api/indexTaskadd";
+
 export default {
   name: "AddEval",
   components: {
@@ -172,9 +173,9 @@ export default {
       EvalListVisible: false,
       // addLoading:false,
     });
-    const checkFinish = (value)=> {
-        state.evaluationTypeId = value.quiz_kid ? value.quiz_kid : null
-        state.evaluationTypeName = value.title ? value.title : ""
+    const checkFinish = (value) => {
+      state.evaluationTypeId = value.quiz_kid ? value.quiz_kid : null
+      state.evaluationTypeName = value.title ? value.title : ""
     }
     const closeDrawer = () => {
       ctx.emit("update:addevalVisible", false);
@@ -183,8 +184,8 @@ export default {
       state.time = undefined;
       state.description = "";
       state.evaluationTypeId = 0,
-      state.evaluationTypeName = "",
-      localStorage.setItem("stageId", props.chooseStageId);
+          state.evaluationTypeName = "",
+          localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
     const afterVisibleChange = (bool) => {
@@ -201,9 +202,9 @@ export default {
       state.evaluationTypeName = "";
     };
     //向关卡或阶段渲染
-    const updateTask = (value) => {
+    const updateTask = async (value) => {
       if (props.isLevel == 1) {
-        RouterEditTask({
+        await RouterEditTask({
           chapterId: props.isactive,
           courseId: Number(value.evaluationId),
           name: value.evaluationName,
@@ -211,34 +212,34 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 10,
         })
-          .then(() => {
-            //message.success(`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`);
-          })
-          .catch(() => {
-            //message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`);
-          });
+            .then(() => {
+              //message.success(`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`);
+            })
+            .catch(() => {
+              //message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`);
+            });
       } else if (props.isLevel == 2) {
-        apitaskadd
-          .addTask({
-            duration: 0,
-            flag: true,
-            courseId: Number(value.evaluationId),
-            name: value.evaluationName,
-            projectId: props.projectId,
-            projectTaskId: props.projectTaskId || 0,
-            stageId: props.chooseStageId || 0,
-            type: 10,
-          })
-          .then(() => {
-            message.destroy()
-            message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-          })
-          .catch(() => {
-            message.destroy()
-            //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-          });
+        await apitaskadd
+            .addTask({
+              duration: 0,
+              flag: true,
+              courseId: Number(value.evaluationId),
+              name: value.evaluationName,
+              projectId: props.projectId,
+              projectTaskId: props.projectTaskId || 0,
+              stageId: props.chooseStageId || 0,
+              type: 10,
+            })
+            .then(() => {
+              message.destroy()
+              message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+            })
+            .catch(() => {
+              message.destroy()
+              //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+            });
       } else if (props.isLevel == 3) {
-        addTempTask({
+        await addTempTask({
           courseId: Number(value.evaluationId),
           name: value.evaluationName,
           projectTemplateId: props.projectTemplateId,
@@ -246,12 +247,12 @@ export default {
           stageId: props.chooseStageId || 0,
           type: 10,
         })
-          .then(() => {
-            //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-          })
-          .catch(() => {
-            //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-          });
+            .then(() => {
+              //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+            })
+            .catch(() => {
+              //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+            });
       }
     };
     //根据id获取测评信息
@@ -260,33 +261,33 @@ export default {
         evaluationId: props.EditEvalId,
       };
       api
-      .queryEvaluationDetailById(objqi)
-      .then((res) => {
-        message.destroy()
-        message.success("获取测评信息成功");
-        state.inputV1 = res.data.data.evaluationName
-        state.evaluationTypeName = res.data.data.evaluationTypeName
-        state.evaluationTypeId = res.data.data.evaluationTypeId;
-        state.time = res.data.data.evaluationStartTime ? [
-          dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"),
-          dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"),
-        ] : undefined ;
-        state.description = res.data.data.evaluationExplain
-      })
-      .catch((err) => {
-        message.destroy()
-        message.error("获取测量平信息失败");
-        console.log(err,"erererrerererererer");
-      });
+          .queryEvaluationDetailById(objqi)
+          .then((res) => {
+            message.destroy()
+            message.success("获取测评信息成功");
+            state.inputV1 = res.data.data.evaluationName
+            state.evaluationTypeName = res.data.data.evaluationTypeName
+            state.evaluationTypeId = res.data.data.evaluationTypeId;
+            state.time = res.data.data.evaluationStartTime ? [
+              dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"),
+              dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"),
+            ] : undefined;
+            state.description = res.data.data.evaluationExplain
+          })
+          .catch((err) => {
+            message.destroy()
+            message.error("获取测量平信息失败");
+            console.log(err, "erererrerererererer");
+          });
     }
-    const creoredit = ()=> {
-      if(props.edit){
+    const creoredit = () => {
+      if (props.edit) {
         editInvistText()
-      }else{
+      } else {
         createEvalText()
       }
     }
-    const editInvistText = ()=> {
+    const editInvistText = () => {
       if (!state.inputV1) {
         message.destroy();
         return message.info("请输入测评名称");
@@ -308,18 +309,18 @@ export default {
         updateTime: "",
       };
       api
-      .updateEvaluation(objei)
-      .then((res) => {
-        updateTask(res.data.data);
-        closeDrawer();
-        ctx.emit("changeData", false);
-        message.destroy();
-          message.success("创建测评成功");
-        })
-        .catch(() => {
-          message.destroy();
-          message.success("创建测评失败");
-        });
+          .updateEvaluation(objei)
+          .then(async (res) => {
+            await updateTask(res.data.data);
+            closeDrawer();
+            ctx.emit("changeData", false);
+            message.destroy();
+            message.success("创建测评成功");
+          })
+          .catch(() => {
+            message.destroy();
+            message.success("创建测评失败");
+          });
     }
     //创建测评信息
     const createEvalText = () => {
@@ -334,29 +335,29 @@ export default {
       let obj = {
         evaluationName: state.inputV1,
         evaluationEndTime: state.time ? dayjs(state.time[1]).format("YYYY-MM-DD") : "",
-        evaluationId: props.evaluationId ,
+        evaluationId: props.evaluationId,
         evaluationStartTime: state.time ? dayjs(state.time[0]).format("YYYY-MM-DD") : "",
         evaluationTypeId: state.evaluationTypeId,
         evaluationTypeName: state.evaluationTypeName,
-        evaluationExplain:state.description,
+        evaluationExplain: state.description,
         evaluationFlag: "",
         evaluationPictureAddress: "",
         evaluationTag: "",
         updateTime: "",
       };
       api
-        .createEvaluation(obj)
-        .then((res) => {
-          updateTask(res.data.data);
-          closeDrawer();
-          ctx.emit("changeData", false);
-          message.destroy();
-          message.success("创建测评成功");
-        })
-        .catch(() => {
-          message.destroy();
-          message.success("创建测评失败");
-        });
+          .createEvaluation(obj)
+          .then(async (res) => {
+            await updateTask(res.data.data);
+            closeDrawer();
+            ctx.emit("changeData", false);
+            message.destroy();
+            message.success("创建测评成功");
+          })
+          .catch(() => {
+            message.destroy();
+            message.success("创建测评失败");
+          });
     };
 
     return {
@@ -380,6 +381,7 @@ export default {
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
+
 .addevalDrawer {
   .drawerMain {
     .header {
@@ -389,6 +391,7 @@ export default {
       justify-content: space-between;
       align-items: center;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -397,32 +400,39 @@ 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;
+
             .checkEval {
               cursor: pointer;
               width: 130px;
@@ -433,34 +443,41 @@ export default {
               margin-left: 15px;
               color: #fff;
             }
+
             .tag-style {
               color: rgb(113, 113, 237);
               background-color: #d7d1f7;
             }
           }
         }
+
         .main_item2 {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
+
           .signbox {
             width: 120px;
             display: flex;
             justify-content: end;
             align-items: center;
+
             .sign {
               margin-right: 5px;
             }
           }
+
           .kqszbox {
             .qdqtbox {
               margin-left: 56px;
             }
+
             .setbox {
               display: flex;
               flex-wrap: wrap;
               margin-top: 10px;
               margin-bottom: 24px;
+
               .timerbox {
                 margin-top: 6px;
                 margin-right: 32px;
@@ -470,10 +487,12 @@ export default {
               }
             }
           }
+
           .btnbox2 {
             display: flex;
             flex-direction: column;
             justify-content: flex-start;
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -490,6 +509,7 @@ export default {
         }
       }
     }
+
     .main_btns {
       height: 72px;
       width: 100%;
@@ -499,6 +519,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;
@@ -508,6 +529,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;

From 96bffbaa8248e02843390537ecfb8796c4959872 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 30 Nov 2022 23:42:17 +0800
Subject: [PATCH 05/28] =?UTF-8?q?--=20=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue | 106 ++++++++++++------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index addd3c89..c41bf964 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -1,11 +1,11 @@
 <template>
   <a-drawer :visible="addfaceteachVisible" class="drawerStyle addfaceteachDrawer" width="90%" title="添加面授"
-    placement="right" @after-visible-change="afterVisibleChange">
+            placement="right" @after-visible-change="afterVisibleChange">
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">添加面授</div>
         <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer" />
+             @click="closeDrawer" />
       </div>
       <div class="contentMain">
         <div class="main_left">
@@ -18,7 +18,7 @@
             </div>
             <div class="btnbox">
               <a-input v-model:value="courseName" style="width: 384px; height: 32px" placeholder="请输入名称"
-                maxlength="20" />
+                       maxlength="20" />
             </div>
           </div>
           <div class="main_item">
@@ -62,7 +62,7 @@
             </div>
             <div class="btnbox">
               <a-auto-complete v-model:value="memberValue.label" placeholder="选择老师" style="width: 364px"
-                :options="options" @search="handleSearch"></a-auto-complete>
+                               :options="options" @search="handleSearch"></a-auto-complete>
             </div>
           </div>
           <div class="main_item">
@@ -102,7 +102,7 @@
             </div>
             <div class="btnbox">
               <a-input v-model:value="address" style="width: 384px; height: 32px" placeholder="请输入上课地址"
-                maxlength="100" />
+                       maxlength="100" />
             </div>
           </div>
           <div class="main_item2">
@@ -157,7 +157,7 @@
             </div>
             <div class="btnbox">
               <a-checkbox v-model:checked="completeLeave"
-                @click="completeLeave = !completeLeave">学员请假后记为任务完成</a-checkbox>
+                          @click="completeLeave = !completeLeave">学员请假后记为任务完成</a-checkbox>
             </div>
           </div>
           <div class="main_item">
@@ -166,7 +166,7 @@
             </div>
             <div class="btnbox">
               <a-checkbox v-model:checked="innerPersion"
-                @click="innerPersion = !innerPersion">允许项目内人员临时到场参加</a-checkbox>
+                          @click="innerPersion = !innerPersion">允许项目内人员临时到场参加</a-checkbox>
               <a-checkbox v-model:checked="outPersion" @click="outPersion = !outPersion">允许项目外人员临时到场参加</a-checkbox>
             </div>
           </div>
@@ -189,7 +189,7 @@
                 </a-tag>
               </div>
               <AssessmentList v-model:assessmentVisible="assessmentVisible" v-model:titleTag="titleTag"
-                v-model:assessmentId="assessmentId" />
+                              v-model:assessmentId="assessmentId" />
 
             </div>
           </div>
@@ -214,7 +214,7 @@
             <!-- 添加作业侧弹窗 -->
             <div>
               <add-homework v-model:addhomeworkVisible="addhomeworkvisible" @getWork="getWork" :faceLevel="true"
-                v-model:EditWorkId="EditWorkId" />
+                            v-model:EditWorkId="EditWorkId" />
             </div>
             <!-- 添加作业侧弹窗 -->
           </div>
@@ -481,12 +481,12 @@ export default {
     const updateFaceTeach = () => {
 
       if (
-        state.courseName == "" ||
-        state.chooseCourse == null ||
-        state.memberValue == {} ||
-        state.chooseTime == [] ||
-        state.duration == "" ||
-        state.address == ""
+          state.courseName == "" ||
+          state.chooseCourse == null ||
+          state.memberValue == {} ||
+          state.chooseTime == [] ||
+          state.duration == "" ||
+          state.address == ""
 
       ) {
         message.destroy();
@@ -527,10 +527,10 @@ export default {
               ctx.emit("changeData", false);
               closeDrawer();
             }).catch(() => {
-              message.destroy();
-              message.error(`添加失败`);
-            });
-     
+          message.destroy();
+          message.error(`添加失败`);
+        });
+
       }
     };
 
@@ -549,15 +549,15 @@ export default {
           type: 2,
         };
         RouterEditTask(editObj1)
-          .then(() => {
-            //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            .then(() => {
+              //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
 
-            // state.addLoading = false;
-            closeDrawer();
-          })
-          .catch(() => {
-            //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-          });
+              // state.addLoading = false;
+              closeDrawer();
+            })
+            .catch(() => {
+              //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+            });
       } else if (props.isLevel == 2) {
         let editObj = {
           courseId: res.data.data.offcoursePlanId,
@@ -570,13 +570,13 @@ export default {
         };
         // 新增编辑或新增项目
         ProjectEditTask(editObj)
-          .then(() => {
-            message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功`);
+            .then(() => {
+              message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功`);
 
-          })
-          .catch(() => {
-            //message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);
-          });
+            })
+            .catch(() => {
+              //message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);
+            });
       } else if (props.isLevel == 3) {
         console.log("dddddddddddd33333333");
         addTempTask({
@@ -588,13 +588,13 @@ export default {
           stageId: props.chooseStageId || 0,
           type: 2,
         })
-          .then(() => {
-            //message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` );
+            .then(() => {
+              //message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` );
 
-          })
-          .catch(() => {
-            //message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);
-          });
+            })
+            .catch(() => {
+              //message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);
+            });
       }
     };
 
@@ -641,20 +641,20 @@ export default {
         pageSize: state.pageSize,
       };
       getMemberInfo(obj)
-        .then((res) => {
-          let data = res.data.data.rows;
-          state.totalPages = res.data.data.total;
-          for (let i in data) {
-            options.value.push({
-              value: data[i].id,
-              label: data[i].realName,
-            });
-          }
-        })
-        .catch((err) => {
-          message.destroy();
-          message.error("获取员工失败" + err);
-        });
+          .then((res) => {
+            let data = res.data.data.rows;
+            state.totalPages = res.data.data.total;
+            for (let i in data) {
+              options.value.push({
+                value: data[i].id,
+                label: data[i].realName,
+              });
+            }
+          })
+          .catch((err) => {
+            message.destroy();
+            message.error("获取员工失败" + err);
+          });
     };
     const handleSearch = debounce((memberValue) => {
       console.log("fetching user", memberValue);

From d6f3e56de32776a7ccd97aeb9cea2d46690de37d Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 30 Nov 2022 23:44:01 +0800
Subject: [PATCH 06/28] =?UTF-8?q?--=20=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddProject.vue | 243 +++++++++++++++-----------
 1 file changed, 141 insertions(+), 102 deletions(-)

diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index e4ecbddd..1d5da783 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -1,20 +1,20 @@
 <template>
   <a-drawer
-    :visible="addprojvisible"
-    class="drawerStyle addonlineDrawer"
-    width="80%"
-    title="添加在线"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
+      :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"
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
         />
       </div>
       <div class="contentMain">
@@ -24,9 +24,9 @@
               <div class="ipt_name">项目名称：</div>
               <div class="fi_input">
                 <a-input
-                  v-model:value="inputV1"
-                  style="width: 240px; height: 40px; border-radius: 8px"
-                  placeholder="请输入项目名称"
+                    v-model:value="inputV1"
+                    style="width: 240px; height: 40px; border-radius: 8px"
+                    placeholder="请输入项目名称"
                 />
               </div>
             </div>
@@ -34,9 +34,9 @@
               <div class="ipt_name">项目经理：</div>
               <div class="fi_input">
                 <a-input
-                  v-model:value="inputV2"
-                  style="width: 240px; height: 40px; border-radius: 8px"
-                  placeholder="请输入项目经理"
+                    v-model:value="inputV2"
+                    style="width: 240px; height: 40px; border-radius: 8px"
+                    placeholder="请输入项目经理"
                 />
               </div>
             </div>
@@ -44,9 +44,9 @@
               <div class="ipt_name">创建人：</div>
               <div class="fi_input">
                 <a-input
-                  v-model:value="inputV3"
-                  style="width: 240px; height: 40px; border-radius: 8px"
-                  placeholder="请输入创建人"
+                    v-model:value="inputV3"
+                    style="width: 240px; height: 40px; border-radius: 8px"
+                    placeholder="请输入创建人"
                 />
               </div>
             </div>
@@ -67,7 +67,7 @@
             <div class="notice_icon"></div>
             <div v-if="selectedRows.length == 0">
               <span class="title"
-                >已选择
+              >已选择
                 <span class="data" style="color: #4ea6ff">{{ 0 }}</span>
                 条</span
               >
@@ -75,41 +75,41 @@
             <div v-else>
               <div>
                 <span class="title"
-                  >已选择
+                >已选择
                   <span class="data" style="color: #4ea6ff">{{
-                    selectedRows.length
-                  }}</span>
+                      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
+                      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
+                      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
+                      class="data"
+                      style="color: #4ea6ff; margin-right: 15px"
+                  >{{ selectedRows[0].creater }}</span
                   >
                 </span>
                 <span class="title"
-                  >创建时间：
+                >创建时间：
                   <span class="data" style="color: #4ea6ff">{{
-                    selectedRows[0].time
-                  }}</span>
+                      selectedRows[0].time
+                    }}</span>
                 </span>
               </div>
               <!-- <div v-else>
@@ -142,33 +142,33 @@
           <div class="drawerbox">
             <!-- 添加的时候显示多选的表 -->
             <a-table
-              v-if="!edit"
-              :columns="tableDataFunc()"
-              :data-source="drawertableData"
-              :row-selection="{
+                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"
+                :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="{
+                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"
+                :loading="tableDataTotal === -1 ? true : false"
+                :scroll="{ x: 700 }"
+                @expand="expandTable"
+                :pagination="false"
             >
             </a-table>
           </div>
@@ -181,11 +181,11 @@
     </div>
     <!-- 有重复添加的项目时的弹窗 -->
     <a-modal
-      v-model:visible="sameModal"
-      :footer="null"
-      :closable="sameCopy"
-      wrapClassName="sameModal"
-      centered="true"
+        v-model:visible="sameModal"
+        :footer="null"
+        :closable="sameCopy"
+        wrapClassName="sameModal"
+        centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -212,11 +212,12 @@
   </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";
+
 export default {
   name: "AddProject",
   props: {
@@ -328,7 +329,7 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:addprojvisible", false);
       ctx.emit("update:edit", false);
-     
+
       state.selectedRows = [];
       state.selectedRowKeys = [];
     };
@@ -370,27 +371,27 @@ export default {
     //获取全部项目信息接口
     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("获取全部项目信息接口失败");
-        });
+          .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) {
         getAllProjText();
       }
@@ -435,12 +436,12 @@ export default {
       state.selectedRows.forEach((item) => {
         let origin = JSON.parse(props.chooseProjectList);
         console.log("ccxx", origin);
-        if(origin==null){
-           closeSameModal();
-           closeDrawer();
-           message.destroy();
-           message.info("添加成功");
-           return;
+        if (origin == null) {
+          closeSameModal();
+          closeDrawer();
+          message.destroy();
+          message.info("添加成功");
+          return;
         }
         if (origin.length == 0) {
           //可以直接添加到任务列表里
@@ -464,9 +465,9 @@ export default {
       });
     };
 
-    const updateTask = (res) => {
+    const updateTask = async (res) => {
       if (props.isLevel == 1) {
-        RouterEditTask({
+        await RouterEditTask({
           chapterId: props.isactive,
           courseId: res.key,
           name: res.name,
@@ -474,13 +475,13 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 13,
         })
-          .then(() => {
-            message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
-            closeDrawer();
-          })
-          .catch(() => {
-            message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-          });
+            .then(() => {
+              message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+              closeDrawer();
+            })
+            .catch(() => {
+              message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+            });
       }
     };
     const onSelectChange = (selectedRowKeys, selectRow) => {
@@ -496,11 +497,13 @@ export default {
       state.sameProj = null;
       state.sameModal = false;
     };
-    const sureSameModal = () => {
+    const sureSameModal = async () => {
       // updateTask(state.sameProj);
-      state.selectedRows.forEach((item) => {
-        updateTask(item);
-      });
+      if (state.selectedRows && state.selectedRows.length) {
+        for (const item in state.selectedRows) {
+          await updateTask(item);
+        }
+      }
       state.sameProj = null;
       state.sameModal = false;
       closeDrawer();
@@ -530,17 +533,21 @@ export default {
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
+
 .sameModal {
   .ant-modal {
     width: 424px !important;
     height: 258px !important;
+
     .ant-modal-content {
       width: 424px !important;
       height: 258px !important;
+
       .ant-modal-body {
         width: 424px !important;
         height: 258px !important;
         padding: 0 !important;
+
         .delete {
           z-index: 999;
           width: 424px;
@@ -557,19 +564,22 @@ 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%
             );
           }
+
           .del_main {
             width: 100%;
             position: relative;
+
             .header {
               display: flex;
               align-items: center;
               padding-top: 20px;
               padding-left: 26px;
               font-size: 16px;
+
               .icon {
                 width: 16px;
                 height: 16px;
@@ -577,6 +587,7 @@ export default {
                 background-image: url(@/assets/images/taskpage/gan.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -587,6 +598,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -596,6 +608,7 @@ export default {
               flex-direction: column;
               // background-color: red;
               position: relative;
+
               .back {
                 position: absolute;
                 top: 30px;
@@ -604,10 +617,12 @@ export default {
                 color: #666666;
               }
             }
+
             .del_btnbox {
               display: flex;
               margin: 30px auto;
               justify-content: center;
+
               .del_btn {
                 width: 100px;
                 height: 40px;
@@ -619,17 +634,20 @@ export default {
 
                 flex-shrink: 0;
                 cursor: pointer;
+
                 .btnText {
                   font-size: 14px;
                   font-weight: 400;
                   line-height: 40px;
                 }
               }
+
               .btn1 {
                 border: 1px solid rgba(64, 158, 255, 1);
                 color: #4ea6ff;
                 margin-right: 14px;
               }
+
               .btn2 {
                 background-color: #4ea6ff;
                 color: #ffffff;
@@ -641,6 +659,7 @@ export default {
     }
   }
 }
+
 .addrefDrawer {
   .drawerMain {
     // .main_notice {
@@ -680,6 +699,7 @@ export default {
       justify-content: space-between;
       align-items: center;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -688,35 +708,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;
@@ -729,32 +757,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;
             }
@@ -762,6 +798,7 @@ export default {
         }
       }
     }
+
     .main_btns {
       height: 72px;
       width: 100%;
@@ -771,6 +808,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;
@@ -780,6 +818,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;

From a0f563d68e953d26c06e386aa7a384e5e6c92a57 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 30 Nov 2022 23:44:28 +0800
Subject: [PATCH 07/28] =?UTF-8?q?--=20=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddRef.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index b45bdc34..32d4e39d 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -176,7 +176,7 @@ export default {
       console.log(errors);
       // message.error("handleFinishFailed");
     };
-    const updateTask = (res) => {
+    const updateTask = async (res) => {
       if (props.isLevel == 1) {
         RouterEditTask({
           chapterId: props.isactive,
@@ -186,9 +186,9 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 7,
         })
-          .then(() => {
-          //  message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
-            ctx.emit("changeData", false);
+          .then(async () => {
+            //  message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+            await ctx.emit("changeData", false);
             closeDrawer();
             state.addLoading = false;
           })
@@ -254,18 +254,18 @@ export default {
       if (props.edit) {
         api
           .updateLinks(obj)
-          .then((res) => {
+          .then(async (res) => {
             message.success("编辑成功");
-            updateTask(res);
+            await updateTask(res);
             ctx.emit("changeData", false);
           })
           .catch(() => {});
       } else {
         api
           .createExternalChain(obj)
-          .then((res) => {
+          .then(async (res) => {
             message.success("提交成功");
-            updateTask(res);
+            await updateTask(res);
             ctx.emit("changeData", false);
           })
           .catch(() => {});

From 650f86e222fa06b06d1d04e62d5b11c7dcbd0692 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 30 Nov 2022 23:45:16 +0800
Subject: [PATCH 08/28] =?UTF-8?q?--=20=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue       | 54 +++++++-------
 src/views/learningpath/LevelAddDetail.vue | 91 ++++-------------------
 2 files changed, 41 insertions(+), 104 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 0b38341b..d7eeb784 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1292,38 +1292,38 @@ export default {
       ],
       // 共享文档列表
       docList: [
-        {
-          name: "测试文档1.doc",
-          src: "",
-        },
-        {
-          name: "测试文档2.doc",
-          src: "",
-        },
-        {
-          name: "测试文档3.doc",
-          src: "",
-        },
+        // {
+        //   name: "测试文档1.doc",
+        //   src: "",
+        // },
+        // {
+        //   name: "测试文档2.doc",
+        //   src: "",
+        // },
+        // {
+        //   name: "测试文档3.doc",
+        //   src: "",
+        // },
       ],
       huodModal: false,
       zhibModal: false,
       //任务大纲列表
       taskSyllabus: [
-        {
-          name: "关卡1  初级产品经理",
-          taskList: [
-            {
-              course: "在线",
-              name: "时间管理",
-              classify: "选修",
-              beginTime: "2022-09-10 14:03",
-              total: 50, //总人数
-              complete: 20, //完成人数
-              percent: 40,
-              routerTaskId: 0,
-            },
-          ],
-        },
+        // {
+        //   name: "关卡1  初级产品经理",
+        //   taskList: [
+        //     {
+        //       course: "在线",
+        //       name: "时间管理",
+        //       classify: "选修",
+        //       beginTime: "2022-09-10 14:03",
+        //       total: 50, //总人数
+        //       complete: 20, //完成人数
+        //       percent: 40,
+        //       routerTaskId: 0,
+        //     },
+        //   ],
+        // },
       ],
       activeKey: ref("1"),
       value: ref(" "),
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 2b62dc46..2f1cf580 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1082,11 +1082,11 @@ export default {
         ? JSON.parse(storage.get("routerId"))
         : null,
       level: [
-        {
-          chapterId: "1",
-          remark: "关卡说明",
-          name: "默认关卡",
-        },
+        // {
+        //   chapterId: "1",
+        //   remark: "关卡说明",
+        //   name: "默认关卡",
+        // },
       ],
       tableData: [
         // {
@@ -1103,78 +1103,15 @@ export default {
         // },
       ],
       tableData2: [
-        {
-          key: 1,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 2,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 3,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 4,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡1",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 5,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡1",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 6,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 7,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 8,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
+        // {
+        //   key: 1,
+        //   name: "张三",
+        //   com: "产研部",
+        //   gang: "产品经理",
+        //   cur: "关卡2",
+        //   jin: "2/10",
+        //   time: "2022-07-15 14:00",
+        // },
       ],
       //项目抽屉、列表参数
       currentPage: 1,

From 665474ef892c012caca0ba7316bce6e7c0a03195 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 30 Nov 2022 23:45:51 +0800
Subject: [PATCH 09/28] =?UTF-8?q?--=20=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ProjectAudit.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
index 9e587e98..8687a8d2 100644
--- a/src/components/drawers/ProjectAudit.vue
+++ b/src/components/drawers/ProjectAudit.vue
@@ -39,7 +39,7 @@
                 <div class="set_content">
                   <div class="setc_name"><span>资源归属：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ sourceBelong }}</span>
+                    <span style="color: #999999">{{ sourceBelongName }}</span>
                   </div>
                 </div>
                 <div class="set_content">
@@ -261,12 +261,11 @@ export default {
       state.showDetail = !state.showDetail;
     };
     const subMit = () => {
-
-      if (state.valueSuggest == null || state.valueSuggest == undefined || state.valueSuggest == "") {
-        message.destroy();
-        message.error("请输入审核意见");
+      if(!state.valueSuggest){
+        message.error(`请输入审核意见！`);
         return
       }
+
       auditView({
         createId: props.chooseCreateId,
         createName: props.chooseCreater,

From e96773ba233dd19a596f4bbe6a6727eb1d4d68c8 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 30 Nov 2022 23:53:23 +0800
Subject: [PATCH 10/28] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddHomework.vue    | 11 ++-
 src/components/drawers/AddLive.vue        | 24 +-----
 src/components/drawers/TaskFaceIn.vue     |  5 +-
 src/views/learningpath/LevelAdd.vue       | 30 +++++---
 src/views/learningpath/LevelAddDetail.vue | 16 ++--
 src/views/projectcenter/ProjectAdd.vue    | 14 ++--
 src/views/projectcenter/ProjectManage.vue | 94 +++++++++++------------
 src/views/projectcenter/TaskAdd.vue       | 11 ++-
 src/views/projectcenter/TaskPage.vue      | 40 +++++-----
 src/views/projectcenter/temTask.vue       | 11 ++-
 10 files changed, 129 insertions(+), 127 deletions(-)

diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 06762db8..52fc3a35 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -182,6 +182,7 @@ export default {
     });
     const state = reactive({
       addLoading: false,
+      fileUrl: null,
     });
     const formRef = ref();
 
@@ -250,12 +251,18 @@ export default {
       console.log(args);
     };
     const handleChange = (info) => {
+      console.log("info", info);
       if (info.file.status !== "uploading") {
         console.log(info.file, info.fileList);
       }
 
       if (info.file.status === "done") {
         message.success(`${info.file.name} 文件上传成功`);
+        console.log("info.file", info.file.response.data);
+        if (info.file.response && info.file.response.data) {
+          // console.log("fileList", fileList);
+          // fileList.value = [info];
+        }
       } else if (info.file.status === "error") {
         message.error(`${info.file.name} 文件上传失败.`);
       }
@@ -285,7 +292,7 @@ export default {
       let obj = {
         submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
         submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-        workEnclosureAddress: "",
+        workEnclosureAddress: state.fileUrl,
         workId: props.edit ? props.EditWorkId : 0,
         workName: formState.workName,
         workRequirement: formState.workRequirement,
@@ -410,7 +417,7 @@ export default {
       let obj = {
         submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
         submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
-        workEnclosureAddress: "",
+        workEnclosureAddress: state.fileUrl,
         workId: props.EditWorkId > 0 ? props.EditWorkId : 0,
         workName: formState.workName,
         workRequirement: formState.workRequirement,
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 39870031..9eafbca2 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -92,7 +92,6 @@
                 "
                 v-model:value="inputV2"
               ></a-input-number>
-
               <span style="margin-left: 5px">分钟</span>
             </div>
           </div>
@@ -157,7 +156,6 @@
               </div>
             </div>
           </div>
-
           <div class="main_item" style="margin-top: -10px">
             <div class="signbox">
               <span style="margin-right: 3px">直播链接：</span>
@@ -192,7 +190,6 @@
               </div>
             </div>
           </div>
-
           <div class="main_item2">
             <div class="signbox">
               <span style="margin-right: 3px">评估：</span>
@@ -223,7 +220,6 @@
               />
             </div>
           </div>
-
           <div class="main_item2">
             <div class="signbox">
               <span style="margin-right: 3px">考勤设置：</span>
@@ -337,7 +333,6 @@ import { getMemberInfo } from "@/api/index1";
 import dayjs from "dayjs";
 import { fileUp } from "../../api/indexEval";
 import AssessmentList from "../drawers/ AssessmentList.vue";
-
 import { debounce } from "lodash-es";
 // import { useRouter } from "vue-router";
 function getBase64(img, callback) {
@@ -345,7 +340,6 @@ function getBase64(img, callback) {
   reader.addEventListener("load", () => callback(reader.result));
   reader.readAsDataURL(img);
 }
-
 export default {
   name: "AddLive",
   components: {
@@ -356,7 +350,6 @@ export default {
       type: Boolean,
       default: false,
     },
-
     EditLiveId: {
       type: Number,
       default: null,
@@ -513,20 +506,17 @@ export default {
           //message.error(`查询失败`);
         });
     };
-
     const cloradio1 = (value) => {
       if (state.radioV1 === value.target._value) {
         state.radioV1 = "";
       }
     };
-
     const handleChange = (info) => {
       if (info.file.status === "uploading") {
         state.loading = true;
         console.log("info", info);
         return;
       }
-
       if (info.file.status === "done") {
         // Get this url from response in real world.
         getBase64(info.file.originFileObj, (base64Url) => {
@@ -535,14 +525,12 @@ export default {
           console.log("imgURL", state.imageUrl);
         });
       }
-
       if (info.file.status === "error") {
         state.loading = false;
         message.destroy();
         message.error("upload error");
       }
     };
-
     const updateTask = (res) => {
       if (props.isLevel == 1) {
         RouterEditTask({
@@ -622,7 +610,6 @@ export default {
         message.destroy();
         return message.warning("直播时长需大于0");
       }
-
       let startTime = toDate(
         new Date(state.time[0].$d).getTime() / 1000,
         "Y-M-D"
@@ -631,7 +618,6 @@ export default {
         new Date(state.time[1].$d).getTime() / 1000,
         "Y-M-D"
       );
-
       state.obj = {
         afterSignIn: state.inputV6,
         beforeSignIn: state.inputV7,
@@ -689,7 +675,6 @@ export default {
           message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
           return reject(false);
         }
-
         let reader = new FileReader();
         reader.readAsDataURL(file);
         reader.onload = () => {
@@ -707,11 +692,9 @@ export default {
             return resolve(true);
           };
         };
-
         return reject(false);
       });
     };
-
     const templateScroll = (e) => {
       console.log("滚动", e);
       const { target } = e;
@@ -760,11 +743,10 @@ export default {
       options.value = [];
       state.fetching = true;
       state.currentPage = 1;
-      state.memberValue = memberValue;
+      state.memberValue.label = memberValue;
       queryMember();
       state.fetching = false;
     }, 300);
-
     const handleChange2 = (value) => {
       console.log(`selected ${value}`);
       state.inputV3 = value;
@@ -779,7 +761,6 @@ export default {
         state.discussSettings = "false";
       }
     };
-
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -1012,5 +993,4 @@ export default {
     }
   }
 }
-</style>
-    
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/src/components/drawers/TaskFaceIn.vue b/src/components/drawers/TaskFaceIn.vue
index c55e492b..5ffe4dc0 100644
--- a/src/components/drawers/TaskFaceIn.vue
+++ b/src/components/drawers/TaskFaceIn.vue
@@ -7,14 +7,15 @@
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
-      <div class="header">
+      <!-- 2022-11-30注释 后面放开 -->
+      <!-- <div class="header">
         <div class="headerTitle">批量面授报名</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
           @click="closeDrawer"
         />
-      </div>
+      </div> -->
       <div class="main">
         <div class="minatitl">
           <div class="up1">请下载</div>
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 0b38341b..02073ad2 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -596,7 +596,8 @@
               </div>
               <div class="xheadb">
                 <button class="addx" @click="showAddStu">添加学员</button>
-                <button class="addd" @click="showImpStu">导入学员</button>
+                <!-- 2022-11-30注释 后面放开 -->
+                <!-- <button class="addd" @click="showImpStu">导入学员</button> -->
                 <div class="select">
                   <a-select
                     style="width: 130px"
@@ -1277,14 +1278,15 @@ export default {
       picUrl: null,
       remark: null,
       projectNameList: [
-        {
-          value: "1",
-          label: "导出信息",
-        },
-        {
-          value: "2",
-          label: "批量调整关卡",
-        },
+        // 2022-11-30注释 后面放开
+        // {
+        //   value: "1",
+        //   label: "导出信息",
+        // },
+        // {
+        //   value: "2",
+        //   label: "批量调整关卡",
+        // },
         {
           value: "3",
           label: "批量删除",
@@ -1501,6 +1503,8 @@ export default {
             return (
               <div class="opa">
                 <div class="opacation">
+                  {/**
+                  2022-11-30注释 后面放开
                   <span
                     onClick={() => {
                       showCheckStu(text.record.studentId);
@@ -1510,6 +1514,9 @@ export default {
                   >
                     查看
                   </span>
+                 */}
+                  {/**
+                    2022-11-30注释 后面放开
                   <span
                     onClick={() => {
                       state.visiblene = true;
@@ -1519,6 +1526,7 @@ export default {
                   >
                     调整
                   </span>
+                 */}
                   <span
                     style="color:#4EA6FF;cursor:pointer"
                     onClick={() => {
@@ -1963,7 +1971,7 @@ export default {
         cancelText: "取消",
         onOk() {
           api
-            .delStudent({ routerId: 100, studentIds: [id] })
+            .delStudent({ routerId: state.routerId, studentIds: [id] })
             .then((res) => {
               message.success("删除成功");
               getStudent();
@@ -2001,7 +2009,7 @@ export default {
         return;
       }
       let obj = {
-        routerId: 100,
+        routerId: state.routerId,
         studentIds: state.selectedRowKeys,
       };
       api
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 2b62dc46..e2bb3f89 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -182,7 +182,8 @@
               </div>
             </div>
             <div class="rightt">
-              <div class="select">
+              <!-- 2022-11-30注释 后面放开 -->
+              <!-- <div class="select">
                 <span>学习模式：</span>
                 <div class="inputbox">
                   <input type="text" placeholder="按学习时间解锁" />
@@ -190,9 +191,8 @@
                     <div class="btnText">切换模式</div>
                   </div>
                 </div>
-                <!-- 切换模式抽屉 -->
                 <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
-              </div>
+              </div> -->
               <div class="line"></div>
               <router-link to="/leveladd">
                 <div style="display: flex">
@@ -744,7 +744,8 @@
               </div>
             </div>
             <div class="rightt">
-              <div class="select">
+              <!-- 2022-11-30注释 后面放开 -->
+              <!-- <div class="select">
                 <span>学习模式：</span>
                 <div class="inputbox">
                   <input type="text" placeholder="按学习时间解锁" />
@@ -752,9 +753,8 @@
                     <div class="btnText">切换模式</div>
                   </div>
                 </div>
-                <!-- 切换模式抽屉 -->
                 <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
-              </div>
+              </div> -->
               <div class="line"></div>
               <router-link to="/leveladd">
                 <div style="display: flex">
@@ -1053,7 +1053,7 @@ import { editTask } from "../../api/indexTaskadd";
 // import { RouterEditTask } from "@/api/indexTask";
 import { useRouter } from "vue-router";
 import { toDate } from "../../api/method";
-import UnlockMode from "../../components/drawers/UnlockMode.vue";
+// import UnlockMode from "../../components/drawers/UnlockMode.vue";
 export default {
   name: "LevelAddDetail",
   components: {
@@ -1071,7 +1071,7 @@ export default {
     AddLive,
     AddRef,
     draggable,
-    UnlockMode,
+    // UnlockMode,
     AddFaceteach,
     AddProject,
   },
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 3400df12..5d106d8e 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -158,16 +158,17 @@
                   return triggerNode.parentNode || document.body;
                 }
               "
-              :value="classifySelect1"
-              mode="multiple"
+              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>
@@ -798,12 +799,13 @@ export default {
     // 项目经理 后续接口调用
     const classifyList1 = ref([]);
     //获取学员
-    const getMember = () => {
+    const getMember = (e) => {
+      console.log("state.classifySelect1", e, state.classifySelect1);
       api1
         .getMemberInfo({
           pageNo: state.currentPage1,
           pageSize: state.pageSize1,
-          keyWord: "",
+          keyWord: e ? e : "",
         })
         .then((res) => {
           if (res.data.code === 200) {
@@ -817,7 +819,7 @@ export default {
               array.push(obj);
             });
             classifyList1.value = array;
-            console.log("获取学员", res.data);
+            console.log("获取学员", res.data, classifyList1.value);
             // classifyList1.value = res.data.data.rows;
             // state.tableDataTotal = res.data.data.total;
             // return res.data.data.rows;
@@ -825,6 +827,7 @@ export default {
         });
     };
     getMember();
+
     //学员滚动加载信息
     const memberScroll = (e) => {
       // console.log("滚动", e, b);
@@ -1221,6 +1224,7 @@ export default {
 
       templateScroll,
       memberScroll,
+      getMember,
     };
   },
 };
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index edc4defe..875aa677 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -2488,20 +2488,10 @@ export default {
                     // options={state.projectNameList}
                     dropdownClassName="tabledropdown"
                   >
-                    {/* 
-										<a-select-option value="基础信息" label="基础信息">
-											<router-link to="/taskpage">基础信息</router-link>
-										</a-select-option>
-										<a-select-option value="存为模版" label="存为模版">
-											<div
-												onClick={() => {
-													showStartModal();
-												}}
-											>
-												存为模版
-											</div>
-										</a-select-option> */}
-                    <a-select-option value="复制" label="复制">
+                    {/**
+2022-11-30注释 后面放开
+
+<a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
                           showCopyModal(value.record.projectId);
@@ -2510,6 +2500,8 @@ export default {
                         复制
                       </div>
                     </a-select-option>
+*/}
+
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
@@ -2587,19 +2579,8 @@ export default {
                     dropdownClassName="tabledropdown"
                   >
                     {/* 
-										<a-select-option value="基础信息" label="基础信息">
-											<router-link to="/taskpage">基础信息</router-link>
-										</a-select-option>
-										<a-select-option value="存为模版" label="存为模版">
-											<div
-												onClick={() => {
-													showStartModal();
-												}}
-											>
-												存为模版
-											</div>
-										</a-select-option> */}
-                    <a-select-option value="复制" label="复制">
+										2022-11-30注释 后面放开
+                     <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
                           showCopyModal(value.record.projectId);
@@ -2608,6 +2589,8 @@ export default {
                         复制
                       </div>
                     </a-select-option>
+                    
+                    */}
                   </a-select>
                 </div>
               </div>
@@ -2675,19 +2658,8 @@ export default {
                     dropdownClassName="tabledropdown"
                   >
                     {/* 
-										<a-select-option value="基础信息" label="基础信息">
-											<router-link to="/taskpage">基础信息</router-link>
-										</a-select-option>
-										<a-select-option value="存为模版" label="存为模版">
-											<div
-												onClick={() => {
-													showStartModal();
-												}}
-											>
-												存为模版
-											</div>
-										</a-select-option> */}
-                    <a-select-option value="复制" label="复制">
+										2022-11-30注释 后面放开
+                     <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
                           showCopyModal(value.record.projectId);
@@ -2696,6 +2668,8 @@ export default {
                         复制
                       </div>
                     </a-select-option>
+                     */}
+
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
@@ -2805,7 +2779,9 @@ export default {
                     // options={state.projectNameList}
                     dropdownClassName="tabledropdown"
                   >
-                    <a-select-option value="复制" label="复制">
+                    {/* 
+										2022-11-30注释 后面放开
+                      <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
                           showCopyModal(value.record.projectId);
@@ -2814,6 +2790,8 @@ export default {
                         复制
                       </div>
                     </a-select-option>
+                     */}
+
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
@@ -2887,7 +2865,9 @@ export default {
                     // options={state.projectNameList}
                     dropdownClassName="tabledropdown"
                   >
-                    <a-select-option value="复制" label="复制">
+                    {/* 
+										2022-11-30注释 后面放开
+                     <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
                           showCopyModal(value.record.projectId);
@@ -2896,6 +2876,7 @@ export default {
                         复制
                       </div>
                     </a-select-option>
+                     */}
                   </a-select>
                 </div>
               </div>
@@ -2957,7 +2938,9 @@ export default {
                     // options={state.projectNameList}
                     dropdownClassName="tabledropdown"
                   >
-                    <a-select-option value="复制" label="复制">
+                    {/* 
+										2022-11-30注释 后面放开
+                      <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
                           showCopyModal(value.record.projectId);
@@ -2966,6 +2949,8 @@ export default {
                         复制
                       </div>
                     </a-select-option>
+                     */}
+
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
@@ -3180,7 +3165,9 @@ export default {
                     // options={state.projectNameList}
                     dropdownClassName="tabledropdown"
                   >
-                    <a-select-option value="复制" label="复制">
+                    {/* 
+										2022-11-30注释 后面放开
+                       <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
                           showCopyModal(value.record.projectId);
@@ -3189,6 +3176,8 @@ export default {
                         复制
                       </div>
                     </a-select-option>
+                     */}
+
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
@@ -3230,7 +3219,9 @@ export default {
                     // options={state.projectNameList}
                     dropdownClassName="tabledropdown"
                   >
-                    <a-select-option value="复制" label="复制">
+                    {/* 
+										2022-11-30注释 后面放开
+                      <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
                           showCopyModal(value.record.projectId);
@@ -3239,6 +3230,8 @@ export default {
                         复制
                       </div>
                     </a-select-option>
+                     */}
+
                     <a-select-option value="存为模版" label="存为模版">
                       <div
                         onClick={() => {
@@ -3295,7 +3288,9 @@ export default {
                         存为模版
                       </div>
                     </a-select-option>
-                    <a-select-option value="复制" label="复制">
+                    {/* 
+										2022-11-30注释 后面放开
+                     <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
                           showCopyModal(value.record.projectId);
@@ -3304,6 +3299,8 @@ export default {
                         复制
                       </div>
                     </a-select-option>
+                     */}
+
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
@@ -3345,7 +3342,9 @@ export default {
                         存为模版
                       </div>
                     </a-select-option>
-                    <a-select-option value="复制" label="复制">
+                    {/* 
+										2022-11-30注释 后面放开
+                      <a-select-option value="复制" label="复制">
                       <div
                         onClick={() => {
                           showCopyModal(value.record.projectId);
@@ -3354,6 +3353,7 @@ export default {
                         复制
                       </div>
                     </a-select-option>
+                     */}
 
                     <a-select-option value="基础信息" label="基础信息">
                       <div
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 67cbe7d6..063039c1 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -124,18 +124,17 @@
               </div>
             </div>
             <div class="rightt">
-              <div class="select">
+              <!-- 2022-11-30注释 后面放开 -->
+              <!-- <div class="select">
                 <span>学习模式：</span>
                 <div class="inputbox">
                   <input type="text" placeholder="按学习时间解锁" />
-                  <!-- v-model:unlockModeVisible="unlockModeVisible" -->
                   <div class="bottonbox" @click="showModeVisible">
                     <div class="btnText">切换模式</div>
                   </div>
-                  <!-- 切换模式抽屉 -->
                   <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
                 </div>
-              </div>
+              </div> -->
               <div class="line"></div>
               <!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
             <div class="pub">保存</div>
@@ -1036,7 +1035,7 @@ import * as apistage from "../../api/indexStage";
 import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
-import UnlockMode from "../../components/drawers/UnlockMode.vue";
+// import UnlockMode from "../../components/drawers/UnlockMode.vue";
 // import * as api1 from "../../api/index1";
 import { useRouter } from "vue-router";
 export default {
@@ -1055,7 +1054,7 @@ export default {
     AddEval,
     AddInvist,
     AddVote,
-    UnlockMode,
+    // UnlockMode,
   },
   setup() {
     const router = useRouter();
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 2856265c..7ddb0e73 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -318,9 +318,10 @@
             <div class="split"></div>
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
-              <button class="btn" @click="showFaceIn" v-if="morFaceT">
+              <!-- 2022-11-30注释 后面放开 -->
+              <!-- <button class="btn" @click="showFaceIn" v-if="morFaceT">
                 批量面授报名
-              </button>
+              </button> -->
               <router-link to="/taskadd">
                 <button to="/taskadd" class="edit">
                   <img
@@ -567,7 +568,8 @@
                         placeholder="请输入小组名称"
                       />
                     </div>
-                    <div
+                    <!-- 2022-11-30注释 后面放开 -->
+                    <!-- <div
                       style="
                         display: flex;
                         align-items: center;
@@ -597,14 +599,10 @@
                           value: 'id',
                         }"
                       ></a-tree-select>
-                      <!-- <a-select
-                        v-model:value="valuestub"
-                        placeholder="请选择部门"
-                        :options="bum"
-                        @change="handleChangeBum"
-                      /> -->
-                    </div>
-                    <div
+              
+                    </div> -->
+                    <!-- 2022-11-30注释 后面放开 -->
+                    <!-- <div
                       style="
                         display: flex;
                         align-items: center;
@@ -618,7 +616,7 @@
                         :options="goodstuList"
                         @change="handleChangeGood"
                       />
-                    </div>
+                    </div> -->
                   </div>
                   <div class="groupright">
                     <div class="btn1" @click="searchStu">
@@ -636,10 +634,11 @@
                     <img src="../../assets/images/courseManage/add0.png" />
                     <span class="btn1text">添加学员</span>
                   </div>
-                  <div class="btn2" @click="showImportStu">
+                  <!-- 2022-11-30注释 后面放开 -->
+                  <!-- <div class="btn2" @click="showImportStu">
                     <img src="../../assets/images/courseManage/reset2.png" />
                     <span class="btn2text">导入学员</span>
-                  </div>
+                  </div> -->
                   <div class="btn2" @click="showAllDelete">
                     <img src="../../assets/images/projectadd/delete.png" />
                     <span class="btn2text">批量删除</span>
@@ -805,10 +804,10 @@
             ></a-tab-pane>
           </a-tabs>
         </a-tab-pane>
-        <a-tab-pane key="5" tab="项目积分">
+        <a-tab-pane key="5" tab="项目积分" disabled>
           <ProjectScore :projectId="projectId"></ProjectScore>
         </a-tab-pane>
-        <a-tab-pane key="6" tab="排行榜">
+        <a-tab-pane key="6" tab="排行榜" disabled>
           <div class="split"></div>
           <div class="content6">
             <div class="title">排行榜</div>
@@ -2920,7 +2919,9 @@ export default {
                   {text.record.excellent ? "取消优秀" : "优秀学员"}
                 </div>
 
-                <div
+                {/**
+            2022-11-30注释 后面放开
+             <div
                   class="studentopea2"
                   onClick={() => {
                     state.Seevisible = true;
@@ -2930,6 +2931,7 @@ export default {
                 >
                   查看
                 </div>
+            */}
                 <div class="studentSelect">
                   <a-select
                     style="width: 50px"
@@ -3132,9 +3134,10 @@ export default {
               : value.source == 3
               ? "受众添加"
               : "-", //加入方式
-          stutime: toDate(value.beginStudyTime / 1000, "Y-M-D"), //开始学习时间
+          stutime: toDate(value.beginStudyTime, "Y-M-D"), //开始学习时间
         };
         array.push(obj);
+        console.log("stutime", obj.stutime);
       });
       state.tabledata = array;
     };
@@ -3711,6 +3714,7 @@ export default {
           groupList: res[2],
           projectId: state.projectId,
           studentList: res[0],
+          projectGroupId: 0,
         };
         console.log("obj", obj);
         api
diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
index 2ce548bf..a0a13d4c 100644
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -133,18 +133,17 @@
               </div>
             </div>
             <div class="rightt">
-              <div class="select">
+              <!-- 2022-11-30注释 后面放开 -->
+              <!-- <div class="select">
                 <span>学习模式：</span>
                 <div class="inputbox">
                   <input type="text" placeholder="按学习时间解锁" />
-                  <!-- v-model:unlockModeVisible="unlockModeVisible" -->
                   <div class="bottonbox" @click="showModeVisible">
                     <div class="btnText">切换模式</div>
                   </div>
-                  <!-- 切换模式抽屉 -->
                   <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
                 </div>
-              </div>
+              </div> -->
               <div class="line"></div>
               <!-- <img class="img2" src="../../assets/images/projectadd/keep.png" />
               <div class="pub">保存</div>
@@ -1049,7 +1048,7 @@ import { message } from "ant-design-vue";
 import * as api from "../../api/indexTemplate";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
-import UnlockMode from "../../components/drawers/UnlockMode.vue";
+// import UnlockMode from "../../components/drawers/UnlockMode.vue";
 // import * as api1 from "../../api/index1";
 import { useRouter } from "vue-router";
 const drawercolumns = [
@@ -1107,7 +1106,7 @@ export default {
     AddEval,
     AddInvist,
     AddVote,
-    UnlockMode,
+    // UnlockMode,
   },
   setup() {
     const router = useRouter();

From b8d33ae9d1b7cc8af5ca23b413984f39b1b95c4b Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Thu, 1 Dec 2022 00:13:25 +0800
Subject: [PATCH 11/28] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=AF=BE=E6=97=B6?=
 =?UTF-8?q?=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index addd3c89..8f5b8a83 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -515,7 +515,8 @@ export default {
           projectMember: p.concat(p1),
           offcourseId: state.chooseCourse,
           offcoursePlanId: props.EditFaceId > 0 ? props.EditFaceId : 0,
-          testId: state.EditTestId
+          testId: state.EditTestId,
+          duration:state.duration,
         };
         console.log("obj============", obj, "6" + "9");
 

From 93318c5ed74c18ba92811f4b529456373bf5c3ee Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 00:14:24 +0800
Subject: [PATCH 12/28] =?UTF-8?q?--=20=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue | 82 +++++++++++++------------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index c41bf964..4040c3b0 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -5,26 +5,26 @@
       <div class="header">
         <div class="headerTitle">添加面授</div>
         <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-             @click="closeDrawer" />
+             @click="closeDrawer"/>
       </div>
       <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
               </div>
               <span style="margin-right: 3px">课程名称：</span>
             </div>
             <div class="btnbox">
               <a-input v-model:value="courseName" style="width: 384px; height: 32px" placeholder="请输入名称"
-                       maxlength="20" />
+                       maxlength="20"/>
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
               </div>
               <span style="margin-right: 3px">选择课程：</span>
             </div>
@@ -41,7 +41,7 @@
             </div>
             <!-- 选择面授侧弹窗 -->
             <div>
-              <sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse" />
+              <sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse"/>
             </div>
             <!-- 选择面授侧弹窗 -->
           </div>
@@ -50,13 +50,13 @@
               <span style="margin-right: 3px">面授说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea v-model:value="description" placeholder="请输入说明" allow-clear maxlength="100" />
+              <a-textarea v-model:value="description" placeholder="请输入说明" allow-clear maxlength="100"/>
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
               </div>
               <span style="margin-right: 3px">授课教师：</span>
             </div>
@@ -68,18 +68,18 @@
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
               </div>
               <span style="margin-right: 3px">面授时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker v-model:value="chooseTime" :placeholder="['      开始时间', '        结束时间']" />
+              <a-range-picker v-model:value="chooseTime" :placeholder="['      开始时间', '        结束时间']"/>
             </div>
           </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
               </div>
               <span style="margin-right: 3px">面授时长：</span>
             </div>
@@ -96,13 +96,13 @@
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
               </div>
               <span style="margin-right: 3px">上课地址：</span>
             </div>
             <div class="btnbox">
               <a-input v-model:value="address" style="width: 384px; height: 32px" placeholder="请输入上课地址"
-                       maxlength="100" />
+                       maxlength="100"/>
             </div>
           </div>
           <div class="main_item2">
@@ -157,7 +157,8 @@
             </div>
             <div class="btnbox">
               <a-checkbox v-model:checked="completeLeave"
-                          @click="completeLeave = !completeLeave">学员请假后记为任务完成</a-checkbox>
+                          @click="completeLeave = !completeLeave">学员请假后记为任务完成
+              </a-checkbox>
             </div>
           </div>
           <div class="main_item">
@@ -166,8 +167,10 @@
             </div>
             <div class="btnbox">
               <a-checkbox v-model:checked="innerPersion"
-                          @click="innerPersion = !innerPersion">允许项目内人员临时到场参加</a-checkbox>
-              <a-checkbox v-model:checked="outPersion" @click="outPersion = !outPersion">允许项目外人员临时到场参加</a-checkbox>
+                          @click="innerPersion = !innerPersion">允许项目内人员临时到场参加
+              </a-checkbox>
+              <a-checkbox v-model:checked="outPersion" @click="outPersion = !outPersion">允许项目外人员临时到场参加
+              </a-checkbox>
             </div>
           </div>
           <div class="main_item2">
@@ -189,7 +192,7 @@
                 </a-tag>
               </div>
               <AssessmentList v-model:assessmentVisible="assessmentVisible" v-model:titleTag="titleTag"
-                              v-model:assessmentId="assessmentId" />
+                              v-model:assessmentId="assessmentId"/>
 
             </div>
           </div>
@@ -214,7 +217,7 @@
             <!-- 添加作业侧弹窗 -->
             <div>
               <add-homework v-model:addhomeworkVisible="addhomeworkvisible" @getWork="getWork" :faceLevel="true"
-                            v-model:EditWorkId="EditWorkId" />
+                            v-model:EditWorkId="EditWorkId"/>
             </div>
             <!-- 添加作业侧弹窗 -->
           </div>
@@ -236,7 +239,7 @@
             </div>
             <!-- 添加考试侧弹窗 -->
             <div>
-              <add-test v-model:addtestVisible="addtestvisible" v-model:EditTestId="EditTestId" :faceLevel="true" />
+              <add-test v-model:addtestVisible="addtestvisible" v-model:EditTestId="EditTestId" :faceLevel="true"/>
             </div>
             <!-- 添加考试侧弹窗 -->
           </div>
@@ -246,7 +249,8 @@
             </div>
             <div class="btnbox">
               <a-upload @change="handleChange" action="/manageApi/file/upload" v-model:file-list="fileList">
-                <button class="xkbtn">上传附件</button></a-upload>
+                <button class="xkbtn">上传附件</button>
+              </a-upload>
             </div>
           </div>
         </div>
@@ -260,20 +264,21 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import {reactive, toRefs, ref} from "vue";
 import SelFacet from "../../components/drawers/SelFacet.vue";
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
-import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
+import {ProjectEditTask, RouterEditTask} from "@/api/indexTask";
 // import * as method from "../../api/method"
-import { message } from "ant-design-vue";
-import { getMemberInfo } from "@/api/index1";
-import { debounce } from "lodash-es";
-import { queryFaceDetailById, editPlan } from "../../api/indexFace";
+import {message} from "ant-design-vue";
+import {getMemberInfo} from "@/api/index1";
+import {debounce} from "lodash-es";
+import {queryFaceDetailById, editPlan} from "../../api/indexFace";
 import dayjs from "dayjs";
 import AssessmentList from "../drawers/ AssessmentList.vue";
 // import { toDate } from "../../api/method";、
-import { addTempTask } from "../../api/indexTaskadd";
+import {addTempTask} from "../../api/indexTaskadd";
+
 export default {
   name: "AddFaceteach",
   components: {
@@ -442,7 +447,7 @@ export default {
         let result = res.data.data;
         state.courseName = result.name;
         state.description = result.description;
-        state.memberValue = { value: result.teacherId, label: result.teacher }
+        state.memberValue = {value: result.teacherId, label: result.teacher}
         state.duration = result.duration;
         if (result.beginTime && result.endTime) {
           state.chooseTime = [
@@ -518,15 +523,16 @@ export default {
           testId: state.EditTestId
         };
         console.log("obj============", obj, "6" + "9");
+        console.log("222222222");
 
-        editPlan(obj)
-            .then((res) => {
+        editPlan(obj).then(async (res) => {
               message.destroy();
-              message.sucsess(`添加成功`);
-              updateTask(res);
+              message.success(`添加成功`);
+              await updateTask(res);
               ctx.emit("changeData", false);
               closeDrawer();
-            }).catch(() => {
+            }).catch((e) => {
+          console.log(e)
           message.destroy();
           message.error(`添加失败`);
         });
@@ -537,7 +543,7 @@ export default {
 
     //更新任务列表
     // 新增编辑或新增项目任务
-    const updateTask = (res) => {
+    const updateTask = async (res) => {
       console.log("props.isLevel=====", props.isLevel);
       if (props.isLevel == 1) {
         let editObj1 = {
@@ -548,7 +554,7 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 2,
         };
-        RouterEditTask(editObj1)
+        await RouterEditTask(editObj1)
             .then(() => {
               //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
 
@@ -569,7 +575,7 @@ export default {
           type: 2,
         };
         // 新增编辑或新增项目
-        ProjectEditTask(editObj)
+        await ProjectEditTask(editObj)
             .then(() => {
               message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功`);
 
@@ -579,7 +585,7 @@ export default {
             });
       } else if (props.isLevel == 3) {
         console.log("dddddddddddd33333333");
-        addTempTask({
+        await addTempTask({
           courseId: res.data.data.offcoursePlanId,
           name: res.data.data.name,
           duration: res.data.data.duration,
@@ -598,7 +604,7 @@ export default {
       }
     };
 
-    const handleChange = ({ file, fileList }) => {
+    const handleChange = ({file, fileList}) => {
       if (file.status !== "uploading") {
         console.log(file, fileList);
       }
@@ -615,7 +621,7 @@ export default {
     // 员工滚动
     const templateScroll = (e) => {
       console.log("滚动", e);
-      const { target } = e;
+      const {target} = e;
       const scrllHeight = target.scrollHeight - target.scrollTop;
       const clientHeight = target.clientHeight;
       // console.log("scrllHeight", scrllHeight, clientHeight);

From 829acf291a848e71e2f7371de575fe1994c2aaba Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 00:38:47 +0800
Subject: [PATCH 13/28] =?UTF-8?q?--=20=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/SeeStu.vue      |  62 +++++-----
 src/views/projectcenter/LibraryAdd.vue | 154 ++++++++++++-------------
 2 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index e55199b7..dce4fedc 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -187,37 +187,37 @@ export default {
       showDown: true,
       showDown1: false,
       stageList: [
-        {
-          stageName: "阶段1腾飞班阶段1",
-          stageId: 1,
-          taskProcessList: [
-            {
-              course: "在线",
-              name: "如何成为一个产品经理",
-              complete: "已完成",
-            },
-            {
-              course: "直播",
-              name: "管理直播课",
-              complete: "已完成",
-            },
-            {
-              course: "面授",
-              name: "管理面授课",
-              complete: "未完成",
-            },
-            {
-              course: "活动",
-              name: "管理活动",
-              complete: "未完成",
-            },
-            {
-              course: "作业",
-              name: "管理者作业",
-              complete: "未完成",
-            },
-          ],
-        },
+        // {
+        //   stageName: "阶段1腾飞班阶段1",
+        //   stageId: 1,
+        //   taskProcessList: [
+        //     {
+        //       course: "在线",
+        //       name: "如何成为一个产品经理",
+        //       complete: "已完成",
+        //     },
+        //     {
+        //       course: "直播",
+        //       name: "管理直播课",
+        //       complete: "已完成",
+        //     },
+        //     {
+        //       course: "面授",
+        //       name: "管理面授课",
+        //       complete: "未完成",
+        //     },
+        //     {
+        //       course: "活动",
+        //       name: "管理活动",
+        //       complete: "未完成",
+        //     },
+        //     {
+        //       course: "作业",
+        //       name: "管理者作业",
+        //       complete: "未完成",
+        //     },
+        //   ],
+        // },
       ],
       stageListActive: 0,
     });
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 12bca0b1..d079e3b2 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -700,83 +700,83 @@ export default defineComponent({
     const state = reactive({
       //任务大纲列表
       taskSyllabus: [
-        {
-          text: "阶段1腾飞班阶段1",
-          children: [
-            {
-              course: "在线",
-              name: "时间管理",
-              classify: "选修",
-              beginTime: "2022-09-10 14:03",
-              total: 50, //总人数
-              complete: 20, //完成人数
-              percent: 40,
-            },
-            {
-              course: "直播",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-12 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-            {
-              course: "面授",
-              name: "管理面授课",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 80, //总人数
-              complete: 0, //完成人数
-              percent: 0,
-            },
-            {
-              course: "活动",
-              name: "管理活动",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 40, //完成人数
-              percent: 80,
-            },
-            {
-              course: "作业",
-              name: "管理者作业",
-              classify: "选修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 30, //完成人数
-              percent: 60,
-            },
-            {
-              course: "考试",
-              name: "管理者考试",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 50, //完成人数
-              percent: 100,
-            },
-            {
-              course: "案例",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-            {
-              course: "外链",
-              name: "管理直播间",
-              classify: "必修",
-              beginTime: "2022-09-16 14:03",
-              total: 50, //总人数
-              complete: 10, //完成人数
-              percent: 20,
-            },
-          ],
-        },
+        // {
+        //   text: "阶段1腾飞班阶段1",
+        //   children: [
+        //     {
+        //       course: "在线",
+        //       name: "时间管理",
+        //       classify: "选修",
+        //       beginTime: "2022-09-10 14:03",
+        //       total: 50, //总人数
+        //       complete: 20, //完成人数
+        //       percent: 40,
+        //     },
+        //     {
+        //       course: "直播",
+        //       name: "管理直播间",
+        //       classify: "必修",
+        //       beginTime: "2022-09-12 14:03",
+        //       total: 50, //总人数
+        //       complete: 10, //完成人数
+        //       percent: 20,
+        //     },
+        //     {
+        //       course: "面授",
+        //       name: "管理面授课",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 80, //总人数
+        //       complete: 0, //完成人数
+        //       percent: 0,
+        //     },
+        //     {
+        //       course: "活动",
+        //       name: "管理活动",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 40, //完成人数
+        //       percent: 80,
+        //     },
+        //     {
+        //       course: "作业",
+        //       name: "管理者作业",
+        //       classify: "选修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 30, //完成人数
+        //       percent: 60,
+        //     },
+        //     {
+        //       course: "考试",
+        //       name: "管理者考试",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 50, //完成人数
+        //       percent: 100,
+        //     },
+        //     {
+        //       course: "案例",
+        //       name: "管理直播间",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 10, //完成人数
+        //       percent: 20,
+        //     },
+        //     {
+        //       course: "外链",
+        //       name: "管理直播间",
+        //       classify: "必修",
+        //       beginTime: "2022-09-16 14:03",
+        //       total: 50, //总人数
+        //       complete: 10, //完成人数
+        //       percent: 20,
+        //     },
+        //   ],
+        // },
       ],
       // 模板编辑列表
       managerOptions: [

From 0c0fc13972c520043075a705e22e03c38361197c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 01:06:28 +0800
Subject: [PATCH 14/28] =?UTF-8?q?--=20=E6=8E=88=E8=AF=BE=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index eda9a8a9..725d498b 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -61,8 +61,8 @@
               <span style="margin-right: 3px">授课教师：</span>
             </div>
             <div class="btnbox">
-              <a-auto-complete v-model:value="memberValue.label" placeholder="选择老师" style="width: 364px"
-                               :options="options" @search="handleSearch"></a-auto-complete>
+              <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"
+                               :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>
             </div>
           </div>
           <div class="main_item">
@@ -675,6 +675,7 @@ export default {
     const handleChange2 = (value, label) => {
       console.log(`selected ${value}`);
       state.memberId = value;
+      // console.log(label)
       state.memberValue = label;
     };
     const handleFocus = () => {

From e6b0be0fe900d06555daf4d119d2cc69e041cce7 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 01:13:00 +0800
Subject: [PATCH 15/28] =?UTF-8?q?--=20=E6=8E=88=E8=AF=BE=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddLive.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 9eafbca2..5ac0ce3e 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -107,7 +107,7 @@
             </div>
             <div class="btnbox">
               <a-auto-complete
-                v-model:value="memberValue.label"
+                :value="memberValue.label"
                 show-search
                 :not-found-content="fetching ? undefined : null"
                 placeholder="Select a teacher"
@@ -747,9 +747,10 @@ export default {
       queryMember();
       state.fetching = false;
     }, 300);
-    const handleChange2 = (value) => {
+    const handleChange2 = (value,label) => {
       console.log(`selected ${value}`);
       state.inputV3 = value;
+      state.memberValue = label;
     };
     const handleFocus = () => {
       queryMember();

From 0576b172313aba7d18270276dd3f8d1c3bb65677 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 01:15:57 +0800
Subject: [PATCH 16/28] =?UTF-8?q?--=20=E6=89=80=E5=B1=9E=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/examine/ProjectReviewedN.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index 7885ac9b..d609602d 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -116,14 +116,14 @@ export default {
           key: "name",
           align: "center",
         },
-
-        {
-          title: "所属项目",
-          dataIndex: "sourceBelongName",
-          key: "sourceBelongName",
-          align: "center",
-          width: "11%",
-        },
+// todo 根项目保存
+        // {
+        //   title: "所属项目",
+        //   dataIndex: "sourceBelongName",
+        //   key: "sourceBelongName",
+        //   align: "center",
+        //   width: "11%",
+        // },
         {
           title: "项目经理",
           dataIndex: "manager",

From 99ea3719f0fede39a385ecc60a356962b8600c6f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 1 Dec 2022 01:34:01 +0800
Subject: [PATCH 17/28] -- bug

---
 src/views/projectcenter/TaskAdd.vue  | 4 ++--
 src/views/projectcenter/TaskPage.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index b8775535..1775f5a1 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -59,7 +59,7 @@
                   <div class="items2">
                     <a-popover
                       placement="topLeft"
-                      v-if="element.tit.length > 10"
+                      v-if="element.tit?.length > 10"
                     >
                       <template #content>
                         <div style="width: 130px">
@@ -73,7 +73,7 @@
                         {{ element.tit }}
                       </div>
                     </a-popover>
-                    <div class="nname" v-if="element.tit.length <= 10">
+                    <div class="nname" v-if="element.tit?.length <= 10">
                       {{ element.tit }}
                     </div>
                   </div>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 7ddb0e73..d255e496 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -2392,7 +2392,7 @@ export default {
     //任务大纲渲染
     const getTaskList = () => {
       let objtl = {
-        projectId: 27,
+        projectId: storage.get("projectId"),
       };
       apitl
         .getProjectDetail(objtl)

From 32983caf867eacf052b1e8e61190957edbbcd598 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 1 Dec 2022 01:56:41 +0800
Subject: [PATCH 18/28] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/PowerList.vue         |  4 ++--
 src/components/drawers/ProjPowerList.vue     |  8 ++++----
 src/views/courselibrary/CoursewareManage.vue |  1 +
 src/views/learningpath/LearningPath.vue      |  1 +
 src/views/projectcenter/ProjectAdd.vue       | 21 ++++++++++++++++----
 src/views/projectcenter/ProjectManage.vue    |  1 +
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/components/drawers/PowerList.vue b/src/components/drawers/PowerList.vue
index 1ebbbd7b..4ee8e317 100644
--- a/src/components/drawers/PowerList.vue
+++ b/src/components/drawers/PowerList.vue
@@ -289,8 +289,8 @@ export default {
             let array = [];
             arr.map((value) => {
               let obj = {
-                key: value.id,
-                id: value.memberNo,
+                key: value.authRefId,
+                id: value.authRefId,
 
                 name: value.memberName ? value.memberName : "-",
 
diff --git a/src/components/drawers/ProjPowerList.vue b/src/components/drawers/ProjPowerList.vue
index bcc28963..f4fa7a54 100644
--- a/src/components/drawers/ProjPowerList.vue
+++ b/src/components/drawers/ProjPowerList.vue
@@ -192,7 +192,7 @@ export default {
       console.log("item", item);
       state.cancelModal = true;
       let obj = {
-        id: item.number,
+        id: item.id,
         name: item.name,
       };
       state.cancelAuthInfo = obj;
@@ -311,15 +311,15 @@ export default {
             let array = [];
             arr.map((value) => {
               let obj = {
-                key: value.id,
-                id: value.id,
+                key: value.memberId,
+                id: value.memberId,
 
                 name: value.memberName ? value.memberName : "-",
 
                 com: value.orgName ? value.orgName : "-",
                 gang: "-",
                 number: value.memberNo ? value.memberNo : "-",
-                state: "-",
+                state: value.tagName ? value.tagName : "-",
               };
               array.push(obj);
             });
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index b9664ae0..71ed0c89 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4793,6 +4793,7 @@ export default defineComponent({
           pageNo: 20,
           pageSize: 1,
           studentList: res[0],
+          keyWord: "",
         };
         console.log("obj", obj);
         api1
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index c3d17fef..3f1685be 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -1693,6 +1693,7 @@ export default {
           pageNo: 20,
           pageSize: 1,
           studentList: res[0],
+          keyWord: "",
         };
         console.log("obj", obj);
         api
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 5d106d8e..ef227fae 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -168,7 +168,7 @@
               mode="multiple"
               :disabled="viewDetail ? true : false"
               @popupScroll="memberScroll"
-              @search="getMember"
+              @search="searchMember"
             >
             </a-select>
           </div>
@@ -446,6 +446,8 @@ export default {
 
       currentPage1: 1, //项目经理
       pageSize1: 10, //项目经理
+
+      searchName: null,
     });
     //分类列表
     const classifyList = ref([]);
@@ -799,13 +801,13 @@ export default {
     // 项目经理 后续接口调用
     const classifyList1 = ref([]);
     //获取学员
-    const getMember = (e) => {
-      console.log("state.classifySelect1", e, state.classifySelect1);
+    const getMember = () => {
+      console.log("state.searchName", state.searchName);
       api1
         .getMemberInfo({
           pageNo: state.currentPage1,
           pageSize: state.pageSize1,
-          keyWord: e ? e : "",
+          keyWord: state.searchName ? state.searchName : "",
         })
         .then((res) => {
           if (res.data.code === 200) {
@@ -828,6 +830,16 @@ export default {
     };
     getMember();
 
+    //搜索学员
+    const searchMember = (e) => {
+      console.log("eee", e);
+      if (e) {
+        state.searchName = e;
+        classifyList1.value = [];
+        getMember();
+      }
+    };
+
     //学员滚动加载信息
     const memberScroll = (e) => {
       // console.log("滚动", e, b);
@@ -1225,6 +1237,7 @@ export default {
       templateScroll,
       memberScroll,
       getMember,
+      searchMember,
     };
   },
 };
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 875aa677..15e46838 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -3521,6 +3521,7 @@ export default {
           pageNo: 20,
           pageSize: 1,
           studentList: res[0],
+          keyWord: "",
         };
         console.log("obj", obj);
         api1

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 19/28] -- 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 6424c8d7044050b499e0e0cde585e05edb71fc91 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Thu, 1 Dec 2022 02:38:03 +0800
Subject: [PATCH 20/28] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8A=95=E7=A5=A8?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexVote.js                     |   9 +-
 src/components/vote/CreateVote.vue       |  87 +++++++++++++--
 src/components/vote/VoteQuestion.vue     | 135 +++++++++++++++--------
 src/components/vote/VoteQuestionItem.vue |  86 +++++++++++----
 4 files changed, 235 insertions(+), 82 deletions(-)

diff --git a/src/api/indexVote.js b/src/api/indexVote.js
index 0f91f1bb..07d1d268 100644
--- a/src/api/indexVote.js
+++ b/src/api/indexVote.js
@@ -60,15 +60,10 @@ export const createVote = (obj) => http.post('/vote/createVote', obj)
 export const deleteVoteMessage = (obj) => http.post('/vote/deleteVoteMessage', { params: obj })
 
 //删除题干信息接口
-export const deleteVoteStem = (obj) => http.post('/vote/deleteVoteStem', obj, {
-  headers: {
-    'token': '123',
-    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
-  }
-})
+export const deleteVoteStem = (voteStemId) => http.post(`/vote/deleteVoteStem?voteStemId=${voteStemId}`)
 
 //删除题选项息接口
-export const deleteVoteStemOption = (obj) => http.post('/vote/deleteVoteStemOption', { params: obj })
+export const deleteVoteStemOption = (optionId) => http.post(`/vote/deleteVoteStemOption?optionId=${optionId}`)
 
 //修改投票信息接口
 export const editVote = (obj) => http.post('/vote/editVote', obj)
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index 8d4f23d2..36a713f3 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -34,8 +34,10 @@
         </div>
         <!-- 创建投票侧弹窗 -->
       </div>
+
       <div v-for="(item, index) in allFormsData" :key="index">
-        <VoteQuestion :item="item" :optionId="optionId" @del="handleDel" />
+        <VoteQuestion v-model:info="information" :item="item" :optionId="optionId" @delOption="delOption"
+          @del="handleDel" @edits="edits" @addOption="addOption" />
       </div>
 
       <div class="footer">
@@ -105,6 +107,7 @@ export default {
       ballotId: "",
       ballotName: "",
       allFormsData: [],
+      allFormsData1: [],
 
     });
     // const router = useRouter();
@@ -139,6 +142,7 @@ export default {
         // let renderArr = [...res];
         // sortBy(renderArr, "orderNumber"); //序号
         state.allFormsData = parseData(res); //类型
+        state.allFormsData1 = parseData(res); //类型
 
         console.log(state.allFormsData);
       }
@@ -271,27 +275,93 @@ export default {
         ],
       };
       state.allFormsData.push(obj);
+      state.allFormsData1.push(obj);
     };
 
     const handleDel = ({ id }) => {
+      console.log('1234523432434234234', id, state.allFormsData)
+
       state.allFormsData.forEach((item, index) => {
         if (item.id === id) {
+          console.log('oooooo', item)
           state.allFormsData.splice(index, 1);
         }
       });
-      state.allFormsData.map((item, index) => {
-        item.id = index + 1;
-        return item;
-      });
+
+      // state.allFormsData.map((item, index) => {
+      //   item.id = index + 1;
+      //   return item;
+      // });
 
       // orderNumber: curItem.orderNumber,
     };
 
+    const delOption = (data) => {
+      console.log('datadatadatadatadata', data, state.allFormsData)
+      state.allFormsData.forEach((item, index) => {
+        if (item.voteStemId === data.value.voteStemId) {
+          state.allFormsData[index].singleList.forEach((ii, nn) => {
+            if (ii.id == data.value.id) {
+              console.log(1212121212, state.allFormsData[index].singleList[nn], nn)
+              state.allFormsData[index].singleList.splice(nn, 1)
+              console.log('12', state.allFormsData)
+            }
+          })
+
+        }
+      });
+
+      state.allFormsData1.forEach((item, index) => {
+        if (item.voteStemId === data.value.voteStemId) {
+          state.allFormsData1[index].singleList.forEach((ii, nn) => {
+            if (ii.id == data.value.id) {
+              console.log(1212121212, state.allFormsData1[index].singleList[nn], nn)
+              state.allFormsData1[index].singleList.splice(nn, 1)
+              console.log('33', state.allFormsData1)
+            }
+          })
+
+        }
+      });
+
+
+    }
+
+    const edits = (data) => {
+      console.log('我传递过来了吗---111', data, data.value.id, state.allFormsData1)
+
+      state.allFormsData1.forEach((item, index) => {
+        if (item.voteStemId === data.value.voteStemId) {
+          item.singleList.forEach((ii, nn) => {
+            if (ii.id === data.value.id) {
+              // ii.optionName = data.value.inputVal
+              state.allFormsData1[index].singleList[nn].inputVal = data.value.inputVal
+            }
+          })
+        }
+      });
+
+      console.log('123-456-789', state.allFormsData1)
+    }
+
+    // 增加选项
+    const addOption = (data) => {
+      console.log(data)
+      state.allFormsData1.forEach((item, index) => {
+        if (item.voteStemId === data.value.voteStemId) {
+          state.allFormsData1[index].singleList = data.value.singleList
+        }
+      });
+    }
+
     const handleSave = () => {
 
+
       let resultPost = {};
 
-      let filterData = parseItem(restData(state.allFormsData, "type"));
+      let filterData = parseItem(restData(state.allFormsData1, "type"));
+
+      console.log("filterData==111", filterData)
 
       if (!state.ballotName) {
         return message.warning("请输入投票名称");
@@ -305,7 +375,7 @@ export default {
       // checkVal(filterData);
       console.log(12121212);
       console.log(filterData);
-
+      console.log('111111222223333----0000', state.ballotId)
       if (state.ballotId) {
         resultPost = {
           ballotId: state.ballotId,
@@ -386,6 +456,9 @@ export default {
       handleDel,
       afterVisibleChange,
       closeDrawer,
+      edits,
+      delOption,
+      addOption
     };
   },
 };
diff --git a/src/components/vote/VoteQuestion.vue b/src/components/vote/VoteQuestion.vue
index dc677774..5ae9ae14 100644
--- a/src/components/vote/VoteQuestion.vue
+++ b/src/components/vote/VoteQuestion.vue
@@ -10,38 +10,20 @@
     </div>
     <div class="name">
       <div class="namebox">
-        <img
-          class="nameimg"
-          src="../../assets/images/basicinfo/asterisk.png"
-        />
-        <div class="inname">题干{{item.id}}</div>
+        <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+        <div class="inname">题干{{ item.id }}</div>
       </div>
       <div class="in">
-        <a-input
-          v-model:value="curItem.valueSingle"
-          placeholder="请输入题干名称"
-          show-count
-          :maxlength="20"
-          style="border-radius: 8px"
-        />
+        <a-input v-model:value="curItem.valueSingle" placeholder="请输入题干名称" show-count :maxlength="20"
+          style="border-radius: 8px" />
       </div>
     </div>
-    <VoteQuestionItem
-      v-for="(item, index) in curItem.singleList"
-      :key="index"
-      :item="item"
-      @input="input"
-      @src="imgSrc"
-      @delImg="delImg"
-      @del="del"
-    />
+    <VoteQuestionItem v-model:info="info" v-for="(item, index) in curItem.singleList" :key="index" :item="item"
+      @input="input" @src="imgSrc" @delImg="delImg" @del="del" @edit="edit" />
     <div class="name">
       <div class="in" style="margin-left: 85px; margin-bottom: 20px">
-        <a-button
-          type="primary"
-          style="width: 100px;height: 40px;border-radius: 8px;background-color: #409eff;"
-          @click="handleSingleAdd"
-        >
+        <a-button type="primary" style="width: 100px;height: 40px;border-radius: 8px;background-color: #409eff;"
+          @click="handleSingleAdd">
           添加选项
         </a-button>
       </div>
@@ -58,7 +40,7 @@ export default {
     VoteQuestionItem,
   },
   props: {
-    num:{
+    num: {
       type: Number,
       default: null,
     },
@@ -68,22 +50,22 @@ export default {
         return {};
       },
     },
-    
+
   },
-  setup(props,{ emit }) {
-  
-    
-   
+  setup(props, { emit }) {
+
+
+
     const curItem = ref(props.item);
     const handleTypesDel = () => {
-      emit("del", { id: curItem.value.id, curItem: curItem.value });
-      console.log("删除题干======",{ id: curItem.value.id, curItem: curItem.value });
-      api.deleteVoteStem({voteStemId:3})
+
+      console.log("删除题干======", { id: curItem.value.id, curItem: curItem.value });
+      api.deleteVoteStem(curItem.value.voteStemId)
         .then(() => {
-        //  message.success('删除题干信息成功')
-          
-      })
-    
+          //  message.success('删除题干信息成功')
+          emit("del", { id: curItem.value.id, curItem: curItem.value });
+        })
+
     };
 
     const handleSingleAdd = () => {
@@ -92,8 +74,10 @@ export default {
         inputVal: "",
         imgVal: "",
       });
+      emit("addOption", curItem);
     };
     const input = ({ id, val }) => {
+      console.log(id, val)
       curItem.value.singleList.forEach((item) => {
         if (item.id === id) {
           item.inputVal = val;
@@ -114,17 +98,28 @@ export default {
         }
       });
     };
-    const del = ({ id }) => {
+    const del = ({ id, data }) => {
+      console.log(data)
+      api.deleteVoteStemOption(data.value.optionId)
+        .then(() => {
+          //  message.success('删除题干信息成功')
+          emit("delOption", data);
+        })
       curItem.value.singleList.forEach((item, index) => {
         if (item.id === id) {
           curItem.value.singleList.splice(index, 1);
         }
       });
 
-      
-  
+
+
     };
 
+    const edit = (data) => {
+      // console.log('111111-223', data.value)
+      emit("edits", data)
+    }
+
     return {
       curItem,
       handleTypesDel,
@@ -133,6 +128,7 @@ export default {
       imgSrc,
       delImg,
       del,
+      edit
     };
   },
 };
@@ -142,10 +138,12 @@ export default {
   width: 100%;
   display: flex;
   flex-direction: column;
+
   .header {
     width: 100%;
     display: flex;
     justify-content: space-between;
+
     .title {
       color: #000000;
       font-size: 18px;
@@ -154,10 +152,12 @@ export default {
       padding-left: 37px;
       //font-weight: 500;
     }
+
     .goback {
       padding-right: 70px;
       //padding-top: 37px;
       position: relative;
+
       .return {
         display: inline-block;
         width: 42px;
@@ -166,6 +166,7 @@ export default {
         margin-right: 10px;
         background-image: url("../../assets/images/projectadd/return.png");
       }
+
       .returntext {
         display: inline-block;
         position: absolute;
@@ -175,16 +176,19 @@ export default {
       }
     }
   }
+
   .addtype {
     display: flex;
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
     margin-right: 20px;
     align-items: center;
     margin-left: 41px;
+
     .addtypen {
       color: #6f6f6f;
       font-size: 14px;
     }
+
     .types {
       cursor: pointer;
       width: 80px;
@@ -197,11 +201,13 @@ export default {
       align-items: center;
       margin: 20px 10px;
     }
+
     .typesCur {
       color: #fff;
       background: #409eff;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
@@ -210,9 +216,11 @@ export default {
     min-width: 690px;
     margin-left: 38px;
     margin-top: 20px;
+
     .tagbox {
       display: flex;
       justify-content: right;
+
       .tagname {
         width: 90px;
         height: 32px;
@@ -226,6 +234,7 @@ export default {
         color: rgba(64, 158, 255, 1);
         font-size: 16px;
       }
+
       .deleteop {
         display: flex;
         justify-content: center;
@@ -237,6 +246,7 @@ export default {
         border: 1px solid #409eff;
         border-radius: 8px;
         cursor: pointer;
+
         .del_text {
           color: #409eff;
           font-size: 14px;
@@ -244,21 +254,25 @@ export default {
         }
       }
     }
+
     .scorebox {
       display: flex;
       align-items: center;
       margin-top: 20px;
       margin-left: 70px;
+
       .scoretext {
         font-size: 14px;
         color: #56a3f9;
       }
+
       .number {
         display: flex;
         border: 1px solid #d7e5fd;
         border-radius: 5px;
         margin: 0 10px;
         padding: 5px;
+
         .btn {
           width: 40px;
           height: 40px;
@@ -274,30 +288,36 @@ export default {
           line-height: 24px;
           cursor: pointer;
         }
+
         .curBtn {
           background: #56a3f9;
           color: #fff;
         }
       }
     }
+
     .picture {
       width: 100px;
       display: flex;
       flex-direction: column;
       margin-top: 20px;
       margin-left: 133px;
+
       .pictureimg {
         width: 100px;
         height: 100px;
       }
+
       .picturename {
         color: #6f6f6f;
         font-size: 14px;
       }
     }
+
     .options {
       display: flex;
     }
+
     .delete {
       cursor: pointer;
       margin-top: 32px;
@@ -306,15 +326,18 @@ export default {
       color: #4ea6ff;
       font-size: 14px;
     }
+
     .name2 {
       display: flex;
       align-items: flex-start;
     }
+
     .name {
       width: 60%;
       // background-color: lightcoral;
       display: flex;
       margin-top: 20px;
+
       //align-items: center;
       //height: 40px;
       // border: 1px solid black;
@@ -324,25 +347,30 @@ export default {
         align-items: center;
         justify-content: flex-end;
         flex-shrink: 0;
+
         .nameimg {
           width: 10px;
           height: 10px;
         }
       }
+
       .inname {
         color: #6f6f6f;
         font-size: 14px;
         margin-left: 7px;
         font-weight: 700;
       }
+
       .in {
         margin-left: 14px;
         flex: 1;
+
         .assess {
           display: flex;
           width: 226px;
           height: 40px;
           border: 1px solid #56a3f9;
+
           //margin-bottom: 20px;
           .assesstype {
             width: 50%;
@@ -352,6 +380,7 @@ export default {
             justify-content: center;
             align-items: center;
           }
+
           .assesswhole {
             width: 50%;
             background: rgba(86, 163, 249, 0.1);
@@ -361,6 +390,7 @@ export default {
             justify-content: center;
             align-items: center;
           }
+
           .ratio {
             position: absolute;
             right: 10px;
@@ -369,24 +399,28 @@ export default {
             font-size: 14px;
           }
         }
+
         .addimg {
           cursor: pointer;
           color: rgba(78, 166, 255, 1);
           font-size: 14px;
         }
+
         .text {
           color: rgba(109, 117, 132, 1);
           font-size: 14px;
           //line-height: 24px;
         }
-        .ant-radio-wrapper {
-        }
+
+        .ant-radio-wrapper {}
+
         .ant-input {
           border-radius: 5px;
           // height: 120%;
           width: 100%;
           height: 35px;
         }
+
         .ant-select-selector {
           border-radius: 5px;
           // height: 120%;
@@ -394,26 +428,32 @@ export default {
           height: 40px;
         }
       }
+
       .numberInp {
         width: 200px;
+
         .ant-input-number {
           width: 200px;
           height: 40px;
           border-radius: 8px;
         }
+
         // .ant-input-number-input-wrap {
         //   width: 200px;
         // }
       }
     }
   }
+
   .name2 {
     display: flex;
     align-items: flex-start;
   }
+
   .opinion {
     display: flex;
     margin-top: 30px;
+
     .namebox {
       width: 120px;
       display: flex;
@@ -421,27 +461,33 @@ export default {
       justify-content: flex-end;
       flex-shrink: 0;
     }
+
     .in {
       margin-left: 14px;
       width: 500px;
+
       .ant-input-textarea-show-count {
         position: relative;
         height: 110px;
       }
+
       .ant-input-textarea-show-count::after {
         position: absolute;
         right: 10px;
         bottom: 0px;
       }
+
       .ant-input {
         border-radius: 8px;
       }
     }
   }
+
   .footer {
     width: 100%;
     margin-top: 31px;
     margin-bottom: 14px;
+
     .btn {
       display: flex;
       margin-bottom: 20px;
@@ -452,6 +498,7 @@ export default {
 
   .uploadContent {
     display: block !important;
+
     .uploadBtn {
       margin-left: 120px !important;
     }
diff --git a/src/components/vote/VoteQuestionItem.vue b/src/components/vote/VoteQuestionItem.vue
index a99eda58..d38f3bc6 100644
--- a/src/components/vote/VoteQuestionItem.vue
+++ b/src/components/vote/VoteQuestionItem.vue
@@ -7,41 +7,27 @@
           <div class="inname">选项{{ item.id }}</div>
         </div>
         <div class="in">
-          <a-input
-            v-model:value="curItem.inputVal"
-            show-count
-            :maxlength="30"
-            style="border-radius: 8px"
-            @change="handleInput"
-          />
+          <a-input v-model:value="curItem.inputVal" show-count :maxlength="30" style="border-radius: 8px"
+            @change="handleInput" />
         </div>
       </div>
       <div class="delete" @click="handleDel">删除</div>
     </div>
     <div class="name uploadContent">
-      <a-upload
-        v-show="!item.imgVal"
-        class="in uploadBtn"
-        :show-upload-list="false"
-        :before-upload="beforeUpload"
-      >
+      <a-upload v-show="!item.imgVal" class="in uploadBtn" :show-upload-list="false" :before-upload="beforeUpload">
         <div class="addimg">+添加图片</div>
       </a-upload>
       <div v-show="item.imgVal" class="picture" style="position: relative">
         <img class="pictureimg" :src="item.imgVal" />
         <div class="picturename" v-show="hasImgName">{{ hasImgName }}</div>
-        <img
-          style="
+        <img style="
             cursor: pointer;
             width: 20px;
             height: 20px;
             position: absolute;
             right: 0;
             top: 0;
-          "
-          src="../../assets/images/basicinfo/close.png"
-          @click="handleCancel"
-        />
+          " src="../../assets/images/basicinfo/close.png" @click="handleCancel" />
       </div>
     </div>
   </div>
@@ -67,12 +53,14 @@ export default {
       hasImgName: "",
     });
 
-    const handleInput = () => {
-      emit("input", { id: curItem.value.id, val: curItem.value.inputVal });
+    const handleInput = (value) => {
+      console.log(value.target.value)
+      emit("edit", curItem)
+      emit("input", { id: curItem.value.id, val: value.target.value });
     };
     const handleDel = () => {
       handleCancel();
-      emit("del", { id: curItem.value.id, optionId: curItem.value.optionId });
+      emit("del", { id: curItem.value.id, optionId: curItem.value.optionId, data: curItem });
     };
     const handleCancel = () => {
       state.hasImgName = "";
@@ -124,10 +112,12 @@ export default {
   width: 100%;
   display: flex;
   flex-direction: column;
+
   .header {
     width: 100%;
     display: flex;
     justify-content: space-between;
+
     .title {
       color: #000000;
       font-size: 18px;
@@ -136,10 +126,12 @@ export default {
       padding-left: 37px;
       //font-weight: 500;
     }
+
     .goback {
       padding-right: 70px;
       //padding-top: 37px;
       position: relative;
+
       .return {
         display: inline-block;
         width: 42px;
@@ -148,6 +140,7 @@ export default {
         margin-right: 10px;
         background-image: url("../../assets/images/projectadd/return.png");
       }
+
       .returntext {
         display: inline-block;
         position: absolute;
@@ -157,16 +150,19 @@ export default {
       }
     }
   }
+
   .addtype {
     display: flex;
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
     margin-right: 20px;
     align-items: center;
     margin-left: 41px;
+
     .addtypen {
       color: #6f6f6f;
       font-size: 14px;
     }
+
     .types {
       cursor: pointer;
       width: 80px;
@@ -179,11 +175,13 @@ export default {
       align-items: center;
       margin: 20px 10px;
     }
+
     .typesCur {
       color: #fff;
       background: #409eff;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
@@ -192,9 +190,11 @@ export default {
     min-width: 690px;
     margin-left: 38px;
     margin-top: 20px;
+
     .tagbox {
       display: flex;
       justify-content: space-between;
+
       .tagname {
         width: 90px;
         height: 32px;
@@ -208,6 +208,7 @@ export default {
         color: rgba(64, 158, 255, 1);
         font-size: 16px;
       }
+
       .deleteop {
         display: flex;
         justify-content: center;
@@ -219,6 +220,7 @@ export default {
         border: 1px solid #409eff;
         border-radius: 8px;
         cursor: pointer;
+
         .del_text {
           color: #409eff;
           font-size: 14px;
@@ -226,21 +228,25 @@ export default {
         }
       }
     }
+
     .scorebox {
       display: flex;
       align-items: center;
       margin-top: 20px;
       margin-left: 70px;
+
       .scoretext {
         font-size: 14px;
         color: #56a3f9;
       }
+
       .number {
         display: flex;
         border: 1px solid #d7e5fd;
         border-radius: 5px;
         margin: 0 10px;
         padding: 5px;
+
         .btn {
           width: 40px;
           height: 40px;
@@ -258,24 +264,29 @@ export default {
         }
       }
     }
+
     .picture {
       width: 100px;
       display: flex;
       flex-direction: column;
       margin-top: 20px;
       margin-left: 133px;
+
       .pictureimg {
         width: 100px;
         height: 100px;
       }
+
       .picturename {
         color: #6f6f6f;
         font-size: 14px;
       }
     }
+
     .options {
       display: flex;
     }
+
     .delete {
       cursor: pointer;
       margin-top: 32px;
@@ -284,15 +295,18 @@ export default {
       color: #4ea6ff;
       font-size: 14px;
     }
+
     .name2 {
       display: flex;
       align-items: flex-start;
     }
+
     .name {
       width: 60%;
       // background-color: lightcoral;
       display: flex;
       margin-top: 20px;
+
       //align-items: center;
       //height: 40px;
       // border: 1px solid black;
@@ -302,25 +316,30 @@ export default {
         align-items: center;
         justify-content: flex-end;
         flex-shrink: 0;
+
         .nameimg {
           width: 10px;
           height: 10px;
         }
       }
+
       .inname {
         color: #6f6f6f;
         font-size: 14px;
         margin-left: 7px;
         font-weight: 700;
       }
+
       .in {
         margin-left: 14px;
         flex: 1;
+
         .assess {
           display: flex;
           width: 226px;
           height: 40px;
           border: 1px solid #56a3f9;
+
           //margin-bottom: 20px;
           .assesstype {
             width: 50%;
@@ -330,6 +349,7 @@ export default {
             justify-content: center;
             align-items: center;
           }
+
           .assesswhole {
             width: 50%;
             background: rgba(86, 163, 249, 0.1);
@@ -339,6 +359,7 @@ export default {
             justify-content: center;
             align-items: center;
           }
+
           .ratio {
             position: absolute;
             right: 10px;
@@ -347,24 +368,28 @@ export default {
             font-size: 14px;
           }
         }
+
         .addimg {
           cursor: pointer;
           color: rgba(78, 166, 255, 1);
           font-size: 14px;
         }
+
         .text {
           color: rgba(109, 117, 132, 1);
           font-size: 14px;
           //line-height: 24px;
         }
-        .ant-radio-wrapper {
-        }
+
+        .ant-radio-wrapper {}
+
         .ant-input {
           border-radius: 5px;
           // height: 120%;
           width: 100%;
           height: 35px;
         }
+
         .ant-select-selector {
           border-radius: 5px;
           // height: 120%;
@@ -372,26 +397,32 @@ export default {
           height: 40px;
         }
       }
+
       .numberInp {
         width: 200px;
+
         .ant-input-number {
           width: 200px;
           height: 40px;
           border-radius: 8px;
         }
+
         // .ant-input-number-input-wrap {
         //   width: 200px;
         // }
       }
     }
   }
+
   .name2 {
     display: flex;
     align-items: flex-start;
   }
+
   .opinion {
     display: flex;
     margin-top: 30px;
+
     .namebox {
       width: 120px;
       display: flex;
@@ -399,27 +430,33 @@ export default {
       justify-content: flex-end;
       flex-shrink: 0;
     }
+
     .in {
       margin-left: 14px;
       width: 500px;
+
       .ant-input-textarea-show-count {
         position: relative;
         height: 110px;
       }
+
       .ant-input-textarea-show-count::after {
         position: absolute;
         right: 10px;
         bottom: 0px;
       }
+
       .ant-input {
         border-radius: 8px;
       }
     }
   }
+
   .footer {
     width: 100%;
     margin-top: 31px;
     margin-bottom: 14px;
+
     .btn {
       display: flex;
       margin-bottom: 20px;
@@ -430,6 +467,7 @@ export default {
 
   .uploadContent {
     display: block !important;
+
     .uploadBtn {
       margin-left: 120px !important;
     }

From de6ff5056918f98b7cfdb5b021183ae967a48cc3 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 1 Dec 2022 02:39:02 +0800
Subject: [PATCH 21/28] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=85=B3=E5=8D=A1?=
 =?UTF-8?q?=E4=B9=A6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAddDetail.vue | 4 ++--
 src/views/projectcenter/temTask.vue       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 6524db2c..14021391 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -59,7 +59,7 @@
                   <div class="items2">
                     <a-popover
                       placement="topLeft"
-                      v-if="element.name.length > 10"
+                      v-if="element.name?.length > 10"
                     >
                       <template #content>
                         <div style="width: 130px">
@@ -70,7 +70,7 @@
                         {{ element.name }}
                       </div>
                     </a-popover>
-                    <div class="nname" v-if="element.name.length <= 10">
+                    <div class="nname" v-if="element.name?.length <= 10">
                       {{ element.name }}
                     </div>
                   </div>
diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
index a0a13d4c..4e7dbebd 100644
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -68,7 +68,7 @@
                   <div class="items2">
                     <a-popover
                       placement="topLeft"
-                      v-if="element.tit.length > 10"
+                      v-if="element.tit?.length > 10"
                     >
                       <template #content>
                         <div style="width: 130px">
@@ -82,7 +82,7 @@
                         {{ element.tit }}
                       </div>
                     </a-popover>
-                    <div class="nname" v-if="element.tit.length <= 10">
+                    <div class="nname" v-if="element.tit?.length <= 10">
                       {{ element.tit }}
                     </div>
                   </div>

From a7eb3ccf66eec274994c78f7bfba5f16f5f7b910 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Thu, 1 Dec 2022 02:40:47 +0800
Subject: [PATCH 22/28] =?UTF-8?q?=E7=9B=B4=E6=92=ADbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue | 11 +++++----
 src/components/drawers/AddLive.vue      | 32 ++++++++++++-------------
 src/components/drawers/AddTest.vue      |  3 ++-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index eda9a8a9..c3e76539 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -532,11 +532,11 @@ export default {
               await updateTask(res);
               ctx.emit("changeData", false);
               closeDrawer();
-            }).catch((e) => {
-          console.log(e)
-          message.destroy();
-          message.error(`添加失败`);
-        });
+                }).catch((e) => {
+              console.log(e)
+              message.destroy();
+              message.error(`添加失败`);
+            });
 
       }
     };
@@ -551,6 +551,7 @@ export default {
           chapterId: props.isactive,
           courseId: res.data.data.offcoursePlanId,
           name: res.data.data.name,
+          duration: res.data.data.duration,
           routerId: props.routerId,
           routerTaskId: props.routerTaskId || 0,
           type: 2,
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 9eafbca2..82d6e286 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -275,9 +275,7 @@
                     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"
@@ -306,8 +304,8 @@
             </div>
             <div class="btnbox">
               <a-checkbox
-                v-model:checked="checkedC2"
-                @onclick="checkedC2 = !checkedC2"
+                v-model:checked="switchC2"
+                @onclick="(switchC2 = !switchC2)"
                 >学员请假后记为任务完成</a-checkbox
               >
             </div>
@@ -424,20 +422,19 @@ export default {
       switchC1: "",
       checkedC1: false,
       checkedC2: false,
-      playback: false,
       assessmentId: null,
       obj: {}, //要传的obj数据
       assessment: [], //评估信息
       assessmentvalue: null,
       needEval: false,
-      otherSettings: false,
+      switchC2: false,
       assessmentVisible: false,
     });
     const closeDrawer = () => {
       ctx.emit("update:addliveVisible", false);
       ctx.emit("update:edit", false);
       state.radioV1 = "";
-      state.playback = false;
+      state.switchC1 = false;
       state.inputV6 = "";
       state.inputV7 = "";
       state.inputV2 = "";
@@ -451,7 +448,7 @@ export default {
       state.switchC1 = "";
       state.imageUrl = "";
       state.needEval = false;
-      state.otherSettings;
+      state.switchC2=false;
       ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
@@ -497,10 +494,11 @@ export default {
           state.inputV7 = res.data.data.afterSignIn;
           state.inputV8 = res.data.data.signOutTime;
           state.textV1 = res.data.data.liveExplain;
-          state.radioV1 = res.data.data.standardSettings;
+          state.radioV1 = Number(res.data.data.standardSettings);
           //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;
         })
         .catch(() => {
           //message.error(`查询失败`);
@@ -536,7 +534,7 @@ export default {
         RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.liveId,
-          duration: res.data.data.duration,
+          duration: res.data.data.liveDuration,
           name: res.data.data.liveName,
           routerId: props.routerId,
           routerTaskId: props.routerTaskId || 0,
@@ -553,7 +551,7 @@ export default {
         apiTask
           .addTask({
             courseId: res.data.data.liveId,
-            duration: res.data.data.duration,
+            duration: res.data.data.liveDuration,
             name: res.data.data.liveName,
             projectId: props.projectId,
             projectTaskId: props.projectTaskId || 0,
@@ -571,7 +569,7 @@ export default {
         console.log("props.projectTemplateId", props.projectTemplateId);
         addTempTask({
           courseId: res.data.data.liveId,
-          duration: res.data.data.duration,
+          duration: res.data.data.liveDuration,
           name: res.data.data.liveName,
           projectTemplateId: props.projectTemplateId,
           projectTaskId: props.projectTaskId || 0,
@@ -631,13 +629,13 @@ export default {
         liveId: props.edit ? props.EditLiveId : 0,
         liveLink: state.inputV4,
         liveName: state.inputV1,
-        livePlayback: state.playback ? "true" : "false",
-        livePlaybackLink: state.playback ? state.inputV5 : "",
+        livePlayback: state.switchC1? "1" : "0",
+        livePlaybackLink: state.switchC1 ? state.inputV5 : "",
         liveTeacherId: state.inputV3,
-        otherSettings: state.otherSettings, //1或0
+        otherSettings: state.switchC2?"1":"0", //1或0
         signOutTime: state.inputV8,
         standardSettings: state.radioV1, //1或2
-        isEvaluate: state.eedEval ? "1" : "0",
+        isEvaluate: state.needEval ? "1" : "0",
       };
       if (props.edit) {
         api
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 6986478d..5d7a03c7 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -754,6 +754,7 @@ export default {
         if (props.isLevel == 1) {
           let editObj1 = {
             chapterId: props.isactive,
+            duration: res.data.data.examinationDuration,
             courseId: res.data.data.examinationId,
             name: res.data.data.examinationName,
             routerId: props.routerId,
@@ -773,7 +774,7 @@ export default {
         } else if (props.isLevel == 2) {
           let editObj = {
             courseId: res.data.data.examinationId,
-            duration: 0,
+            duration: res.data.data.examinationDuration,
             name: res.data.data.examinationName,
             projectId: props.projectId,
             projectTaskId: props.projectTaskId || 0,

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 23/28] =?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 24/28] =?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 25/28] -- 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 26/28] =?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 27/28] -- 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 28/28] =?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,