From c1983082a5ea3e9fd1aeeaa43f6ca08aabf1d3e3 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 17 Dec 2022 17:40:47 +0800
Subject: [PATCH] =?UTF-8?q?--=20=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                         |    2 +
 src/App.vue                                  |   52 +-
 src/api/ThirdApi.js                          |    4 -
 src/api/index1.js                            |    2 +
 src/api/request.js                           |    2 +-
 src/components/student/CommonStudent.vue     |  394 ++--
 src/components/student/TableStudent.vue      |  213 ++
 src/views/courselibrary/CoursewareManage.vue |  488 ++---
 src/views/learningpath/LevelAdd.vue          |  124 +-
 src/views/projectcenter/TaskPage.vue         | 1877 ++++++++----------
 vue.config.js                                |    3 +
 11 files changed, 1558 insertions(+), 1603 deletions(-)
 create mode 100644 src/components/student/TableStudent.vue

diff --git a/.env b/.env
index c17aadbe..8ae4eb09 100644
--- a/.env
+++ b/.env
@@ -3,6 +3,8 @@ VUE_APP_BASE_API=/manageApi
 VUE_APP_PROXY_URL=http://111.231.196.214:30001/
 VUE_APP_LOGIN_URL=https://u-pre.boe.com/web
 
+VUE_APP_BOE_API_URL=https://u-pre.boe.com
+
 
 VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc/iframe
 VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loading
diff --git a/src/App.vue b/src/App.vue
index c8167e9a..50a97012 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,27 +1,27 @@
 <template>
   <div id="container" v-if="!isLogin">
-    <nav-top />
+    <nav-top/>
     <div style="display: flex">
-      <nav-left />
+      <nav-left/>
       <div style="flex: 1; display: flex; flex-direction: column; width: 0">
-        <open-pages />
-        <bread-crumb />
+        <open-pages/>
+        <bread-crumb/>
         <main>
           <a-config-provider :locale="zhCN">
-            <router-view />
+            <router-view/>
           </a-config-provider>
         </main>
       </div>
     </div>
   </div>
   <div id="container" v-if="isLogin">
-    <router-view />
+    <router-view/>
   </div>
 </template>
 <script>
-import { computed, defineComponent, ref } from "vue";
-import { useRouter, useRoute } from "vue-router";
-import { useStore } from "vuex";
+import {computed, defineComponent, ref} from "vue";
+import {useRouter, useRoute} from "vue-router";
+import {useStore} from "vuex";
 import NavLeft from "@/components/NavLeft";
 import NavTop from "@/components/NavTop";
 import OpenPages from "@/components/OpenPages";
@@ -78,7 +78,7 @@ export default defineComponent({
         return;
       }
       const memberInitInfo = await api1
-          .getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
+          .getMemberInfo({keyWord: "", pageNo: 1, pageSize: 10})
           .then((res) => res.data.data.rows);
       store.commit("SET_MEMBER_INFO", memberInitInfo);
       localStorage.setItem("memberInitInfo", JSON.stringify(memberInitInfo));
@@ -94,13 +94,13 @@ export default defineComponent({
       if (localStory) {
         list = localStorage.getItem(key);
         if (list) {
-          store.commit("SET_DICT", { key, data: JSON.parse(list) });
+          store.commit("SET_DICT", {key, data: JSON.parse(list)});
           return;
         }
       }
       list = await getDictList(key);
       localStory && localStorage.setItem(key, JSON.stringify(list));
-      store.commit("SET_DICT", { key, data: list });
+      store.commit("SET_DICT", {key, data: list});
     }
 
     const getDictList = (param) =>
@@ -199,6 +199,34 @@ export default defineComponent({
     box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
   }
 
+  .cus-btn {
+    width: 100%;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-right: 16px;
+    border: 1px solid #4ea6ff;
+    border-radius: 8px;
+    background: #4ea6ff;
+    cursor: pointer;
+    color: #fff;
+  }
+
+  .white {
+    background: #fff;
+    color: #4ea6ff;
+  }
+
+  .cus-input {
+    height: 40px;
+    border-radius: 8px;
+  }
+  .cus-select{
+    height: 40px;
+    border-radius: 8px;
+  }
+
   // @media screen and (max-width: 1366px) {
   //   .cmMain {
   //     width: 750px;
diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js
index ae3a197a..4158b413 100644
--- a/src/api/ThirdApi.js
+++ b/src/api/ThirdApi.js
@@ -1,8 +1,4 @@
-export const BASE = 'https://pre.boe.com'
-export const BASE_DEV = 'https://u-pre.boe.com'
-
 export const USER_LIST = '/userbasic/user/list post'
 export const ORG_LIST = '/userbasic/org/list post'
 export const ORG_CHILD_LIST = '/userbasic/org/info post'
-
 export const AUDIENCE_LIST = '/userbasic/audience/list post'
\ No newline at end of file
diff --git a/src/api/index1.js b/src/api/index1.js
index 5b2c8cb1..7bf6ff85 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -131,6 +131,8 @@ export const addStudentCourse = (obj) => http.post("/admin/offcourse/addStudent"
 // 获取组织结构树
 export const orgtree = () => http.get("/org/tree");
 export const saveStu = obj => http.post("/admin/student/addStudent", obj);
+export const getStuPage = obj => http.get("/admin/student/getStudent", {params: obj});
+export const delStudentList = obj => http.post("/admin/student/delStudent", obj);
 export const validateName = obj => http.post("/admin/validate/validateName", obj);
 
 //获取积分列表
diff --git a/src/api/request.js b/src/api/request.js
index 818d666e..cc035bf9 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -122,7 +122,7 @@ export function useRequest(_url, params = {}, init = true) {
 export async function request(_url, params) {
     const s = _url.split(' ')
     let url = s[0]
-    const method = s[1] || 'get'
+    const method = s[1]?.toLowerCase() || 'get'
     if (method === 'get') {
         let paramsArray = [];
         //拼接参数
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 2f5fec29..d27ba47a 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -1,187 +1,195 @@
 <template>
-  <a-drawer
-      :visible="visiableState"
-      class="drawerStyle ProjCheckship"
-      placement="right"
-      width="45%"
-  >
-    <div class="drawerMain" id="ProjCheckship">
-      <div class="header">
-        <div class="headerTitle">
-          {{ {1: '查看权', 2: '管理权', 3: '添加学员'}[type] || '' }}
+  <div>
+    <a-drawer
+        :visible="visiable"
+        class="drawerStyle ProjCheckship"
+        placement="right"
+        width="45%"
+    >
+      <div class="drawerMain" id="ProjCheckship">
+        <div class="header">
+          <div class="headerTitle">
+            {{ {1: '添加学员', 2: '添加学员', 3: '添加学员'}[type] || '' }}
+          </div>
+          <img
+              style="width: 29px; height: 29px; cursor: pointer"
+              src="../../assets/images/basicinfo/close.png"
+              @click="closeDrawer"
+          />
         </div>
-        <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
-        />
-      </div>
-      <div style="width:100%;display: grid;grid-template-columns: 750px auto;">
-        <div class="tabs">
-          <a-tabs v-model:activeKey="activeKey">
-            <a-tab-pane :key="1" tab="快速选人">
-              <div :style="{ height: screenHeight - 235 + 'px' }">
-                <div class="tab1">
-                  <a-form-item label="姓名">
-                    <a-input
-                        v-model:value="nameSearch.keyword"
-                        style="width: 270px; height: 40px; border-radius: 8px"
-                        placeholder="请输入姓名"
-                    />
-                    <a-button type="primary" @click="onSearchStu" style="margin-left: 20px;border-radius: 4px">
-                      <template #icon>
-                        <SearchOutlined/>
-                      </template>
-                      搜索
-                    </a-button>
-                    <a-button @click="resetStu" style="margin-left: 20px;border-radius: 4px">重置</a-button>
-                  </a-form-item>
+        <div style="width:100%;display: grid;grid-template-columns: 750px auto;">
+          <div class="tabs">
+            <a-tabs v-model:activeKey="activeKey">
+              <a-tab-pane :key="1" tab="快速选人">
+                <div :style="{ height: screenHeight - 235 + 'px' }">
+                  <div class="tab1">
+                    <a-form-item label="姓名">
+                      <a-input
+                          v-model:value="nameSearch.keyword"
+                          style="width: 270px; height: 40px; border-radius: 8px"
+                          placeholder="请输入姓名"
+                      />
+                      <a-button type="primary" @click="onSearchStu" style="margin-left: 20px;border-radius: 4px">
+                        <template #icon>
+                          <SearchOutlined/>
+                        </template>
+                        搜索
+                      </a-button>
+                      <a-button @click="resetStu" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                    </a-form-item>
+                  </div>
+                  <div class="chooseLeft" style="display: grid;grid-template-columns: 250px auto">
+                    <div :style="{ height: screenHeight - 235 + 'px' ,overflowY:'auto'}">
+                      <a-tree
+                          allow-clear
+                          tree-default-expand-all
+                          :tree-data="treeData"
+                          :fieldNames="{
+                          children: 'treeChildList',
+                          key: 'id',
+                          title: 'name',
+                          value: 'name',
+                        }"
+                          @select="stuStuOrgSelect"
+                      >
+                      </a-tree>
+                    </div>
+                    <div class="tableBox tabb">
+                      <a-table
+                          :columns="stuColumns"
+                          :data-source="stuData"
+                          :pagination="stuPagination"
+                          :loading="stuLoading"
+                          row-key="id"
+                          :row-selection="stuRowSelection"
+                      />
+                    </div>
+                  </div>
                 </div>
-                <div class="chooseLeft" style="display: grid;grid-template-columns: 250px auto">
-                  <div :style="{ height: screenHeight - 235 + 'px' ,overflowY:'auto'}">
+              </a-tab-pane>
+              <a-tab-pane :key="2" tab="添加组织">
+                <div
+                    :style="{ height: screenHeight - 235 + 'px' }"
+                >
+                  <div class="tab2">
+                    <a-form-item label="组织：">
+                      <a-input
+                          v-model:value="searchOrgName.keyword"
+                          style="width: 230px; height: 40px; border-radius: 8px"
+                          placeholder="请输入组织"
+                      />
+                      <a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">
+                        <template #icon>
+                          <SearchOutlined/>
+                        </template>
+                        搜索
+                      </a-button>
+                      <a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                    </a-form-item>
+                  </div>
+                  <div class="boeTree">
                     <a-tree
-                        allow-clear
-                        tree-default-expand-all
-                        :tree-data="treeData"
+                        :tree-data="searchOrgName.keyword ? orgData : treeData"
+                        @select="onOrgSelectChange"
                         :fieldNames="{
                           children: 'treeChildList',
                           key: 'id',
                           title: 'name',
                           value: 'name',
                         }"
-                        @select="stuStuOrgSelect"
+                        row-key="id"
+                        :row-selection="orgRowSelection"
+                        multiple
                     >
                     </a-tree>
                   </div>
+                </div>
+              </a-tab-pane>
+              <a-tab-pane :key="3" tab="受众关联">
+                <div
+                    :style="{ height: screenHeight - 235 + 'px' }"
+                >
+                  <div>
+                    <a-form-item label="受众名称：">
+                      <a-input
+                          v-model:value="audienceName.keyword"
+                          style="width: 260px; height: 40px; border-radius: 8px"
+                          placeholder="请输入受众名称"
+                      />
+                      <a-button type="primary" @click="searchAudi" style="margin-left: 20px;border-radius: 4px">
+                        <template #icon>
+                          <SearchOutlined/>
+                        </template>
+                        搜索
+                      </a-button>
+                      <a-button @click="resetAudienceInfo" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                    </a-form-item>
+                  </div>
                   <div class="tableBox tabb">
                     <a-table
-                        :columns="stuColumns"
-                        :data-source="stuData"
-                        :pagination="stuPagination"
-                        :loading="stuLoading"
+                        style="border: 1px solid #f2f6fe"
                         row-key="id"
-                        :row-selection="stuRowSelection"
+                        :columns="audiColums"
+                        :data-source="audiData"
+                        :loading="audiLoading"
+                        :pagination="auditPagination"
+                        :row-selection="auditRowSelection"
                     />
                   </div>
                 </div>
-              </div>
-            </a-tab-pane>
-            <a-tab-pane :key="2" tab="添加组织">
-              <div
-                  :style="{ height: screenHeight - 235 + 'px' }"
-              >
-                <div class="tab2">
-                  <a-form-item label="组织：">
-                    <a-input
-                        v-model:value="searchOrgName.keyword"
-                        style="width: 230px; height: 40px; border-radius: 8px"
-                        placeholder="请输入组织"
-                    />
-                    <a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">
-                      <template #icon>
-                        <SearchOutlined/>
-                      </template>
-                      搜索
-                    </a-button>
-                    <a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>
-                  </a-form-item>
-                </div>
-                <div class="boeTree">
-                  <a-tree
-                      :tree-data="searchOrgName.keyword ? orgData : treeData"
-                      @select="onOrgSelectChange"
-                      :fieldNames="{
-                          children: 'treeChildList',
-                          key: 'id',
-                          title: 'name',
-                          value: 'name',
-                        }"
-                      row-key="id"
-                      :row-selection="orgRowSelection"
-                      multiple
-                  >
-                  </a-tree>
-                  <!--                  <div>-->
-                  <!--                    <a-table-->
-                  <!--                        :columns="stuColumns"-->
-                  <!--                        :data-source="stuData"-->
-                  <!--                        :pagination="stuPagination"-->
-                  <!--                        :loading="orgLoading"-->
-                  <!--                        row-key="id"-->
-                  <!--                        :row-selection="stuRowSelection"-->
-                  <!--                    />-->
-                  <!--                  </div>-->
-                </div>
-              </div>
-            </a-tab-pane>
-            <a-tab-pane :key="3" tab="受众关联">
-              <div
-                  :style="{ height: screenHeight - 235 + 'px' }"
-              >
-                <div>
-                  <a-form-item label="受众名称：">
-                    <a-input
-                        v-model:value="audienceName.keyword"
-                        style="width: 260px; height: 40px; border-radius: 8px"
-                        placeholder="请输入受众名称"
-                    />
-                    <a-button type="primary" @click="searchAudi" style="margin-left: 20px;border-radius: 4px">
-                      <template #icon>
-                        <SearchOutlined/>
-                      </template>
-                      搜索
-                    </a-button>
-                    <a-button @click="resetAudienceInfo" style="margin-left: 20px;border-radius: 4px">重置</a-button>
-                  </a-form-item>
-                </div>
-                <div class="tableBox tabb">
-                  <a-table
-                      style="border: 1px solid #f2f6fe"
-                      row-key="id"
-                      :columns="audiColums"
-                      :data-source="audiData"
-                      :loading="audiLoading"
-                      :pagination="auditPagination"
-                      :row-selection="auditRowSelection"
-                  />
-                </div>
-              </div>
-            </a-tab-pane>
-          </a-tabs>
-        </div>
-        <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
-          <div>
-            <div style="margin-top: 20px">快速选人</div>
-            <a-tag :closable="true" color="#4ea6ff" @close="stuDel(i)" v-for="(item,i) in selectsData.studentList"
-                   :key="i" style="margin-top:20px">
-              {{ item.realName }}
-            </a-tag>
+              </a-tab-pane>
+            </a-tabs>
           </div>
-          <div>
-            <div style="margin-top: 20px">组织添加</div>
-            <a-tag :closable="true" color="#4ea6ff" @close="orgDel(i)" v-for="(item,i) in selectsData.deptList" :key="i"
-                   style="margin-top:20px">
-              {{ item.name }}
-            </a-tag>
-          </div>
-          <div>
-            <div style="margin-top: 20px">受众添加</div>
-            <a-tag :closable="true" color="#4ea6ff" @close="AuditDel(i)" v-for="(item,i) in selectsData.groupList"
-                   :key="i" style="margin-top:20px">
-              {{ item.audienceName }}
-            </a-tag>
+          <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
+            <div>
+              <div style="margin-top: 20px">快速选人</div>
+              <a-tag :closable="true" color="#4ea6ff" @close="stuDel(i)" v-for="(item,i) in selectsData.studentList"
+                     :key="i" style="margin-top:20px">
+                {{ item.realName }}
+              </a-tag>
+            </div>
+            <div>
+              <div style="margin-top: 20px">组织添加</div>
+              <a-tag :closable="true" color="#4ea6ff" @close="orgDel(i)" v-for="(item,i) in selectsData.deptList"
+                     :key="i"
+                     style="margin-top:20px">
+                {{ item.name }}
+              </a-tag>
+            </div>
+            <div>
+              <div style="margin-top: 20px">受众添加</div>
+              <a-tag :closable="true" color="#4ea6ff" @close="AuditDel(i)" v-for="(item,i) in selectsData.groupList"
+                     :key="i" style="margin-top:20px">
+                {{ item.audienceName }}
+              </a-tag>
+            </div>
           </div>
         </div>
+        <div class="btnn">
+          <button class="btn1" @click="closeDrawer">取消</button>
+          <button class="btn2" @click="submitAuth">确定</button>
+        </div>
       </div>
-      <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="submitAuth">确定</button>
-      </div>
+    </a-drawer>
+    <div @click="openDrawer">
+      <slot></slot>
     </div>
-  </a-drawer>
+  </div>
+  <a-modal v-model:visible="stageVisible" width="1000px" title="选择阶段" @ok="handleStageOk">
+    <div>
+      {{ type === 1 ? '选择阶段' : '选择关卡' }}
+      <a-select style="width: 150px" :placeholder="type===1?'选择阶段':'选择关卡'" v-model:value="selectsData.stageId"
+                className="cus-select">
+        <a-select-option v-for="(item,i) in stageIds" :key="i" :value="item.id">{{
+            item.name || '默认'
+          }}
+        </a-select-option>
+      </a-select>
+    </div>
+  </a-modal>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import {computed, defineEmits, defineProps, ref, watch} from "vue";
 import {useStore} from "vuex";
 import {useBoeApi, useBoeApiPage} from "@/api/request";
 import {AUDIENCE_LIST, ORG_LIST, USER_LIST} from "@/api/ThirdApi";
@@ -191,16 +199,17 @@ const store = useStore();
 const emit = defineEmits({})
 const props = defineProps({
   type: Number,
-  visiable: {
-    type: Boolean,
-    default: false
-  },
+  id: String,
+  stage: {
+    type: Array,
+    default: () => []
+  }
 })
-
-const visiableState = computed(() => props.visiable)
-
+const visiable = ref(false)
 const activeKey = ref(1)
+const stageVisible = ref(false)
 const selectsData = ref({
+  stageId: '',
   studentList: [],
   deptList: [],
   groupList: []
@@ -222,6 +231,8 @@ const searchOrgName = ref({
   pageSize: 10
 })
 
+const stageIds = computed(() => props.stage)
+
 const {
   data: stuData,
   fetch: searchStu,
@@ -250,7 +261,7 @@ const {
   total: audiTotal
 } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
   init: true,
-  result: res => res.result.audienceList,
+  result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})),
   totalPage: res => res.result.totalPage,
   total: res => res.result.totalElement
 })
@@ -367,11 +378,11 @@ const auditRowSelection = computed(() => ({
   preserveSelectedRowKeys: true,
 }))
 
-onMounted(() => {
-});
-
 const closeDrawer = () => {
-
+  visiable.value = false
+};
+const openDrawer = () => {
+  visiable.value = true
 };
 //获取组织树
 const treeData = computed(() => {
@@ -397,6 +408,7 @@ function AuditDel(i) {
   auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id)
   selectsData.value.groupList.splice(i, 1)
 }
+
 //
 // function orgSelect(key, obj) {
 //   console.log(obj)
@@ -432,8 +444,6 @@ const changePagination = (page) => {
 };
 
 const auditChangePagination = (page) => {
-  console.log(1111111111)
-  console.log(page)
   audienceName.value.page = page;
   searchAudi()
 };
@@ -468,14 +478,50 @@ const resetAudienceInfo = () => {
 // };
 //确定添加授权
 const submitAuth = () => {
-  emit('update:visiable', false)
-  saveStu(selectsData.value)
+  if (props.type !== 3) {
+    stageVisible.value = true
+  } else {
+    handleStageOk()
+  }
 };
 
+function handleStageOk() {
+  stageVisible.value = false
+  visiable.value = false
+  emit('finash', false)
+  saveStu({
+    targetId: props.id,
+    type: props.type,
+    deptIds: selectsData.value.deptList?.map(e => e.id),
+    stageId: selectsData.value.stageId,
+    groupIds: selectsData.value.groupList?.map(e => e.id),
+    studentList: selectsData.value.studentList
+  }).then(() => {
+    emit('finash', true)
+  })
+}
+
+watch(visiable, () => {
+  stuSelectKeys.value = []
+  orgSelectKeys.value = []
+  auditSelectKeys.value = []
+  selectsData.value = {
+    stageId: '',
+    studentList: [],
+    deptList: [],
+    groupList: []
+  }
+
+})
 
 </script>
 <style>
 .ant-btn-primary {
   background-color: #4ea6ff !important;
 }
+
+.cus-select {
+  height: 40px;
+  border-radius: 8px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
new file mode 100644
index 00000000..9e5e6572
--- /dev/null
+++ b/src/components/student/TableStudent.vue
@@ -0,0 +1,213 @@
+<template>
+  <div>
+    <a-row type="flex" gutter="12" style="padding-left: 20px">
+      <a-col>
+        <a-form-item title="姓名：" @click="getStuList">
+          <a-input class="cus-input" v-model:value="tableParam.studentName" placeholder="请输入姓名"/>
+        </a-form-item>
+      </a-col>
+      <a-col>
+        <a-button class="cus-btn" style="width: 100px">
+          <template #icon>
+            <img 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-col>
+    </a-row>
+
+    <a-row type="flex" gutter="12" style="padding-left: 20px">
+      <a-col :span="1.5">
+        <CommonStudent :type="type" :id="id" @finash="submitCall" :stage="stage">
+          <a-button class="cus-btn">
+            <template #icon><img style="margin-right: 10px" src="../../assets/images/courseManage/add0.png"/></template>
+            添加学员
+          </a-button>
+        </CommonStudent>
+      </a-col>
+      <a-col :span="1.5">
+        <a-button class="cus-btn white" @click="bathDel">
+          <template #icon><img style="margin-right: 10px" src="../../assets/images/projectadd/delete.png"/></template>
+          批量删除
+        </a-button>
+      </a-col>
+    </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"
+      >
+        <template #action="{record}">
+          <a-row gutter="12">
+            <a-col>
+              <slot name="extension" v-bind:data="{record}"></slot>
+            </a-col>
+            <a-col>
+              <a-select style="width: 80px" value="更多">
+                <a-select-option value="删除" label="删除">
+                  <div @click="del(record.id)">删除</div>
+                </a-select-option>
+              </a-select>
+            </a-col>
+          </a-row>
+        </template>
+      </a-table>
+    </div>
+  </div>
+</template>
+<script setup>
+import {computed, defineProps, onMounted, ref, watch} from "vue";
+import {delStudentList, getStuPage} from "@/api/index1";
+import CommonStudent from '@/components/student/CommonStudent'
+
+const props = defineProps({
+  type: Number,
+  id: String,
+  columns: {
+    type: Array,
+    default: () => []
+  },
+  stage: {
+    type: Array,
+    default: () => []
+  }
+})
+const tablecolumns = ref([
+  {
+    title: "姓名",
+    dataIndex: "studentName",
+    key: "studentName",
+    width: "20%",
+    align: "left",
+    className: "h",
+  },
+  {
+    title: "工号",
+    dataIndex: "studentUserNo",
+    key: "studentUserNo",
+    width: "10%",
+    align: "center",
+    className: "h",
+    ellipsis: true,
+  },
+  {
+    title: "部门",
+    dataIndex: "studentDepartName",
+    key: "studentDepartName",
+    width: "10%",
+    align: "center",
+    className: "h",
+    ellipsis: true,
+  },
+  {
+    title: "加入方式",
+    dataIndex: "source",
+    key: "source",
+    width: "10%",
+    align: "center",
+    customRender: ({record: {source}}) => ({1: '快速添加', 2: '组织', 3: '受众'}[source])
+  },
+  ...props.columns,
+  {
+    title: "操作",
+    dataIndex: "operation",
+    key: "operation",
+    width: "25%",
+    align: "center",
+    slots: {customRender: 'action'}
+  },
+]);
+const tableParam = ref({
+  studentName: "",
+  pageNo: 1,
+  pageSize: 10,
+  type: props.type,
+  pid: props.id,
+})
+const stuSelectKeys = ref([])
+const tableData = ref({
+  list: [],
+  total: 0,
+  loading: false
+})
+
+const stuRowSelection = computed(() => ({
+  columnWidth: 20,
+  selectedRowKeys: stuSelectKeys.value,
+  onChange: onStuSelectChange,
+  preserveSelectedRowKeys: true,
+}))
+
+onMounted(() => {
+  getStuList()
+})
+
+function onStuSelectChange(e) {
+  stuSelectKeys.value = e
+}
+
+const stuPagination = computed(() => ({
+  total: tableData.value.total,
+  showSizeChanger: false,
+  current: tableParam.value.pageNo,
+  pageSize: tableParam.value.pageSize,
+  onChange: changePagination
+}))
+
+function changePagination(page) {
+  tableParam.value.pageNo = page;
+  getStuList()
+}
+
+function getStuList() {
+  tableData.value.loading = true
+  getStuPage(tableParam.value).then(res => {
+    tableData.value.total = res.data.data.total;
+    tableData.value.list = res.data.data.records;
+    tableData.value.loading = false;
+  })
+}
+
+function reset() {
+
+}
+
+function bathDel() {
+  stuSelectKeys.value && stuSelectKeys.value.length && delStudentList({
+    ids: stuSelectKeys.value,
+  }).then(() => {
+    getStuList()
+  })
+}
+
+function del(id) {
+  id && delStudentList({
+    ids: [id],
+  }).then(() => {
+    getStuList()
+  })
+}
+
+function submitCall(flag) {
+  tableData.value.loading = true
+  flag && getStuList()
+}
+
+</script>
+<style>
+.studentopea1 {
+  font-size: 14px;
+  font-weight: 400;
+  color: #387df7;
+  line-height: 22px;
+  padding-right: 8px;
+  border-right: 1px solid #e9e9e9;
+  cursor: pointer;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 2dfe28b8..f818f770 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2276,236 +2276,168 @@
                 <span>{{ currentPlanItem.teacher }}</span>
               </div>
               <div class="stmm_i5">
-                <div class="i5_left">
-                  <!-- <a-input
-                    v-model:value="xygl_inputV1"
-                    style="
-                      width: 270px;
-                      height: 40px;
-                      border-radius: 8px;
-                      margin-right: 14px;
-                    "
-                    placeholder="请输入姓名"
-                  /> -->
-                  <a-input
-                    v-model:value="xygl_inputV1"
-                    placeholder="请输入姓名"
-                    style="
-                      width: 400px;
-                      height: 40px;
-                      border-radius: 8px;
-                      margin-right: 14px;
-                    "
-                  />
-                  <div class="btn btn1" @click="handleSearchStu">
-                    <div class="search"></div>
-                    <div class="btnText">搜索</div>
-                  </div>
-                  <div class="btnn btn2" @click="handleRestStu">
-                    <div class="search"></div>
-                    <div class="btnText">重置</div>
-                  </div>
-                </div>
-                <div class="btns">
-                  <div class="btn btn3" @click="showStuAdd(currentPlanItem)">
-                    <div class="search"></div>
-                    <div class="btnText">添加学员</div>
-                  </div>
-                  <!-- 2022-11-30注释 后面放开 -->
-                  <!-- <div class="stmm_btn btn4" @click="hideShow">
-                    <div class="btn4_sub">
-                      <span style="color: #4ea6ff; margin-right: 4px">
-                        批量操作
-                      </span>
-                      <div
-                        class="b_zk"
-                        :style="{ display: hideshow ? 'block' : 'none' }"
-                      ></div>
-                      <div
-                        class="b_sq"
-                        :style="{ display: hideshow ? 'none' : 'block' }"
-                      ></div>
-                    </div>
-                    <div
-                      class="btn4_sup"
-                      :style="{ display: hideshow ? 'none' : 'block' }"
-                    >
-                      <div class="btnsbox">
-                        <div class="btn4_tit" @click="handleAllJion">
-                          <span style="color: #4ea6ff">批量录入成绩</span>
-                        </div>
-                        <div class="btn4_op1" @click="handleAllover">
-                          <span>批量结业</span>
-                        </div>
-                        <div class="btn4_op2" @click="handleAllSuc">
-                          <span>批量通过</span>
-                        </div>
-                        <div class="btn4_op3" @click="handleAllReject">
-                          <span>批量拒绝</span>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="stmm_btn btn5" @click="handleExportStu">
-                    <div class="export"></div>
-                    <div class="btnText">导出</div>
-                  </div> -->
-                </div>
+                <TableStudent :type="3" :id="offcourseId" :columns="stuColumns">
+<!--                  <template #extension = "data">-->
+<!--                    <div style="display: flex">-->
+<!--                      <button @click="handlJoinStu(data)">成绩录入</button>-->
+<!--                    </div>-->
+<!--                  </template>-->
+                </TableStudent>
               </div>
               <div class="tableBox" style="margin-top: 20px">
-                <a-table
-                  :columns="columns7"
-                  :data-source="tableData7"
-                  :loading="tableDataTotal3 === -1 ? true : false"
-                  :scroll="{ x: 800 }"
-                  expandRowByClick="true"
-                  @expand="expandTable"
-                  :pagination="false"
-                  :row-selection="{
-                    selectedRowKeys: selectedRowKeys7,
-                    onChange: onSelectChange7,
-                  }"
-                >
-                  <template #bodyCell="{ record, column }">
-                    <!-- 操作1 -->
-                    <template
-                      v-if="
-                        (String(record.applyStatus) === '0' ||
-                          record.status === '待审核') &&
-                        column.key === 'overstatus'
-                      "
-                    >
-                      <span class="table-operation">-</span>
-                    </template>
-                    <template
-                      v-if="
-                        (String(record.applyStatus) === '-1' ||
-                          record.status === '已拒绝') &&
-                        column.key === 'overstatus'
-                      "
-                    >
-                      <span class="table-operation">-</span>
-                    </template>
-                    <template
-                      v-if="
-                        (String(record.applyStatus) === '1' ||
-                          record.status === '已通过') &&
-                        column.key === 'overstatus'
-                      "
-                    >
-                      <span class="table-operation">
-                        <a
-                          @click="
-                            () => {
-                              handlJoinStu(record);
-                            }
-                          "
-                        >
-                          成绩录入
-                        </a>
-                        <a
-                          @click="
-                            () => {
-                              handleOverStu(record);
-                            }
-                          "
-                        >
-                          结业
-                        </a>
-                      </span>
-                    </template>
-                    <!-- 操作2 -->
-                    <template
-                      v-if="
-                        (String(record.applyStatus) === '0' ||
-                          record.status === '待审核') &&
-                        column.key === 'operation'
-                      "
-                    >
-                      <span class="table-operation">
-                        <a
-                          @click="
-                            () => {
-                              handleSucessStu(record);
-                            }
-                          "
-                        >
-                          通过
-                        </a>
-                        <a
-                          @click="
-                            () => {
-                              handleRejectStu(record);
-                            }
-                          "
-                        >
-                          拒绝
-                        </a>
-                        <a
-                          @click="
-                            () => {
-                              handleDeleteStu(record);
-                            }
-                          "
-                        >
-                          删除
-                        </a>
-                      </span>
-                    </template>
-                    <template
-                      v-if="
-                        (String(record.applyStatus) === '1' ||
-                          record.status === '已通过') &&
-                        column.key === 'operation'
-                      "
-                    >
-                      <span class="table-operation">
-                        <a
-                          @click="
-                            () => {
-                              handleDeleteStu(record);
-                            }
-                          "
-                        >
-                          删除
-                        </a>
-                      </span>
-                    </template>
-                    <template
-                      v-if="
-                        (String(record.applyStatus) === '-1' ||
-                          record.status === '已拒绝') &&
-                        column.key === 'operation'
-                      "
-                    >
-                      <span class="table-operation">
-                        <a
-                          @click="
-                            () => {
-                              handleDeleteStu(record);
-                            }
-                          "
-                        >
-                          删除
-                        </a>
-                      </span>
-                    </template>
-                  </template>
-                </a-table>
-                <div class="tableBox" style="margin-top: 50px">
-                  <div class="pa">
-                    <a-pagination
-                      :showSizeChanger="false"
-                      showQuickJumper="true"
-                      hideOnSinglePage="true"
-                      :pageSize="pageSize3"
-                      :current="currentPage3"
-                      :total="tableDataTotal3"
-                      class="pagination"
-                      @change="handelChangePage3"
-                    />
-                  </div>
-                </div>
+<!--                <a-table-->
+<!--                  :columns="columns7"-->
+<!--                  :data-source="tableData7"-->
+<!--                  :loading="tableDataTotal3 === -1 ? true : false"-->
+<!--                  :scroll="{ x: 800 }"-->
+<!--                  expandRowByClick="true"-->
+<!--                  @expand="expandTable"-->
+<!--                  :pagination="false"-->
+<!--                  :row-selection="{-->
+<!--                    selectedRowKeys: selectedRowKeys7,-->
+<!--                    onChange: onSelectChange7,-->
+<!--                  }"-->
+<!--                >-->
+<!--                  <template #bodyCell="{ record, column }">-->
+<!--                    &lt;!&ndash; 操作1 &ndash;&gt;-->
+<!--                    <template-->
+<!--                      v-if="-->
+<!--                        (String(record.applyStatus) === '0' ||-->
+<!--                          record.status === '待审核') &&-->
+<!--                        column.key === 'overstatus'-->
+<!--                      "-->
+<!--                    >-->
+<!--                      <span class="table-operation">-</span>-->
+<!--                    </template>-->
+<!--                    <template-->
+<!--                      v-if="-->
+<!--                        (String(record.applyStatus) === '-1' ||-->
+<!--                          record.status === '已拒绝') &&-->
+<!--                        column.key === 'overstatus'-->
+<!--                      "-->
+<!--                    >-->
+<!--                      <span class="table-operation">-</span>-->
+<!--                    </template>-->
+<!--                    <template-->
+<!--                      v-if="-->
+<!--                        (String(record.applyStatus) === '1' ||-->
+<!--                          record.status === '已通过') &&-->
+<!--                        column.key === 'overstatus'-->
+<!--                      "-->
+<!--                    >-->
+<!--                      <span class="table-operation">-->
+<!--                        <a-->
+<!--                          @click="-->
+<!--                            () => {-->
+<!--                              handlJoinStu(record);-->
+<!--                            }-->
+<!--                          "-->
+<!--                        >-->
+<!--                          成绩录入-->
+<!--                        </a>-->
+<!--                        <a-->
+<!--                          @click="-->
+<!--                            () => {-->
+<!--                              handleOverStu(record);-->
+<!--                            }-->
+<!--                          "-->
+<!--                        >-->
+<!--                          结业-->
+<!--                        </a>-->
+<!--                      </span>-->
+<!--                    </template>-->
+<!--                    &lt;!&ndash; 操作2 &ndash;&gt;-->
+<!--                    <template-->
+<!--                      v-if="-->
+<!--                        (String(record.applyStatus) === '0' ||-->
+<!--                          record.status === '待审核') &&-->
+<!--                        column.key === 'operation'-->
+<!--                      "-->
+<!--                    >-->
+<!--                      <span class="table-operation">-->
+<!--                        <a-->
+<!--                          @click="-->
+<!--                            () => {-->
+<!--                              handleSucessStu(record);-->
+<!--                            }-->
+<!--                          "-->
+<!--                        >-->
+<!--                          通过-->
+<!--                        </a>-->
+<!--                        <a-->
+<!--                          @click="-->
+<!--                            () => {-->
+<!--                              handleRejectStu(record);-->
+<!--                            }-->
+<!--                          "-->
+<!--                        >-->
+<!--                          拒绝-->
+<!--                        </a>-->
+<!--                        <a-->
+<!--                          @click="-->
+<!--                            () => {-->
+<!--                              handleDeleteStu(record);-->
+<!--                            }-->
+<!--                          "-->
+<!--                        >-->
+<!--                          删除-->
+<!--                        </a>-->
+<!--                      </span>-->
+<!--                    </template>-->
+<!--                    <template-->
+<!--                      v-if="-->
+<!--                        (String(record.applyStatus) === '1' ||-->
+<!--                          record.status === '已通过') &&-->
+<!--                        column.key === 'operation'-->
+<!--                      "-->
+<!--                    >-->
+<!--                      <span class="table-operation">-->
+<!--                        <a-->
+<!--                          @click="-->
+<!--                            () => {-->
+<!--                              handleDeleteStu(record);-->
+<!--                            }-->
+<!--                          "-->
+<!--                        >-->
+<!--                          删除-->
+<!--                        </a>-->
+<!--                      </span>-->
+<!--                    </template>-->
+<!--                    <template-->
+<!--                      v-if="-->
+<!--                        (String(record.applyStatus) === '-1' ||-->
+<!--                          record.status === '已拒绝') &&-->
+<!--                        column.key === 'operation'-->
+<!--                      "-->
+<!--                    >-->
+<!--                      <span class="table-operation">-->
+<!--                        <a-->
+<!--                          @click="-->
+<!--                            () => {-->
+<!--                              handleDeleteStu(record);-->
+<!--                            }-->
+<!--                          "-->
+<!--                        >-->
+<!--                          删除-->
+<!--                        </a>-->
+<!--                      </span>-->
+<!--                    </template>-->
+<!--                  </template>-->
+<!--                </a-table>-->
+<!--                <div class="tableBox" style="margin-top: 50px">-->
+<!--                  <div class="pa">-->
+<!--                    <a-pagination-->
+<!--                      :showSizeChanger="false"-->
+<!--                      showQuickJumper="true"-->
+<!--                      hideOnSinglePage="true"-->
+<!--                      :pageSize="pageSize3"-->
+<!--                      :current="currentPage3"-->
+<!--                      :total="tableDataTotal3"-->
+<!--                      class="pagination"-->
+<!--                      @change="handelChangePage3"-->
+<!--                    />-->
+<!--                  </div>-->
+<!--                </div>-->
               </div>
             </div>
           </div>
@@ -2604,11 +2536,11 @@
             </div>
           </div>
           <div class="qrm_btnbox">
-            <div class="qrm_btn btn1">
-              <div class="btnText" @click="rg_exit">取消</div>
+            <div class="qrm_btn btn1"  @click="rg_exit">
+              <div class="btnText">取消</div>
             </div>
-            <div class="qrm_btn btn2">
-              <div class="btnText" @click="handleJoin">确定</div>
+            <div class="qrm_btn btn2"  @click="handleJoin">
+              <div class="btnText">确定</div>
             </div>
           </div>
         </div>
@@ -2930,6 +2862,7 @@ import { queryWorkDetailById } from "@/api/indexWork";
 import { queryExaminationDetailById } from "@/api/indexExam";
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
+import TableStudent from "@/components/student/TableStudent";
 //列表表格
 const columns1 = [
   // {
@@ -3448,6 +3381,7 @@ export default defineComponent({
     AddHomework,
     AddTest,
     NameInput,
+    TableStudent,
     // VNodes: (_, {attrs}) => {
     //   return attrs.vnodes;
     // },
@@ -3458,6 +3392,72 @@ export default defineComponent({
     const CourseModalRef = ref(null);
 
     const state = reactive({
+      stuColumns:[
+        {
+          title: "报名状态",
+          width: '10%',
+          dataIndex: "status",
+          key: "5",
+          align: "center",
+          customRender: ({ record }) => {
+            switch (String(record.source)) {
+              case "0":
+                return "待审核";
+              case "1":
+                return "审核通过";
+              case "2":
+                return "审核拒绝";
+            }
+          },
+        },
+        {
+          title: "加入方式",
+          width: '10%',
+          dataIndex: "join",
+          key: "6",
+          align: "center",
+          customRender: ({ record }) => {
+            switch (String(record.source)) {
+              case "1":
+                return "手动加入";
+              case "2":
+                return "报名加入";
+            }
+          },
+        },
+        {
+          title: "签到状态",
+          width: '10%',
+          dataIndex: "signstatus",
+          key: "7",
+          align: "center",
+          customRender: ({ record }) => {
+            switch (String(record.signStatus)) {
+              case "0":
+                return "未签到";
+              case "1":
+                return "已签到";
+              case "2":
+                return "请假";
+            }
+          },
+        },
+        {
+          title: "评估状态",
+          width: '10%',
+          dataIndex: "evastatus",
+          key: "8",
+          align: "center",
+          customRender: ({ record }) => {
+            switch (String(record.evalStatus)) {
+              case "0":
+                return "未评估";
+              case "1":
+                return "已评估";
+            }
+          },
+        },
+      ],
       shipType: 1,
       addLoading: false,
       currentPlanItem: {},
@@ -8640,6 +8640,30 @@ export default defineComponent({
   margin-bottom: 20px;
 }
 
+.cus-btn {
+  width: 100%;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 16px;
+  border: 1px solid #4ea6ff;
+  border-radius: 8px;
+  background: #4ea6ff;
+  cursor: pointer;
+  color: #fff;
+}
+
+.white {
+  background: #fff;
+  color: #4ea6ff;
+}
+
+.cus-input {
+  height: 40px;
+  border-radius: 8px;
+}
+
 // .tableSelect {
 //   position: relative;
 //   .hoverList {
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index f5ee9805..7342bdd8 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -505,127 +505,7 @@
           </div>
         </a-tab-pane>
         <a-tab-pane key="3" tab="学员管理" force-render>
-          <div class="split"></div>
-          <div class="xwid">
-            <div class="pad"></div>
-            <div class="xin" style="overflow-x: auto">
-              <div class="xhead">
-                <a-input
-                  v-model:value="gatenamee"
-                  style="width: 270px; height: 40px; border-radius: 8px"
-                  placeholder="请输入姓名"
-                />
-                <div class="btns" @click="searchLevel">
-                  <div class="btn btn1">
-                    <div class="search"></div>
-                    <a-button
-                      class="btnText"
-                      style="
-                        border: none;
-                        background: none;
-                        transform: translateY(-20%);
-                      "
-                      >搜索
-                    </a-button>
-                  </div>
-                  <div class="btn btn2" @click="resetLevel">
-                    <div class="search"></div>
-                    <a-button
-                      style="
-                        border: none;
-                        background: none;
-                        transform: translateY(-20%);
-                        width: 100%;
-                      "
-                      class="btnText"
-                      >重置</a-button
-                    >
-                  </div>
-                </div>
-              </div>
-              <div class="xheadb">
-                <button class="addx" @click="showAddStu">添加学员</button>
-                <!-- 2022-11-30注释 后面放开 -->
-                <!-- <button class="addd" @click="showImpStu">导入学员</button> -->
-                <div class="select">
-                  <a-button
-                    style="
-                      border: 1px solid rgba(64, 158, 255, 1);
-                      background: none;
-                      width: 130px;
-                      height: 40px;
-                      font-size: 14px;
-                      font-weight: 400;
-                      color: rgba(64, 158, 255, 1);
-                      margin-left: 5px;
-                      border-radius: 8px;
-                      cursor: pointer;
-                    "
-                    class="btnText"
-                    @click="deleteStu()"
-                    >批量删除</a-button
-                  >
-                  <!-- <a-select
-                    style="width: 130px"
-                    value="更多操作"
-                    @change="handleStuChange"
-                    :options="projectNameList"
-                  >
-                  </a-select> -->
-                </div>
-              </div>
-                  <!-- 2022-12-11注释 后面放开 -->
-                 <!--
-              <div class="talk">
-                <img class="im" src="../../assets/images/leveladd/gan.png" />
-                <div class="xu">
-                  <span class="yi">已选择</span>
-                  <div style="width: 5px; display: inline-block"></div>
-                  <span class="th">{{ selectedRowKeys.length }}</span>
-                  <div style="width: 5px; display: inline-block"></div>
-                  <span class="yi">项</span>
-                  <span class="zon">列表选项总数：</span>
-                  <span class="th">{{ stuTotal }}</span>
-                  <span class="yi"> 条</span>
-                </div>
-                <div class="clear" @click="clearChooseStu">清空</div>
-              </div>-->
-              <div class="tableBox" style="margin-top: 30px">
-                <a-table
-                  style="border: 1px solid #f2f6fe"
-                  :columns="tableDataFunc()"
-                  :scroll="{ x: 1400 }"
-                  :data-source="tableData"
-                  :loading="tableDataTotal === -1 ? true : false"
-                  expandRowByClick="true"
-                  @expand="expandTable"
-                  :pagination="false"
-                  :row-selection="{
-                    columnWidth: 30,
-                    selectedRowKeys: selectedRowKeys,
-                    onChange: onSelectChange,
-                  }"
-                />
-            
-                <div class="pa">
-                  <a-pagination
-                  v-if="tableDataTotal > 10"
-                    :showSizeChanger="false"
-                    showQuickJumper="true"
-                    hideOnSinglePage="true"
-                    :pageSize="pageSize"
-                    :current="currentPage"
-                    :total="tableDataTotal"
-                    @change="pageChange"
-                    class="pagination"
-                    style="display: block"
-                   
-                  />
-                </div>
-              </div>
-            </div>
-            <div class="pad"></div>
-          </div>
+          <TableStudent :type="3" :id="routerId"></TableStudent>
         </a-tab-pane>
             <!--1211注释 待开放  
         <a-tab-pane key="4" tab="设置">
@@ -1232,6 +1112,7 @@ import * as api from "../../api/index1";
 import { editRoutered } from "../../api/indexLearningPath";
 import { codeUrl } from "../../api/method";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
+import TableStudent from "@/components/student/TableStudent";
 // import * as student from "@/api/student";
 export default {
   name: "LevelAdd",
@@ -1248,6 +1129,7 @@ export default {
     WorkManage,
     SeeStu,
     TwoDimensionalCode,
+    TableStudent,
   },
   setup() {
     const router = useRouter();
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 1c7eda96..0bd959c9 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>
@@ -163,15 +163,15 @@
           <span style="color: #7096e3; cursor: pointer">更多</span>
           <div class="moreArrow"></div>
           <div class="moreItems">-->
-            <!-- <div class="sammo">结束</div>
-            <div class="sammo">复制</div>
-            <div class="sammo" @click="showStartModal">存为模板</div>
-          </div>
-        </div> -->
+        <!-- <div class="sammo">结束</div>
+        <div class="sammo">复制</div>
+        <div class="sammo" @click="showStartModal">存为模板</div>
+      </div>
+    </div> -->
         <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,271 +691,8 @@
           <div class="content3">
             <a-tabs v-model:activeKey="activeKey1">
               <a-tab-pane key="8" tab="学员管理">
-                <div class="group">
-                  <div class="groupleft">
-                    <div
-                      style="
-                        display: flex;
-                        align-items: center;
-                        margin-right: 10px;
-                        margin-bottom: 10px;
-                      "
-                    >
-                      <div class="groupname" style="width: 42px">姓名：</div>
-                      <a-input
-                        v-model:value="valuestun"
-                        placeholder="请输入姓名"
-                      />
-                    </div>
-                          <!-- 2022-11-30注释 后面放开 -->
-                    <!--
-                    <div
-                      style="
-                        display: flex;
-                        align-items: center;
-                        margin-right: 10px;
-                        margin-bottom: 10px;
-                      "
-                    >
-               
-                      <div class="groupname">小组名称：</div>
-                      <a-input
-                        v-model:value="valuestugroup"
-                        placeholder="请输入小组名称"
-                      />
-                    </div>
-                    <div
-                      style="
-                        display: flex;
-                        align-items: center;
-                        margin-right: 10px;
-                        margin-bottom: 10px;
-                      "
-                    >
-                      <div class="groupname" style="width: 42px">部门：</div>
-                      <a-tree-select
-                        :getPopupContainer="
-                          (triggerNode) => {
-                            return triggerNode.parentNode || document.body;
-                          }
-                        "
-                        v-model:value="valuestub"
-                        :dropdown-style="{
-                          maxHeight: '400px',
-                          overflow: 'auto',
-                        }"
-                        placeholder="请选择部门"
-                        :options="bum"
-                        @change="handleChangeBum"
-                        :tree-data="bum"
-                        :fieldNames="{
-                          children: 'treeChildList',
-                          label: 'name',
-                          value: 'id',
-                        }"
-                      ></a-tree-select>
-              
-                    </div> -->
-                    <!-- 2022-11-30注释 后面放开 -->
-                    <!-- <div
-                      style="
-                        display: flex;
-                        align-items: center;
-                        margin-bottom: 10px;
-                      "
-                    >
-                      <div class="groupname" style="width: 42px">学员：</div>
-                      <a-select
-                        v-model:value="valuegood"
-                        placeholder="是否为优秀学员"
-                        :options="goodstuList"
-                        @change="handleChangeGood"
-                      />
-                    </div> -->
-                  </div>
-                  <div class="groupright">
-                    <div class="btn1" @click="searchStu">
-                      <img src="../../assets/images/courseManage/search0.png" />
-                      <span class="btn1text">搜索</span>
-                    </div>
-                    <div class="btn2" @click="resetCancel">
-                      <img src="../../assets/images/courseManage/reset1.png" />
-                      <span class="btn2text">重置</span>
-                    </div>
-                  </div>
-                </div>
-                <div class="second2" style="margin-top: 20px">
-                  <div class="btn1" @click="showStuAdd">
-                    <img src="../../assets/images/courseManage/add0.png" />
-                    <span class="btn1text">添加学员</span>
-                  </div>
-                  <!-- 2022-11-30注释 后面放开 -->
-                  <!-- <div class="btn2" @click="showImportStu">
-                    <img src="../../assets/images/courseManage/reset2.png" />
-                    <span class="btn2text">导入学员</span>
-                  </div> -->
-                  <div class="btn2" @click="showAllDelete">
-                    <img src="../../assets/images/projectadd/delete.png" />
-                    <span class="btn2text">批量删除</span>
-                  </div>
-                </div>
-                 <!-- 2022-12-11注释 后面放开 -->
-                 <!--
-                <div class="talk">
-                  <img class="im" src="../../assets/images/leveladd/gan.png" />
-                  <div class="xu">
-                    <span class="yi">已选择</span>
-                    <div style="width: 5px; display: inline-block"></div>
-                    <span class="th">{{ choosed }}</span>
-                    <div style="width: 5px; display: inline-block"></div>
-                    <span class="yi">项</span>
-                    <span class="zon">列表选项总计：</span>
-                    <span class="yi">{{ total }}</span>
-                    <span class="yi">条</span>
-                  </div>
-                  <div class="clear" @click="clearChooseStu">清空</div>
-                </div>-->
-                <div class="tab" style="margin: 20px 32px 30px 32px">
-                  <a-table
-                    style="border: 1px solid #f2f6fe"
-                    :columns="studentColumns()"
-                    :data-source="tabledata"
-                    expandRowByClick="true"
-                    :scroll="{ x: 1400 }"
-                    @expand="expandTable"
-                    :pagination="false"
-                    :loading="loading"
-                    :row-selection="{
-                      columnWidth: 30,
-                      selectedRowKeys: selectedRowKeys,
-                      onChange: onSelectChange,
-                    }"
-                  />
-                  <!-- 列表无数据样式
-                  <div
-                    class="nostu"
-                    :style="{ display: total > 0 ? 'none' : 'block' }"
-                  >                   -->
-                  <div class="nostu" style="display: none">
-                    <div class="nostuimg"></div>
-                  </div>
-                     <div class="tableBox">  
-                  <div class="pa">
-                    <a-pagination
-                      v-if="total > 10"
-                      :showSizeChanger="false"
-                      showQuickJumper="true"
-                      hideOnSinglePage="true"
-                      :pageSize="stupageSize"
-                      :current="currentPageStu"
-                      :total="total"
-                      class="pagination"
-                      @change="changePaginationStu"
-                    />
-                  </div></div>
-                </div>
+                <TableStudent :type="1" :id="projectId" :columns="stuColumns" :stage="stage"></TableStudent>
               </a-tab-pane>
-              <!--
-              <a-tab-pane key="9" tab="小组管理" force-render>
-                <div class="group">
-                  <div class="groupleft">
-                    <div class="groupname">小组名称：</div>
-                    <a-input
-                      v-model:value="valuestugn"
-                      placeholder="请输入小组名称"
-                    />
-                  </div>
-                  <div class="groupright">
-                    <div class="btn1" @click="searchGroup">
-                      <img src="../../assets/images/courseManage/search0.png" />
-                      <span class="btn1text">搜索</span>
-                    </div>
-                    <div class="btn2" @click="resetGroupName">
-                      <img src="../../assets/images/courseManage/reset1.png" />
-                      <span class="btn2text">重置</span>
-                    </div>
-                  </div>
-                </div>
-                <div class="second2">
-                  <div class="btn1" @click="showModal2(1, null)">
-                    <img src="../../assets/images/courseManage/add0.png" />
-                    <span class="btn1text">创建小组</span>
-                  </div>-->
-                  <!-- 2022-12-2注释 后面放开 -->
-                  <!-- <div class="btn2" @click="showSubset">
-                    <img src="../../assets/images/courseManage/reset2.png" />
-                    <span class="btn2text">随机分组</span>
-                  </div> 
-                </div>-->
-                <!-- 小组列表 
-                <div class="groupmain">
-                  <div
-                    class="groupbox"
-                    v-for="item in groupList"
-                    :key="item.projectGroupId"
-                  >
-                    <div style="width: 90%">
-                      <div class="grouptitle">
-                        <div class="goodgruop">{{ item.groupName }}</div>
-                        <div class="more">
-                          <span
-                            style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
-                            >. . .</span
-                          >
-                          <div class="moreItems">
-                            <div class="sammo" @click="showModal2(2, item)">
-                              编辑
-                            </div>
-                            <div
-                              class="sammo"
-                              @click="deleteGroupBtn(item.projectGroupId)"
-                            >
-                              删除
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="leader">组长：{{ item.leaderName }}</div>
-                      <div class="grocenter">
-                        <div class="leader1">进度</div>
-                        <a-progress :percent="item.completeRatio" />
-                      </div>
-                      <div
-                        class="grofooter"
-                        @click="showMemberList(item.projectGroupId)"
-                      >
-                        <div class="ftext">组员名单 ></div>-->
-                        <!-- <div class="peoples">
-                          <div class="people1">
-                            <img
-                                src="../../assets/images/taskpage/people1.png"
-                            />
-                          </div>
-                          <div class="people2">
-                            <img
-                                src="../../assets/images/taskpage/people2.png"
-                            />
-                          </div>
-                          <div class="people3">
-                            <img
-                                src="../../assets/images/taskpage/people3.png"
-                            />
-                          </div>
-                          <div class="people4">
-                            <img
-                                src="../../assets/images/taskpage/people4.png"
-                            />
-                          </div>
-                        </div> 
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </a-tab-pane>
-
-              -->
-
-
             </a-tabs>
           </div>
         </a-tab-pane>
@@ -1120,9 +857,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>
@@ -1130,7 +867,7 @@
                     <div class="setc_name"><span>项目时间：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
-                        >{{ startTime }} ～ {{ endTime }}</span
+                      >{{ startTime }} ～ {{ endTime }}</span
                       >
                     </div>
                   </div>
@@ -1150,10 +887,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>
@@ -1161,10 +898,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>
@@ -1182,7 +919,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>
@@ -1295,89 +1032,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;
@@ -1387,18 +1124,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>
@@ -1419,15 +1156,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">
@@ -1441,19 +1178,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;
@@ -1463,13 +1200,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>
@@ -1477,31 +1214,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"
@@ -1521,12 +1258,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>
@@ -1554,11 +1291,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>
@@ -1586,11 +1323,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>
@@ -1619,12 +1356,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>
@@ -1654,11 +1391,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>
@@ -1683,21 +1420,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;
@@ -1707,21 +1444,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>
@@ -1762,20 +1499,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>
@@ -1802,11 +1539,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>
@@ -1833,11 +1570,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>
@@ -1867,11 +1604,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>
@@ -1898,18 +1635,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";
@@ -1925,7 +1662,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";
@@ -1938,18 +1675,19 @@ 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";
 
 export default {
   name: "taskPage",
@@ -1976,11 +1714,30 @@ export default {
     NoticeHis,
     TwoDimensionalCode,
     ProjectManager,
+    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,
+      },
+        {
+          title: "最近学习时间",
+          dataIndex: "stutime",
+          key: "stutime",
+          width: 80,
+          align: "center",
+          className: "h",
+        }],
       loading: false,
       projectId: route.query.projectId,
       isbj: storage.get("isbj") ? JSON.parse(storage.get("isbj")) : null,
@@ -2047,23 +1804,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, //时间管理
@@ -2210,24 +1967,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>;
@@ -2317,24 +2074,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>;
@@ -2424,24 +2181,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>;
@@ -2647,7 +2404,7 @@ export default {
     // 输入接入 -- start --
     // 资源归属 sourceBelongId 后续给接口
     state.bum = computed(() => {
-      console.log("基础信息 store.state.orgtreeList",store.state.orgtreeList);
+      console.log("基础信息 store.state.orgtreeList", store.state.orgtreeList);
       return store.state.orgtreeList ? store.state.orgtreeList : [];
     });
 
@@ -2657,41 +2414,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 = "无阶段任务";
+              //暂时传个固定的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;
               }
-              state.taskSyllabus = taskarr;
             }
-          }
-        })
-        .catch((err) => {
-          console.log("获取任务列表失败", err);
-        });
+          })
+          .catch((err) => {
+            console.log("获取任务列表失败", err);
+          });
     };
 
     //学员学员管理渲染
@@ -2771,7 +2528,7 @@ export default {
       // state.activeKey = "2";
       routered.push({
         path: `/taskadd`,
-        query: { projectId: state.projectId },
+        query: {projectId: state.projectId},
       });
     };
     const tostudent = () => {
@@ -2795,16 +2552,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;
     };
@@ -2824,16 +2581,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;
     };
@@ -2846,7 +2603,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) {
@@ -2993,19 +2750,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);
+          });
     };
 
     //关闭提交审核弹窗
@@ -3109,36 +2866,36 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-           width:"20%",
+          width: "20%",
           align: "left",
           className: "h",
           // scopedSlots: { customRender: "action" }, //引入的插槽
           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>
             );
           },
         },
@@ -3146,49 +2903,49 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          width:"10%",
+          width: "10%",
           align: "center",
           className: "h",
           ellipsis: true,
         },
         //  {
-         //   title: "岗位",
-         //   dataIndex: "gangw",
-         //   key: "gangw",
-          // width: 50,
-          //  align: "center",
-           // className: "h",
+        //   title: "岗位",
+        //   dataIndex: "gangw",
+        //   key: "gangw",
+        // width: 50,
+        //  align: "center",
+        // className: "h",
         //  },
         //  {
-          //  title: "所属小组",
-          //  dataIndex: "group",
-         //   key: "group",
-          // width: 50,
-          //  align: "center",
-          //  className: "h",
-         // },
-         {
-            title: "进度",
-            dataIndex: "progress",
-            key: "progress",
-            width:"10%",
-            align: "center",
-            className: "h",
-            ellipsis: true,
-          },
+        //  title: "所属小组",
+        //  dataIndex: "group",
+        //   key: "group",
+        // width: 50,
+        //  align: "center",
+        //  className: "h",
+        // },
+        {
+          title: "进度",
+          dataIndex: "progress",
+          key: "progress",
+          width: "10%",
+          align: "center",
+          className: "h",
+          ellipsis: true,
+        },
         //  {
-         //   title: "证书",
-          //  dataIndex: "diploma",
-          //  key: "diploma",
-          // width: 30,
-          //  align: "center",
-           // className: "h",
+        //   title: "证书",
+        //  dataIndex: "diploma",
+        //  key: "diploma",
+        // width: 30,
+        //  align: "center",
+        // className: "h",
         //  },
         {
           title: "最近学习时间",
           dataIndex: "stutime",
           key: "stutime",
-          width:"20%",
+          width: "20%",
           align: "center",
           className: "h",
           // sorter: {
@@ -3200,7 +2957,7 @@ export default {
           title: "加入方式",
           dataIndex: "putin",
           key: "putin",
-          width:"10%",
+          width: "10%",
           align: "center",
           className: "h",
           ellipsis: true,
@@ -3209,38 +2966,38 @@ export default {
           title: "操作",
           dataIndex: "operation",
           key: "operation",
-          width:"20%",
+          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
-                  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);
-                    }
-                  }}
+                    style={{
+                      display: "flex",
+                      alignItems: "center",
+                      justifyContent: "center",
+                    }}
                 >
-                  {text.record.excellent ? "取消优秀" : "优秀学员"}
-                </div>
+                  <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>
 
-                {/**
+                  {/**
                    2022-11-30注释 后面放开
                    <div
                    class="studentopea2"
@@ -3253,41 +3010,41 @@ export default {
                    查看
                    </div>
                    */}
-                <div class="studentSelect">
-                  <a-select
-                    style="width: 50px"
-                    value="更多"
-                    // options={state.projectNameList}
-                    dropdownClassName="tabledropdown"
-                  >
-               {/**
-                   <a-select-option value="换组" label="换组">
-                    <div
-                        onClick={() => {
+                  <div class="studentSelect">
+                    <a-select
+                        style="width: 50px"
+                        value="更多"
+                        // options={state.projectNameList}
+                        dropdownClassName="tabledropdown"
+                    >
+                      {/**
+                       <a-select-option value="换组" label="换组">
+                       <div
+                       onClick={() => {
                           state.Changevisible = true;
                           console.log(text, "xixixixix");
                           state.ChangeGroupStuId = text.record.studentId;
                           state.ChangeGroupStuName = text.record.name;
                           state.ChangeGroupId = text.record.groupId;
                         }}
-                      >
-                        换组
-                      </div>
-                    </a-select-option>
-                    */}
-                    <a-select-option value="删除" label="删除">
-                      <div
-                        onClick={() => {
-                          // console.log("点击了111", text);
-                          showDeleteOne(text.record.studentId);
-                        }}
-                      >
-                        删除
-                      </div>
-                    </a-select-option>
-                  </a-select>
+                       >
+                       换组
+                       </div>
+                       </a-select-option>
+                       */}
+                      <a-select-option value="删除" label="删除">
+                        <div
+                            onClick={() => {
+                              // console.log("点击了111", text);
+                              showDeleteOne(text.record.studentId);
+                            }}
+                        >
+                          删除
+                        </div>
+                      </a-select-option>
+                    </a-select>
+                  </div>
                 </div>
-              </div>
             );
           },
         },
@@ -3334,13 +3091,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);
+          });
     };
 
     //搜索
@@ -3381,15 +3138,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 = [];
     };
     //批量删除学员弹窗
@@ -3412,16 +3169,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) => {
@@ -3450,15 +3207,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);
@@ -3498,13 +3255,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);
@@ -3538,7 +3295,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%",
       });
@@ -3546,9 +3303,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();
     };
     //获取学员列表
@@ -3565,16 +3322,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 = () => {
@@ -3587,19 +3344,21 @@ export default {
           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];
+            state.passInfo = dataset[dataset.length - 1];
 
-           /** 
-            for (let i = 0; i < dataset.length; i++) {
+            /**
+             for (let i = 0; i < dataset.length; i++) {
               if (dataset[i].status == -5) {
                 state.isPass = true;
                 state.passInfo = dataset[i].description;
               }
               // isPass passInfo
             }
-            */
+             */
           }
-
+          state.stage = res.data.data.stageList.map(e => ({id: e.stageId, name: e.name}))
+          console.log(1111111111111)
+          console.log(state.stage)
           let info = res.data.data.projectInfo;
           // let start = toDate(info.beginTime / 1000, "Y-M-D h:m");
           let start = info.beginTime;
@@ -3665,20 +3424,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) => {
@@ -3703,16 +3462,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) {
@@ -3725,15 +3484,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("小组编辑失败");
+            });
       }
     };
     //搜索小组重置
@@ -3765,27 +3524,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;
+      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);
           });
-          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---------项目概览
 
@@ -3816,15 +3575,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);
@@ -3879,12 +3638,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") {
@@ -3935,17 +3694,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
+                                ? ""
+                                : "-";
       });
     };
     //打开发布弹窗
@@ -3971,19 +3730,19 @@ export default {
         projectId: state.projectId,
       };
       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);
-        });
+          .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);
+          });
       //获取阶段及任务总数
     };
     //关闭发布弹窗
@@ -3998,17 +3757,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);
+          });
     };
 
     //打开撤回弹窗
@@ -4025,17 +3784,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);
+          });
     };
 
     //打开撤回审核弹窗
@@ -4050,17 +3809,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 = () => {
@@ -4078,17 +3837,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 = () => {
@@ -4109,17 +3868,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) => {
@@ -4154,45 +3913,45 @@ 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();
+      // getStu();
       getTaskList();
       getTaskInfo();
       getGroup();
@@ -4360,8 +4119,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%
         );
       }
 
@@ -4369,9 +4128,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%
         );
       }
 
@@ -4409,9 +4168,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;
@@ -4435,9 +4194,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;
 
@@ -4556,8 +4315,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%
             );
           }
 
@@ -4683,8 +4442,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%
             );
           }
 
@@ -4815,8 +4574,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%
             );
           }
 
@@ -4916,9 +4675,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%
         );
       }
 
@@ -5017,8 +4776,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%
         );
       }
 
@@ -5057,9 +4816,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;
@@ -5083,9 +4842,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;
 
@@ -5869,7 +5628,7 @@ export default {
 
     .group {
       display: flex;
-     
+
 
       .groupleft {
         display: flex;
@@ -6051,8 +5810,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);
       }
 
@@ -6166,8 +5925,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;
         }
@@ -6178,12 +5937,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;
         }
 
@@ -6603,8 +6362,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;
           }
         }
@@ -7205,8 +6964,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/vue.config.js b/vue.config.js
index 369c1aa0..7d893046 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -22,6 +22,9 @@ module.exports = defineConfig({
                 pathRewrite: {
                     "^/manageApi": "",
                 },
+            },"/userbasic": {
+                target: process.env.VUE_APP_BOE_API_URL,
+                changeOrigin: true, //表示是否改变原域名
             },
         },
     },