From 5adc818ed0cf009a8bf7aa3ebeddbe93e0497f72 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Mon, 5 Dec 2022 21:04:47 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=E5=88=9B=E5=BB=BA=E7=9B=B4=E6=92=AD?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index eaabbe00..1dedcb9a 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -66,8 +66,10 @@
             </div>
             <div class="btnbox">
               <a-range-picker
+                  show-time
                   style="width: 424px"
                   v-model:value="time"
+                  format="YYYY/MM/DD HH:mm"
                   :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
@@ -492,9 +494,11 @@ export default {
             console.log("获取的数据",res)
             state.inputV1 = res.data.data.liveName;
             state.time = [
-              dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"),
-              dayjs(res.data.data.liveEndTime, "YYYY-MM-DD"),
+              dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"),
+              dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"),
             ];
+            console.log(state.time)
+
             state.inputV2 = res.data.data.liveDuration;
             state.inputV3 = res.data.data.liveTeacherId;
             //state.fileList= res.data.data
@@ -632,11 +636,11 @@ export default {
       }
       let startTime = toDate(
           new Date(state.time[0].$d).getTime() / 1000,
-          "Y-M-D"
+          "Y-M-D h:m"
       );
       let endTime = toDate(
           new Date(state.time[1].$d).getTime() / 1000,
-          "Y-M-D"
+          "Y-M-D h:m"
       );
       state.obj = {
         afterSignIn: state.inputV6,
@@ -661,6 +665,7 @@ export default {
         isEvaluate: state.needEval ? "1" : "0",
       };
       console.log('我是要更新的数据',state.obj )
+      
       if (props.edit) {
         api
             .updateLiveBroadcastMessage(state.obj)

From d370576c231fecfdef3209ee53aa2823d5020b73 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Mon, 5 Dec 2022 21:43:41 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E5=92=8C=E6=A1=88=E4=BE=8B=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddCase.vue   |  8 ++++++++
 src/components/drawers/AddOnline.vue | 25 +++++++------------------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 9ac7873e..b0976927 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -216,6 +216,7 @@ export default {
       state.apiTaskList = selectedRows;
     };
     const handelChangePage = (page, pageSize) => {
+      state.selectedRowKeys = []
       state.currentPage = page;
       state.pageSize = pageSize;
       getAllCaseText();
@@ -250,7 +251,14 @@ export default {
           isTop: "",
         })
         .then((res) => {
+          console.log('案例列表',res)
           if (res.status === 200) {
+            state.selectedRowKeys=[0]
+            for(let i=0;i<res.data.data.length;i++){
+              if(Number(res.data.data[i].casesId) == props.EditCaseId){
+                state.selectedRowKeys = [i]
+              }
+            }
             getTableDate(res.data.data);
           }
         })
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 57473288..0850304e 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -79,24 +79,7 @@
         <div class="main_table">
           <!-- 编辑的表格 -->
           <div v-if="edit">
-            <div
-              v-if="choicecourse"
-              class="main_btns"
-              style="justify-content: flex-start"
-            >
-              <div
-                class="btn2"
-                style="
-                  display: flex;
-                  justify-content: center;
-                  align-items: center;
-                "
-                @click="ChoiceCourse"
-              >
-                选择在线课
-              </div>
-            </div>
-            <div v-else>
+            <div>
               <a-table
                 class="ant-table-striped"
                 :row-class-name="
@@ -338,6 +321,7 @@ export default {
     };
     const handelChangePage = (page) => {
       state.currentPage = page;
+      state.selectedRowKeys = []
       getAllOnlineText();
     };
     const getTableDate = (tableData) => {
@@ -381,6 +365,11 @@ export default {
           state.tableDataTotal = res.data.data.count;
           if (res.status === 200) {
             console.log("获取在线课列表数据", res);
+            for(let i=0;i<res.data.data.list.length;i++){
+              if(Number(res.data.data.list[i].onlineClassesId) == props.EditOnlineId){
+                state.selectedRowKeys = [i+1]
+              }
+            }
             getTableDate(arr);
           }
         })

From 9d916073149e44596f0e35b29ba2a88ac4590701 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Mon, 5 Dec 2022 21:47:39 +0800
Subject: [PATCH 3/8] =?UTF-8?q?style:=E9=9A=90=E8=97=8F=E6=8E=88=E8=AF=BE?=
 =?UTF-8?q?=E6=95=99=E5=B8=88=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84=E8=80=81=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/project/ProjectManager.vue b/src/components/project/ProjectManager.vue
index 21b31a40..84bbbc90 100644
--- a/src/components/project/ProjectManager.vue
+++ b/src/components/project/ProjectManager.vue
@@ -69,7 +69,7 @@ export default {
 
     onMounted(() => {
       console.log('onMounted')
-      init()
+      // init()
     })
 
     function getMember() {

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

---
 src/api/config.js                         |    6 +-
 src/views/learningpath/LearningPath.vue   |  114 +-
 src/views/learningpath/LevelAdd.vue       |   26 +-
 src/views/learningpath/LevelAddDetail.vue |    4 +-
 src/views/projectcenter/TaskPage.vue      | 1554 +++++++++++----------
 5 files changed, 876 insertions(+), 828 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index 6dda3fdf..e0c19a8e 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-05 16:33:28
+ * @LastEditTime: 2022-12-05 17:39:23
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -24,7 +24,7 @@ const http = axios.create({
 
 http.interceptors.request.use(
   (config) => {
-    console.log("config", config);
+    // console.log("config", config);
     // const token = localStorage.getItem("token");
     // // const token = getCookie('token')
     // // console.log('token', token)
@@ -56,7 +56,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');
         // window.open("http://111.231.196.214:12013/manage/login", '_self');
       }
       console.log("api %o", msg);
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 0112720a..f82e7bc4 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -878,11 +878,16 @@ export default {
       api
         .handleLearnPath(obj)
         .then((res) => {
-          console.log("发布成功", res);
-          message.destroy();
-          message.success("发布成功");
-          state.pub = false;
-          getLearnPath();
+          console.log("发布", res);
+          if (res.data.code === 200) {
+            message.destroy();
+            message.success("发布成功");
+            state.pub = false;
+            getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("发布失败", err);
@@ -909,11 +914,16 @@ export default {
       api
         .handleLearnPath(obj)
         .then((res) => {
-          console.log("复制成功", res);
-          message.destroy();
-          message.success("复制成功");
-          state.copyModal = false;
-          getLearnPath();
+          if (res.data.code === 200) {
+            console.log("复制成功", res);
+            message.destroy();
+            message.success("复制成功");
+            state.copyModal = false;
+            getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("复制失败", err);
@@ -937,11 +947,16 @@ export default {
       api
         .handleLearnPath(obj)
         .then((res) => {
-          console.log("停用成功", res);
-          message.destroy();
-          message.success("停用成功");
-          state.stopModal = false;
-          getLearnPath();
+          if (res.data.code === 200) {
+            console.log("停用成功", res);
+            message.destroy();
+            message.success("停用成功");
+            state.stopModal = false;
+            getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("停用失败", err);
@@ -979,11 +994,16 @@ export default {
       api
         .handleLearnPath(obj)
         .then((res) => {
-          console.log("撤回成功", res);
-          message.destroy();
-          message.success("撤回成功");
-          state.backModal = false;
-          getLearnPath();
+          if (res.data.code === 200) {
+            console.log("撤回成功", res);
+            message.destroy();
+            message.success("撤回成功");
+            state.backModal = false;
+            getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("撤回失败", err);
@@ -1502,11 +1522,16 @@ export default {
       api
         .handleLearnPath(obj)
         .then((res) => {
-          console.log("删除成功", res);
-          message.destroy();
-          message.success("删除成功");
-          state.deleteModal = false;
-          getLearnPath();
+          if (res.data.code === 200) {
+            console.log("删除成功", res);
+            message.destroy();
+            message.success("删除成功");
+            state.deleteModal = false;
+            getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("删除失败", err);
@@ -1579,23 +1604,28 @@ export default {
       api
         .createLearnPath(obj)
         .then((res) => {
-          console.log("修改成功", res);
-          message.destroy();
-          message.success("修改成功");
-          // state.createLoading = false;
-          // state.currentPage = 1;
-          state.out1 = false;
-          // router.push("/leveladd");
-          getLearnPath();
-          // setTimeout(() => {
-          //   console.log("修改成功", res);
-          //   message.success("修改成功");
-          //   // state.createLoading = false;
-          //   // state.currentPage = 1;
-          //   state.out1 = false;
-          //   // router.push("/leveladd");
-          //   getLearnPath();
-          // }, 1000);
+          if (res.data.code === 200) {
+            console.log("修改成功", res);
+            message.destroy();
+            message.success("修改成功");
+            // state.createLoading = false;
+            // state.currentPage = 1;
+            state.out1 = false;
+            // router.push("/leveladd");
+            getLearnPath();
+            // setTimeout(() => {
+            //   console.log("修改成功", res);
+            //   message.success("修改成功");
+            //   // state.createLoading = false;
+            //   // state.currentPage = 1;
+            //   state.out1 = false;
+            //   // router.push("/leveladd");
+            //   getLearnPath();
+            // }, 1000);
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
         })
         .catch((err) => {
           console.log("修改失败", err);
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index edf0de79..8bba71ef 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -138,10 +138,11 @@
                 <div class="centermain">快速添加学员</div>
               </div>
               <!-- 2022-12-2注释 后面放开 -->
-              <!-- <div
+              <div
                 class="taskbox"
                 @click="showPub"
                 style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)"
+                v-if="action === 0"
               >
                 <div class="leftt">
                   <img src="../../assets/images/taskpage/left3.png" />
@@ -156,7 +157,7 @@
                   发布
                 </div>
                 <div class="centermain">快速发布项目</div>
-              </div> -->
+              </div>
             </div>
           </div>
           <!-- 概览（有数据） -->
@@ -1770,12 +1771,17 @@ export default {
       };
       handleLearnPath(obj)
         .then((res) => {
-          console.log("发布成功", res);
-          message.destroy();
-          message.success("发布成功");
-          state.pub = false;
-          state.nodata = false;
-          // getLearnPath();
+          if (res.data.code === 200) {
+            console.log("发布成功", res);
+            message.destroy();
+            message.success("发布成功");
+            state.pub = false;
+            state.nodata = false;
+            // getLearnPath();
+          }
+          if (res.data.code === -1) {
+            message.warning(res.data.msg);
+          }
 
           reget();
         })
@@ -2407,7 +2413,9 @@ export default {
   .ant-modal {
     width: 424px !important;
     height: 258px !important;
-
+    .ant-modal-close-x {
+      display: none;
+    }
     .ant-modal-content {
       width: 424px !important;
       height: 258px !important;
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 73c0975d..f2f5540f 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -905,9 +905,7 @@
             <div class="close_exit" @click="closedeleteAll"></div>
           </div>
           <div class="body">
-            <span
-              >请确认是否批量删除{{ deleteType === 1 ? "任务" : "学员" }}</span
-            >
+            <span>请确认是否批量删除任务</span>
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closedeleteAll">
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 10bcce5b..15aca1d4 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3,7 +3,7 @@
   <div class="taskpage">
     <div class="addhead" style="flex-shrink: 0">
       <div class="leftimg">
-        <img class="img" :src="picUrl"/>
+        <img class="img" :src="picUrl" />
       </div>
       <div class="imgfor">
         <div class="forz">{{ name }}</div>
@@ -11,29 +11,29 @@
         <div class="fort">起止时间：{{ startTime }}至{{ endTime }}</div>
       </div>
       <div class="right">
-        <img class="img1" src="../../assets/images/leveladd/ma.png"/>
+        <img class="img1" src="../../assets/images/leveladd/ma.png" />
         <div class="line" v-if="action == 1 || action == 0"></div>
         <img
-            v-if="action == 1 || action == 0"
-            class="img2"
-            src="../../assets/images/leveladd/pub.png"
+          v-if="action == 1 || action == 0"
+          class="img2"
+          src="../../assets/images/leveladd/pub.png"
         />
         <!-- <div class="pub">发布</div> -->
         <!-- 已发布的显示 -->
         <div
-            class="pub"
-            style="width: 28px"
-            v-if="action == 1"
-            @click="showBackModal"
+          class="pub"
+          style="width: 28px"
+          v-if="action == 1"
+          @click="showBackModal"
         >
           {{ act }}
         </div>
         <!-- 未发布/草稿的显示 -->
         <div
-            class="pub"
-            style="width: 28px"
-            v-if="action == 0"
-            @click="showProjectPub"
+          class="pub"
+          style="width: 28px"
+          v-if="action == 0"
+          @click="showProjectPub"
         >
           {{ act }}
         </div>
@@ -43,9 +43,9 @@
         </div> -->
         <div class="line"></div>
         <img
-            style="margin-right: 15px"
-            class="img2"
-            src="../../assets/images/leveladd/more.png"
+          style="margin-right: 15px"
+          class="img2"
+          src="../../assets/images/leveladd/more.png"
         />
         <!-- <div class="more">
           <span style="color: #7096e3; cursor: pointer">更多</span>
@@ -88,7 +88,7 @@
         <div class="line"></div>
         <router-link to="/projectmanage">
           <div style="display: flex">
-            <img class="img2" src="../../assets/images/leveladd/back.png"/>
+            <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
           </div>
         </router-link>
@@ -97,11 +97,11 @@
     <div class="split" style="flex-shrink: 0"></div>
     <div class="content">
       <a-tabs
-          class="tab"
-          v-model:activeKey="activeKey"
-          size="large"
-          :tabBarStyle="{ marginLeft: '10px', marginTop: '5px' }"
-          @change="tabsChange"
+        class="tab"
+        v-model:activeKey="activeKey"
+        size="large"
+        :tabBarStyle="{ marginLeft: '10px', marginTop: '5px' }"
+        @change="tabsChange"
       >
         <a-tab-pane key="1" tab="概览">
           <div class="split"></div>
@@ -112,18 +112,18 @@
             </div>
             <div class="second">
               <div
-                  class="taskbox"
-                  @click="totask"
-                  style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
+                class="taskbox"
+                @click="totask"
+                style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left1.png"/>
+                  <img src="../../assets/images/taskpage/left1.png" />
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture1.png"/>
+                  <img src="../../assets/images/taskpage/picture1.png" />
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right1.png"/>
+                  <img src="../../assets/images/taskpage/right1.png" />
                 </div>
                 <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
                   添加任务
@@ -131,18 +131,18 @@
                 <div class="centermain">快速添加任务/阶段</div>
               </div>
               <div
-                  class="taskbox"
-                  @click="tostudent"
-                  style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
+                class="taskbox"
+                @click="tostudent"
+                style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left2.png"/>
+                  <img src="../../assets/images/taskpage/left2.png" />
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture2.png"/>
+                  <img src="../../assets/images/taskpage/picture2.png" />
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right2.png"/>
+                  <img src="../../assets/images/taskpage/right2.png" />
                 </div>
                 <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                   添加学员
@@ -180,27 +180,27 @@
             <div class="second" style="margin-top: 0">
               <div class="nubbox">
                 <span class="nub1">{{
-                    projectInfoOverview.totalStudentCnt
-                  }}</span>
+                  projectInfoOverview.totalStudentCnt
+                }}</span>
                 <div class="nub2">总人数</div>
               </div>
               <div class="nubbox">
                 <span class="nub1" style="color: #ff90ae">{{
-                    projectInfoOverview.studyStudentCnt
-                  }}</span>
+                  projectInfoOverview.studyStudentCnt
+                }}</span>
                 <div class="nub2">学习人数</div>
               </div>
               <div class="nubbox">
                 <span class="nub1" style="color: #a497ff">{{
-                    projectInfoOverview.completeStudentCnt
-                  }}</span>
+                  projectInfoOverview.completeStudentCnt
+                }}</span>
                 <div class="nub2">完成人数</div>
               </div>
               <div class="nubbox">
                 <div>
                   <span class="nub1" style="color: #5dc988">{{
-                      projectInfoOverview.onlineCourseCnt
-                    }}</span
+                    projectInfoOverview.onlineCourseCnt
+                  }}</span
                   ><span style="color: #5dc988; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">在线课程数</div>
@@ -208,8 +208,8 @@
               <div class="nubbox">
                 <div>
                   <span class="nub1" style="color: #ff90ae">{{
-                      projectInfoOverview.offLineCourseCnt
-                    }}</span
+                    projectInfoOverview.offLineCourseCnt
+                  }}</span
                   ><span style="color: #ff90ae; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">面授课程数</div>
@@ -217,8 +217,8 @@
               <div class="nubbox">
                 <div>
                   <span class="nub1" style="color: #a497ff">{{
-                      projectInfoOverview.completeRatio
-                    }}</span
+                    projectInfoOverview.completeRatio
+                  }}</span
                   ><span style="color: #a497ff; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">总完成率</div>
@@ -233,13 +233,13 @@
             </div> -->
             <div class="stagemess">
               <div
-                  v-for="item in stageList"
-                  :class="{
+                v-for="item in stageList"
+                :class="{
                   stage1: item.stageId == choosedStageId,
                   stage2: item.stageId != choosedStageId,
                 }"
-                  :key="item.stageId"
-                  @click="choosedStageId = item.stageId"
+                :key="item.stageId"
+                @click="choosedStageId = item.stageId"
               >
                 {{ item.stage }}
               </div>
@@ -253,28 +253,28 @@
             <div class="stagelast">
               <div class="stagepro">
                 <a-progress
-                    type="dashboard"
-                    gapDegree="0"
-                    :percent="stageOverviewList.completeCourseRatio"
-                    :width="140"
+                  type="dashboard"
+                  gapDegree="0"
+                  :percent="stageOverviewList.completeCourseRatio"
+                  :width="140"
                 />
                 <div class="protext">课程完成率</div>
               </div>
               <div class="stagepro">
                 <a-progress
-                    type="dashboard"
-                    gapDegree="0"
-                    :percent="stageOverviewList.completeExamRatio"
-                    :width="140"
+                  type="dashboard"
+                  gapDegree="0"
+                  :percent="stageOverviewList.completeExamRatio"
+                  :width="140"
                 />
                 <div class="protext">考试通过率</div>
               </div>
               <div class="stagepro" style="margin-right: 0">
                 <a-progress
-                    type="dashboard"
-                    gapDegree="0"
-                    :percent="stageOverviewList.completeRatio"
-                    :width="140"
+                  type="dashboard"
+                  gapDegree="0"
+                  :percent="stageOverviewList.completeRatio"
+                  :width="140"
                 />
                 <div class="protext">作业完成率</div>
               </div>
@@ -285,8 +285,8 @@
                 <div class="proright1">
                   <span class="textpro">阶段任务总数</span>
                   <a-progress
-                      :percent="stageOverviewList.totalTaskCnt"
-                      style="width: 369px"
+                    :percent="stageOverviewList.totalTaskCnt"
+                    style="width: 369px"
                   />
                 </div>
                 <div class="pronub" style="margin-left: 206px">
@@ -295,8 +295,8 @@
                 <div class="proright1">
                   <span class="textpro">必修课</span>
                   <a-progress
-                      :percent="stageOverviewList.totalReqCnt"
-                      style="width: 369px"
+                    :percent="stageOverviewList.totalReqCnt"
+                    style="width: 369px"
                   />
                 </div>
                 <div class="pronub" style="margin-left: 142px">
@@ -305,8 +305,8 @@
                 <div class="proright1">
                   <span class="textpro">选修课</span>
                   <a-progress
-                      :percent="stageOverviewList.totalOptCnt"
-                      style="width: 369px"
+                    :percent="stageOverviewList.totalOptCnt"
+                    style="width: 369px"
                   />
                 </div>
               </div>
@@ -324,12 +324,12 @@
                 批量面授报名
               </button> -->
               <router-link
-                  :to="{ path: `/taskadd`, query: { projectId: projectId } }"
+                :to="{ path: `/taskadd`, query: { projectId: projectId } }"
               >
                 <button class="edit">
                   <img
-                      class="editimg"
-                      src="../../assets/images/projectadd/edit.png"
+                    class="editimg"
+                    src="../../assets/images/projectadd/edit.png"
                   />
                   <span class="editext">编辑</span>
                 </button>
@@ -346,8 +346,8 @@
               </router-link>
             </div> -->
             <div
-                class="taskSyllabus"
-                v-if="
+              class="taskSyllabus"
+              v-if="
                 taskSyllabus &&
                 taskSyllabus.length &&
                 (taskSyllabus.length > 1 || taskSyllabus[0].name)
@@ -356,12 +356,12 @@
               <a-collapse v-model:activeKey="taskSyllabusActive" accordion>
                 <template #expandIcon="{ isActive }">
                   <img
-                      :style="{
+                    :style="{
                       width: isActive ? 9.1 : 8.1,
                       height: isActive ? 8.1 : 9.1,
                       'margin-right': isActive ? '12px' : '13px',
                     }"
-                      :src="
+                    :src="
                       isActive
                         ? require('../../assets/images/projectadd/open.png')
                         : require('../../assets/images/projectadd/close.png')
@@ -371,19 +371,19 @@
                 </template>
                 <template v-for="(value, index) in taskSyllabus">
                   <a-collapse-panel
-                      :key="index"
-                      v-if="value.name"
-                      :header="value.name"
+                    :key="index"
+                    v-if="value.name"
+                    :header="value.name"
                   >
                     <div
-                        class="course"
-                        v-for="(item, key) in value.taskList"
-                        :key="key"
+                      class="course"
+                      v-for="(item, key) in value.taskList"
+                      :key="key"
                     >
                       <div class="first">
                         <div class="icon">
                           <div
-                              style="
+                            style="
                               width: 31px;
                               height: 28px;
                               display: flex;
@@ -392,7 +392,7 @@
                             "
                           >
                             <img
-                                :src="
+                              :src="
                                 item.type == 1
                                   ? require('../../assets/images/leveladd/zai.png')
                                   : item.type == 2
@@ -431,7 +431,7 @@
                       </div>
                       <div class="type">
                         <div
-                            :class="item.flag == true ? 'typename1' : 'typename'"
+                          :class="item.flag == true ? 'typename1' : 'typename'"
                         >
                           <span v-if="item.flag">必修</span>
                           <span v-else>选修</span>
@@ -447,29 +447,29 @@
                         <div class="progresstext">
                           {{
                             item.finishStuCnt && item.finishStuCnt !== null
-                                ? item.finishStuCnt
-                                : 0
+                              ? item.finishStuCnt
+                              : 0
                           }}/{{
                             item.totalStuCnt && item.totalStuCnt !== null
-                                ? item.totalStuCnt
-                                : 0
+                              ? item.totalStuCnt
+                              : 0
                           }}人
                         </div>
                         <div style="display: flex">
                           <a-progress
-                              :showInfo="false"
-                              :percent="item.percent"
-                              strokeColor="#FFC067"
-                              trailColor="rgba(253, 209, 98, 0.2)"
+                            :showInfo="false"
+                            :percent="item.percent"
+                            strokeColor="#FFC067"
+                            trailColor="rgba(253, 209, 98, 0.2)"
                           />
                           <span class="progresstext" style="margin-left: 10px"
-                          >{{
+                            >{{
                               (item.finishStuCnt && item.finishStuCnt !== null
-                                  ? item.finishStuCnt
-                                  : 0 / item.totalStuCnt &&
+                                ? item.finishStuCnt
+                                : 0 / item.totalStuCnt &&
                                   item.totalStuCnt !== null
-                                      ? item.totalStuCnt
-                                      : 0) * 100
+                                ? item.totalStuCnt
+                                : 0) * 100
                             }}%</span
                           >
                         </div>
@@ -500,9 +500,9 @@
                           考勤
                         </div> -->
                         <div
-                            class="operation"
-                            style="cursor: pointer"
-                            @click="showCodeModal"
+                          class="operation"
+                          style="cursor: pointer"
+                          @click="showCodeModal"
                         >
                           二维码
                         </div>
@@ -537,22 +537,22 @@
               </a-collapse>
               <!-- 无数据创建任务  v-if="taskSyllabus.length == 0"-->
               <router-link
-                  :to="{ path: `/taskadd`, query: { projectId: projectId } }"
-                  class="taskbox"
-                  style="
+                :to="{ path: `/taskadd`, query: { projectId: projectId } }"
+                class="taskbox"
+                style="
                   background: linear-gradient(180deg, #ddeaff, #f0f8fe);
                   display: block;
                 "
-                  v-if="taskSyllabus.length == 0"
+                v-if="taskSyllabus.length == 0"
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left2.png"/>
+                  <img src="../../assets/images/taskpage/left2.png" />
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture8.png"/>
+                  <img src="../../assets/images/taskpage/picture8.png" />
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right2.png"/>
+                  <img src="../../assets/images/taskpage/right2.png" />
                 </div>
                 <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                   创建任务
@@ -563,8 +563,8 @@
             </div>
             <div v-else>
               <div
-                  class="taskbox"
-                  @click="
+                class="taskbox"
+                @click="
                   () => {
                     routered.push({
                       path: `/taskadd`,
@@ -572,16 +572,16 @@
                     });
                   }
                 "
-                  style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
+                style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left1.png"/>
+                  <img src="../../assets/images/taskpage/left1.png" />
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture1.png"/>
+                  <img src="../../assets/images/taskpage/picture1.png" />
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right1.png"/>
+                  <img src="../../assets/images/taskpage/right1.png" />
                 </div>
                 <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
                   添加任务
@@ -600,7 +600,7 @@
                 <div class="group">
                   <div class="groupleft">
                     <div
-                        style="
+                      style="
                         display: flex;
                         align-items: center;
                         margin-right: 10px;
@@ -609,12 +609,12 @@
                     >
                       <div class="groupname" style="width: 42px">姓名：</div>
                       <a-input
-                          v-model:value="valuestun"
-                          placeholder="请输入姓名"
+                        v-model:value="valuestun"
+                        placeholder="请输入姓名"
                       />
                     </div>
                     <div
-                        style="
+                      style="
                         display: flex;
                         align-items: center;
                         margin-right: 10px;
@@ -623,8 +623,8 @@
                     >
                       <div class="groupname">小组名称：</div>
                       <a-input
-                          v-model:value="valuestugroup"
-                          placeholder="请输入小组名称"
+                        v-model:value="valuestugroup"
+                        placeholder="请输入小组名称"
                       />
                     </div>
                     <!-- 2022-11-30注释 后面放开 -->
@@ -679,18 +679,18 @@
                   </div>
                   <div class="groupright">
                     <div class="btn1" @click="searchStu">
-                      <img src="../../assets/images/courseManage/search0.png"/>
+                      <img src="../../assets/images/courseManage/search0.png" />
                       <span class="btn1text">搜索</span>
                     </div>
                     <div class="btn2" @click="resetCancel">
-                      <img src="../../assets/images/courseManage/reset1.png"/>
+                      <img src="../../assets/images/courseManage/reset1.png" />
                       <span class="btn2text">重置</span>
                     </div>
                   </div>
                 </div>
                 <div class="second2" style="margin-top: 20px">
                   <div class="btn1" @click="showStuAdd">
-                    <img src="../../assets/images/courseManage/add0.png"/>
+                    <img src="../../assets/images/courseManage/add0.png" />
                     <span class="btn1text">添加学员</span>
                   </div>
                   <!-- 2022-11-30注释 后面放开 -->
@@ -699,12 +699,12 @@
                     <span class="btn2text">导入学员</span>
                   </div> -->
                   <div class="btn2" @click="showAllDelete">
-                    <img src="../../assets/images/projectadd/delete.png"/>
+                    <img src="../../assets/images/projectadd/delete.png" />
                     <span class="btn2text">批量删除</span>
                   </div>
                 </div>
                 <div class="talk">
-                  <img class="im" src="../../assets/images/leveladd/gan.png"/>
+                  <img class="im" src="../../assets/images/leveladd/gan.png" />
                   <div class="xu">
                     <span class="yi">已选择</span>
                     <div style="width: 5px; display: inline-block"></div>
@@ -719,15 +719,15 @@
                 </div>
                 <div class="tab" style="margin: 20px 32px 30px 32px">
                   <a-table
-                      style="border: 1px solid #f2f6fe"
-                      :columns="studentColumns()"
-                      :data-source="tabledata"
-                      expandRowByClick="true"
-                      :scroll="{ x: 1400 }"
-                      @expand="expandTable"
-                      :pagination="false"
-                      :loading="loading"
-                      :row-selection="{
+                    style="border: 1px solid #f2f6fe"
+                    :columns="studentColumns()"
+                    :data-source="tabledata"
+                    expandRowByClick="true"
+                    :scroll="{ x: 1400 }"
+                    @expand="expandTable"
+                    :pagination="false"
+                    :loading="loading"
+                    :row-selection="{
                       columnWidth: 30,
                       selectedRowKeys: selectedRowKeys,
                       onChange: onSelectChange,
@@ -743,15 +743,15 @@
                   </div>
                   <div class="pa">
                     <a-pagination
-                        v-if="total > 10"
-                        showSizeChanger="true"
-                        showQuickJumper="true"
-                        hideOnSinglePage="true"
-                        :pageSize="stupageSize"
-                        :current="currentPageStu"
-                        :total="total"
-                        class="pagination"
-                        @change="changePaginationStu"
+                      v-if="total > 10"
+                      showSizeChanger="true"
+                      showQuickJumper="true"
+                      hideOnSinglePage="true"
+                      :pageSize="stupageSize"
+                      :current="currentPageStu"
+                      :total="total"
+                      class="pagination"
+                      @change="changePaginationStu"
                     />
                   </div>
                 </div>
@@ -761,24 +761,24 @@
                   <div class="groupleft">
                     <div class="groupname">小组名称：</div>
                     <a-input
-                        v-model:value="valuestugn"
-                        placeholder="请输入小组名称"
+                      v-model:value="valuestugn"
+                      placeholder="请输入小组名称"
                     />
                   </div>
                   <div class="groupright">
                     <div class="btn1" @click="searchGroup">
-                      <img src="../../assets/images/courseManage/search0.png"/>
+                      <img src="../../assets/images/courseManage/search0.png" />
                       <span class="btn1text">搜索</span>
                     </div>
                     <div class="btn2" @click="resetGroupName">
-                      <img src="../../assets/images/courseManage/reset1.png"/>
+                      <img src="../../assets/images/courseManage/reset1.png" />
                       <span class="btn2text">重置</span>
                     </div>
                   </div>
                 </div>
                 <div class="second2">
                   <div class="btn1" @click="showModal2(1, null)">
-                    <img src="../../assets/images/courseManage/add0.png"/>
+                    <img src="../../assets/images/courseManage/add0.png" />
                     <span class="btn1text">创建小组</span>
                   </div>
                   <!-- 2022-12-2注释 后面放开 -->
@@ -790,25 +790,25 @@
                 <!-- 小组列表 -->
                 <div class="groupmain">
                   <div
-                      class="groupbox"
-                      v-for="item in groupList"
-                      :key="item.projectGroupId"
+                    class="groupbox"
+                    v-for="item in groupList"
+                    :key="item.projectGroupId"
                   >
                     <div style="width: 90%">
                       <div class="grouptitle">
                         <div class="goodgruop">{{ item.groupName }}</div>
                         <div class="more">
                           <span
-                              style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
-                          >. . .</span
+                            style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
+                            >. . .</span
                           >
                           <div class="moreItems">
                             <div class="sammo" @click="showModal2(2, item)">
                               编辑
                             </div>
                             <div
-                                class="sammo"
-                                @click="deleteGroupBtn(item.projectGroupId)"
+                              class="sammo"
+                              @click="deleteGroupBtn(item.projectGroupId)"
                             >
                               删除
                             </div>
@@ -818,11 +818,11 @@
                       <div class="leader">组长：{{ item.leaderName }}</div>
                       <div class="grocenter">
                         <div class="leader1">进度</div>
-                        <a-progress :percent="item.completeRatio"/>
+                        <a-progress :percent="item.completeRatio" />
                       </div>
                       <div
-                          class="grofooter"
-                          @click="showMemberList(item.projectGroupId)"
+                        class="grofooter"
+                        @click="showMemberList(item.projectGroupId)"
                       >
                         <div class="ftext">组员名单 ></div>
                         <!-- <div class="peoples">
@@ -1016,9 +1016,9 @@
                     <div class="setc_name"><span>封面图：</span></div>
                     <div class="setc_main">
                       <img
-                          style="width: 151px; height: 84px"
-                          :src="picUrl"
-                          alt=""
+                        style="width: 151px; height: 84px"
+                        :src="picUrl"
+                        alt=""
                       />
                     </div>
                   </div>
@@ -1026,7 +1026,7 @@
                     <div class="setc_name"><span>项目时间：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
-                      >{{ startTime }} ～ {{ endTime }}</span
+                        >{{ startTime }} ～ {{ endTime }}</span
                       >
                     </div>
                   </div>
@@ -1052,9 +1052,9 @@
                     <div class="setc_name"><span>同步学习记录：</span></div>
                     <div class="setc_main">
                       <a-radio v-model:checked="checkedSty" :disabled="true"
-                      ><span style="color: #333333"
-                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                      ></a-radio
+                        ><span style="color: #333333"
+                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                        ></a-radio
                       >
                     </div>
                   </div>
@@ -1062,10 +1062,10 @@
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
-                      ><ProjectLevel
+                        ><ProjectLevel
                           v-model:value="level"
                           :disabled="true"
-                      ></ProjectLevel
+                        ></ProjectLevel
                       ></span>
                     </div>
                   </div>
@@ -1073,10 +1073,10 @@
                     <div class="setc_name"><span>培训体系：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
-                      ><TrainClass
+                        ><TrainClass
                           v-model:value="systemId"
                           :disabled="true"
-                      ></TrainClass
+                        ></TrainClass
                       ></span>
                     </div>
                   </div>
@@ -1084,7 +1084,7 @@
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
                       <a-radio v-model:checked="checkedBOEU" :disabled="true"
-                      ><span style="color: #333333">BOEU实施</span></a-radio
+                        ><span style="color: #333333">BOEU实施</span></a-radio
                       >
                     </div>
                   </div>
@@ -1105,54 +1105,54 @@
                     </div>
                     <div class="btnbox" style="margin: 20px">
                       <a-upload
-                          v-if="docChecked == true"
-                          v-model:file-list="fileList"
-                          name="file"
-                          action="/manageApi/file/upload"
-                          @change="handleChange"
+                        v-if="docChecked == true"
+                        v-model:file-list="fileList"
+                        name="file"
+                        action="/manageApi/file/upload"
+                        @change="handleChange"
                       >
                         <span
-                            class="xkbtn"
-                            style="cursor: pointer; font-size: 17px"
-                        >上传</span
+                          class="xkbtn"
+                          style="cursor: pointer; font-size: 17px"
+                          >上传</span
                         >
                         <img
-                            src="@/assets/images/basicinfo/cloud.png"
-                            style="cursor: pointer; width: 34px; height: 34px"
-                            alt=""
+                          src="@/assets/images/basicinfo/cloud.png"
+                          style="cursor: pointer; width: 34px; height: 34px"
+                          alt=""
                         />
                       </a-upload>
                       <div
-                          v-if="docChecked == true"
-                          class="btnbox"
-                          style="margin: 20px"
+                        v-if="docChecked == true"
+                        class="btnbox"
+                        style="margin: 20px"
                       >
                         <span style="color: #999999">
                           支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
                         </span>
                       </div>
                       <div
-                          v-for="item in fileList"
-                          :key="item.uid"
-                          class="docListStyle"
+                        v-for="item in fileList"
+                        :key="item.uid"
+                        class="docListStyle"
                       >
                         <img
-                            src="@/assets/images/basicinfo/download.png"
-                            style="
+                          src="@/assets/images/basicinfo/download.png"
+                          style="
                             cursor: pointer;
                             width: 40px;
                             height: 40px;
                             margin-right: 40px;
                           "
-                            alt=""
+                          alt=""
                         />
                         <span style="font: oblique bold 16px Sans-serif">{{
-                            item.name
-                          }}</span>
+                          item.name
+                        }}</span>
                         <span
-                            style="color: #4ea6ff; float: right; cursor: pointer"
-                            @click="deFile(item.uid)"
-                        >删除</span
+                          style="color: #4ea6ff; float: right; cursor: pointer"
+                          @click="deFile(item.uid)"
+                          >删除</span
                         >
                       </div>
                     </div>
@@ -1166,89 +1166,89 @@
     </div>
     <!-- 时间管理抽屉 -->
     <time-manage
-        v-model:Tvisible="visible"
-        :projectTaskId="projectTaskId"
-        :title="showTimeText"
-        :itemsType="itemstype"
+      v-model:Tvisible="visible"
+      :projectTaskId="projectTaskId"
+      :title="showTimeText"
+      :itemsType="itemstype"
     />
     <!-- 面授管理抽屉 -->
     <face-manage
-        v-model:Fvisible="FaceVisivle"
-        :projectTaskId="projectTaskId"
-        :title="showFaceText"
+      v-model:Fvisible="FaceVisivle"
+      :projectTaskId="projectTaskId"
+      :title="showFaceText"
     />
     <!-- 学员（小组管理）创建小组抽屉 -->
-    <subset-manage v-model:Svisible="subsetVisivle"/>
+    <subset-manage v-model:Svisible="subsetVisivle" />
     <!-- 学员管理-添加学员抽屉 -->
     <!-- <stu-add v-model:Stuvisible="Stuvisible" /> -->
     <!-- 添加学员抽屉 -->
     <proj-check-ship
-        v-model:ProjCheckvisible="Stuvisible"
-        :selectProjectId="projectId"
-        v-model:addAuthList="addAuthList"
-        :authClassify="authClassify"
-        classify="project"
-        :type="2"
+      v-model:ProjCheckvisible="Stuvisible"
+      :selectProjectId="projectId"
+      v-model:addAuthList="addAuthList"
+      :authClassify="authClassify"
+      classify="project"
+      :type="2"
     />
     <!-- 学员管理-导入学员抽屉 -->
-    <import-stu v-model:Importvisible="Importvisible"/>
+    <import-stu v-model:Importvisible="Importvisible" />
     <!-- 查看学员 传入查看学员的id-->
     <see-stu
-        v-model:Seevisible="Seevisible"
-        v-model:checkStuId="checkStuId"
-        v-model:projectId="projectId"
+      v-model:Seevisible="Seevisible"
+      v-model:checkStuId="checkStuId"
+      v-model:projectId="projectId"
     />
     <!-- 学员换组 -->
     <change-group
-        v-model:Changevisible="Changevisible"
-        v-model:projectId="projectId"
-        v-model:ChangeGroupStuId="ChangeGroupStuId"
-        v-model:ChangeGroupStuName="ChangeGroupStuName"
-        v-model:ChangeGroupId="ChangeGroupId"
-        @changeD="changeGrouped"
+      v-model:Changevisible="Changevisible"
+      v-model:projectId="projectId"
+      v-model:ChangeGroupStuId="ChangeGroupStuId"
+      v-model:ChangeGroupStuName="ChangeGroupStuName"
+      v-model:ChangeGroupId="ChangeGroupId"
+      @changeD="changeGrouped"
     />
     <!-- 组员名单抽屉 -->
     <member-list
-        v-model:Lvisible="Lvisible"
-        v-model:chooseGroupId="chooseGroupId"
-        v-model:projectId="projectId"
+      v-model:Lvisible="Lvisible"
+      v-model:chooseGroupId="chooseGroupId"
+      v-model:projectId="projectId"
     />
     <!-- 面授学员抽屉 -->
-    <face-stu v-model:FSvisible="FSvisible"/>
+    <face-stu v-model:FSvisible="FSvisible" />
     <!-- 活动考勤抽屉 -->
-    <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText"/>
+    <active-attendance v-model:AAvisible="AAvisible" :title="showkaoqinText" />
     <!-- 作业管理抽屉 -->
     <work-manage
-        v-model:Wvisible="Wvisible"
-        :projectTaskId="projectTaskId"
-        :title="showWorkText"
+      v-model:Wvisible="Wvisible"
+      :projectTaskId="projectTaskId"
+      :title="showWorkText"
     />
     <!-- 考试管理抽屉 -->
     <test-manage
-        v-model:TMvisible="TMvisible"
-        :title="showTestText"
-        :projectTaskId="projectTaskId"
-        :itemsType="itemstype"
+      v-model:TMvisible="TMvisible"
+      :title="showTestText"
+      :projectTaskId="projectTaskId"
+      :itemsType="itemstype"
     />
     <!-- 批量面授报名 -->
-    <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible"/>
+    <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
 
     <!-- 概览（无数据）-项目发布弹窗 -->
     <div>
       <a-modal
-          v-model:visible="pubproject"
-          :title="null"
-          @ok="closeModal"
-          :footer="null"
-          :closable="false"
-          :centered="true"
-          wrapClassName="pubproject"
-          width="679px"
-          height="437px"
+        v-model:visible="pubproject"
+        :title="null"
+        @ok="closeModal"
+        :footer="null"
+        :closable="false"
+        :centered="true"
+        wrapClassName="pubproject"
+        width="679px"
+        height="437px"
       >
         <div
-            class="modalHeader"
-            style="
+          class="modalHeader"
+          style="
             width: 100%;
             height: 68px;
             display: flex;
@@ -1258,18 +1258,18 @@
         >
           <div class="headerLeft" style="margin-left: 32px">
             <span style="width: 15px; height: 15px"
-            ><img src="../../assets/images/taskpage/pub.png"
+              ><img src="../../assets/images/taskpage/pub.png"
             /></span>
             <span
-                class="headerLeftText"
-                style="font-size: 16px; margin-left: 10px"
-            >项目发布</span
+              class="headerLeftText"
+              style="font-size: 16px; margin-left: 10px"
+              >项目发布</span
             >
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
             <img
-                style="width: 22px; height: 22px"
-                src="../../assets/images/basicinfo/close22.png"
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
             />
           </div>
         </div>
@@ -1290,15 +1290,15 @@
             </div>
           </div>
           <div class="send">
-            <a-switch v-model:checked="checked" size="small"/>
+            <a-switch v-model:checked="checked" size="small" />
             <span class="sendtext">发送项目通知</span>
           </div>
           <div class="ckb">
             <a-checkbox v-model:checked="checked1"
-            ><span class="sendpeo">发给老师</span></a-checkbox
+              ><span class="sendpeo">发给老师</span></a-checkbox
             >
             <a-checkbox v-model:checked="checked2"
-            ><span class="sendpeo">发给学员</span></a-checkbox
+              ><span class="sendpeo">发给学员</span></a-checkbox
             >
           </div>
           <div class="pubtn">
@@ -1312,19 +1312,19 @@
     <!-- 学员-创建小组弹窗 -->
     <div>
       <a-modal
-          v-model:visible="stugroup"
-          :title="null"
-          @ok="closeModal2"
-          :footer="null"
-          :closable="false"
-          :centered="true"
-          wrapClassName="doublepro"
-          width="624px"
-          height="332px"
+        v-model:visible="stugroup"
+        :title="null"
+        @ok="closeModal2"
+        :footer="null"
+        :closable="false"
+        :centered="true"
+        wrapClassName="doublepro"
+        width="624px"
+        height="332px"
       >
         <div
-            class="modalHeader"
-            style="
+          class="modalHeader"
+          style="
             width: 100%;
             height: 68px;
             display: flex;
@@ -1333,12 +1333,14 @@
           "
         >
           <div class="headerLeft" style="margin-left: 32px">
-            <span class="headerLeftText" style="font-size: 16px">创建小组</span>
+            <span class="headerLeftText" style="font-size: 16px">{{
+              stuMemberClassify === 1 ? "创建小组" : "编辑小组"
+            }}</span>
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
             <img
-                style="width: 22px; height: 22px"
-                src="../../assets/images/basicinfo/close22.png"
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
             />
           </div>
         </div>
@@ -1346,33 +1348,37 @@
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                  style="width: 10px; height: 10px"
-                  src="../../assets/images/basicinfo/asterisk.png"
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">小组名称:</div>
             <div class="in">
               <a-input
-                  v-model:value="valueaddg"
-                  placeholder="请输入小组名称"
-                  style="border-radius: 8px; height: 40px"
+                v-model:value="valueaddg"
+                placeholder="请输入小组名称"
+                style="border-radius: 8px; height: 40px"
               />
             </div>
           </div>
           <div class="name">
             <div class="star" style="margin-top: -4px">
               <img
-                  style="width: 10px; height: 10px; margin-left: 15px"
-                  src="../../assets/images/basicinfo/asterisk.png"
+                style="width: 10px; height: 10px; margin-left: 15px"
+                src="../../assets/images/basicinfo/asterisk.png"
               />
             </div>
             <div class="inname">小组长:</div>
             <div class="in">
-              <a-input
-                  v-model:value="valueaddm"
-                  placeholder="请输入小组长"
-                  style="border-radius: 8px; height: 40px"
-              />
+              <ProjectManager
+                v-model:value="stuGroupId"
+                v-model:name="stuGroupName"
+              ></ProjectManager>
+              <!-- <a-input
+                v-model:value="valueaddm"
+                placeholder="请输入小组长"
+                style="border-radius: 8px; height: 40px"
+              /> -->
             </div>
           </div>
           <div class="pubtn">
@@ -1386,12 +1392,12 @@
     <!-- 取消学员弹窗 -->
     <div>
       <a-modal
-          v-model:visible="canclestu"
-          :footer="null"
-          :closable="close"
-          wrapClassName="canclestu"
-          centered="true"
-          @cancel="closeModal1"
+        v-model:visible="canclestu"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu"
+        centered="true"
+        @cancel="closeModal1"
       >
         <div class="delete">
           <div class="del_header"></div>
@@ -1419,11 +1425,11 @@
     <!-- 优秀学员弹窗 -->
     <div>
       <a-modal
-          v-model:visible="canclestu1"
-          :footer="null"
-          :closable="close"
-          wrapClassName="canclestu1"
-          centered="true"
+        v-model:visible="canclestu1"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu1"
+        centered="true"
       >
         <div class="delete">
           <div class="del_header"></div>
@@ -1451,11 +1457,11 @@
     <!-- 删除学员弹窗 -->
     <div>
       <a-modal
-          v-model:visible="deleteOneStu"
-          :footer="null"
-          :closable="close"
-          wrapClassName="canclestu1"
-          centered="true"
+        v-model:visible="deleteOneStu"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu1"
+        centered="true"
       >
         <div class="delete">
           <div class="del_header"></div>
@@ -1484,12 +1490,12 @@
     <!-- 删除弹窗 -->
     <div>
       <a-modal
-          v-model:visible="delete_hs"
-          :footer="null"
-          :closable="closableQR"
-          wrapClassName="DelModal"
-          style="margin-top: 400px"
-          @cancel="delete_exit"
+        v-model:visible="delete_hs"
+        :footer="null"
+        :closable="closableQR"
+        wrapClassName="DelModal"
+        style="margin-top: 400px"
+        @cancel="delete_exit"
       >
         <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
           <div class="del_header"></div>
@@ -1519,11 +1525,11 @@
     <!-- 批量删除弹窗 -->
     <div>
       <a-modal
-          v-model:visible="allDelete"
-          :footer="null"
-          :closable="close"
-          wrapClassName="canclestu1"
-          centered="true"
+        v-model:visible="allDelete"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu1"
+        centered="true"
       >
         <div class="delete">
           <div class="del_header"></div>
@@ -1548,30 +1554,30 @@
       </a-modal>
     </div>
     <!-- 编辑项目弹窗 -->
-    <proj-set v-model:editHs="editHs" v-model:projectId="projectId"/>
+    <proj-set v-model:editHs="editHs" v-model:projectId="projectId" />
 
     <!-- 二维码弹窗 -->
     <two-dimensional-code
-        v-model:codevisible="codevisible"
-        :codeInfo="codeInfo"
-        index="0"
-        type="课程二维码"
+      v-model:codevisible="codevisible"
+      :codeInfo="codeInfo"
+      index="0"
+      type="课程二维码"
     />
     <!-- 二维码弹窗 -->
 
     <!-- 发布弹窗 -->
     <a-modal
-        v-model:visible="projectPub"
-        :title="null"
-        :footer="null"
-        :closable="false"
-        wrapClassName="projectPub"
-        width="679px"
-        height="437px"
+      v-model:visible="projectPub"
+      :title="null"
+      :footer="null"
+      :closable="false"
+      wrapClassName="projectPub"
+      width="679px"
+      height="437px"
     >
       <div
-          class="modalHeader"
-          style="
+        class="modalHeader"
+        style="
           width: 100%;
           height: 68px;
           display: flex;
@@ -1581,21 +1587,21 @@
       >
         <div class="headerLeft" style="margin-left: 32px">
           <span style="width: 15px; height: 15px"
-          ><img src="../../assets/images/taskpage/pub.png"
+            ><img src="../../assets/images/taskpage/pub.png"
           /></span>
           <span
-              class="headerLeftText"
-              style="font-size: 16px; margin-left: 10px"
-          >项目发布</span
+            class="headerLeftText"
+            style="font-size: 16px; margin-left: 10px"
+            >项目发布</span
           >
         </div>
         <div
-            style="cursor: pointer; margin-right: 32px"
-            @click="closeProjectPub"
+          style="cursor: pointer; margin-right: 32px"
+          @click="closeProjectPub"
         >
           <img
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close22.png"
           />
         </div>
       </div>
@@ -1636,11 +1642,11 @@
 
     <!-- 撤回弹窗 -->
     <a-modal
-        v-model:visible="backModal"
-        :footer="null"
-        :closable="closeBack"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="backModal"
+      :footer="null"
+      :closable="closeBack"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1668,11 +1674,11 @@
 
     <!-- 结束项目弹窗 -->
     <a-modal
-        v-model:visible="stopModal"
-        :footer="null"
-        :closable="closeStop"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="stopModal"
+      :footer="null"
+      :closable="closeStop"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1702,11 +1708,11 @@
 
     <!-- 存为模版弹窗 -->
     <a-modal
-        v-model:visible="startModal"
-        :footer="null"
-        :closable="closeStart"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="startModal"
+      :footer="null"
+      :closable="closeStart"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1733,9 +1739,9 @@
   </div>
 </template>
 <script>
-import {reactive, toRefs, onMounted, watch, computed} from "vue";
-import {useRoute} from "vue-router";
-import {useRouter} from "vue-router";
+import { reactive, toRefs, onMounted, watch, computed } from "vue";
+import { useRoute } from "vue-router";
+import { useRouter } from "vue-router";
 // import { CaretRightOutlined } from "@ant-design/icons-vue";
 import TimeManage from "../../components/drawers/TimeManage";
 import FaceManage from "../../components/drawers/FaceManage";
@@ -1754,7 +1760,7 @@ import NoticePub from "../../components/drawers/NoticePub";
 import NoticeHis from "../../components/drawers/NoticeHis";
 // import ProjectScore from "../../components/drawers/ProjectScore";
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
-import {storage} from "../../api/storage";
+import { storage } from "../../api/storage";
 import * as api from "../../api/index1";
 import * as apiproj from "../../api/index";
 import {
@@ -1765,18 +1771,18 @@ import {
   editGroup,
   topStudent,
 } from "../../api/indexProjStu";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
 import * as apitl from "../../api/index";
-import {getTask} from "../../api/indexTaskadd";
-import {editProj} from "../../api/indexTaskadd";
-import {toDate} from "../../api/method";
+import { getTask } from "../../api/indexTaskadd";
+import { editProj } from "../../api/indexTaskadd";
+import { toDate } from "../../api/method";
 import projSet from "../../components/Modals/projSet";
-import {overview} from "../../api/indexProjStu";
+import { overview } from "../../api/indexProjStu";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import TrainClass from "@/components/project/TrainClass";
-
+import ProjectManager from "@/components/project/ProjectManager";
 export default {
   name: "taskPage",
   components: {
@@ -1801,6 +1807,7 @@ export default {
     projSet,
     NoticeHis,
     TwoDimensionalCode,
+    ProjectManager,
   },
   setup() {
     const store = useStore();
@@ -1872,23 +1879,23 @@ export default {
       projectTaskId: "", //项目任务任务id
       //进度排行学员
       rankjindu: [
-        {value: "学员", label: "学员"},
-        {value: "小组", label: "小组"},
+        { value: "学员", label: "学员" },
+        { value: "小组", label: "小组" },
       ],
       valuestu1: "学员",
       //进度排行阶段
-      rankjieduan: [{value: "第一阶段", label: "第一阶段"}],
+      rankjieduan: [{ value: "第一阶段", label: "第一阶段" }],
       valuestu2: "第一阶段",
       //积分排行
       rankxuefen: [
-        {value: "学员", label: "学员"},
-        {value: "小组", label: "小组"},
+        { value: "学员", label: "学员" },
+        { value: "小组", label: "小组" },
       ],
       valuestu3: "学员",
       //学时排行
       rankxueshi: [
-        {value: "学员", label: "学员"},
-        {value: "小组", label: "小组"},
+        { value: "学员", label: "学员" },
+        { value: "小组", label: "小组" },
       ],
       valuestu4: "学员",
       visible: false, //时间管理
@@ -1940,6 +1947,8 @@ export default {
       valuestugroup: "", //学员管理小组名称
       projectGroupId: null, //是编辑小组id
       stuMemberClassify: null, //1：新建小组 2：编辑小组
+      stuGroupId: null, //选择的小组长id
+      stuGroupName: null, //选择的小组长名字
       valueDate: "", //排行榜输入日期
       noticeChecked: true,
       noticeContent: "",
@@ -2031,24 +2040,24 @@ export default {
           customRender: (text) => {
             if (text.record.rank == "1") {
               return (
-                  <img
-                      style={{width: 24, height: 24}}
-                      src={require("../../assets/images/taskpage/one.png")}
-                  />
+                <img
+                  style={{ width: 24, height: 24 }}
+                  src={require("../../assets/images/taskpage/one.png")}
+                />
               );
             } else if (text.record.rank == "2") {
               return (
-                  <img
-                      style={{width: 24, height: 24}}
-                      src={require("../../assets/images/taskpage/two.png")}
-                  />
+                <img
+                  style={{ width: 24, height: 24 }}
+                  src={require("../../assets/images/taskpage/two.png")}
+                />
               );
             } else if (text.record.rank == "3") {
               return (
-                  <img
-                      style={{width: 24, height: 24}}
-                      src={require("../../assets/images/taskpage/three.png")}
-                  />
+                <img
+                  style={{ width: 24, height: 24 }}
+                  src={require("../../assets/images/taskpage/three.png")}
+                />
               );
             } else {
               return <div>{text.record.rank}</div>;
@@ -2138,24 +2147,24 @@ export default {
           customRender: (text) => {
             if (text.record.rank == "1") {
               return (
-                  <img
-                      style={{width: 24, height: 24}}
-                      src={require("../../assets/images/taskpage/one.png")}
-                  />
+                <img
+                  style={{ width: 24, height: 24 }}
+                  src={require("../../assets/images/taskpage/one.png")}
+                />
               );
             } else if (text.record.rank == "2") {
               return (
-                  <img
-                      style={{width: 24, height: 24}}
-                      src={require("../../assets/images/taskpage/two.png")}
-                  />
+                <img
+                  style={{ width: 24, height: 24 }}
+                  src={require("../../assets/images/taskpage/two.png")}
+                />
               );
             } else if (text.record.rank == "3") {
               return (
-                  <img
-                      style={{width: 24, height: 24}}
-                      src={require("../../assets/images/taskpage/three.png")}
-                  />
+                <img
+                  style={{ width: 24, height: 24 }}
+                  src={require("../../assets/images/taskpage/three.png")}
+                />
               );
             } else {
               return <div>{text.record.rank}</div>;
@@ -2245,24 +2254,24 @@ export default {
           customRender: (text) => {
             if (text.record.rank == "1") {
               return (
-                  <img
-                      style={{width: 24, height: 24}}
-                      src={require("../../assets/images/taskpage/one.png")}
-                  />
+                <img
+                  style={{ width: 24, height: 24 }}
+                  src={require("../../assets/images/taskpage/one.png")}
+                />
               );
             } else if (text.record.rank == "2") {
               return (
-                  <img
-                      style={{width: 24, height: 24}}
-                      src={require("../../assets/images/taskpage/two.png")}
-                  />
+                <img
+                  style={{ width: 24, height: 24 }}
+                  src={require("../../assets/images/taskpage/two.png")}
+                />
               );
             } else if (text.record.rank == "3") {
               return (
-                  <img
-                      style={{width: 24, height: 24}}
-                      src={require("../../assets/images/taskpage/three.png")}
-                  />
+                <img
+                  style={{ width: 24, height: 24 }}
+                  src={require("../../assets/images/taskpage/three.png")}
+                />
               );
             } else {
               return <div>{text.record.rank}</div>;
@@ -2470,35 +2479,35 @@ export default {
         projectId: state.projectId,
       };
       apitl
-          .getProjectDetail(objtl)
-          .then((res) => {
-            if (res.status == 200) {
-              console.log("阶段列表", res.data.data.stageList);
-              for (let i = 0; i < res.data.data.stageList.length; i++) {
-                for (
-                    let k = 0;
-                    k < res.data.data.stageList[i].taskList.length;
-                    k++
-                ) {
-                  if (res.data.data.stageList[i].taskList[k].name == "面授") {
-                    state.morFaceT = true;
-                    break;
-                  }
+        .getProjectDetail(objtl)
+        .then((res) => {
+          if (res.status == 200) {
+            console.log("阶段列表", res.data.data.stageList);
+            for (let i = 0; i < res.data.data.stageList.length; i++) {
+              for (
+                let k = 0;
+                k < res.data.data.stageList[i].taskList.length;
+                k++
+              ) {
+                if (res.data.data.stageList[i].taskList[k].name == "面授") {
+                  state.morFaceT = true;
+                  break;
                 }
               }
-
-              //暂时传个固定的id用 到时候看数据里面是否有在更换
-              // state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId
-              let leng = res.data.data.stageList.length;
-              if (leng > 0) {
-                let taskarr = res.data.data.stageList;
-                state.taskSyllabus = taskarr;
-              }
             }
-          })
-          .catch((err) => {
-            console.log("获取任务列表失败", err);
-          });
+
+            //暂时传个固定的id用 到时候看数据里面是否有在更换
+            // state.projectTaskId = res.data.data.stageList[0].taskList[0].projectTaskId
+            let leng = res.data.data.stageList.length;
+            if (leng > 0) {
+              let taskarr = res.data.data.stageList;
+              state.taskSyllabus = taskarr;
+            }
+          }
+        })
+        .catch((err) => {
+          console.log("获取任务列表失败", err);
+        });
     };
 
     //学员学员管理渲染
@@ -2598,16 +2607,16 @@ export default {
         topFlag: 1,
       };
       topStudent(obj)
-          .then((res) => {
-            console.log(`优秀学员授予成功${res.data}`);
-            message.success("优秀学员称号授予成功");
+        .then((res) => {
+          console.log(`优秀学员授予成功${res.data}`);
+          message.success("优秀学员称号授予成功");
 
-            getStu();
-          })
-          .catch((err) => {
-            console.log(`优秀学员授予成功${err}`);
-            message.warning("优秀学员称号授予失败");
-          });
+          getStu();
+        })
+        .catch((err) => {
+          console.log(`优秀学员授予成功${err}`);
+          message.warning("优秀学员称号授予失败");
+        });
       state.changeGoods = [];
       state.canclestu = false;
     };
@@ -2627,16 +2636,16 @@ export default {
         topFlag: 0,
       };
       topStudent(obj)
-          .then((res) => {
-            console.log(`取消优秀学员称号成功${res}`);
-            message.success("优秀学员称号取消成功");
+        .then((res) => {
+          console.log(`取消优秀学员称号成功${res}`);
+          message.success("优秀学员称号取消成功");
 
-            getStu();
-          })
-          .catch((err) => {
-            console.log(`取消优秀学员称号失败${err}`);
-            message.warning("优秀学员称号取消失败");
-          });
+          getStu();
+        })
+        .catch((err) => {
+          console.log(`取消优秀学员称号失败${err}`);
+          message.warning("优秀学员称号取消失败");
+        });
       state.changeGoods = [];
       state.canclestu1 = false;
     };
@@ -2649,24 +2658,27 @@ export default {
     const showModal2 = (classify, item) => {
       state.stuMemberClassify = classify;
       state.projectGroupId =
-          item && item.projectGroupId ? item.projectGroupId : null;
+        item && item.projectGroupId ? item.projectGroupId : null;
       state.stugroup = true;
+      console.log("item", item);
       if (item) {
         state.valueaddg = item.groupName;
-        state.valueaddm = item.leaderName;
+        state.stuGroupName = item.leaderName;
+        state.stuGroupId = item.leaderId;
       }
       console.log("编辑小组item", item);
     };
     const closeModal2 = () => {
       state.stugroup = false;
       state.valueaddg = null;
-      state.valueaddm = null;
+      state.stuGroupName = null;
+      state.stuGroupId = null;
       state.projectGroupId = null;
       state.stuMemberClassify = null;
     };
     //点击确定创建小组
     const createG = () => {
-      if (state.valueaddm == "" || state.valueaddg == "") {
+      if (state.stuGroupName == "" || state.valueaddg == "") {
         message.destroy();
         return message.warning("请输入必填项");
       } else {
@@ -2885,29 +2897,29 @@ export default {
           customRender: (text) => {
             console.log(text.excellent);
             return (
-                <div>
-                  {text.record.excellent ? (
-                      <div
-                          style={{
-                            display: "flex",
-                            alignItems: "center",
-                          }}
-                      >
-                        <span class="stydentName">{text.value}</span>
-                        <div class="studentExcellent">
-                          <img
-                              class="studentExcellentImg"
-                              src={require("../../assets/images/taskpage/excellent.png")}
-                          />
-                          <span class="studentExcellentT">优秀</span>
-                        </div>
-                      </div>
-                  ) : (
-                      <div>
-                        <span>{text.value}</span>
-                      </div>
-                  )}
-                </div>
+              <div>
+                {text.record.excellent ? (
+                  <div
+                    style={{
+                      display: "flex",
+                      alignItems: "center",
+                    }}
+                  >
+                    <span class="stydentName">{text.value}</span>
+                    <div class="studentExcellent">
+                      <img
+                        class="studentExcellentImg"
+                        src={require("../../assets/images/taskpage/excellent.png")}
+                      />
+                      <span class="studentExcellentT">优秀</span>
+                    </div>
+                  </div>
+                ) : (
+                  <div>
+                    <span>{text.value}</span>
+                  </div>
+                )}
+              </div>
             );
           },
         },
@@ -2978,35 +2990,35 @@ export default {
           // width: 60,
           align: "center",
           className: "h",
-          scopedSlots: {customRender: "action"}, //引入的插槽
+          scopedSlots: { customRender: "action" }, //引入的插槽
           customRender: (text) => {
             // console.log(text);
             return (
+              <div
+                style={{
+                  display: "flex",
+                  alignItems: "center",
+                  justifyContent: "center",
+                }}
+              >
                 <div
-                    style={{
-                      display: "flex",
-                      alignItems: "center",
-                      justifyContent: "center",
-                    }}
+                  class="studentopea1"
+                  onClick={() => {
+                    if (text.record.excellent === false) {
+                      state.canclestu = true;
+                      console.log("youxiu", text.record.studentId);
+                      state.changeGoods.push(text.record.studentId);
+                    } else if (text.record.excellent === true) {
+                      state.canclestu1 = true;
+                      console.log("youxiu", text.record.studentId);
+                      state.changeGoods.push(text.record.studentId);
+                    }
+                  }}
                 >
-                  <div
-                      class="studentopea1"
-                      onClick={() => {
-                        if (text.record.excellent === false) {
-                          state.canclestu = true;
-                          console.log("youxiu", text.record.studentId);
-                          state.changeGoods.push(text.record.studentId);
-                        } else if (text.record.excellent === true) {
-                          state.canclestu1 = true;
-                          console.log("youxiu", text.record.studentId);
-                          state.changeGoods.push(text.record.studentId);
-                        }
-                      }}
-                  >
-                    {text.record.excellent ? "取消优秀" : "优秀学员"}
-                  </div>
+                  {text.record.excellent ? "取消优秀" : "优秀学员"}
+                </div>
 
-                  {/**
+                {/**
                    2022-11-30注释 后面放开
                    <div
                    class="studentopea2"
@@ -3019,39 +3031,39 @@ export default {
                    查看
                    </div>
                    */}
-                  <div class="studentSelect">
-                    <a-select
-                        style="width: 50px"
-                        value="更多"
-                        // options={state.projectNameList}
-                        dropdownClassName="tabledropdown"
-                    >
-                      <a-select-option value="换组" label="换组">
-                        <div
-                            onClick={() => {
-                              state.Changevisible = true;
-                              console.log(text, "xixixixix");
-                              state.ChangeGroupStuId = text.record.studentId;
-                              state.ChangeGroupStuName = text.record.name;
-                              state.ChangeGroupId = text.record.groupId;
-                            }}
-                        >
-                          换组
-                        </div>
-                      </a-select-option>
-                      <a-select-option value="删除" label="删除">
-                        <div
-                            onClick={() => {
-                              // console.log("点击了111", text);
-                              showDeleteOne(text.record.studentId);
-                            }}
-                        >
-                          删除
-                        </div>
-                      </a-select-option>
-                    </a-select>
-                  </div>
+                <div class="studentSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="更多"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    <a-select-option value="换组" label="换组">
+                      <div
+                        onClick={() => {
+                          state.Changevisible = true;
+                          console.log(text, "xixixixix");
+                          state.ChangeGroupStuId = text.record.studentId;
+                          state.ChangeGroupStuName = text.record.name;
+                          state.ChangeGroupId = text.record.groupId;
+                        }}
+                      >
+                        换组
+                      </div>
+                    </a-select-option>
+                    <a-select-option value="删除" label="删除">
+                      <div
+                        onClick={() => {
+                          // console.log("点击了111", text);
+                          showDeleteOne(text.record.studentId);
+                        }}
+                      >
+                        删除
+                      </div>
+                    </a-select-option>
+                  </a-select>
                 </div>
+              </div>
             );
           },
         },
@@ -3098,13 +3110,13 @@ export default {
         type: type,
       };
       api
-          .billboard(obj)
-          .then((res) => {
-            console.log("获取成功", res);
-          })
-          .catch((err) => {
-            console.log("获取失败", err);
-          });
+        .billboard(obj)
+        .then((res) => {
+          console.log("获取成功", res);
+        })
+        .catch((err) => {
+          console.log("获取失败", err);
+        });
     };
 
     //搜索
@@ -3145,15 +3157,15 @@ export default {
         projectId: state.projectId,
         studentIds: state.chooseDeleteOne,
       })
-          .then((res) => {
-            console.log(res, "单个删除成功");
-            message.success("删除成功");
-            getStu();
-          })
-          .catch((err) => {
-            console.log(err, "单个删除失败");
-            message.warning("删除失败");
-          });
+        .then((res) => {
+          console.log(res, "单个删除成功");
+          message.success("删除成功");
+          getStu();
+        })
+        .catch((err) => {
+          console.log(err, "单个删除失败");
+          message.warning("删除失败");
+        });
       state.chooseDeleteOne = [];
     };
     //批量删除学员弹窗
@@ -3176,16 +3188,16 @@ export default {
         projectId: state.projectId,
         studentIds: state.selectedRows,
       })
-          .then((res) => {
-            console.log(res, "删除成功");
-            message.success("删除成功");
-            state.selectedRows = [];
-            getStu();
-          })
-          .catch((err) => {
-            console.log(err, "删除失败");
-            message.warning("删除失败");
-          });
+        .then((res) => {
+          console.log(res, "删除成功");
+          message.success("删除成功");
+          state.selectedRows = [];
+          getStu();
+        })
+        .catch((err) => {
+          console.log(err, "删除失败");
+          message.warning("删除失败");
+        });
       state.allDelete = false;
     };
     const handleChangeGood = (value) => {
@@ -3214,15 +3226,15 @@ export default {
           excellent: value.topFlag == 1 ? true : false, //是否优秀学员
           progress: value.completeStageCnt + "/" + value.totalStageCnt,
           putin:
-              value.source == 0
-                  ? "报名加入"
-                  : value.source == 1
-                      ? "指定添加"
-                      : value.source == 2
-                          ? "组织添加"
-                          : value.source == 3
-                              ? "受众添加"
-                              : "-", //加入方式
+            value.source == 0
+              ? "报名加入"
+              : value.source == 1
+              ? "指定添加"
+              : value.source == 2
+              ? "组织添加"
+              : value.source == 3
+              ? "受众添加"
+              : "-", //加入方式
           stutime: toDate(value.beginStudyTime, "Y-M-D"), //开始学习时间
         };
         array.push(obj);
@@ -3262,13 +3274,13 @@ export default {
         pageSize: 10,
         projectId: state.projectId,
         topFlag:
-            state.valuegood == "优秀学员"
-                ? 1
-                : state.valuegood == "普通学员"
-                    ? 0
-                    : state.valuegood == "全部"
-                        ? ""
-                        : "",
+          state.valuegood == "优秀学员"
+            ? 1
+            : state.valuegood == "普通学员"
+            ? 0
+            : state.valuegood == "全部"
+            ? ""
+            : "",
       };
       //重新获取列表
       getStu(obj);
@@ -3304,9 +3316,9 @@ export default {
     //学员重置
     const resetCancel = () => {
       (state.valuestun = null),
-          (state.valuestugroup = null),
-          (state.valuestub = null),
-          (state.valuegood = null);
+        (state.valuestugroup = null),
+        (state.valuestub = null),
+        (state.valuegood = null);
       getStu();
     };
     //获取学员列表
@@ -3323,16 +3335,16 @@ export default {
         topFlag: "",
       };
       getProjStu(objf)
-          .then((res) => {
-            console.log("获取学员列表", res.data);
-            state.total = res.data.data.total;
-            let arr = res.data.data.rows;
-            getTableDataList(arr);
-            state.loading = false;
-          })
-          .catch((err) => {
-            console.log("获取学员列表失败", err);
-          });
+        .then((res) => {
+          console.log("获取学员列表", res.data);
+          state.total = res.data.data.total;
+          let arr = res.data.data.rows;
+          getTableDataList(arr);
+          state.loading = false;
+        })
+        .catch((err) => {
+          console.log("获取学员列表失败", err);
+        });
     };
     //获取项目信息
     const getTaskInfo = () => {
@@ -3403,20 +3415,20 @@ export default {
         projectId: state.projectId,
       };
       getGroupList(objf)
-          .then((res) => {
-            console.log(res.data.data.rows, "获取小组列表成功");
-            if (res.data.code === 200) {
-              let arr = res.data.data.rows;
-              setGroupList(arr);
-            }
-            // let leng = res.data.data.rows.length;
-            // if (leng > 0) {
+        .then((res) => {
+          console.log(res.data.data.rows, "获取小组列表成功");
+          if (res.data.code === 200) {
+            let arr = res.data.data.rows;
+            setGroupList(arr);
+          }
+          // let leng = res.data.data.rows.length;
+          // if (leng > 0) {
 
-            // }
-          })
-          .catch((err) => {
-            console.log(err, "获取列表失败");
-          });
+          // }
+        })
+        .catch((err) => {
+          console.log(err, "获取列表失败");
+        });
     };
     //删除小组
     const deleteGroupBtn = (projectGroupId) => {
@@ -3434,42 +3446,42 @@ export default {
       if (state.stuMemberClassify === 1) {
         let obj = {
           groupName: state.valueaddg,
-          leaderId: 0,
-          leaderName: state.valueaddm,
+          leaderId: state.stuGroupId,
+          leaderName: state.stuGroupName,
           // projectGroupId: 0,
           projectId: state.projectId,
         };
         editGroup(obj)
-            .then((res) => {
-              console.log("小组创建成功", res);
-              message.success("小组创建成功");
-              getGroup();
-            })
-            .catch((err) => {
-              console.log("小组创建失败", err);
-              message.warning("小组创建失败");
-            });
+          .then((res) => {
+            console.log("小组创建成功", res);
+            message.success("小组创建成功");
+            getGroup();
+          })
+          .catch((err) => {
+            console.log("小组创建失败", err);
+            message.warning("小组创建失败");
+          });
       }
       //编辑
       if (state.stuMemberClassify === 2) {
         let obj = {
           groupName: state.valueaddg,
-          leaderId: 0,
-          leaderName: state.valueaddm,
+          leaderId: state.stuGroupId,
+          leaderName: state.stuGroupName,
           projectGroupId: state.projectGroupId,
           projectId: state.projectId,
         };
         console.log("编辑小组obj", obj);
         editGroup(obj)
-            .then((res) => {
-              console.log("小组编辑成功", res);
-              message.success("小组编辑成功");
-              getGroup();
-            })
-            .catch((err) => {
-              console.log("小组编辑失败", err);
-              message.warning("小组编辑失败");
-            });
+          .then((res) => {
+            console.log("小组编辑成功", res);
+            message.success("小组编辑成功");
+            getGroup();
+          })
+          .catch((err) => {
+            console.log("小组编辑失败", err);
+            message.warning("小组编辑失败");
+          });
       }
     };
     //搜索小组重置
@@ -3501,31 +3513,31 @@ export default {
     //start---------项目概览
     // 获取项目概览
     const getOverview = () => {
-      overview({projectId: state.projectId})
-          .then((res) => {
-            Object.keys(res.data.data.projectInfoOverview).forEach((item) => {
-              levelList.projectInfoOverview[item] =
-                  res.data.data.projectInfoOverview[item] || 0;
-            });
-            Object.keys(res.data.data.stageOverviewList).forEach((item) => {
-              levelList.stageOverviewList[item] =
-                  res.data.data.stageOverviewList[item] || 0;
-            });
-            // res.data.data.routerInfoOverview.forEach((r) => {
-            //   console.log(r)
-            // })
-            // state.addLoading = false;
-            console.log("项目概览--" + res);
-          })
-          .catch((err) => {
-            // state.addLoading = false;
-            // message.error("概览获取失败");
-            console.log("获取失败" + err);
+      overview({ projectId: state.projectId })
+        .then((res) => {
+          Object.keys(res.data.data.projectInfoOverview).forEach((item) => {
+            levelList.projectInfoOverview[item] =
+              res.data.data.projectInfoOverview[item] || 0;
           });
+          Object.keys(res.data.data.stageOverviewList).forEach((item) => {
+            levelList.stageOverviewList[item] =
+              res.data.data.stageOverviewList[item] || 0;
+          });
+          // res.data.data.routerInfoOverview.forEach((r) => {
+          //   console.log(r)
+          // })
+          // state.addLoading = false;
+          console.log("项目概览--" + res);
+        })
+        .catch((err) => {
+          // state.addLoading = false;
+          // message.error("概览获取失败");
+          console.log("获取失败" + err);
+        });
     };
     //end---------项目概览
 
-    const handleChange = ({file, fileList}) => {
+    const handleChange = ({ file, fileList }) => {
       let list = [];
       if (file.status !== "uploading") {
         console.log("上传的list", fileList);
@@ -3558,12 +3570,12 @@ export default {
           templateId: state.templateId || 0,
           type: state.type,
         })
-            .then((res) => {
-              console.log("上传成功", res);
-            })
-            .catch((err) => {
-              console.log("上传失败了", err);
-            });
+          .then((res) => {
+            console.log("上传成功", res);
+          })
+          .catch((err) => {
+            console.log("上传失败了", err);
+          });
       }
 
       if (file.status === "done") {
@@ -3613,13 +3625,13 @@ export default {
       }).then((res) => {
         state.action = res.data.data.projectInfo.status;
         state.act =
-            state.action == 0
-                ? "发布"
-                : state.action == 1
-                    ? "撤回"
-                    : state.action == -1
-                        ? ""
-                        : "-";
+          state.action == 0
+            ? "发布"
+            : state.action == 1
+            ? "撤回"
+            : state.action == -1
+            ? ""
+            : "-";
       });
     };
     //打开发布弹窗
@@ -3636,18 +3648,18 @@ export default {
         projectId: state.projectId,
       };
       apiproj
-          .projectStudent(obj)
-          .then((res) => {
-            if (res.status === 200) {
-              // console.log("res", res.data);
-              state.projectStudentsNum = res.data.data.total
-                  ? res.data.data.total
-                  : 0;
-            }
-          })
-          .catch((err) => {
-            console.log("获取学员人数失败", err);
-          });
+        .projectStudent(obj)
+        .then((res) => {
+          if (res.status === 200) {
+            // console.log("res", res.data);
+            state.projectStudentsNum = res.data.data.total
+              ? res.data.data.total
+              : 0;
+          }
+        })
+        .catch((err) => {
+          console.log("获取学员人数失败", err);
+        });
       //获取阶段及任务总数
     };
     //关闭发布弹窗
@@ -3661,17 +3673,17 @@ export default {
         projectId: state.releaseProjectId,
       };
       apiproj
-          .releaseProject(obj)
-          .then((res) => {
-            console.log("发布成功", res);
-            message.destroy();
-            message.success("发布成功");
-            state.projectPub = false;
-            reget();
-          })
-          .catch((err) => {
-            console.log("发布失败", err);
-          });
+        .releaseProject(obj)
+        .then((res) => {
+          console.log("发布成功", res);
+          message.destroy();
+          message.success("发布成功");
+          state.projectPub = false;
+          reget();
+        })
+        .catch((err) => {
+          console.log("发布失败", err);
+        });
     };
 
     //打开撤回弹窗
@@ -3688,17 +3700,17 @@ export default {
         type: 0,
       };
       apiproj
-          .handleProject(obj)
-          .then((res) => {
-            console.log("撤回成功", res);
-            message.destroy();
-            message.success("撤回成功");
-            state.backModal = false;
-            reget();
-          })
-          .catch((err) => {
-            console.log("撤回失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.backModal = false;
+          reget();
+        })
+        .catch((err) => {
+          console.log("撤回失败", err);
+        });
     };
     //关闭结束弹窗
     const closeStopModal = () => {
@@ -3711,17 +3723,17 @@ export default {
         type: -1,
       };
       apiproj
-          .handleProject(obj)
-          .then((res) => {
-            console.log("结束成功", res);
-            message.destroy();
-            message.success("已结束");
-            state.stopModal = false;
-            reget();
-          })
-          .catch((err) => {
-            console.log("结束失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("结束成功", res);
+          message.destroy();
+          message.success("已结束");
+          state.stopModal = false;
+          reget();
+        })
+        .catch((err) => {
+          console.log("结束失败", err);
+        });
     };
     //打开结束弹窗
     const showStopModal = () => {
@@ -3742,17 +3754,17 @@ export default {
         type: 1,
       };
       apiproj
-          .handleProject(obj)
-          .then((res) => {
-            console.log("模版保存成功", res);
-            message.destroy();
-            message.success("模版保存成功");
-            state.startModal = false;
-            reget();
-          })
-          .catch((err) => {
-            console.log("模版保存失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("模版保存成功", res);
+          message.destroy();
+          message.success("模版保存成功");
+          state.startModal = false;
+          reget();
+        })
+        .catch((err) => {
+          console.log("模版保存失败", err);
+        });
     };
     //删除文件
     const deFile = (id) => {
@@ -3787,42 +3799,42 @@ export default {
         templateId: state.templateId || 0,
         type: state.type,
       })
-          .then((res) => {
-            console.log("上传成功", res);
-            message.destroy();
-            return message.success("删除成功");
-          })
-          .catch((err) => {
-            console.log("上传失败了", err);
-            message.warning("删除失败");
-          });
+        .then((res) => {
+          console.log("上传成功", res);
+          message.destroy();
+          return message.success("删除成功");
+        })
+        .catch((err) => {
+          console.log("上传失败了", err);
+          message.warning("删除失败");
+        });
     };
 
     //添加学员
     watch(
-        () => state.addAuthList,
-        (res) => {
-          console.log("res", res, state.addAuthList);
-          let obj = {
-            deptList: res[1],
-            groupList: res[2],
-            projectId: state.projectId,
-            studentList: res[0],
-            projectGroupId: 0,
-          };
-          console.log("obj", obj);
-          state.loading = true;
-          api
-              .addStudentProject(obj)
-              .then((res) => {
-                console.log("添加学员成功", res);
-                message.success("添加学员成功");
-                getStu();
-              })
-              .catch((err) => {
-                console.log("添加学员失败", err);
-              });
-        }
+      () => state.addAuthList,
+      (res) => {
+        console.log("res", res, state.addAuthList);
+        let obj = {
+          deptList: res[1],
+          groupList: res[2],
+          projectId: state.projectId,
+          studentList: res[0],
+          projectGroupId: 0,
+        };
+        console.log("obj", obj);
+        state.loading = true;
+        api
+          .addStudentProject(obj)
+          .then((res) => {
+            console.log("添加学员成功", res);
+            message.success("添加学员成功");
+            getStu();
+          })
+          .catch((err) => {
+            console.log("添加学员失败", err);
+          });
+      }
     );
     onMounted(() => {
       getStu();
@@ -3943,8 +3955,8 @@ export default {
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
-                rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%
+          rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%
         );
       }
 
@@ -3952,9 +3964,9 @@ export default {
 
       .modalHeader {
         background: linear-gradient(
-                0deg,
-                rgba(78, 166, 255, 0) 0%,
-                rgba(78, 166, 255, 0.2) 100%
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -3992,9 +4004,9 @@ export default {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-                    180deg,
-                    rgba(254, 243, 221, 1),
-                    rgba(255, 250, 240, 1)
+              180deg,
+              rgba(254, 243, 221, 1),
+              rgba(255, 250, 240, 1)
             );
             border-radius: 10px;
             margin-right: 7px;
@@ -4018,9 +4030,9 @@ export default {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-                    180deg,
-                    rgba(221, 234, 255, 1),
-                    rgba(240, 248, 254, 1)
+              180deg,
+              rgba(221, 234, 255, 1),
+              rgba(240, 248, 254, 1)
             );
             border-radius: 10px;
 
@@ -4139,8 +4151,8 @@ export default {
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-                    rgba(78, 166, 255, 0.2) 0%,
-                    rgba(78, 166, 255, 0) 100%
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -4266,8 +4278,8 @@ export default {
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-                    rgba(78, 166, 255, 0.2) 0%,
-                    rgba(78, 166, 255, 0) 100%
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -4398,8 +4410,8 @@ export default {
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-                    rgba(78, 166, 255, 0.2) 0%,
-                    rgba(78, 166, 255, 0) 100%
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -4499,9 +4511,9 @@ export default {
     .ant-modal-body {
       .modalHeader {
         background: linear-gradient(
-                0deg,
-                rgba(78, 166, 255, 0) 0%,
-                rgba(78, 166, 255, 0.2) 100%
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
         );
       }
 
@@ -4600,8 +4612,8 @@ export default {
 
       .modalHeader {
         background: linear-gradient(
-                rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%
+          rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%
         );
       }
 
@@ -4640,9 +4652,9 @@ export default {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-                    180deg,
-                    rgba(254, 243, 221, 1),
-                    rgba(255, 250, 240, 1)
+              180deg,
+              rgba(254, 243, 221, 1),
+              rgba(255, 250, 240, 1)
             );
             border-radius: 10px;
             margin-right: 7px;
@@ -4666,9 +4678,9 @@ export default {
             width: 280px;
             height: 110px;
             background: linear-gradient(
-                    180deg,
-                    rgba(221, 234, 255, 1),
-                    rgba(240, 248, 254, 1)
+              180deg,
+              rgba(221, 234, 255, 1),
+              rgba(240, 248, 254, 1)
             );
             border-radius: 10px;
 
@@ -5629,8 +5641,8 @@ export default {
       }
 
       .ant-table-tbody
-      > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-      > td {
+        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+        > td {
         background: rgba(250, 250, 250, 1);
       }
 
@@ -5744,8 +5756,8 @@ export default {
         display: inline-block;
 
         .ant-select:not(.ant-select-customize-input)
-        .ant-select-selector
-        .ant-select-selection-search-input {
+          .ant-select-selector
+          .ant-select-selection-search-input {
           background-color: rgba(255, 255, 255, 0);
           border: none;
         }
@@ -5756,12 +5768,12 @@ export default {
         }
 
         .ant-select-single:not(.ant-select-customize-input)
-        .ant-select-selector {
+          .ant-select-selector {
           padding: 0;
         }
 
         .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input)
-        .ant-select-selector {
+          .ant-select-selector {
           box-shadow: none;
         }
 
@@ -6181,8 +6193,8 @@ export default {
           }
 
           .ant-table-tbody
-          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          > td {
+            > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+            > td {
             background: #f6f9fd;
           }
         }
@@ -6783,8 +6795,8 @@ export default {
             width: calc(100%);
             height: 40px;
             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%
             );
           }
 

From 53256b70b5eae0ce18ef1a9852ceea460c00f99c Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Mon, 5 Dec 2022 22:11:22 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=8A=95=E7=A5=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/vote/AddVote.vue    | 51 +++++++++++++++++++++++++++---
 src/components/vote/CreateVote.vue |  5 +++
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 311ca8e9..21aa3c4e 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -55,7 +55,7 @@
               <div v-if="ballotId > 0">
                 <a-tag closable color="processing" @close="handlelog">
                   <span style="font-size: 14px; line-height: 33px">
-                    删除投票
+                    {{  ballot_name }}
                   </span>
                 </a-tag>
               </div>
@@ -64,6 +64,7 @@
                   v-model:createVoteVisible="createVoteVisible"
                   v-model:ballotId="ballotId"
                   v-model:editChild="editChild"
+                  v-model:ballot_name="ballot_name"
                 />
               </div>
               <button
@@ -75,7 +76,7 @@
               </button>
               <div :style="{ display: creVote ? 'block' : 'none' }">
                 <div class="fileTigan">
-                  <span style="color: #388be1">{{ ballotName }}</span>
+                  <span style="color: #388be1">{{  ballot_name }}</span>
                   <div class="delBox" @click="dleVoteStem()"></div>
                 </div>
               </div>
@@ -93,6 +94,12 @@
           </div>
           <div class="main_item">
             <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
               <span style="margin-right: 3px">起止时间：</span>
             </div>
             <div class="btnbox">
@@ -105,6 +112,12 @@
           </div>
           <div class="main_item">
             <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
               <span style="margin-right: 3px">基础投票数：</span>
             </div>
             <div class="btnbox">
@@ -142,6 +155,7 @@
                 v-model:value="textV1"
                 placeholder="请输入投票说明"
                 allow-clear
+                :rows="6"
                 maxlength="150"
               />
             </div>
@@ -231,7 +245,7 @@ export default {
       voteStemId: null,
       EditVoteId: "",
       voteStemName: "",
-      ballotName: "",
+      ballot_name: "",
       editStem: false, //编辑状态
       ballotId: 0, //题干id
       optionId: "", //删除，修改选项id
@@ -240,6 +254,7 @@ export default {
       fileList: [],
       voteCount: null,
       projectTemplateId: null,
+
     });
     const closeDrawer = () => {
       (state.inputV1 = ""),
@@ -289,6 +304,7 @@ export default {
           console.log("file========", file);
           console.log("file========", file.response);
           state.voteCount = file.response.data;
+
         }
       });
       //fileList.value = resFileList;
@@ -386,8 +402,12 @@ export default {
         return message.info("请创建题干信息");
       }
 
-      if (state.basevote == "") {
-        state.basevote = 1;
+      if (!state.time) {
+        message.destroy();
+        return message.warning("请输入直播时间");
+      }
+      if (!state.basevote) {
+        return message.info("请上传投票基数");
       }
       if (state.time != undefined) {
         state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
@@ -672,6 +692,27 @@ export default {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
+          .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;
+            }
+          }
 
           .signbox {
             width: 120px;
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index c15ab7b7..066465fc 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -118,6 +118,10 @@ export default {
       type: Number,
       default: null,
     },
+    ballot_name: {
+      type: String,
+      default: null,
+    },
     editChild: {
       type: Boolean,
       default: false,
@@ -150,6 +154,7 @@ export default {
       handleAllCancel();
       ctx.emit("update:createVoteVisible", false);
       ctx.emit("update:ballotId", state.ballotId);
+      ctx.emit("update:ballot_name", state.ballotName);
     };
     // 详情
     const getInfoDate = async () => {

From 54d6528569c87d9140fcd02614c0519714c9ddd3 Mon Sep 17 00:00:00 2001
From: kclf <1195754634@qq.com>
Date: Mon, 5 Dec 2022 22:34:04 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=8A=95=E7=A5=A8=E6=9C=89=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AAbug=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=9A=84=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E8=BF=87=EF=BC=8C=E5=88=A0=E4=B8=8D=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/vote/AddVote.vue    | 6 ++----
 src/components/vote/CreateVote.vue | 2 +-
 src/views/research/ResearchAdd.vue | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 21aa3c4e..4c2a5f77 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -55,7 +55,7 @@
               <div v-if="ballotId > 0">
                 <a-tag closable color="processing" @close="handlelog">
                   <span style="font-size: 14px; line-height: 33px">
-                    {{  ballot_name }}
+                    {{ ballot_name }}
                   </span>
                 </a-tag>
               </div>
@@ -76,7 +76,7 @@
               </button>
               <div :style="{ display: creVote ? 'block' : 'none' }">
                 <div class="fileTigan">
-                  <span style="color: #388be1">{{  ballot_name }}</span>
+                  <span style="color: #388be1">{{ ballot_name }}</span>
                   <div class="delBox" @click="dleVoteStem()"></div>
                 </div>
               </div>
@@ -254,7 +254,6 @@ export default {
       fileList: [],
       voteCount: null,
       projectTemplateId: null,
-
     });
     const closeDrawer = () => {
       (state.inputV1 = ""),
@@ -304,7 +303,6 @@ export default {
           console.log("file========", file);
           console.log("file========", file.response);
           state.voteCount = file.response.data;
-
         }
       });
       //fileList.value = resFileList;
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index 066465fc..7105db41 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -272,7 +272,7 @@ export default {
           }
         });
       } else {
-        virtualDel();
+        virtualDel(id);
       }
     };
     const virtualDel = (id) => {
diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index 323d038f..b427a393 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -460,7 +460,7 @@ export default {
           });
         }
       } else {
-        virtualDel();
+        virtualDel(id);
       }
     };
     const virtualDel = (id) => {

From 1f9345ec35c4b93616f9d2083192661ac35e64ad Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Mon, 5 Dec 2022 22:55:39 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=85=B1=E4=BA=AB=E6=96=87=E6=A1=A3=EF=BC=8C=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskPage.vue | 94 ++++++++++++++++++++++++++--
 1 file changed, 89 insertions(+), 5 deletions(-)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 10bcce5b..e7d86159 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1087,6 +1087,12 @@
                       ><span style="color: #333333">BOEU实施</span></a-radio
                       >
                     </div>
+                  </div>  
+                  <div class="set_content" v-if="isPass">
+                    <div class="setc_name"><span>审核意见：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #333333">{{passInfo}}</span>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -1100,7 +1106,7 @@
                       <div class="box"></div>
                       <div class="onetitle">上传共享文档</div>
                       <div class="oneedi">
-                        <a-switch v-model:checked="docChecked"></a-switch>
+                        <a-switch v-model:checked="docChecked" @change="checkedClose"></a-switch>
                       </div>
                     </div>
                     <div class="btnbox" style="margin: 20px">
@@ -2419,6 +2425,10 @@ export default {
 
       authClassify: 3,
       addAuthList: [],
+      switchopen: true,
+      isPass:false, // 是否审核未通过 
+      passInfo:null, // 审核未通过原因说明
+      
     });
 
     const levelList = reactive({
@@ -3341,6 +3351,19 @@ export default {
       }).then((res) => {
         console.log("get task", res.data.data);
         if (res.data.code === 200) {
+          // 判断当前审核是否通过
+          if(res.data.data.projectAuditLogDtoList!==null){
+            console.log('审核信息是什么',res.data.data.projectAuditLogDtoList)
+            let dataset = res.data.data.projectAuditLogDtoList
+            for(let i=0;i<dataset.length;i++){
+              if(dataset[i].status==-5){
+                state.isPass = true
+                state.passInfo = dataset[i].description
+              }
+              // isPass passInfo
+            }
+          }
+
           let info = res.data.data.projectInfo;
           // let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
           let start = info.beginTime;
@@ -3370,6 +3393,9 @@ export default {
           state.type = info.type;
           state.category = info.category;
           state.noticeFlag = info.noticeFlag;
+          state.switchopen = info.attachSwitch==1?true:false
+          state.docChecked = info.attachSwitch==1?true:false;
+          
           // state.attach = info.attach;
           // state.templateId = info.templateId;
           state.sourceBelong = info.sourceBelongName;
@@ -3525,6 +3551,41 @@ export default {
     };
     //end---------项目概览
 
+     // 设置上传图片开关
+     const checkedClose = (data, a) => {
+      console.log(data, a);
+      state.docChecked = data;
+      state.switchopen = data
+      // 更新开关状态
+      editProj({
+          attachSwitch:state.switchopen?1:-1,
+          boeFlag: state.boeFlag,
+          category: state.category,
+          courseSyncFlag: state.courseSyncFlag,
+          level: state.tlevel,
+          manager: state.manager,
+          managerId: state.managerId,
+          name: state.name,
+          notice: state.notice,
+          noticeFlag: state.noticeFlag,
+          parentId: state.parentId,
+          picUrl: state.picUrl,
+          projectId: Number(state.projectId),
+          remark: state.remark,
+          sourceBelongId: Number(state.tsourceBelong),
+          status: state.status,
+          systemId: state.tsystemId,
+          templateId: state.templateId || 0,
+          type: state.type,
+        })
+            .then((res) => {
+              console.log("上传成功", res);
+            })
+            .catch((err) => {
+              console.log("上传失败了", err);
+            });
+    };
+
     const handleChange = ({file, fileList}) => {
       let list = [];
       if (file.status !== "uploading") {
@@ -3535,13 +3596,13 @@ export default {
         let str = JSON.stringify(list);
         console.log("str", str);
         //要编辑项目
-        editProj({
+        console.log('编辑的项目信息',{
           attach: str,
-          beginTime: state.tstartTime.slice(0, 10),
+          // beginTime: state.tstartTime.slice(0, 10),
           boeFlag: state.boeFlag,
           category: state.category,
           courseSyncFlag: state.courseSyncFlag,
-          endTime: state.tendTime.slice(0, 10),
+          // endTime: state.tendTime.slice(0, 10),
           level: state.tlevel,
           manager: state.manager,
           managerId: state.managerId,
@@ -3550,7 +3611,29 @@ export default {
           noticeFlag: state.noticeFlag,
           parentId: state.parentId,
           picUrl: state.picUrl,
-          projectId: state.projectId,
+          projectId: Number(state.projectId),
+          remark: state.remark,
+          sourceBelongId: Number(state.tsourceBelong),
+          status: state.status,
+          systemId: state.tsystemId,
+          templateId: state.templateId || 0,
+          type: state.type,
+        })
+        editProj({
+          attachSwitch:state.switchopen?1:-1,
+          attach: str,
+          boeFlag: state.boeFlag,
+          category: state.category,
+          courseSyncFlag: state.courseSyncFlag,
+          level: state.tlevel,
+          manager: state.manager,
+          managerId: state.managerId,
+          name: state.name,
+          notice: state.notice,
+          noticeFlag: state.noticeFlag,
+          parentId: state.parentId,
+          picUrl: state.picUrl,
+          projectId: Number(state.projectId),
           remark: state.remark,
           sourceBelongId: Number(state.tsourceBelong),
           status: state.status,
@@ -3926,6 +4009,7 @@ export default {
       deFile,
       toDate,
       routered,
+      checkedClose
     };
   },
 };

From 721bd80e5256bfa405d0a8b45467d6ad26719ec6 Mon Sep 17 00:00:00 2001
From: kclf <1195754634@qq.com>
Date: Mon, 5 Dec 2022 23:17:37 +0800
Subject: [PATCH 8/8] t

---
 src/api/indexEval.js                         | 44 +++++++++++-------
 src/components/vote/AddVote.vue              | 49 ++++++++++++--------
 src/views/courselibrary/CoursewareManage.vue |  3 +-
 3 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/src/api/indexEval.js b/src/api/indexEval.js
index 7f2da7ce..396d5b15 100644
--- a/src/api/indexEval.js
+++ b/src/api/indexEval.js
@@ -45,29 +45,39 @@ export const fileUp = (data) =>
     headers: { "Content-Type": "multipart/form-data" },
   });
 
-//删除测评信息
-export const deleteEvaluationById = (obj) => http.post('/evaluation/deleteEvaluationById', { params: obj }, {
-    header: {
-        'token': '123',
-    }
-})
+//上传文件
+export const baseVoteupload = (data) =>
+  http.post("/vote/baseVoteupload", data, {
+    headers: { "Content-Type": "multipart/form-data" },
+  });
 
+//删除测评信息
+export const deleteEvaluationById = (obj) =>
+  http.post(
+    "/evaluation/deleteEvaluationById",
+    { params: obj },
+    {
+      header: {
+        token: "123",
+      },
+    }
+  );
 
 //根据ID获取测评信息详情
 export const queryEvaluationDetailById = (obj) =>
-  http.post("/evaluation/queryEvaluationDetailById", obj,{
+  http.post("/evaluation/queryEvaluationDetailById", obj, {
     headers: {
-      'token': '123',
-      'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
-    }
-});
+      token: "123",
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+    },
+  });
 
 //修改测评信息
 export const updateEvaluation = (obj) =>
   http.post("/evaluation/updateEvaluation", obj);
 
 //测评列表查询接口
-  export const choiceEvaluation = (obj) =>
+export const choiceEvaluation = (obj) =>
   http.post("/evaluation/choiceEvaluation", obj);
 
 // 测试方法
@@ -79,9 +89,9 @@ export const updateEvaluation = (obj) =>
 // })
 //根据name获取测评信息详情
 export const getEvalListByName = (obj) =>
-  http.post("/evaluation/queryEvaluationDetailById", obj,{
+  http.post("/evaluation/queryEvaluationDetailById", obj, {
     headers: {
-      'token': '123',
-      'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
-    }
-});
\ No newline at end of file
+      token: "123",
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+    },
+  });
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 4c2a5f77..0c87fcd5 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -121,16 +121,22 @@
               <span style="margin-right: 3px">基础投票数：</span>
             </div>
             <div class="btnbox">
-              <a-upload
+              <!-- <a-upload
                 @change="handleChange"
                 :before-upload="beforeUpload"
                 :multiple="true"
                 :max-count="1"
                 action="/manageApi/vote/baseVoteupload"
                 v-model:file-list="fileList"
+              > -->
+              <a-upload
+                :before-upload="beforeUpload"
+                :multiple="false"
+                :max-count="1"
+                v-model:file-list="fileList"
               >
-                <button class="xkbtn">点击上传</button></a-upload
-              >
+                <button class="xkbtn">点击上传</button>
+              </a-upload>
               <div v-if="voteCount > 0">
                 <a-tag color="processing">
                   <span style="font-size: 14px; line-height: 33px">
@@ -178,6 +184,7 @@ import { RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 import * as apiTask from "../../api/indexTaskadd";
 import { addTempTask } from "../../api/indexTaskadd";
+import { baseVoteupload } from "../../api/indexEval";
 
 export default {
   name: "AddVote",
@@ -278,13 +285,9 @@ export default {
     };
 
     // 限制文件格式上传
-    const beforeUpload = (obj) => {
-      console.log(obj);
-    };
-
-    const handleChange = (info) => {
-      console.log(info.file.type, info.file.type.indexOf("sheet"));
-      if (info.file.type.indexOf("sheet") == -1) {
+    const beforeUpload = (file) => {
+      console.log(file);
+      if (file.type.indexOf("sheet") == -1) {
         message.destroy();
         message.error("请上传正确的文件格式");
 
@@ -294,18 +297,25 @@ export default {
         return;
       }
 
-      let resFileList = [...info.fileList];
+      // let resFileList = [...info.fileList];
 
-      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);
-          state.voteCount = file.response.data;
+      // 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);
+      //     state.voteCount = file.response.data;
+      //   }
+      // });
+
+      const formData = new FormData();
+      formData.append("uploadFile", file);
+      baseVoteupload(formData).then((res) => {
+        if (res.data.code === 200) {
+          console.log(res);
         }
       });
-      //fileList.value = resFileList;
     };
 
     //删除题干信息接口
@@ -470,7 +480,6 @@ export default {
       updateVoteInfo,
       queryStem,
       closeStem,
-      handleChange,
       beforeUpload,
       handlelog,
     };
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 46e7b971..24002989 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3101,7 +3101,8 @@ const columns1 = [
     customRender: ({ text }) => {
       return text ? text : "-";
     },
-  },{
+  },
+  {
     title: " 所属路径",
     width: 250,
     dataIndex: "routerName",