From 47648682a59fee6ec955f9bc243bd2537bd4a7de Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 19 Dec 2022 18:27:24 +0800
Subject: [PATCH 01/13] =?UTF-8?q?--=20=E5=AD=A6=E5=91=98=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=92=8C=E6=9C=80=E5=90=8E=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskPage.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index ce26f4c2..4bf504cb 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1729,11 +1729,13 @@ export default {
         align: "center",
         className: "h",
         ellipsis: true,
+        customRender: ({record}) => <div>{record.finishTaskNum}/{record.totalTaskNum}</div>
+
       },
         {
           title: "最近学习时间",
-          dataIndex: "stutime",
-          key: "stutime",
+          dataIndex: "lastStudyTime",
+          key: "lastStudyTime",
           width: 80,
           align: "center",
           className: "h",

From 790030d8d19f8e0675f7d8836e33e963bd9234a5 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 19 Dec 2022 19:35:54 +0800
Subject: [PATCH 02/13] =?UTF-8?q?--=20=E9=A1=B9=E7=9B=AE=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E9=80=89=E6=8B=A9=E9=98=B6=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 1cc63a5a..a6ea1333 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -478,7 +478,7 @@ const resetAudienceInfo = () => {
 // };
 //确定添加授权
 const submitAuth = () => {
-  if (props.type !== 3) {
+  if (props.type === 2) {
     stageVisible.value = true
   } else {
     handleStageOk()

From 78ecfd3d6a2338de6dd22f5b6ba8f2635b3c09ca Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 19 Dec 2022 19:41:08 +0800
Subject: [PATCH 03/13] =?UTF-8?q?--=20=E5=AD=A6=E5=91=98=E6=B3=AA=E9=A3=99?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index a6ea1333..57aca2bc 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -241,7 +241,7 @@ const {
   loading: stuLoading,
   total: stuTotal
 } = useBoeApiPage(USER_LIST, nameSearch.value, {
-  init: true,
+  init: false,
   result: res => res.result.userInfoList,
   totalPage: res => res.result.totalPage,
   total: res => res.result.totalElement
@@ -260,7 +260,7 @@ const {
   loading: audiLoading,
   total: audiTotal
 } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
-  init: true,
+  init: false,
   result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})),
   totalPage: res => res.result.totalPage,
   total: res => res.result.totalElement

From d7aa5fc85616f91302cb8ccfedcb29a85ab74c31 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 19 Dec 2022 19:56:27 +0800
Subject: [PATCH 04/13] -- bug

---
 src/views/projectcenter/ProjectManage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 2964c0a0..4240bca5 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -974,7 +974,7 @@ export default {
         return;
       } */
       const offName = await validateName({
-        name: state.qdms_inputV1,
+        name: state.projectInfo.name,
         type: 1,
         id: state.projectInfo.projectId,
       }).then((res) => {

From dd9c9cbf4cceedfc752d88cb8ba66f071ab176fa Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 19 Dec 2022 20:18:14 +0800
Subject: [PATCH 05/13] -- bug

---
 src/views/projectcenter/ProjectAdd.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 8c4edc69..df820a9b 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -357,7 +357,7 @@ export default {
               ...res.data.data.projectInfo,
               ...state.projectInfo,
             };
-            state.projectInfo.name = ''
+            routers.query.parentId && (state.projectInfo.name = '')
             state.projectInfo.rangeTime = [
               state.projectInfo.beginTime,
               state.projectInfo.endTime,

From 7fa58cdea1be786f02cbeb410eb542fec78d392c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 19 Dec 2022 20:38:02 +0800
Subject: [PATCH 06/13] -- bug

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

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index df820a9b..698f067f 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -357,7 +357,6 @@ export default {
               ...res.data.data.projectInfo,
               ...state.projectInfo,
             };
-            routers.query.parentId && (state.projectInfo.name = '')
             state.projectInfo.rangeTime = [
               state.projectInfo.beginTime,
               state.projectInfo.endTime,

From d8e0b3c1b51fa11c0510731a64f68445e75cfac1 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Mon, 19 Dec 2022 20:45:23 +0800
Subject: [PATCH 07/13] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=AD=A6=E5=91=98=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request.js                        |    2 +-
 src/assets/scss/common.scss               |   53 +-
 src/views/learningpath/LearningPath.vue   |   37 +-
 src/views/learningpath/LevelAdd.vue       |  101 +-
 src/views/projectcenter/ProjectManage.vue |   10 +-
 src/views/projectcenter/TaskPage.vue      | 1542 +++++++++++----------
 src/views/research/ResearchManage.vue     |    6 +-
 7 files changed, 894 insertions(+), 857 deletions(-)

diff --git a/src/api/request.js b/src/api/request.js
index d741c2df..6d49d284 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -138,7 +138,7 @@ export async function request(_url, params) {
         }
     }
     const body = method !== 'get' ? params || {} : {}
-    url = process.env.VUE_APP_BOE_API_URL + url
+    // url = process.env.VUE_APP_BOE_API_URL + url
     return fetch(url, {
         method,
         headers: {
diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index a8adc8b1..00bd95e6 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -51,31 +51,37 @@ body {
   height: 6px;
   /*对水平流动条有效*/
 }
+
 ::-o-scrollbar {
   width: 6px;
   /*对垂直流动条有效*/
   height: 6px;
   /*对水平流动条有效*/
 }
+
 .scrollbar {
   width: 6px;
   /*对垂直流动条有效*/
   height: 6px;
   /*对水平流动条有效*/
 }
+
 /*定义滚动条的轨道颜色、内阴影及圆角*/
 ::-webkit-scrollbar-track {
   background-color: rgba(239, 244, 252, 1);
   border-radius: 6px;
 }
+
 ::-moz-scrollbar-track {
   background-color: rgba(239, 244, 252, 1);
   border-radius: 6px;
 }
+
 ::-o-scrollbar-track {
   background-color: rgba(239, 244, 252, 1);
   border-radius: 6px;
 }
+
 .scrollbar-track {
   background-color: rgba(239, 244, 252, 1);
   border-radius: 6px;
@@ -86,14 +92,17 @@ body {
   border-radius: 3px;
   background-color: rgba(78, 166, 255, 1);
 }
+
 ::-moz-scrollbar-thumb {
   border-radius: 3px;
   background-color: rgba(78, 166, 255, 1);
 }
+
 ::-o-scrollbar-thumb {
   border-radius: 3px;
   background-color: rgba(78, 166, 255, 1);
 }
+
 .scrollbar-thumb {
   border-radius: 3px;
   background-color: rgba(78, 166, 255, 1);
@@ -104,35 +113,43 @@ body {
   background-color: cyan;
   display: none;
 }
+
 ::-moz-scrollbar-button {
   background-color: cyan;
   display: none;
 }
+
 ::-o-scrollbar-button {
   background-color: cyan;
   display: none;
 }
+
 .scrollbar-button {
   background-color: cyan;
   display: none;
 }
+
 /*定义右下角汇合处的样式*/
 ::-webkit-scrollbar-corner {
   background: rgba(239, 244, 252, 1);
   ;
 }
+
 ::-moz-scrollbar-corner {
   background: rgba(239, 244, 252, 1);
   ;
 }
+
 ::-o-scrollbar-corner {
   background: rgba(239, 244, 252, 1);
   ;
 }
+
 .scrollbar-corner {
   background: rgba(239, 244, 252, 1);
   ;
 }
+
 //隐藏滚动条----------------------------------------------------------------
 
 //禁止选中----------------------------------------------------------
@@ -329,7 +346,8 @@ textarea {
 
 //抽屉--------------------------------------------------------
 .drawerStyle {
-	// transform: translateX(0px) !important;
+
+  // transform: translateX(0px) !important;
   .ant-drawer-content-wrapper {
     max-width: 1050px;
 
@@ -437,29 +455,34 @@ textarea {
   }
 }
 
-.ant-modal{
-  .modalHeader{
-    background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
+.ant-modal {
+  .modalHeader {
+    background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
   }
-  .top{
-    background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
+
+  .top {
+    background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
   }
-  .del_header{
-    background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important;
+
+  .del_header {
+    background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important;
   }
 }
+
 //弹窗--------------------------------------------------------
 
 //loading--------------------------------------------------------
 .aeLoading {
   width: 100%;
   height: 100%;
-background: rgba(0, 0, 0, 0.2);
-display: flex;
-align-items: center;
-justify-content: center;
-position: absolute;
-left: 0;
-top:0,
+  background: rgba(0, 0, 0, 0.2);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 100
 }
+
 //loading--------------------------------------------------------
\ No newline at end of file
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 69f732e7..46fead1f 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -203,7 +203,7 @@
               <!-- <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" /> -->
-            
+
               <div
                 @click="chooseImg(item)"
                 v-for="(item, index) in imgData"
@@ -244,7 +244,7 @@
             class="aeLoading"
             :style="{ display: lpLoading ? 'flex' : 'none' }"
           >
-            <a-spin :spinning="lpLoading" tip=""/>
+            <a-spin :spinning="lpLoading" tip="" />
           </div>
         </div>
       </div>
@@ -278,7 +278,7 @@
               />
             </div>
             <div class="inname">路径图名称</div>
-            <div class="in" >
+            <div class="in">
               <!--              <a-input-->
               <!--                  v-model:value="pathName"-->
               <!--                  maxlength="20"-->
@@ -332,7 +332,7 @@
               <!-- <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" /> -->
-       
+
               <div
                 @click="chooseImg2(item)"
                 v-for="(item, index) in imgData"
@@ -709,7 +709,7 @@ import { storage } from "../../api/storage";
 import { useStore } from "vuex";
 import OrgClass from "@/components/project/OrgClass";
 import NameInput from "@/components/project/NameInput";
-
+import { getStuPage } from "@/api/index1";
 export default {
   name: "learningPath",
   components: {
@@ -857,7 +857,7 @@ export default {
       state.pathName = "";
       state.pathBg = "";
       state.pathBgId = "";
-      if(store.state.userInfo.departId && store.state.userInfo.departName){
+      if (store.state.userInfo.departId && store.state.userInfo.departName) {
         state.organizationSelectName = store.state.userInfo.departName;
         state.organizationSelectId = store.state.userInfo.departId;
       }
@@ -867,7 +867,7 @@ export default {
     const handleOut1 = () => {
       state.pathName = "";
       state.pathBg = "";
-      state.pathBgId =1;
+      state.pathBgId = 1;
       state.organizationSelectName = null;
       state.organizationSelectId = null;
       state.pathIntro = "";
@@ -908,12 +908,12 @@ export default {
       let stuobj = {
         pageNo: 1,
         pageSize: 10,
-        routerId: router.id,
+        pid: router.id,
+        type: 2,
       };
-      api
-        .getStudent(stuobj)
+      getStuPage(stuobj)
         .then((res) => {
-          console.log("获取学员列表", res.data.data.total);
+          console.log("获取学员列表", res.data);
           if (res.data.code === 200) {
             state.routeStudentsNum = res.data.data.total;
             state.pubLoading = false;
@@ -1175,7 +1175,7 @@ export default {
           key: "opacation",
           width: "20%",
           align: "center",
-         // fixed: "right",
+          // fixed: "right",
           scopedSlots: { customRender: "action" }, //引入的插槽
           customRender: (text) => {
             // console.log(text);
@@ -1626,17 +1626,16 @@ export default {
             arr.forEach((item) => {
               if (item.dictValue === state.pathBg) {
                 state.pathBgId = item.dictCode;
-
               }
             });
 
             //for (let i = 0; i < arr.length; i++) {
-             //  console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
+            //  console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
             //  if (arr[i].dictValue === state.pathBg) {
-             //   state.pathBgId = arr[i].dictCode;
+            //   state.pathBgId = arr[i].dictCode;
 
-           //   }
-          //  }
+            //   }
+            //  }
           }
         })
         .catch((err) => {
@@ -1745,7 +1744,7 @@ export default {
       state.searchdate = null;
       state.startTime = null;
       state.endTime = null;
-      state.createUser=null;
+      state.createUser = null;
       getLearnPath();
     };
 
@@ -1803,7 +1802,7 @@ export default {
       //   state.imgData = ;
       // }
     });
-    const imgData = computed(()=>store.state.pathmapPic)
+    const imgData = computed(() => store.state.pathmapPic);
     //添加权限
     watch(
       () => state.addAuthList,
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index adb871c6..f7ed9e15 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -10,26 +10,27 @@
         <div class="fort">创建时间：{{ cretime }}</div>
       </div>
       <div class="right">
-       <!--
+        <!--
         <img
           class="img1"
           src="../../assets/images/leveladd/ma.png"
           @click="showCodeModel2()"
         />
         <div v-if="action == 1 || action == 0" class="line"></div>-->
-        <div class ="pubIcon" v-if="action == 1 || action == 0"  @click="pubIcon(action)">
-        <img
-          class="img2"
-          src="../../assets/images/leveladd/pub.png"
-        />
-        <!-- 已发布的显示 -->
-        <div class="pub" style="width: 28px">
-          {{ act }}
+        <div
+          class="pubIcon"
+          v-if="action == 1 || action == 0"
+          @click="pubIcon(action)"
+        >
+          <img class="img2" src="../../assets/images/leveladd/pub.png" />
+          <!-- 已发布的显示 -->
+          <div class="pub" style="width: 28px">
+            {{ act }}
+          </div>
         </div>
-       </div>
         <div class="line"></div>
         <router-link to="/learningpath"
-          ><div style="display: flex; ">
+          ><div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
           </div>
@@ -507,7 +508,7 @@
         <a-tab-pane key="3" tab="学员管理" force-render>
           <TableStudent :type="2" :id="routerId" :stage="stage"></TableStudent>
         </a-tab-pane>
-            <!--1211注释 待开放
+        <!--1211注释 待开放
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
 
@@ -703,7 +704,6 @@
           </a-tabs>
         </a-tab-pane>
    -->
-
       </a-tabs>
 
       <a-modal
@@ -1114,6 +1114,7 @@ import { codeUrl } from "../../api/method";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 import TableStudent from "@/components/student/TableStudent";
 // import * as student from "@/api/student";
+import { getStuPage } from "@/api/index1";
 export default {
   name: "LevelAdd",
   components: {
@@ -1367,12 +1368,12 @@ export default {
           className: "h",
         },
         //  {
-         //   title: "岗位",
-          //  dataIndex: "gang",
-         //   key: "gang",
-         //   width: 110,
-          //  align: "center",
-         //   className: "h",
+        //   title: "岗位",
+        //  dataIndex: "gang",
+        //   key: "gang",
+        //   width: 110,
+        //  align: "center",
+        //   className: "h",
         //  },
         {
           title: "当前关卡",
@@ -1382,14 +1383,14 @@ export default {
           align: "center",
           className: "h",
         },
-          {
-            title: "进度",
-           dataIndex: "jin",
-           key: "jin",
-            width: 110,
-           align: "center",
-           className: "h",
-          },
+        {
+          title: "进度",
+          dataIndex: "jin",
+          key: "jin",
+          width: 110,
+          align: "center",
+          className: "h",
+        },
         {
           title: "开始时间",
           dataIndex: "time",
@@ -1680,10 +1681,10 @@ export default {
       let stuobj = {
         pageNo: 1,
         pageSize: 10,
-        routerId: state.routerId,
+        pid: state.routerId,
+        type: 2,
       };
-      api
-        .getStudent(stuobj)
+      getStuPage(stuobj)
         .then((res) => {
           console.log("获取学员列表", res.data.data.total);
           if (res.data.code === 200) {
@@ -1695,14 +1696,13 @@ export default {
           console.log("获取学员列表失败", err);
         });
     };
-    const pubIcon =(action)=>{
-      if(action ==1){
+    const pubIcon = (action) => {
+      if (action == 1) {
         showBackModal();
-      }else{
+      } else {
         showPub();
       }
-
-    }
+    };
     //显示撤回弹窗
     const showBackModal = () => {
       state.backModal = true;
@@ -1868,7 +1868,10 @@ export default {
             state.nodata = false;
           }
           let data = res.data.data.chapterList;
-          state.stage = res.data.data.chapterList.map(e => ({id: e.chapterId, name: e.name}))
+          state.stage = res.data.data.chapterList.map((e) => ({
+            id: e.chapterId,
+            name: e.name,
+          }));
           state.taskSyllabus = data;
           // for(let i in data) {
           //   state.taskSyllabus[i].name = data[i].name
@@ -2851,23 +2854,23 @@ export default {
         background-color: #e8effa;
         margin-right: 28px;
       }
-      .pubIcon{
+      .pubIcon {
         display: flex;
         align-items: center;
 
         .img2 {
-        width: 42px;
-        height: 42px;
-        margin-right: 22px;
-      }
+          width: 42px;
+          height: 42px;
+          margin-right: 22px;
+        }
 
-      .pub {
-        color: #ffb64e;
-        font-size: 14px;
-        margin-top: 5px;
-        margin-right: 30px;
-        cursor: pointer;
-      }
+        .pub {
+          color: #ffb64e;
+          font-size: 14px;
+          margin-top: 5px;
+          margin-right: 30px;
+          cursor: pointer;
+        }
       }
 
       .img2 {
@@ -4262,7 +4265,5 @@ export default {
       }
     }
   }
-
-
 }
 </style>
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 2964c0a0..1d398ef2 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -51,7 +51,6 @@
             format="YYYY-MM-DD"
             style="border-radius: 8px; height: 40px; margin-left: 5px"
             :placeholder="['      开始时间', '        结束时间']"
-       
           />
         </div>
         <div style="display: flex; margin-bottom: 20px">
@@ -829,7 +828,7 @@ import { changeOwnership } from "@/api/method";
 import NameInput from "@/components/project/NameInput";
 import { validateName } from "@/api/index1";
 //import { toDate } from "../../api/method";
-
+import { getStuPage } from "@/api/index1";
 export default {
   name: "projectManage",
   components: {
@@ -1050,10 +1049,10 @@ export default {
       let obj = {
         pageNo: 0,
         pageSize: 0,
-        projectId: object.projectId,
+        pid: object.projectId,
+        type: 1,
       };
-      api
-        .projectStudent(obj)
+      getStuPage(obj)
         .then((res) => {
           if (res.data.code === 200) {
             // console.log("res", res.data);
@@ -1699,7 +1698,6 @@ export default {
             state.searchParam.valueDate &&
             state.searchParam.valueDate.length === 2
               ? dayjs(state.searchParam.valueDate[0]).format("YYYY-MM-DD")
-            
               : "",
           endTime:
             state.searchParam.valueDate &&
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index ce26f4c2..5a5c991f 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>
@@ -29,74 +29,74 @@
         ></div>-->
         <!-- 显示发布图标 -->
         <img
-            v-if="action == 2"
-            class="img2"
-            src="../../assets/images/leveladd/pub.png"
+          v-if="action == 2"
+          class="img2"
+          src="../../assets/images/leveladd/pub.png"
         />
         <!-- 显示撤回发布图标 -->
         <img
-            v-if="action == 3"
-            class="img2"
-            src="../../assets/images/project/finish.png"
+          v-if="action == 3"
+          class="img2"
+          src="../../assets/images/project/finish.png"
         />
         <!-- 显示审核图标 -->
         <img
-            v-if="action == 0 || action == -2"
-            class="img2"
-            src="../../assets/images/project/reviewsubmit.png"
+          v-if="action == 0 || action == -2"
+          class="img2"
+          src="../../assets/images/project/reviewsubmit.png"
         />
         <!-- 显示撤回审核图标 -->
         <img
-            v-if="action == 1"
-            class="img2"
-            src="../../assets/images/project/reviewrecall.png"
+          v-if="action == 1"
+          class="img2"
+          src="../../assets/images/project/reviewrecall.png"
         />
         <!-- <div class="pub">发布</div> -->
 
         <!-- 显示提交审核 -->
         <div
-            class="pub"
-            style="width: 56px; color: #a497ff"
-            v-if="action == 0 || action == -2"
-            @click="submitExamine"
+          class="pub"
+          style="width: 56px; color: #a497ff"
+          v-if="action == 0 || action == -2"
+          @click="submitExamine"
         >
           {{ act }}
         </div>
         <!-- 显示撤回审核 -->
         <div
-            class="pub"
-            style="width: 56px; color: #a497ff"
-            v-if="action == 1"
-            @click="showRecallReviewModal"
+          class="pub"
+          style="width: 56px; color: #a497ff"
+          v-if="action == 1"
+          @click="showRecallReviewModal"
         >
           {{ act }}
         </div>
         <!-- 显示发布 -->
         <div
-            class="pub"
-            style="width: 28px"
-            v-if="action == 2"
-            @click="showProjectPub"
+          class="pub"
+          style="width: 28px"
+          v-if="action == 2"
+          @click="showProjectPub"
         >
           {{ act }}
         </div>
         <!-- 显示撤回发布 -->
         <div
-            class="pub"
-            style="width: 56px; color: #57c887"
-            v-if="action == 3"
-            @click="showBackModal"
+          class="pub"
+          style="width: 56px; color: #57c887"
+          v-if="action == 3"
+          @click="showBackModal"
         >
           {{ act }}
         </div>
 
         <!-- 项目提交审核弹窗 -->
         <a-modal
-            v-model:visible="reviewModal"
-            :footer="null"
-            :closable="false"
-            wrapClassName="CopyModal"
-            centered="true"
+          v-model:visible="reviewModal"
+          :footer="null"
+          :closable="false"
+          wrapClassName="CopyModal"
+          centered="true"
         >
           <div class="delete">
             <div class="del_header"></div>
@@ -171,7 +171,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>
@@ -180,11 +180,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>
@@ -196,8 +196,8 @@
             <div class="second">
               <!-- @click="totask" -->
               <div
-                  class="taskbox"
-                  @click="
+                class="taskbox"
+                @click="
                   () => {
                     routered.push({
                       path: `/taskadd`,
@@ -205,16 +205,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)">
                   添加任务
@@ -222,18 +222,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)">
                   添加学员
@@ -271,27 +271,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>
@@ -299,8 +299,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>
@@ -308,8 +308,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>
@@ -324,13 +324,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>
@@ -344,28 +344,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>
@@ -376,8 +376,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">
@@ -386,8 +386,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">
@@ -396,8 +396,8 @@
                 <div class="proright1">
                   <span class="textpro">选修课</span>
                   <a-progress
-                      :percent="stageOverviewList.totalOptCnt"
-                      style="width: 369px"
+                    :percent="stageOverviewList.totalOptCnt"
+                    style="width: 369px"
                   />
                 </div>
               </div>
@@ -415,12 +415,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>
@@ -437,8 +437,8 @@
               </router-link>
             </div> -->
             <div
-                class="taskSyllabus"
-                v-if="
+              class="taskSyllabus"
+              v-if="
                 taskSyllabus &&
                 taskSyllabus.length &&
                 (taskSyllabus.length > 1 || taskSyllabus[0].name)
@@ -447,12 +447,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')
@@ -462,19 +462,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;
@@ -483,7 +483,7 @@
                             "
                           >
                             <img
-                                :src="
+                              :src="
                                 item.type == 1
                                   ? require('../../assets/images/leveladd/zai.png')
                                   : item.type == 2
@@ -524,7 +524,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>
@@ -540,29 +540,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>
@@ -631,22 +631,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)">
                   创建任务
@@ -657,8 +657,8 @@
             </div>
             <div v-else>
               <div
-                  class="taskbox"
-                  @click="
+                class="taskbox"
+                @click="
                   () => {
                     routered.push({
                       path: `/taskadd`,
@@ -666,16 +666,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)">
                   添加任务
@@ -691,7 +691,12 @@
           <div class="content3">
             <a-tabs v-model:activeKey="activeKey1">
               <a-tab-pane key="8" tab="学员管理">
-                <TableStudent :type="1" :id="projectId" :columns="stuColumns" :stage="stage"></TableStudent>
+                <TableStudent
+                  :type="1"
+                  :id="projectId"
+                  :columns="stuColumns"
+                  :stage="stage"
+                ></TableStudent>
               </a-tab-pane>
             </a-tabs>
           </div>
@@ -857,9 +862,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>
@@ -867,7 +872,7 @@
                     <div class="setc_name"><span>项目时间：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
-                      >{{ startTime }} ～ {{ endTime }}</span
+                        >{{ startTime }} ～ {{ endTime }}</span
                       >
                     </div>
                   </div>
@@ -887,10 +892,10 @@
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
-                      ><ProjectLevel
+                        ><ProjectLevel
                           v-model:value="level"
                           :tag="true"
-                      ></ProjectLevel
+                        ></ProjectLevel
                       ></span>
                     </div>
                   </div>
@@ -898,10 +903,10 @@
                     <div class="setc_name"><span>培训体系：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
-                      ><TrainClass
+                        ><TrainClass
                           v-model:value="systemId"
                           :tag="true"
-                      ></TrainClass
+                        ></TrainClass
                       ></span>
                     </div>
                   </div>
@@ -909,9 +914,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>
@@ -919,7 +924,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>
@@ -1032,89 +1037,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;
@@ -1124,18 +1129,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>
@@ -1156,15 +1161,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">
@@ -1178,19 +1183,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;
@@ -1200,13 +1205,13 @@
         >
           <div class="headerLeft" style="margin-left: 32px">
             <span class="headerLeftText" style="font-size: 16px">{{
-                stuMemberClassify === 1 ? "创建小组" : "编辑小组"
-              }}</span>
+              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>
@@ -1214,31 +1219,31 @@
           <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">
               <ProjectManager
-                  v-model:value="stuGroupId"
-                  v-model:name="stuGroupName"
+                v-model:value="stuGroupId"
+                v-model:name="stuGroupName"
               ></ProjectManager>
               <!-- <a-input
                 v-model:value="valueaddm"
@@ -1258,12 +1263,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>
@@ -1291,11 +1296,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>
@@ -1323,11 +1328,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>
@@ -1356,12 +1361,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>
@@ -1391,11 +1396,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>
@@ -1420,21 +1425,21 @@
       </a-modal>
     </div>
     <!-- 编辑项目弹窗 -->
-    <proj-set v-model:editHs="editHs" v-model:projectId="projectId"/>
+    <proj-set v-model:editHs="editHs" v-model:projectId="projectId" />
 
     <!-- 发布弹窗 -->
     <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;
@@ -1444,21 +1449,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>
@@ -1499,20 +1504,20 @@
       </div>
       <!--  加载动画 -->
       <div
-          class="aeLoading"
-          :style="{ display: projectPubLoading ? 'flex' : 'none' }"
+        class="aeLoading"
+        :style="{ display: projectPubLoading ? 'flex' : 'none' }"
       >
-        <a-spin :spinning="projectPubLoading"/>
+        <a-spin :spinning="projectPubLoading" />
       </div>
     </a-modal>
 
     <!-- 撤回弹窗 -->
     <a-modal
-        v-model:visible="backModal"
-        :footer="null"
-        :closable="closeBack"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="backModal"
+      :footer="null"
+      :closable="closeBack"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1539,11 +1544,11 @@
     </a-modal>
     <!-- 项目撤回审核弹窗 -->
     <a-modal
-        v-model:visible="recallReviewModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="recallReviewModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1570,11 +1575,11 @@
     </a-modal>
     <!-- 结束项目弹窗 -->
     <a-modal
-        v-model:visible="stopModal"
-        :footer="null"
-        :closable="closeStop"
-        wrapClassName="CopyModal"
-        centered="true"
+      v-model:visible="stopModal"
+      :footer="null"
+      :closable="closeStop"
+      wrapClassName="CopyModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -1604,11 +1609,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>
@@ -1635,18 +1640,18 @@
 
     <!-- 二维码弹窗 -->
     <two-dimensional-code
-        v-model:codevisible="codevisible"
-        :codeInfo="codeInfo"
-        index="0"
-        type="课程二维码"
+      v-model:codevisible="codevisible"
+      :codeInfo="codeInfo"
+      index="0"
+      type="课程二维码"
     />
     <!-- 二维码弹窗 -->
   </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 TimeManage from "../../components/drawers/TimeManage";
 import FaceManage from "../../components/drawers/FaceManage";
 import SubsetManage from "../../components/drawers/SubsetManage";
@@ -1662,7 +1667,7 @@ import ChangeGroup from "../../components/drawers/ChangeGroup";
 import NoticePub from "../../components/drawers/NoticePub";
 import NoticeHis from "../../components/drawers/NoticeHis";
 import TaskImpStu from "../../components/drawers/TaskFaceIn";
-import {storage} from "../../api/storage";
+import { storage } from "../../api/storage";
 import * as api from "../../api/index1";
 import * as apis from "../../api/index";
 import * as apiproj from "../../api/index";
@@ -1675,20 +1680,20 @@ import {
   editGroup,
   topStudent,
 } from "../../api/indexProjStu";
-import {message, Modal} from "ant-design-vue";
+import { message, Modal } from "ant-design-vue";
 import * as apitl from "../../api/index";
-import {getTask} from "../../api/indexTaskadd";
-import {editProj} from "../../api/indexTaskadd";
-import {toDate, codeUrl} from "../../api/method";
+import { getTask } from "../../api/indexTaskadd";
+import { editProj } from "../../api/indexTaskadd";
+import { toDate, codeUrl } 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/ProjectManagerNew";
 import TableStudent from "@/components/student/TableStudent";
-
+import { getStuPage } from "@/api/index1";
 export default {
   name: "taskPage",
   components: {
@@ -1714,22 +1719,23 @@ export default {
     NoticeHis,
     TwoDimensionalCode,
     ProjectManager,
-    TableStudent
+    TableStudent,
   },
   setup() {
     const store = useStore();
     const route = useRoute();
     const state = reactive({
       stage: [],
-      stuColumns: [{
-        title: "进度",
-        dataIndex: "progress",
-        key: "progress",
-        width: 80,
-        align: "center",
-        className: "h",
-        ellipsis: true,
-      },
+      stuColumns: [
+        {
+          title: "进度",
+          dataIndex: "progress",
+          key: "progress",
+          width: 80,
+          align: "center",
+          className: "h",
+          ellipsis: true,
+        },
         {
           title: "最近学习时间",
           dataIndex: "stutime",
@@ -1737,7 +1743,8 @@ export default {
           width: 80,
           align: "center",
           className: "h",
-        }],
+        },
+      ],
       loading: false,
       projectId: route.query.projectId,
       isbj: storage.get("isbj") ? JSON.parse(storage.get("isbj")) : null,
@@ -1804,23 +1811,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, //时间管理
@@ -1967,24 +1974,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>;
@@ -2074,24 +2081,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>;
@@ -2181,24 +2188,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>;
@@ -2414,41 +2421,41 @@ 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;
-                console.log("11-22-33", taskarr);
-                if (taskarr.length == 1) {
-                  if (taskarr[0].stageId == "0") {
-                    taskarr[0].name = "无阶段任务";
-                  }
-                }
-                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;
+              console.log("11-22-33", taskarr);
+              if (taskarr.length == 1) {
+                if (taskarr[0].stageId == "0") {
+                  taskarr[0].name = "无阶段任务";
+                }
+              }
+              state.taskSyllabus = taskarr;
+            }
+          }
+        })
+        .catch((err) => {
+          console.log("获取任务列表失败", err);
+        });
     };
 
     //学员学员管理渲染
@@ -2528,7 +2535,7 @@ export default {
       // state.activeKey = "2";
       routered.push({
         path: `/taskadd`,
-        query: {projectId: state.projectId},
+        query: { projectId: state.projectId },
       });
     };
     const tostudent = () => {
@@ -2552,16 +2559,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;
     };
@@ -2581,16 +2588,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;
     };
@@ -2603,7 +2610,7 @@ 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) {
@@ -2750,19 +2757,19 @@ export default {
       };
       console.log("提交审核obj", obj);
       apis
-          .handleProject(obj)
-          .then((res) => {
-            console.log("提交成功", res);
-            message.destroy();
-            message.success("提交成功");
-            state.reviewModal = false;
-            getTaskInfo();
-            // getTask();
-            reget();
-          })
-          .catch((err) => {
-            console.log("提交失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("提交成功", res);
+          message.destroy();
+          message.success("提交成功");
+          state.reviewModal = false;
+          getTaskInfo();
+          // getTask();
+          reget();
+        })
+        .catch((err) => {
+          console.log("提交失败", err);
+        });
     };
 
     //关闭提交审核弹窗
@@ -2873,29 +2880,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>
             );
           },
         },
@@ -2969,35 +2976,35 @@ export default {
           width: "20%",
           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"
@@ -3010,14 +3017,14 @@ export default {
                    查看
                    </div>
                    */}
-                  <div class="studentSelect">
-                    <a-select
-                        style="width: 50px"
-                        value="更多"
-                        // options={state.projectNameList}
-                        dropdownClassName="tabledropdown"
-                    >
-                      {/**
+                <div class="studentSelect">
+                  <a-select
+                    style="width: 50px"
+                    value="更多"
+                    // options={state.projectNameList}
+                    dropdownClassName="tabledropdown"
+                  >
+                    {/**
                        <a-select-option value="换组" label="换组">
                        <div
                        onClick={() => {
@@ -3032,19 +3039,19 @@ export default {
                        </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>
+                    <a-select-option value="删除" label="删除">
+                      <div
+                        onClick={() => {
+                          // console.log("点击了111", text);
+                          showDeleteOne(text.record.studentId);
+                        }}
+                      >
+                        删除
+                      </div>
+                    </a-select-option>
+                  </a-select>
                 </div>
+              </div>
             );
           },
         },
@@ -3091,13 +3098,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);
+        });
     };
 
     //搜索
@@ -3138,15 +3145,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 = [];
     };
     //批量删除学员弹窗
@@ -3169,16 +3176,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) => {
@@ -3207,15 +3214,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);
@@ -3255,13 +3262,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);
@@ -3295,7 +3302,7 @@ export default {
         title: "确定清空所有学员吗？",
         onOk: async () => {
           state.tabledata = [];
-          student.studentDelAll({id: state.projectId, type: 1});
+          student.studentDelAll({ id: state.projectId, type: 1 });
         },
         bodyStyle: "margin-top:70%",
       });
@@ -3303,9 +3310,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();
     };
     //获取学员列表
@@ -3322,16 +3329,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 = () => {
@@ -3341,7 +3348,10 @@ export default {
         console.log("get task", res.data.data);
         if (res.data.code === 200) {
           // 判断当前审核是否通过
-          if (res.data.data.status == -5 && res.data.data.projectAuditLogDtoList !== null) {
+          if (
+            res.data.data.status == -5 &&
+            res.data.data.projectAuditLogDtoList !== null
+          ) {
             console.log("审核信息是什么", res.data.data.projectAuditLogDtoList);
             let dataset = res.data.data.projectAuditLogDtoList;
             state.passInfo = dataset[dataset.length - 1];
@@ -3356,7 +3366,10 @@ export default {
             }
              */
           }
-          state.stage = res.data.data.stageList.map(e => ({id: e.stageId, name: e.name}))
+          state.stage = res.data.data.stageList.map((e) => ({
+            id: e.stageId,
+            name: e.name,
+          }));
           let info = res.data.data.projectInfo;
           // let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
           let start = info.beginTime;
@@ -3422,20 +3435,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) => {
@@ -3460,16 +3473,16 @@ export default {
         };
         console.log("小组创建obj", obj);
         editGroup(obj)
-            .then((res) => {
-              console.log("小组创建成功", res);
-              message.success("小组创建成功");
-              getGroup();
-              getStu();
-            })
-            .catch((err) => {
-              console.log("小组创建失败", err);
-              message.warning("小组创建失败");
-            });
+          .then((res) => {
+            console.log("小组创建成功", res);
+            message.success("小组创建成功");
+            getGroup();
+            getStu();
+          })
+          .catch((err) => {
+            console.log("小组创建失败", err);
+            message.warning("小组创建失败");
+          });
       }
       //编辑
       if (state.stuMemberClassify === 2) {
@@ -3482,15 +3495,15 @@ export default {
         };
         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("小组编辑失败");
+          });
       }
     };
     //搜索小组重置
@@ -3522,27 +3535,27 @@ 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---------项目概览
 
@@ -3573,15 +3586,15 @@ 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);
+        });
     };
 
-    const handleChange = ({file, fileList}) => {
+    const handleChange = ({ file, fileList }) => {
       let list = [];
       if (file.status !== "uploading") {
         console.log("上传的list", fileList);
@@ -3636,12 +3649,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") {
@@ -3692,17 +3705,17 @@ export default {
         console.log("获取项目状态", res);
         state.action = res.data.data.projectInfo.status;
         state.act =
-            state.action == 2
-                ? "发布"
-                : state.action == 0
-                    ? "提交审核"
-                    : state.action == 1
-                        ? "撤回审核"
-                        : state.action == 3
-                            ? "撤回发布"
-                            : state.action == -1
-                                ? ""
-                                : "-";
+          state.action == 2
+            ? "发布"
+            : state.action == 0
+            ? "提交审核"
+            : state.action == 1
+            ? "撤回审核"
+            : state.action == 3
+            ? "撤回发布"
+            : state.action == -1
+            ? ""
+            : "-";
       });
     };
     //打开发布弹窗
@@ -3725,22 +3738,22 @@ export default {
       let obj = {
         pageNo: 0,
         pageSize: 0,
-        projectId: state.projectId,
+        pid: state.projectId,
+        type: 1,
       };
-      apiproj
-          .projectStudent(obj)
-          .then((res) => {
-            if (res.data.code === 200) {
-              // console.log("res", res.data);
-              state.projectStudentsNum = res.data.data.total
-                  ? res.data.data.total
-                  : 0;
-              state.projectPubLoading = false;
-            }
-          })
-          .catch((err) => {
-            console.log("获取学员人数失败", err);
-          });
+      getStuPage(obj)
+        .then((res) => {
+          if (res.data.code === 200) {
+            // console.log("res", res.data);
+            state.projectStudentsNum = res.data.data.total
+              ? res.data.data.total
+              : 0;
+            state.projectPubLoading = false;
+          }
+        })
+        .catch((err) => {
+          console.log("获取学员人数失败", err);
+        });
       //获取阶段及任务总数
     };
     //关闭发布弹窗
@@ -3755,17 +3768,17 @@ export default {
         type: 4,
       };
       apiproj
-          .handleProject(obj)
-          .then((res) => {
-            console.log("发布成功", res);
-            message.destroy();
-            message.success("发布成功");
-            state.projectPub = false;
-            reget();
-          })
-          .catch((err) => {
-            console.log("发布失败", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("发布成功", res);
+          message.destroy();
+          message.success("发布成功");
+          state.projectPub = false;
+          reget();
+        })
+        .catch((err) => {
+          console.log("发布失败", err);
+        });
     };
 
     //打开撤回弹窗
@@ -3782,17 +3795,17 @@ export default {
         type: -4,
       };
       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);
+        });
     };
 
     //打开撤回审核弹窗
@@ -3807,17 +3820,17 @@ export default {
       };
       console.log("撤回成功obj", obj);
       apiproj
-          .handleProject(obj)
-          .then((res) => {
-            console.log("撤回成功", res);
-            message.destroy();
-            message.success("撤回成功");
-            state.recallReviewModal = false;
-            reget();
-          })
-          .catch((err) => {
-            console.log("撤回成功", err);
-          });
+        .handleProject(obj)
+        .then((res) => {
+          console.log("撤回成功", res);
+          message.destroy();
+          message.success("撤回成功");
+          state.recallReviewModal = false;
+          reget();
+        })
+        .catch((err) => {
+          console.log("撤回成功", err);
+        });
     };
     //关闭提交审核弹窗
     const closeRecallReviewModal = () => {
@@ -3835,17 +3848,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 = () => {
@@ -3866,17 +3879,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) => {
@@ -3911,42 +3924,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();
@@ -4117,8 +4130,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%
         );
       }
 
@@ -4126,9 +4139,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%
         );
       }
 
@@ -4166,9 +4179,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;
@@ -4192,9 +4205,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;
 
@@ -4313,8 +4326,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%
             );
           }
 
@@ -4440,8 +4453,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%
             );
           }
 
@@ -4572,8 +4585,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%
             );
           }
 
@@ -4673,9 +4686,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%
         );
       }
 
@@ -4774,8 +4787,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%
         );
       }
 
@@ -4814,9 +4827,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;
@@ -4840,9 +4853,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;
 
@@ -5627,7 +5640,6 @@ export default {
     .group {
       display: flex;
 
-
       .groupleft {
         display: flex;
         flex-wrap: wrap;
@@ -5808,8 +5820,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);
       }
 
@@ -5923,8 +5935,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;
         }
@@ -5935,12 +5947,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;
         }
 
@@ -6360,8 +6372,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;
           }
         }
@@ -6962,8 +6974,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%
             );
           }
 
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 732ad5e8..afd6dc32 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -174,7 +174,11 @@
     <!--操作弹窗 -->
   </div>
   <!--  加载动画 -->
-  <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+  <div
+    class="aeLoading"
+    style="z-index: 100"
+    :style="{ display: addLoading ? 'flex' : 'none' }"
+  >
     <a-spin :spinning="addLoading" tip="" />
   </div>
 </template>

From f8650e799a2ea5875b69695119b2a562d1b226ae Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 19 Dec 2022 21:01:13 +0800
Subject: [PATCH 08/13] =?UTF-8?q?--=20=E5=AD=A6=E5=91=98=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                          |  1 +
 src/views/learningpath/LearningPath.vue   | 21 ++++++---------------
 src/views/projectcenter/ProjectManage.vue | 22 +++++-----------------
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 21944ade..215b7666 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -57,6 +57,7 @@ export const getProjectDetail = (obj) => http.get('/admin/project/detail', {para
 export const releaseProject = (obj) => http.post('/admin/project/publish', obj)
 //获取项目学员
 export const projectStudent = (obj) => http.post('/admin/project/studentList', obj)
+export const projectStudentCount = (obj) => http.get('/admin/student/getStudentCount', {params: obj})
 //撤回发布、结束
 export const handleProject = (obj) => http.post('/admin/project/handle', obj)
 
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 69f732e7..7efd5fba 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -699,6 +699,7 @@ import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 // import ManageRight from "../../components/drawers/ManageRight";
 import * as api from "../../api/index1";
+import * as apiStu from "../../api/index";
 import { message } from "ant-design-vue";
 import {
   commonData,
@@ -905,23 +906,13 @@ export default {
           console.log("err", err);
         });
       //获取学员列表
-      let stuobj = {
-        pageNo: 1,
-        pageSize: 10,
-        routerId: router.id,
-      };
-      api
-        .getStudent(stuobj)
-        .then((res) => {
-          console.log("获取学员列表", res.data.data.total);
-          if (res.data.code === 200) {
-            state.routeStudentsNum = res.data.data.total;
+      apiStu.projectStudentCount({
+          pid: router.id,
+          type:2
+        }).then((res) => {
+            state.routeStudentsNum = res.data.data;
             state.pubLoading = false;
-          }
         })
-        .catch((err) => {
-          console.log("获取学员列表失败", err);
-        });
     };
     //确定发布
     const releaseLearnPath = () => {
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 4240bca5..60dadd79 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1047,25 +1047,13 @@ export default {
         state.projectTasks = res.data.data.tasks;
       });
       //获取学员总数
-      let obj = {
-        pageNo: 0,
-        pageSize: 0,
-        projectId: object.projectId,
-      };
-      api
-        .projectStudent(obj)
-        .then((res) => {
-          if (res.data.code === 200) {
-            // console.log("res", res.data);
-            state.projectStudentsNum = res.data.data.total
-              ? res.data.data.total
-              : 0;
+      api.projectStudentCount({
+        pid: object.projectId,
+        type:1
+      }).then((res) => {
+            state.projectStudentsNum = res.data.data
             state.projectPubLoading = false;
-          }
         })
-        .catch((err) => {
-          console.log("获取学员人数失败", err);
-        });
       //获取阶段及任务总数
     };
     //确认发布项目

From 83a0ae8e1851b351fc784958b4c0bd60d4b023a9 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 19 Dec 2022 21:37:23 +0800
Subject: [PATCH 09/13] =?UTF-8?q?--=20=E5=BC=80=E8=AF=BE=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/TableStudent.vue      | 83 +++++++++++---------
 src/views/courselibrary/CoursewareManage.vue |  4 +-
 2 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index d8564dde..6ccf626c 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -4,9 +4,9 @@
       <a-col>
         <a-form-item title="姓名：" @click="getStuList">
           <a-input
-            class="cus-input"
-            v-model:value="tableParam.studentName"
-            placeholder="请输入姓名"
+              class="cus-input"
+              v-model:value="tableParam.studentName"
+              placeholder="请输入姓名"
           />
         </a-form-item>
       </a-col>
@@ -14,15 +14,16 @@
         <a-button class="cus-btn" style="width: 100px">
           <template #icon>
             <img
-              style="margin-right: 10px"
-              src="../../assets/images/courseManage/search0.png"
-          /></template>
+                style="margin-right: 10px"
+                src="../../assets/images/courseManage/search0.png"
+            /></template>
           搜索
         </a-button>
       </a-col>
       <a-col :span="2">
         <a-button class="cus-btn white" style="width: 100px" @click="reset"
-          >重置</a-button
+        >重置
+        </a-button
         >
       </a-col>
     </a-row>
@@ -30,14 +31,14 @@
     <a-row type="flex" gutter="12" style="padding-left: 20px">
       <a-col :span="1.5">
         <CommonStudent
-          :type="type"
-          :id="id"
-          @finash="submitCall"
-          :stage="stage"
+            :type="type"
+            :id="id"
+            @finash="submitCall"
+            :stage="stage"
         >
           <a-button class="cus-btn">
             <template #icon
-              ><img
+            ><img
                 style="margin-right: 10px"
                 src="../../assets/images/courseManage/add0.png"
             /></template>
@@ -48,7 +49,7 @@
       <a-col :span="1.5">
         <a-button class="cus-btn white" @click="bathDel">
           <template #icon
-            ><img
+          ><img
               style="margin-right: 10px"
               src="../../assets/images/projectadd/delete.png"
           /></template>
@@ -58,17 +59,17 @@
     </a-row>
     <div style="margin-top: 20px">
       <a-table
-        :columns="tablecolumns"
-        :data-source="tableData.list"
-        :pagination="stuPagination"
-        :loading="tableData.loading"
-        row-key="id"
-        :row-selection="stuRowSelection"
+          :columns="tablecolumns"
+          :data-source="tableData.list"
+          :pagination="stuPagination"
+          :loading="tableData.loading"
+          row-key="id"
+          :row-selection="stuRowSelection"
       >
         <template #action="{ record }">
           <div
-            @click="del(record.id)"
-            style="color: #4ea6ff; font-size: 14px; text-align: center"
+              @click="del(record.id)"
+              style="color: #4ea6ff; font-size: 14px; text-align: center"
           >
             删除
           </div>
@@ -96,8 +97,8 @@
   </div>
 </template>
 <script setup>
-import { computed, defineProps, onMounted, ref } from "vue";
-import { delStudentList, getStuPage } from "@/api/index1";
+import {computed, defineProps, onMounted, ref, watch} from "vue";
+import {delStudentList, getStuPage} from "@/api/index1";
 import CommonStudent from "@/components/student/CommonStudent";
 
 const props = defineProps({
@@ -145,8 +146,8 @@ const tablecolumns = ref([
     key: "source",
     width: "10%",
     align: "center",
-    customRender: ({ record: { source } }) =>
-      ({ 1: "快速添加", 2: "组织", 3: "受众" }[source]),
+    customRender: ({record: {source}}) =>
+        ({1: "快速添加", 2: "组织", 3: "受众"}[source]),
   },
   ...props.columns,
   {
@@ -155,7 +156,7 @@ const tablecolumns = ref([
     key: "operation",
     width: "25%",
     align: "center",
-    slots: { customRender: "action" },
+    slots: {customRender: "action"},
   },
 ]);
 const tableParam = ref({
@@ -183,6 +184,11 @@ onMounted(() => {
   getStuList();
 });
 
+watch(props, () => {
+  tableParam.value.pid= props.id
+  getStuList();
+})
+
 function onStuSelectChange(e) {
   stuSelectKeys.value = e;
 }
@@ -209,25 +215,26 @@ function getStuList() {
   });
 }
 
-function reset() {}
+function reset() {
+}
 
 function bathDel() {
   stuSelectKeys.value &&
-    stuSelectKeys.value.length &&
-    delStudentList({
-      ids: stuSelectKeys.value,
-    }).then(() => {
-      getStuList();
-    });
+  stuSelectKeys.value.length &&
+  delStudentList({
+    ids: stuSelectKeys.value,
+  }).then(() => {
+    getStuList();
+  });
 }
 
 function del(id) {
   id &&
-    delStudentList({
-      ids: [id],
-    }).then(() => {
-      getStuList();
-    });
+  delStudentList({
+    ids: [id],
+  }).then(() => {
+    getStuList();
+  });
 }
 
 function submitCall(flag) {
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 773b19bf..6ed1ff76 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2278,7 +2278,7 @@
                 <span>{{ currentPlanItem.teacher }}</span>
               </div>
               <div class="stmm_i5">
-                <TableStudent :type="3" :id="offcourseId" :columns="stuColumns">
+                <TableStudent :type="3" :id="offcoursePlanId" :columns="stuColumns">
                   <!--                  <template #extension = "data">-->
                   <!--                    <div style="display: flex">-->
                   <!--                      <button @click="handlJoinStu(data)">成绩录入</button>-->
@@ -4982,7 +4982,7 @@ export default defineComponent({
       console.log(state.currentPlanItem);
 
       state.sm_hs = true;
-      getTableDate2();
+      // getTableDate2();
     };
     const sm_exit = () => {
       state.sm_hs = false;

From 829a799c998862c37a9fea5c6e77587b61bde631 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 19 Dec 2022 21:41:38 +0800
Subject: [PATCH 10/13] =?UTF-8?q?--=20=E4=B8=8D=E5=B8=A6=E5=87=BA=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectAdd.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 698f067f..cdd74c79 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -357,6 +357,7 @@ export default {
               ...res.data.data.projectInfo,
               ...state.projectInfo,
             };
+            !routers.query.projectId && !!routers.query.parentId && (state.projectInfo.name = '')
             state.projectInfo.rangeTime = [
               state.projectInfo.beginTime,
               state.projectInfo.endTime,

From 360b068a1bd0285163af4255a66ab24a351e4561 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Mon, 19 Dec 2022 21:44:20 +0800
Subject: [PATCH 11/13] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/NoticeHis.vue    | 21 ++++++++-
 src/components/drawers/NoticePub.vue    | 62 +++++++++++++------------
 src/components/student/TableStudent.vue |  1 +
 src/views/projectcenter/TaskPage.vue    |  5 +-
 4 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue
index 22d89d06..07f391d6 100644
--- a/src/components/drawers/NoticeHis.vue
+++ b/src/components/drawers/NoticeHis.vue
@@ -12,9 +12,9 @@
       <div class="itemtime">{{ item.pubtime }}</div>
     </div>
   </div>
-</template>s
+</template>
 <script>
-import { reactive, toRefs, onMounted } from "vue";
+import { reactive, toRefs, onMounted, watch } from "vue";
 import { getTask } from "../../api/indexTaskadd";
 import { noticeList } from "../../api/indexNotice";
 import emitter from "../../utils/bus";
@@ -26,6 +26,10 @@ export default {
       type: Number,
       default: null,
     },
+    show: {
+      type: String,
+      default: null,
+    },
   },
 
   setup(props) {
@@ -89,6 +93,19 @@ export default {
       getTaskInfo();
       getNotice();
     });
+    watch(
+      () => props.show,
+      () => {
+        console.log("props.show", props.show);
+        if (props.show == 12) {
+          getTaskInfo();
+          getNotice();
+        }
+      },
+      {
+        deep: true,
+      }
+    );
     return {
       ...toRefs(state),
       getTaskInfo,
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index ff637f60..33a2fb59 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -4,11 +4,11 @@
   <div class="noticeTitle">
     <!-- <div class="notitle"><span class="titlespan">公告</span></div> -->
     <div class="switch">
-      <a-switch v-model:checked="noticeChecked" @click="noticeFlag"  size="small" /><span
-        style="margin-left: 16px"
-      >
-        开启
-      </span>
+      <a-switch
+        v-model:checked="noticeChecked"
+        @click="noticeFlag"
+        size="small"
+      /><span style="margin-left: 16px"> 开启 </span>
     </div>
     <template v-if="noticeChecked">
       <p>当前公告内容：</p>
@@ -23,10 +23,8 @@
       </template>
       <!-- 编辑 -->
       <template v-if="editOn">
-      
-          <div class="txt-content">
-            {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
-        
+        <div class="txt-content">
+          {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
         </div>
         <p>编辑新公告：</p>
         <a-textarea
@@ -74,29 +72,30 @@ export default {
         state.projectInfo = res.data.data.projectInfo;
         state.noticeContent1 = state.projectInfo.notice;
         state.noticeContent = state.projectInfo.notice;
-        state.noticeChecked = state.projectInfo.noticeFlag==0?false:true;
+        state.noticeChecked = state.projectInfo.noticeFlag == 0 ? false : true;
       });
-      console.log("state.noticeChecked",state.noticeChecked);
+      console.log("state.noticeChecked", state.noticeChecked);
     };
 
     const handleEdit = () => {
       state.editOn = true;
     };
     const handleCancel = () => {
-      
       state.editOn = false;
     };
-    const noticeFlag =()=>{
+    const noticeFlag = () => {
       //state.noticeChecked = !state.noticeChecked;
-      console.log("111",state.projectInfo);
-      state.projectInfo.noticeFlag = state.noticeChecked?1:0;
-      editProj(state.projectInfo).then((res)=>{
-        console.log("res",res.data.data.projectInfo);
-      }).catch((error)=>{
-        console.log(error);
-      });
-      console.log("222",state.projectInfo);
-    }
+      console.log("111", state.projectInfo);
+      state.projectInfo.noticeFlag = state.noticeChecked ? 1 : 0;
+      editProj(state.projectInfo)
+        .then((res) => {
+          console.log("res5555555555", res);
+        })
+        .catch((error) => {
+          console.log(error);
+        });
+      console.log("222", state.projectInfo);
+    };
     const pubNotice = () => {
       if (state.noticeContent == "") {
         message.destroy();
@@ -107,15 +106,22 @@ export default {
           projectId: props.projectId,
           title: "",
         };
-        publishNotice(obj);//加入历史
-        state.projectInfo.notice =state.noticeContent;
-        editProj(state.projectInfo).then((res) => {
+        publishNotice(obj); //加入历史
+        state.projectInfo.notice = state.noticeContent;
+        console.log("222444444", state.projectInfo);
+        state.noticeContent1 =
+          state.noticeContent == "" ? "暂无公告" : state.noticeContent;
+        message.success("发布成功");
+        handleCancel();
+        editProj(state.projectInfo)
+          .then((res) => {
             // console.log("res");
             // console.log(res);
             if (res.data.code === 200) {
               message.destroy();
-              message.success("发布成功", res);
-              state.noticeContent1 = res.data.data.notice==""?"暂无公告":res.data.data.notice;
+              message.success("发布成功");
+              state.noticeContent1 =
+                res.data.data.notice == "" ? "暂无公告" : res.data.data.notice;
               handleCancel();
               emitter.emit("setNotice", false);
             }
@@ -125,8 +131,6 @@ export default {
             message.warning("发布失败");
             console.log(err);
           });
-    
-       
       }
     };
     onMounted(() => {
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index d8564dde..9c130b3b 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -203,6 +203,7 @@ function changePagination(page) {
 function getStuList() {
   tableData.value.loading = true;
   getStuPage(tableParam.value).then((res) => {
+    console.log("学员管理-获取学员", res.data);
     tableData.value.total = res.data.data.total;
     tableData.value.list = res.data.data.records;
     tableData.value.loading = false;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index e3fc74cd..632693a9 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -708,7 +708,10 @@
               <NoticePub v-model:projectId="projectId"></NoticePub>
             </a-tab-pane>
             <a-tab-pane key="12" tab="历史公告" force-render>
-              <NoticeHis v-model:projectId="projectId"></NoticeHis>
+              <NoticeHis
+                v-model:projectId="projectId"
+                :show="activeKeyNotice"
+              ></NoticeHis>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>

From 25063036af07e3289ce2e4752cead125d8d1febc Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Mon, 19 Dec 2022 22:20:57 +0800
Subject: [PATCH 12/13] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                          | 2 +-
 src/components/drawers/NoticePub.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4afa9ca8..b7e3719f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.9.17------------");
+    console.log("版本0.9.18------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index 33a2fb59..a19a2293 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -119,7 +119,7 @@ export default {
             // console.log(res);
             if (res.data.code === 200) {
               message.destroy();
-              message.success("发布成功");
+              // message.success("发布成功");
               state.noticeContent1 =
                 res.data.data.notice == "" ? "暂无公告" : res.data.data.notice;
               handleCancel();

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

---
 src/api/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/request.js b/src/api/request.js
index 6d49d284..d741c2df 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -138,7 +138,7 @@ export async function request(_url, params) {
         }
     }
     const body = method !== 'get' ? params || {} : {}
-    // url = process.env.VUE_APP_BOE_API_URL + url
+    url = process.env.VUE_APP_BOE_API_URL + url
     return fetch(url, {
         method,
         headers: {