diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js
index ea5bdc95..788346fc 100644
--- a/src/api/ThirdApi.js
+++ b/src/api/ThirdApi.js
@@ -1,4 +1,6 @@
-// export const USER_LIST = '/userbasic/user/list post'
+//学员列表带分页
+export const USER_LIST_PAGE = '/userbasic/user/list post'
+//学员列表 没有分页数据 只能通过名称检索 速度较快
 export const USER_LIST = '/userbasic/user/searchList post'
 export const ORG_LIST = '/userbasic/org/list post'
 export const ORG_CHILD_LIST = '/userbasic/org/info post'
diff --git a/src/api/index1.js b/src/api/index1.js
index 26d63f93..e72c8d52 100644
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -80,6 +80,7 @@ export const delStudent = (obj) =>
 
 // 获取学员路径图进度明细
 export const stuProgress = (params) => http.get('/admin/router/detail', { params });
+export const stuRouterProgress = (params) => http.get('/admin/router/stuDetail', { params });
 // export const stuProgress = (obj) =>http.post("/admin/router/studentProcess", obj);
 
 //编辑学习路径基本信息
diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js
index b32b9956..0b964005 100644
--- a/src/api/indexProjStu.js
+++ b/src/api/indexProjStu.js
@@ -27,7 +27,9 @@ export const removeGroupStudent = (obj) => http.post('/admin/project/removeGroup
 //查看学员
 // export const studentProcess = (obj) => http.get('/admin/project/studentProcess', { params: obj })
 export const studentProcess = (obj) => http.get('/admin/project/detail', { params: obj })
-export const studentRank = (obj) => http.get('/admin/project/studentRank', { params: obj })
+export const projectStudentProcess = (obj) => http.get('/admin/project/stuDetail', { params: obj })
+export const projectStudentRank = (obj) => http.get('/admin/project/studentRank', { params: obj })
+export const routerStudentRank = (obj) => http.get('/admin/router/studentRank', { params: obj })
 
 //是否优秀学员
 export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)
diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue
index 2e610bf3..931f533c 100644
--- a/src/components/BreadCrumb.vue
+++ b/src/components/BreadCrumb.vue
@@ -430,6 +430,20 @@ export default {
             },
           ];
         }
+        if (
+          n.indexOf("/sonproject") !== -1 ||
+          n.indexOf("/SonProject") !== -1
+        ) {
+          state.list = [
+            {
+              name: "项目",
+              href: "",
+            },
+            {
+              name: "基础信息",
+            },
+          ];
+        }
       }
     );
 
diff --git a/src/components/common/CommonAlert.vue b/src/components/common/CommonAlert.vue
new file mode 100644
index 00000000..46b81112
--- /dev/null
+++ b/src/components/common/CommonAlert.vue
@@ -0,0 +1,70 @@
+<template>
+  <a-modal
+      :visible="true"
+      :footer="null"
+      :closable="false"
+      wrapClassName="DelModal"
+      style="margin-top: 400px"
+      :zIndex="9999"
+      @cancel="close"
+  >
+    <div class="delete">
+      <div class="del_header"></div>
+      <div class="del_main">
+        <div class="header">
+          <div class="del-icons">
+            <img :src="types[type]" alt=""/>
+          </div>
+          <span>提示</span>
+        </div>
+        <div class="body">
+          <div><span>{{ content }}</span></div>
+        </div>
+        <div class="del_btnbox">
+          <div class="del_btn btn1" @click="close">
+            <div class="btnText">取消</div>
+          </div>
+          <div class="del_btn btn2" @click="handleConfirm">
+            <div class="btnText">确定</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </a-modal>
+</template>
+<script setup>
+import notide from '@/assets/images/coursewareManage/notice.png'
+import infoPng from '@/assets/images/coursewareManage/QR.png'
+import {defineProps, ref} from "vue";
+
+const props = defineProps({
+  close: {
+    type: Function,
+    default: () => ({})
+  },
+  ok: {
+    type: Function,
+    default: () => ({})
+  },
+  content: String,
+  title: {
+    type: String,
+    default: '提示'
+  },
+  type: {
+    type: Number,
+    default: 1
+  }
+})
+const types = {
+  1: infoPng,
+  2: notide
+}
+const type = ref(1)
+
+function handleConfirm() {
+  props.ok()
+  props.close()
+}
+
+</script>
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index bc5bbb1b..20e1c7b2 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -406,8 +406,8 @@ const beforeUpload = (file) => {
     message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
     return false;
   }
-
-  let isLt1M = file.size < 2097152;
+  
+  let isLt1M = file.size < 2000000;
   console.log(file.size, isLt1M)
   if (!isLt1M) {
     message.error("图片大小超过2MB!");
diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index 5130f258..93b5d457 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -3,20 +3,20 @@
     <slot></slot>
   </div>
   <a-drawer
-      :visible="visible"
-      class="drawerStyle addonlineDrawer"
-      width="1000"
-      title="添加在线"
-      placement="right"
+    :visible="visible"
+    class="drawerStyle addonlineDrawer"
+    width="1000"
+    title="添加在线"
+    placement="right"
   >
     <div class="drawerMain">
       <div class="header">
-        <div v-if="taskIndex>=0" class="headerTitle">编辑项目</div>
+        <div v-if="taskIndex >= 0" class="headerTitle">编辑项目</div>
         <div v-else class="headerTitle">添加项目</div>
         <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
         />
       </div>
       <div class="contentMain">
@@ -26,10 +26,10 @@
               <div class="ipt_name"></div>
               <div class="fi_input">
                 <a-input
-                    v-model:value="params.name"
-                    style="width: 210px; height: 40px; border-radius: 8px"
-                    placeholder="请输入项目名称"
-                    maxlength="20"
+                  v-model:value="params.name"
+                  style="width: 210px; height: 40px; border-radius: 8px"
+                  placeholder="请输入项目名称"
+                  maxlength="20"
                 />
               </div>
             </div>
@@ -37,10 +37,10 @@
               <div class="ipt_name"></div>
               <div class="fi_input">
                 <a-input
-                    v-model:value="params.manager"
-                    style="width: 210px; height: 40px; border-radius: 8px"
-                    placeholder="请输入项目经理"
-                    maxlength="20"
+                  v-model:value="params.manager"
+                  style="width: 210px; height: 40px; border-radius: 8px"
+                  placeholder="请输入项目经理"
+                  maxlength="20"
                 />
               </div>
             </div>
@@ -48,10 +48,10 @@
               <div class="ipt_name"></div>
               <div class="fi_input">
                 <a-input
-                    v-model:value="params.createName"
-                    style="width: 210px; height: 40px; border-radius: 8px"
-                    placeholder="请输入创建人"
-                    maxlength="20"
+                  v-model:value="params.createName"
+                  style="width: 210px; height: 40px; border-radius: 8px"
+                  placeholder="请输入创建人"
+                  maxlength="20"
                 />
               </div>
             </div>
@@ -65,63 +65,56 @@
               <div class="search"></div>
               <div class="btnText">重置</div>
             </div>
+            <div class="btn btn2" @click="reset">
+              <div class="search"></div>
+              <div class="btnText">刷新</div>
+            </div>
           </div>
         </div>
 
-        <div class="main_item" style="margin-top: 16px;margin-bottom: 32px;">
-          <button class="xkbtn" @click="goProjectmanage">
-            新建项目
-          </button>
+        <div class="main_item" style="margin-top: 16px; margin-bottom: 32px">
+          <button class="xkbtn" @click="goProjectmanage">新建项目</button>
         </div>
 
-        <div class="main_notice" v-if="edit" style="display:none;">
-          <div class="mntc_left">
+        <div class="main_notice" v-if="taskIndex >= 0">
+          <div class="mntc_left" v-if="selectedRows">
             <div class="notice_icon"></div>
-            <div v-if="selectedRows.length == 0">
-              <span class="title"
-              >已选择
-                <span class="data" style="color: #4ea6ff">{{ 0 }}</span>
-                条</span
-              >
-            </div>
-            <div v-else>
+            <div>
               <div>
                 <span class="title"
-                >已选择
-                  <span class="data" style="color: #4ea6ff">{{
-                      selectedRows.length
-                    }}</span>
+                  >已选择
+                  <span class="data" style="color: #4ea6ff">{{ 1 }}</span>
                   条&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span
                 >
                 <span class="title"
-                >名称：
+                  >名称：
                   <span
-                      class="data"
-                      style="color: #4ea6ff; margin-right: 15px"
-                  >{{ selectedRows[0].name }}</span
+                    class="data"
+                    style="color: #4ea6ff; margin-right: 15px"
+                    >{{ selectedRows?.name }}</span
                   >
                 </span>
                 <span class="title"
-                >项目经理：
+                  >项目经理：
                   <span
-                      class="data"
-                      style="color: #4ea6ff; margin-right: 15px"
-                  >{{ selectedRows[0].manager }}</span
+                    class="data"
+                    style="color: #4ea6ff; margin-right: 15px"
+                    >{{ selectedRows?.manager }}</span
                   >
                 </span>
                 <span class="title"
-                >创建人：
+                  >创建人：
                   <span
-                      class="data"
-                      style="color: #4ea6ff; margin-right: 15px"
-                  >{{ selectedRows[0].creater }}</span
+                    class="data"
+                    style="color: #4ea6ff; margin-right: 15px"
+                    >{{ selectedRows?.createName }}</span
                   >
                 </span>
                 <span class="title"
-                >创建时间：
+                  >创建时间：
                   <span class="data" style="color: #4ea6ff">{{
-                      selectedRows[0].time
-                    }}</span>
+                    selectedRows?.createTime
+                  }}</span>
                 </span>
               </div>
             </div>
@@ -130,15 +123,17 @@
         <div class="main_table">
           <div class="drawerbox">
             <a-table
-                :customRow="customRow"
-                class="ant-table-striped"
-                :row-class-name="(_, index) => (index % 2 === 1 ? 'table-striped' : null)"
-                row-key="id"
-                :columns="columns"
-                :data-source="data"
-                :loading="loading"
-                :pagination="pagination"
-                :row-selection="rowSelection"
+              :customRow="customRow"
+              class="ant-table-striped"
+              :row-class-name="
+                (_, index) => (index % 2 === 1 ? 'table-striped' : null)
+              "
+              row-key="id"
+              :columns="columns"
+              :data-source="data"
+              :loading="loading"
+              :pagination="pagination"
+              :row-selection="rowSelection"
             />
           </div>
         </div>
@@ -150,10 +145,10 @@
     </div>
     <!-- 有重复添加的项目时的弹窗 -->
     <a-modal
-        v-model:visible="sameModal"
-        :footer="null"
-        wrapClassName="sameModal"
-        centered="true"
+      v-model:visible="sameModal"
+      :footer="null"
+      wrapClassName="sameModal"
+      centered="true"
     >
       <div class="delete">
         <div class="del_header"></div>
@@ -180,28 +175,45 @@
   </a-drawer>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, ref, watch} from "vue";
-import {message} from "ant-design-vue";
-import {useRouter} from "vue-router";
-import {useRowsPage} from "@/api/request";
-import {PROJECT_AUDIT_PAGE} from "@/api/apis";
-
+import { computed, defineEmits, defineProps, ref, watch } from "vue";
+import { message } from "ant-design-vue";
+// import { useRouter } from "vue-router";
+import { useRowsPage } from "@/api/request";
+import { PROJECT_AUDIT_PAGE } from "@/api/apis";
+import { getProjectDetail } from "@/api/index";
 const props = defineProps({
   type: Number,
-  taskList: []
-})
-const visible = ref(false)
-const sameModal = ref(false)
-const emit = defineEmits({})
+  taskList: [],
+});
+const visible = ref(false);
+const sameModal = ref(false);
+const emit = defineEmits({});
 
 const columns = ref([
   {
     title: "项目名称",
     dataIndex: "name",
     key: "projectName",
-    width: "40%",
+    width: "20%",
     ellipsis: true,
   },
+  {
+    title: "所属项目",
+    dataIndex: "topName",
+    key: "topName",
+    width: "20%",
+    ellipsis: true,
+    customRender: ({ record: { gaName, faName, name } }) => (
+      <div title={faName ? gaName !== null ? gaName + "/" + faName : faName : name}>
+        {
+          faName ? gaName !== null
+            ? (gaName + "/" + faName).length > 16 ? (gaName + "/" + faName).slice(0, 16) + '...' : (gaName + "/" + faName)
+            : faName.length > 16 ? faName.slice(0, 16) + '...' : faName
+            : name.length > 16 ? name.slice(0, 16) + '...' : name
+        }
+      </div>
+    ),
+  },
   {
     title: "项目经理",
     dataIndex: "manager",
@@ -223,38 +235,42 @@ const columns = ref([
     width: "20%",
     align: "center",
   },
-])
+]);
 const initParams = {
   pageNo: 1,
   pageSize: 10,
-  orderAsc: true
-}
-const params = ref(initParams)
-const router = useRouter();
+  orderAsc: true,
+};
+const params = ref(initParams);
+// const router = useRouter();
 const rowSelectKeys = ref([]);
 const selectsData = ref([]);
 const taskIndex = ref(-1);
 
-const {data, loading, total, fetch} = useRowsPage(PROJECT_AUDIT_PAGE, params.value, {
-  init: false,
-  result: res => res.result.list,
-  totalPage: res => res.result.totalPages,
-  total: res => res.result.count
-})
-
+const { data, loading, total, fetch } = useRowsPage(
+  PROJECT_AUDIT_PAGE,
+  params.value,
+  {
+    init: false,
+    result: (res) => res.result.list,
+    totalPage: (res) => res.result.totalPages,
+    total: (res) => res.result.count,
+  }
+);
+console.log(data)
 watch(taskIndex, () => {
   // if (taskIndex.value >= 0) {
   //   rowSelectKeys.value = [props.taskList[taskIndex.value].courseId]
   //   selectsData.value = data.value.find(t => t.id === props.taskList[taskIndex.value].courseId) || {}
   // }
-})
+});
 
 const customRow = (record) => ({
   onClick: () => {
-    rowSelectKeys.value = [record.id]
-    selectsData.value = [record]
-  }
-})
+    rowSelectKeys.value = [record.id];
+    selectsData.value = [record];
+  },
+});
 
 const pagination = computed(() => ({
   total: total.value,
@@ -266,10 +282,10 @@ const pagination = computed(() => ({
 
 const changePagination = (e) => {
   params.value.pageNo = e;
-  fetch()
+  fetch();
 };
 const rowSelection = computed(() => ({
-  type: 'radio',
+  type: "radio",
   columnWidth: 20,
   selectedRowKeys: rowSelectKeys.value,
   onChange: onSelectChange,
@@ -279,73 +295,90 @@ const rowSelection = computed(() => ({
 function onSelectChange(e, l) {
   rowSelectKeys.value = e;
   selectsData.value = l;
+  selectedRows.value = l[0];
+  console.log("selectedRows", selectedRows);
 }
 
 function search() {
-  params.value.pageNo = 1
-  fetch()
+  params.value.pageNo = 1;
+  fetch();
 }
 
 function reset() {
   rowSelectKeys.value = [];
   selectsData.value = [];
-  params.value.pageNo = 1
-  params.value.keyWord = ''
-  params.value.createName = ''
-  params.value.manager = ''
-  params.value.name = ''
-  fetch()
+  params.value.pageNo = 1;
+  params.value.keyWord = "";
+  params.value.createName = "";
+  params.value.manager = "";
+  params.value.name = "";
+  fetch();
 }
 
 const closeDrawer = () => {
-  visible.value = false
-  taskIndex.value = -1
-  reset()
+  visible.value = false;
+  taskIndex.value = -1;
+  selectedRows.value = null;
+  reset();
 };
 
 function confirm() {
   if (!selectsData.value.length || !rowSelectKeys.value.length) {
     message.warning("请选择项目！");
-    return
+    return;
   }
   if (taskIndex.value === -1) {
-    const list = props.taskList
+    const list = props.taskList;
     list.push({
       name: selectsData.value[0].name,
       type: props.type,
       courseId: selectsData.value[0].id,
-      info: {...selectsData.value[0]}
-    })
+      info: { ...selectsData.value[0] },
+    });
   } else {
-    const data = props.taskList[taskIndex.value]
-    data.name = selectsData.value[0].name
-    data.courseId = selectsData.value[0].id
-    data.info = selectsData.value[0]
+    const data = props.taskList[taskIndex.value];
+    data.name = selectsData.value[0].name;
+    data.courseId = selectsData.value[0].id;
+    data.info = selectsData.value[0];
   }
-  emit('update:taskList', [...props.taskList])
-  closeDrawer()
+  emit("update:taskList", [...props.taskList]);
+  closeDrawer();
 }
 
 const goProjectmanage = () => {
-  router.push({path: "/projectmanage"});
-}
+  // router.push({path: "/projectmanage"});
+  window.open(process.env.VUE_APP_BASE + "/projectmanage");
+};
 
 function closeSameModal() {
-  sameModal.value = false
-}
-
-function sureSameModal() {
-
+  sameModal.value = false;
 }
 
+function sureSameModal() {}
+let selectedRows = ref(null);
 function openDrawer(i, row) {
+  console.log("row", row);
+
   row && (rowSelectKeys.value = [row.courseId]);
-  row && (selectsData.value = [{name: row.name, id: row.courseId}]);
-  (i >= 0) && (taskIndex.value = i)
-  visible.value = true
+  row && (selectsData.value = [{ name: row.name, id: row.courseId }]);
+  i >= 0 && (taskIndex.value = i);
+  visible.value = true;
+
+  //获取项目详情
+  if (row && row.courseId) {
+    getProjectDetail({
+      projectId: row.courseId,
+    }).then((res) => {
+      console.log("获取选中项目详情", res);
+      if (res.data.code === 200) {
+        selectedRows.value = res.data.data.projectInfo;
+        console.log("selectedRows", selectedRows);
+      }
+    });
+  }
 }
 
-defineExpose({openDrawer})
+defineExpose({ openDrawer });
 </script>
 <style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
@@ -383,8 +416,8 @@ defineExpose({openDrawer})
             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%
             );
           }
 
@@ -626,8 +659,8 @@ defineExpose({openDrawer})
         }
 
         .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;
         }
       }
@@ -680,8 +713,8 @@ defineExpose({openDrawer})
       }
 
       .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;
       }
 
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 4f29790c..2f38e378 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -355,6 +355,7 @@ async function confirm() {
   }).catch(err => {
     console.log(err)
   })
+  
   emit('update:taskList', [...props.taskList])
   closeDrawer()
 }
diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue
index a4cf1020..8384985c 100644
--- a/src/components/drawers/AssessmentAll.vue
+++ b/src/components/drawers/AssessmentAll.vue
@@ -17,10 +17,16 @@
       <div class="search"></div>
       <div class="btnText">重置</div>
     </div>
+    <div class="btnsn" @click="reset">
+      <div class="search"></div>
+      <div class="btnText">刷新</div>
+    </div>
   </div>
 
   <div class="main_item">
-    <button class="xkbtn" style="margin:0" @click="goResearchmanage">新建评估</button>
+    <button class="xkbtn" style="margin: 0" @click="goResearchmanage">
+      新建评估
+    </button>
   </div>
 
   <div class="main_notice" style="display: none">
@@ -44,7 +50,7 @@
 </template>
 <script setup>
 import { computed, defineEmits, defineProps, ref, watch } from "vue";
-import { useRouter } from "vue-router";
+// import { useRouter } from "vue-router";
 import { useRowsPage } from "@/api/request";
 import { ASSESSMENT_PAGE } from "@/api/apis";
 
@@ -105,7 +111,7 @@ const initParams = {
   pageSize: 10,
   releaseStatus: 2,
 };
-const router = useRouter();
+// const router = useRouter();
 const params = ref(initParams);
 
 const rowSelectKeys = ref([]);
@@ -147,7 +153,7 @@ const pagination = computed(() => ({
 }));
 
 const changePagination = (e) => {
-  params.value.pageIndex = e;
+  params.value.pageNo = e;
   fetch();
 };
 const rowSelection = computed(() => ({
@@ -156,12 +162,12 @@ const rowSelection = computed(() => ({
   selectedRowKeys: rowSelectKeys.value,
   onChange: onSelectChange,
   preserveSelectedRowKeys: true,
-  getCheckboxProps: getCheckboxProps
+  getCheckboxProps: getCheckboxProps,
 }));
 const getCheckboxProps = () => ({
   // 某几项默认禁止选中(R: 当state等于1时)
-  disabled: false
-})
+  disabled: false,
+});
 
 function onSelectChange(e, l) {
   rowSelectKeys.value = e;
@@ -180,12 +186,13 @@ function reset() {
   selectsData.value = [];
   params.value.pageIndex = 1;
   params.value.keyWord = "";
-  params.value.assessmentName ="";
+  params.value.assessmentName = "";
   fetch();
 }
 
 const goResearchmanage = () => {
-  router.push({ path: "/researchmanage" });
+  // router.push({ path: "/researchmanage" });
+  window.open(process.env.VUE_APP_BASE + "/researchmanage");
 };
 </script>
 <style lang="scss">
diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue
index f0511332..95fa23be 100644
--- a/src/components/drawers/CheckStu.vue
+++ b/src/components/drawers/CheckStu.vue
@@ -1,40 +1,41 @@
 <template>
   <a-drawer
-    :visible="CheckStuvisible"
-    class="drawerStyle CheckStu"
-    placement="right"
-    width="70%"
-    @after-visible-change="afterVisibleChange"
+      :visible="CheckStuvisible"
+      class="drawerStyle CheckStu"
+      placement="right"
+      width="70%"
   >
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">查看</div>
         <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
         />
       </div>
       <a-spin v-if="loading" :spinning="loading"/>
       <div v-if="!loading" class="main">
         <div class="stuinfor">
           <div class="portrait">
-            <img src="../../assets/images/studentimg/character.png" />
+            <img src="../../assets/images/studentimg/character.png"/>
           </div>
           <div class="stumation">
-            <div class="stuname">{{pro==null?"":pro.routerInfo.name}}</div>
-            <div class="stugangw">{{pro==null?"":pro.routerInfo.organizationName?pro.routerInfo.organizationName:"" + '-' + pro==null?"":pro.routerInfo.jobName?pro.routerInfo.jobName:""}}</div>
+            <div class="stuname">{{ pro.userInfo?.realName }}</div>
+            <div class="stugangw">
+              {{pro.routerInfo?.departName || '' }} - {{ pro.userInfo?.jobName || ''}}
+            </div>
           </div>
           <div class="sortbox">
             <div class="sortname">进度排名</div>
             <div class="sortnub">
-              <span class="nub1">{{rank.current}}</span>
-              <span class="total">/{{rank.total}}</span>
+              <span class="nub1">{{ rank.current || 0 }}</span>
+              <span class="total">/{{ rank.total || 0 }}</span>
             </div>
           </div>
           <a-divider
-            type="vertical"
-            style="
+              type="vertical"
+              style="
               height: 49px;
               margin-left: 34px;
               background-color: rgba(170, 166, 166, 0.3);
@@ -43,13 +44,13 @@
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">完成必修</div>
             <div class="sortnub">
-              <span class="nub1">{{pro==null?"":pro.currentReqCnt}}</span>
-              <span class="total">/{{pro==null?"":pro.totalReqCnt}}</span>
+              <span class="nub1">{{ rank.finishCompulsoryNum || 0 }}</span>
+              <span class="total">/{{ rank.totalCompulsoryNum || 0 }}</span>
             </div>
           </div>
           <a-divider
-            type="vertical"
-            style="
+              type="vertical"
+              style="
               height: 49px;
               margin-left: 34px;
               background-color: rgba(170, 166, 166, 0.3);"
@@ -57,56 +58,16 @@
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">已修证书</div>
             <div class="sortnub">
-              <span class="nub1">{{pro==null?"":pro.routerInfo.certCnt?pro.routerInfo.certCnt:0}}</span>
+              <span class="nub1">{{ rank.certNum || 0 }}</span>
             </div>
           </div>
         </div>
-        <!-- <div class="secondrow">
-          <div class="rowleft">{{ pro.name }}</div> -->
-          <!-- <div class="rowbox" @click="showProMess">
-            <div class="shuom">说明</div>
-            <div><img src="../../assets/images/studentimg/chak.png" /></div>
-          </div> -->
-        <!-- </div> -->
-        <!-- <div v-for="(item) in pro.chapterList" class="mainbox"
-        style="margin-top: 15px; height: 56px"
-        :key="item.chapterId">
-        <div class="rowtitle" @click="changeDown">
-            <div class="titleimg">
-              <img
-                :src="
-                  showDown
-                    ? require('../../assets/images/studentimg/open.png')
-                    : require('../../assets/images/studentimg/close.png')
-                "
-              />
-            </div>
-            <div class="titletext">{{item.chapterName}}</div>
-          </div>
-
-          <div :style="{ display: showDown ? 'block' : 'none' }">
-            <div  v-for="_item in item.taskList" :key="_item.routerTaskId" class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zai.png" /></div>
-                <div class="text1">{{checkType(_item.type)}}</div>
-                <div class="text2">{{_item.name}}</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/complete.png" />
-                </div>
-                <div class="altext">{{checkStatus(_item.status)}}</div>
-              </div>
-            </div>
-          </div>
-        </div>  -->
-
         <div class="mainbox">
           <a-collapse v-model:activeKey="stageListActive">
             <template #expandIcon="{ isActive }">
               <img
-                style="margin-right: 20px"
-                :src="
+                  style="margin-right: 20px"
+                  :src="
                   isActive
                     ? require('../../assets/images/studentimg/open.png')
                     : require('../../assets/images/studentimg/close.png')
@@ -114,36 +75,29 @@
               />
               <div></div>
             </template>
-            <a-collapse-panel
-              v-for="value in pro==null?[]:pro.chapterList"
-              :key="value.chapterId"
-              :header="value.chapterName"
-             
-            > 
-            <template #extra >
-            <div @click.stop="">
-              <div class="rowbox">
-                <a-popover title="关卡说明">
-                <template #content>
-                  <p>{{value.remark}}</p>
-                </template>
-              <div class="shuom">说明</div>
-              </a-popover>
-              <div><img src="../../assets/images/studentimg/chak.png" /></div>
-            </div>
-           </div> 
-            </template>
-         
-              <div 
-                class="rowclass"
-                v-for="(item, key) in value.taskList"
-                :key="key"
+            <a-collapse-panel v-for="value in pro.chapterList || []" :key="value.id" :header="value.name">
+              <template #extra>
+                <div @click.stop="">
+                  <div class="rowbox">
+                    <a-popover title="关卡说明">
+                      <template #content>
+                        <p>{{ value.remark }}</p>
+                      </template>
+                      <div class="shuom">说明</div>
+                    </a-popover>
+                    <div><img src="../../assets/images/studentimg/chak.png"/></div>
+                  </div>
+                </div>
+              </template>
+              <div
+                  class="rowclass"
+                  v-for="(item, key) in value.taskList"
+                  :key="key"
               >
-            
                 <div class="leftclass">
                   <div>
                     <img
-                      :src="
+                        :src="
                         item.type === 1
                           ? require('../../assets/images/leveladd/zai.png')
                           : item.type === 2
@@ -180,16 +134,16 @@
                 <div class="alreadyclass">
                   <div class="alimg">
                     <img
-                      :src="
+                        :src="
                         item.status === 1
                           ? require('../../assets/images/studentimg/complete.png')
                           : require('../../assets/images/studentimg/notice.png')
                       "
                     />
                   </div>
-                  <div class="altext">{{ item.status ==0?"进行中":item.status ==1?"已完成":"未开始" }}</div>
+                  <div class="altext">{{ item.status === 0 ? "进行中" : item.status === 1 ? "已完成" : "未开始" }}</div>
                 </div>
-               
+
               </div>
             </a-collapse-panel>
           </a-collapse>
@@ -201,18 +155,16 @@
       </div>
     </div>
   </a-drawer>
-  <check-stu-mess v-model:StuMessvisible="StuMessvisible" />
+  <check-stu-mess v-model:StuMessvisible="StuMessvisible"/>
 </template>
 
 <script>
-import { reactive, toRefs } from "vue";
-import CheckStuMess from "./CheckStuMess.vue";
-import {stuProgress} from "@/api/index1";
-import {studentRank} from "@/api/indexProjStu";
-// import {message} from "ant-design-vue";
+import {reactive, toRefs, watch} from "vue";
+import {stuRouterProgress} from "@/api/index1";
+import {routerStudentRank} from "@/api/indexProjStu";
+
 export default {
   name: "CheckStu",
-  components: { CheckStuMess },
   props: {
     CheckStuvisible: {
       type: Boolean,
@@ -231,59 +183,43 @@ export default {
     const state = reactive({
       StuMessvisible: false,
       showDown: false,
-      pro:null,
-      loading:true,
+      pro: null,
+      loading: false,
       stageListActive: 0,
-      rank:{total:1,current:1},
+      rank: {total: 0, current: 0, finishCompulsoryNum: 0, totalCompulsoryNum: 0, certNum: 0},
     });
+
+    watch([()=>props.studentId, ()=>props.routerId], () => {
+      console.log(111111)
+      console.log(props)
+      getStuProgress()
+      getStuRank()
+    })
+
     const closeDrawer = () => {
       ctx.emit("update:CheckStuvisible", false);
     };
 
     const getStuRank = () => {
-      studentRank({
-        projectId: props.routerId,
-        studentId: props.studentId,
-        type:2
-      }).then(res=>{
-        state.rank = res.data.data
-      })
+      routerStudentRank({routerId: props.routerId, studentId: props.studentId}).then(res => state.rank = res.data.data)
     }
 
     const showProMess = () => {
       state.StuMessvisible = true;
     };
-    const afterVisibleChange = (bool) => {
-      if(props.CheckStuvisible) {
-        getStuProgress()
-        getStuRank()
-      }
-      console.log("state", bool);
-    };
     const changeDown = () => {
       state.showDown = !state.showDown;
     };
     const getStuProgress = () => {
       state.loading = true
-      let obj = {
-        routerId:props.routerId,
-        id:props.studentId
-      }
-      console.log("obj",obj);
-      stuProgress(obj).then(res => {
-        console.log("查询当前学员进度信息success",res)
+      stuRouterProgress({routerId: props.routerId, userId: props.studentId}).then(res => {
         state.pro = res.data.data
         state.loading = false
-        console.log(res)
-      }).catch(err => {
-        console.log("查询当前学员进度信息err",err)
-        state.loading = false
-        console.log(err)
       })
     }
 
-  const checkType = (type) => {
-    let typeRules = [
+    const checkType = (type) => {
+      let typeRules = [
         "",
         "在线",
         "面授",
@@ -300,49 +236,39 @@ export default {
         "项目",
       ];
       return typeRules[type];
-  }
-
-  const checkStatus = (status) => {
-    if(status < 0) return "未开始"
-    let statusRules = [
-      "进行中","已完成"
-    ]
-    return statusRules[status]
-  }
-
+    }
 
     return {
       ...toRefs(state),
-      afterVisibleChange,
       closeDrawer,
       showProMess,
       changeDown,
       checkType,
-      checkStatus,
-      // change,
-
     };
   },
 };
 </script>
 
-<style lang="scss" >
+<style lang="scss">
 .CheckStu {
   .ant-drawer-content-wrapper {
     // max-width: 1000px;
     .ant-drawer-header {
       display: none !important;
     }
+
     .ant-drawer-body {
       padding: 0;
     }
   }
+
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;
     overflow-x: auto;
     display: flex;
     flex-direction: column;
+
     .header {
       height: 73px;
       border-bottom: 1px solid #e8e8e8;
@@ -352,6 +278,7 @@ export default {
       // background-color: red;
       margin-bottom: 20px;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -360,11 +287,13 @@ export default {
         // margin-left: 24px;
       }
     }
+
     .main {
       display: flex;
       flex-direction: column;
       overflow-y: auto;
       padding-bottom: 80px;
+
       .stuinfor {
         display: flex;
         align-items: center;
@@ -374,35 +303,43 @@ export default {
         background-image: url("../../assets/images/studentimg/bgimg.png");
         background-repeat: no-repeat;
         background-position: right;
+
         .stumation {
           margin-left: 24px;
+
           .stuname {
             color: #333333;
             font-size: 18px;
           }
+
           .stugangw {
             color: #999999;
             font-size: 16px;
             margin-top: 7px;
           }
         }
+
         .sortbox {
           display: flex;
           flex-direction: column;
           justify-content: center;
           margin-left: 114px;
+
           .sortname {
             color: #666660;
             font-size: 14px;
           }
+
           .sortnub {
             display: flex;
             justify-content: center;
             margin-top: 7px;
+
             .nub1 {
               color: #0060ff;
               font-size: 22px;
             }
+
             .total {
               color: #999999;
               font-size: 22px;
@@ -410,13 +347,16 @@ export default {
           }
         }
       }
+
       .secondrow {
         margin-top: 32px;
         display: flex;
+
         .rowleft {
           color: rgba(51, 51, 51, 1);
           font-size: 16px;
         }
+
         .rowbox {
           width: 64px;
           height: 24px;
@@ -427,6 +367,7 @@ export default {
           border: 1px solid rgba(64, 158, 255, 1);
           background: rgba(64, 158, 255, 0.1);
           cursor: pointer;
+
           .shuom {
             color: rgba(64, 158, 255, 1);
             font-size: 14px;
@@ -435,6 +376,7 @@ export default {
           }
         }
       }
+
       // .mainbox {
       //   // height: 463px;
       //   margin-right: 37px;
@@ -512,6 +454,7 @@ export default {
           background: rgba(64, 158, 255, 0.1);
           margin-right: 480px;
           cursor: pointer;
+
           .shuom {
             color: rgba(64, 158, 255, 1);
             font-size: 14px;
@@ -519,23 +462,28 @@ export default {
             margin-right: 5px;
           }
         }
+
         .ant-collapse {
           background-color: #ffffff;
           border: 0;
         }
+
         .ant-collapse-content > .ant-collapse-content-box {
           padding: 0;
           border: 0;
         }
+
         .ant-collapse > .ant-collapse-item {
           border: 1px solid rgba(221, 238, 255, 1);
           border-radius: 6px;
           margin-bottom: 15px;
           border-bottom: 0px;
         }
+
         .ant-collapse-content {
           border-top: 0;
         }
+
         .ant-collapse-header {
           display: flex;
           align-items: center;
@@ -545,52 +493,60 @@ export default {
           color: rgba(51, 51, 51, 1);
           font-weight: 500;
         }
+
         .rowclass {
           height: 81px;
           border-bottom: 1px solid rgba(221, 238, 255, 1);
           display: flex;
           justify-content: space-between;
           align-items: center;
+
           .leftclass {
             display: flex;
             margin-left: 25px;
             align-items: center;
+
             .text1 {
               color: #000000;
               font-size: 14px;
               font-weight: 500;
               margin-left: 25px;
-              word-break:keep-all;
-              white-space:nowrap;
+              word-break: keep-all;
+              white-space: nowrap;
             }
+
             .text2 {
               color: rgba(51, 51, 51, 0.8);
               font-size: 14px;
               margin-left: 65px;
-              word-break:keep-all;
-              white-space:nowrap;
-              overflow:hidden;
-              text-overflow:ellipsis;
+              word-break: keep-all;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
             }
           }
+
           .alreadyclass {
             display: flex;
             margin-right: 57px;
+
             .alimg {
               height: 16px;
               width: 16px;
             }
+
             .altext {
               color: rgba(56, 125, 247, 1);
               font-size: 14px;
               margin-left: 16px;
-              word-break:keep-all;
-              white-space:nowrap;
+              word-break: keep-all;
+              white-space: nowrap;
             }
           }
         }
       }
     }
+
     .btnn {
       height: 72px;
       width: 100%;
@@ -602,6 +558,7 @@ export default {
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
       .btn2 {
         cursor: pointer;
         width: 100px;
diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
index fb1a8d15..75c9d5fe 100644
--- a/src/components/drawers/ProjectAudit.vue
+++ b/src/components/drawers/ProjectAudit.vue
@@ -417,7 +417,7 @@ export default {
         message.error(`请输入审核意见！`);
         return;
       }
-
+      ctx.emit("update:ProjAuditvisible", false);
       auditView({
         createId: props.chooseCreateId,
         createName: props.chooseCreater,
diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index fc44574f..d4846eaa 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -1,58 +1,56 @@
 <!-- eslint-disable vue/no-use-v-if-with-v-for -->
 <template>
-  <a-drawer :visible="Seevisible" class="drawerStyle seestu" placement="right" width="70%"
-    @after-visible-change="afterVisibleChange">
+  <a-drawer :visible="Seevisible" class="drawerStyle seestu" placement="right" width="70%">
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">查看</div>
         <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer" />
+             @click="closeDrawer"/>
       </div>
-      <a-spin v-if="loading" :spinning="loading" />
+      <a-spin v-if="loading" :spinning="loading"/>
       <div v-if="!loading" class="main">
         <div class="stuinfor">
           <div class="portrait">
-            <img src="../../assets/images/studentimg/character.png" />
+            <img src="../../assets/images/studentimg/character.png"/>
           </div>
           <div class="stumation">
-            <div class="stuname">{{ userName }}</div>
-            <div class="stugangw">{{ deptName }} - {{ jobName }}</div>
+            <div class="stuname">{{ info.userInfo?.realName }}</div>
+            <div class="stugangw">{{ info.userInfo?.departName }} - {{ info.userInfo?.jobName }}</div>
           </div>
           <div class="sortbox">
             <div class="sortname">进度排名</div>
             <div class="sortnub">
-              <span class="nub1">{{ rank.current }}</span>
-              <span class="total">/{{ rank.total }}</span>
+              <span class="nub1">{{ rank.current || 0 }}</span>
+              <span class="total">/{{ rank.total || 0 }}</span>
             </div>
           </div>
           <a-divider type="vertical" style="
                 height: 49px;
                 margin-left: 34px;
                 background-color: rgba(170, 166, 166, 0.3);
-              " />
+              "/>
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">完成必修</div>
             <div class="sortnub">
-              <span class="nub1">{{ currentReqCnt }}</span>
-              <span class="total">/{{ totalReqCnt }}</span>
+              <span class="nub1">{{ rank.finishCompulsoryNum || 0 }}</span>
+              <span class="total">/{{ rank.totalCompulsoryNum || 0 }}</span>
             </div>
           </div>
 
           <a-divider type="vertical" style="
                 height: 49px;
                 margin-left: 34px;
-                background-color: rgba(170, 166, 166, 0.3);" />
+                background-color: rgba(170, 166, 166, 0.3);"/>
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">已修证书</div>
             <div class="sortnub">
-              <span class="nub1">{{ 0 }}</span>
+              <span class="nub1">{{ rank.certNum || 0 }}</span>
             </div>
           </div>
 
         </div>
         <div class="secondrow">
-          <div class="rowleft">{{ name }} </div>
-          <div class="rowRight"> 排序号：{{ sort }}</div>
+          <div class="rowleft">{{ info.projectInfo.name }}</div>
         </div>
         <div class="mainbox">
           <a-collapse v-model:activeKey="stageListActive">
@@ -61,10 +59,10 @@
                 isActive
                   ? require('../../assets/images/studentimg/open.png')
                   : require('../../assets/images/studentimg/close.png')
-              " />
+              "/>
               <div></div>
             </template>
-            <a-collapse-panel v-for="value in stageList" :key="value.stageId" :header="value.stageName">
+            <a-collapse-panel v-for="value in info.stageList" :key="value.id" :header="value.name || '无阶段任务'">
               <template #extra>
                 <div @click.stop="">
                   <div class="rowbox">
@@ -74,7 +72,7 @@
                       </template>
                       <div class="shuom">说明</div>
                     </a-popover>
-                    <div><img src="../../assets/images/studentimg/chak.png" /></div>
+                    <div><img src="../../assets/images/studentimg/chak.png"/></div>
                   </div>
                 </div>
               </template>
@@ -83,37 +81,36 @@
 
                 <div class="leftclass">
                   <div>
-                    <img :src="
-                      item.course === '在线'
-                        ? require('../../assets/images/leveladd/zai.png')
-                        : item.course === '面授'
+                    <img
+                        :src="
+                        item.type === 1
+                          ? require('../../assets/images/leveladd/zai.png')
+                          : item.type === 2
                           ? require('../../assets/images/leveladd/mian.png')
-                          : item.course === '案例'
-                            ? require('../../assets/images/leveladd/an.png')
-                            : item.course === '作业'
-                              ? require('../../assets/images/leveladd/zuo.png')
-                              : item.course === '考试'
-                                ? require('../../assets/images/leveladd/kao.png')
-                                : item.course === '直播'
-                                  ? require('../../assets/images/leveladd/zhi.png')
-                                  : item.course === '外链'
-                                    ? require('../../assets/images/leveladd/wai.png')
-                                    : item.course === '讨论'
-                                      ? require('../../assets/images/leveladd/tao.png')
-                                      : item.course === '活动'
-                                        ? require('../../assets/images/leveladd/huo.png')
-                                        : item.course === '测评'
-                                          ? require('../../assets/images/leveladd/ce.png')
-                                          : item.course === '调研'
-                                            ? require('../../assets/images/leveladd/diao.png')
-                                            : item.course === '投票'
-                                              ? require('../../assets/images/leveladd/tou.png')
-                                              : item.course === '评估'
-                                                ? require('../../assets/images/leveladd/diao.png')
-                                                : item.course === '项目'
-                                                ? require('../../assets/images/leveladd/xiangmu.png')
-                                                : null
-                    " />
+                          : item.type === 3
+                          ? require('../../assets/images/leveladd/an.png')
+                          : item.type === 4
+                          ? require('../../assets/images/leveladd/zuo.png')
+                          : item.type === 5
+                          ? require('../../assets/images/leveladd/kao.png')
+                          : item.type === 6
+                          ? require('../../assets/images/leveladd/zhi.png')
+                          : item.type === 7
+                          ? require('../../assets/images/leveladd/wai.png')
+                          : item.type === 8
+                          ? require('../../assets/images/leveladd/tao.png')
+                          : item.type === 9
+                          ? require('../../assets/images/leveladd/huo.png')
+                          : item.type === 10
+                          ? require('../../assets/images/leveladd/ce.png')
+                          : item.type === 11
+                          ? require('../../assets/images/leveladd/diao.png')
+                          : item.type === 12
+                          ? require('../../assets/images/leveladd/tou.png')
+                          : item.type === 13
+                          ? require('../../assets/images/leveladd/xiangmu.png')
+                          : null"
+                    />
                   </div>
                   <div class="text1">{{ item.course }}</div>
                   <div class="text2">{{ item.name }}</div>
@@ -124,11 +121,10 @@
                       item.complete === '已完成'
                         ? require('../../assets/images/studentimg/complete.png')
                         : require('../../assets/images/studentimg/notice.png')
-                    " />
+                    "/>
                   </div>
                   <div class="altext">{{ item.complete }}</div>
                 </div>
-
               </div>
             </a-collapse-panel>
           </a-collapse>
@@ -138,17 +134,18 @@
         <button class="btn2" @click="closeDrawer">关闭</button>
       </div>
     </div>
-    <pro-mess v-model:Provisible="Provisible" />
+    <pro-mess v-model:Provisible="Provisible"/>
   </a-drawer>
 </template>
 
 <script>
-import { reactive, toRefs } from "vue";
+import {reactive, toRefs, watch} from "vue";
 import ProMess from "./ProMess.vue";
-import { studentProcess, studentRank } from "../../api/indexProjStu";
+import {projectStudentRank, projectStudentProcess} from "@/api/indexProjStu";
+
 export default {
   name: "SeeStu",
-  components: { ProMess },
+  components: {ProMess},
   props: {
     Seevisible: {
       type: Boolean,
@@ -166,213 +163,40 @@ export default {
   setup(props, ctx) {
     const state = reactive({
       loading: false,
-      userName: null, //用户名
-      deptName: null, //部门
-      jobName: null, //岗位
-      certCnt: null, //已修证书
-      name: null, //路径图名称
-      totalReqCnt: null, //累计必修数
-      currentReqCnt: null, //完成必修数
+      info: {},
       Provisible: false,
-      showDown: true,
-      showDown1: false,
-      rank: { total: 1, current: 1 },
-      sort: null,
-      stageList: [
-        // {
-        //   stageName: "阶段1腾飞班阶段1",
-        //   stageId: 1,
-        //   taskList: [
-        //     {
-        //       course: "在线",
-        //       name: "如何成为一个产品经理",
-        //       complete: "已完成",
-        //     },
-        //     {
-        //       course: "直播",
-        //       name: "管理直播课",
-        //       complete: "已完成",
-        //     },
-        //     {
-        //       course: "面授",
-        //       name: "管理面授课",
-        //       complete: "未完成",
-        //     },
-        //     {
-        //       course: "活动",
-        //       name: "管理活动",
-        //       complete: "未完成",
-        //     },
-        //     {
-        //       course: "作业",
-        //       name: "管理者作业",
-        //       complete: "未完成",
-        //     },
-        //   ],
-        // },
-      ],
       stageListActive: 0,
+      rank: {total: 0, current: 0, finishCompulsoryNum: 0, totalCompulsoryNum: 0, certNum: 0},
     });
+
+    watch([() => props.checkStuId, () => props.projectId], () => {
+      getStuRank()
+      check()
+    })
+
+
     const closeDrawer = () => {
       ctx.emit("update:Seevisible", false);
     };
 
     const getStuRank = () => {
-      studentRank({
-        projectId: props.projectId,
-        studentId: props.checkStuId,
-        type: 1
-      }).then(res => {
-        state.rank = res.data.data
-      })
+      projectStudentRank({projectId: props.projectId, studentId: props.checkStuId}).then(res => state.rank = res.data.data)
     }
-
     const showProMess = () => {
       state.Provisible = true;
     };
-    const afterVisibleChange = (bool) => {
-      console.log("state", bool);
-      if (bool == true) {
-        check();
-        getStuRank()
-      }
-    };
-    const changeDown = () => {
-      state.showDown = !state.showDown;
-    };
-    const changeDown1 = () => {
-      state.showDown1 = !state.showDown1;
-    };
-    const taskList = (tableData) => {
-      let data = tableData;
-      console.log('我排序了吗--------------------------》', data)
-      let array = [];
-      if (data != undefined) {
-        data.map((value) => {
-          console.log('我排序了吗---------value-----------------》', value)
-          let obj = {
-            course:
-              value.type == 1
-                ? "在线"
-                : value.type == 2
-                  ? "面授"
-                  : value.type == 3
-                    ? "案例"
-                    : value.type == 4
-                      ? "作业"
-                      : value.type == 5
-                        ? "考试"
-                        : value.type == 6
-                          ? "直播"
-                          : value.type == 7
-                            ? "外链"
-                            : value.type == 8
-                              ? "讨论"
-                              : value.type == 9
-                                ? "活动"
-                                : value.type == 10
-                                  ? "测评"
-                                  : value.type == 11
-                                    ? "评估"
-                                    : value.type == 12
-                                      ? "投票"
-                                      : "-",
-            name: value.name,
-            projectId: value.projectId,
-            complete:
-              value.status == -1
-                ? "未开始"
-                : value.status == 1
-                  ? "已完成"
-                  : value.status == 0
-                    ? "未完成"
-                    : "-",
-            flag: value.flag == 0 ? "选修" : "必修",
-            currentRatio: value.currentRatio,
-            routerTaskId: value.routerTaskId,
-          };
-          console.log('我排序了吗---------obj-----------------》', obj)
-          array.push(obj);
-        });
-        array.sort((a, b) => { return a.projectId - b.projectId })
-      }
-
-      console.log('我排序了吗-----------1---------------》', array)
-      return array;
-    };
-    const setStageList = (tableData) => {
-      let data = tableData;
-      console.log("查看了学员1", data);
-      let array = [];
-      //无阶段任务
-      if (data?.length == 1 && data[0].id == 0) {
-        console.log("无阶段任务", data);
-        data.map((value) => {
-          let obj = {
-            stageName: "无阶段任务",
-            stageId: 0,
-            remark: value.remark,
-            taskList: taskList(value.taskList),
-          };
-          array.push(obj);
-        });
-      } else { //有阶段
-        console.log("有阶段", data);
-        data.map((value) => {
-          console.log("有阶段value", value);
-          let obj = {
-            stageName: value.name,
-            stageId: value.id,
-            remark: value.remark,
-            taskList: taskList(value.taskList),
-          };
-          if (value.id > 0) {
-            array.push(obj);
-          }
-          console.log("有阶段array", array);
-        });
-      }
-
-      state.stageList = array;
-    };
     const check = () => {
       state.loading = true
-      let obj = {
-        projectId: props.projectId,
-        studentId: props.checkStuId,
-      };
-      studentProcess(obj).then((res) => {
+      projectStudentProcess({projectId: props.projectId, userId: props.checkStuId}).then((res) => {
         state.loading = false
-        console.log("查看了学员", res.data);
-        let result = res.data.data;
-        console.log("查看了学员result:", result);
-        state.userName = result.projectInfo.name;
-        state.deptName = result.projectInfo.deptName;
-        state.jobName = result.projectInfo.jobName;
-        state.certCnt = result.projectInfo.certCnt == null ? 0 : result.projectInfo.certCnt;
-        state.name = result.projectInfo.name;
-        state.currentReqCnt = result.projectInfo.currentReqCnt;
-        state.totalReqCnt = result.projectInfo.totalReqCnt;
-
-        if (result.stageList.length > 0) {
-          state.sort = result.stageList[0].sort;
-
-        }
-        setStageList(result.stageList);
-      });
-    };
+        state.info = res.data.data;
+      })
+    }
 
     return {
       ...toRefs(state),
-      afterVisibleChange,
       closeDrawer,
       showProMess,
-      changeDown,
-      changeDown1,
-      check,
-      setStageList,
-      taskList,
-      // change,
     };
   },
 };
@@ -521,12 +345,12 @@ export default {
           border: 0;
         }
 
-        .ant-collapse-content>.ant-collapse-content-box {
+        .ant-collapse-content > .ant-collapse-content-box {
           padding: 0;
           border: 0;
         }
 
-        .ant-collapse>.ant-collapse-item {
+        .ant-collapse > .ant-collapse-item {
           border: 1px solid rgba(221, 238, 255, 1);
           border-radius: 6px;
           margin-bottom: 15px;
diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue
index 20edd2b4..7bce6344 100644
--- a/src/components/drawers/ViewAssess.vue
+++ b/src/components/drawers/ViewAssess.vue
@@ -194,8 +194,8 @@ export default {
         console.log('我是传递过来的参数', props.datasource)
         console.log('我是传递过来的参数2', props.basicdata)
         api.QueryAssessmentDetail({
-          "assessmentSubmitId": props.datasource.assessmentSubmitId,
-          "courseId": props.basicdata.assessmentId,
+          "assessmentSubmitId": props.datasource.assessmentSubmitId?props.datasource.assessmentSubmitId:props.datasource.assessmentResultIds,
+          "courseId": props.basicdata.id,
           "studentId": props.datasource.studentId
         }).then(res=>{
           console.log(res)
diff --git a/src/components/drawers/project/AddCertificate.vue b/src/components/drawers/project/AddCertificate.vue
index 76f49710..317a3088 100644
--- a/src/components/drawers/project/AddCertificate.vue
+++ b/src/components/drawers/project/AddCertificate.vue
@@ -462,20 +462,6 @@ export default {
     function CreateCertificate() {
       state.CCertificate = true;
     }
-    //上传封面
-    const handleChange = (info) => {
-      if (info.file.status === "uploading") {
-        return;
-      }
-      if (info.file.status === "done") {
-        console.log("上传图片返回的信息 %o", info.file.name);
-        state.imageUrl = process.env.VUE_APP_FILE_PATH + info.file.name;
-        state.imageName = info.file.name;
-      }
-      if (info.file.status === "error") {
-        message.error("upload error");
-      }
-    };
 
     const beforeUpload = (file) => {
       const isJpgOrPng =
@@ -501,19 +487,14 @@ export default {
       fileUp(formDatas).then((res) => {
         if (res.data.code === 200) {
           console.log(file)
-          state.imageUrl = res.data.data;
-          state.imageName = file.name;
+          state.imageUrl =  process.env.VUE_APP_FILE_PATH + res.data.data;
+          state.imageName =  process.env.VUE_APP_FILE_PATH + res.data.data; 
         }
       });
       return false;
     };
 
-    // function beforeUpload(file) {
-    //   if (!state.fileType.includes(file.name.split(".").slice(-1).join(""))) {
-    //     message.error("不支持该格式");
-    //     return false;
-    //   }
-    // }
+
 
     //查看证书
     const getcertificate = () => {
@@ -528,7 +509,7 @@ export default {
           if (res.data.code === 200) {
             let info = res.data.data;
             state.certificateName = info.name; //证书名称
-            state.imageUrl = process.env.VUE_APP_FILE_PATH + info.url; //证书封面
+            state.imageUrl = info.url; //证书封面
             state.certificateRemark = info.remark; //证书说明
             state.condition = info.finishType; //选择条件
             state.large = info.finishType == 1 ? info.finishValue : null; //选择项目里的全部任务或必修任务
@@ -634,7 +615,6 @@ export default {
       closeDrawer,
       selectCondition,
       selectlarge,
-      handleChange,
       beforeUpload,
       CreateCertificate,
       saveupdatecertificate,
diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index cdfe8fcc..8217e1f7 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -55,7 +55,7 @@
                 placeholder="请输入姓名"
               />
             </div>
-            <div v-if="datasource.type !==1" class="namecon" style="margin-right: 50px">
+            <div class="namecon" style="margin-right: 50px">
               <div class="name">任务状态：</div>
               <div class="select">
                 <a-select
@@ -128,6 +128,8 @@
       </div>-->
     </div>
   </a-drawer>
+  <view-assess v-model:Assessvisible="Assessvisible" :datasource="evalDataSource" :evalName="datasource.info?.assessmentName"
+    :basicdata="datasource.info" />
 </template>
 
 <script>
@@ -135,9 +137,11 @@ import { toRefs, reactive, onMounted, onUnmounted } from "vue";
 import { message } from "ant-design-vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/indexTaskManage";
+import ViewAssess from "../ViewAssess";
+
 export default {
   name: "ProjectOnlineManage",
-
+  components: { ViewAssess },
   props: {
     Tvisible: {
       type: Boolean,
@@ -195,6 +199,8 @@ export default {
       ],
       tabledata: [],
       tableDataTotalLoading: true, // 表格loading加载配置
+      evalDataSource: "",
+      Assessvisible: false
     });
     const tableDataFunc = () => {
       const columns = [
@@ -309,9 +315,42 @@ export default {
           },
         },
       ];
+
+      let obj = {
+          title: "操作",
+          dataIndex: "finishStatus",
+          key: "finishStatus",
+          width: 60,
+          align: "center",
+          ellipsis: true,
+          className: "h",
+          customRender: (text) => {
+            return (
+              <div class="racona">
+                <a
+                  onClick={()=>{
+                    console.log('iyiy', text.record)
+                    showassess(text.record);
+                  }}>查看</a>
+              </div>
+            );
+          },
+        }
+
+        {/* 评估查看操作 */}
+        if(props.datasource.type==11){
+          columns.push(obj)
+        }
+
       return columns;
     };
 
+    {/* 查看评估弹框 */}
+    const showassess = (data) => {
+      state.evalDataSource = data;
+      state.Assessvisible = true;
+    };
+
     const closeDrawer = () => {
       ctx.emit("update:Tvisible", false);
       state.currentPage = 1;
@@ -405,20 +444,20 @@ export default {
           if(res.data.code==200){
             state.tableDataTotalLoading = false;
             let newData = []
-            for(let i=0;i<res.data.data.studyDetailList.length;i++){
+            for(let i=0;i<res.data.data.studyDetailList.records.length;i++){
               // 处理在线课字段和表格中字段保持一致
               let obj = {
-                studentUserNo: res.data.data.studyDetailList[i].studentCode,
-                studentName: res.data.data.studyDetailList[i].studentName,
-                studentDepartName: res.data.data.studyDetailList[i].studentDepartName,
-                studentJobName: res.data.data.studyDetailList[i].studentJobName,
-                lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
-                finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
+                studentUserNo: res.data.data.studyDetailList.records[i].studentCode,
+                studentName: res.data.data.studyDetailList.records[i].studentName,
+                studentDepartName: res.data.data.studyDetailList.records[i].studentDepartName,
+                studentJobName: res.data.data.studyDetailList.records[i].studentJobName,
+                lastStudyTime: res.data.data.studyDetailList.records[i].finishedTime,
+                finishStatus: res.data.data.studyDetailList.records[i].status?res.data.data.studyDetailList.records[i].status:0
               }
               newData.push(obj)
             }
             state.tabledata = newData;
-            state.tableDataTotal = res.data.data.total;
+            state.tableDataTotal = res.data.data.studyDetailList.total;
           }
         }).catch(err=>{
           console.log(err)
@@ -454,13 +493,18 @@ export default {
 
     // 导出数据
     function exportTaskStu() {
-      window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
-      // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`)
+      if(props.datasource.type==1){
+        {/* 在线课导出 */}
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${1}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
+      }else{
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
+      }
     }
 
     return {
       ...toRefs(state),
       selectProjectName,
+      showassess,
       closeDrawer,
       afterVisibleChange,
       tableDataFunc,
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index 171d61bc..3d01f886 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -55,7 +55,7 @@
                 placeholder="请输入姓名"
               />
             </div>
-            <div v-if="datasource.type !==1" class="namecon" style="margin-right: 50px">
+            <div class="namecon" style="margin-right: 50px">
               <div class="name">任务状态：</div>
               <div class="select">
                 <a-select
@@ -390,7 +390,7 @@ export default {
         console.log("我是传递的查询参数", {
           "pageNo": state.currentPage,
           "pageSize": state.pageSize,
-          "chapterId": props.outchapter,
+          "chapterId": props.datasource.chapterId,
           "status": state.projectName,
           "studentName": state.name,
           "taskId": props.datasource.courseId,
@@ -401,7 +401,7 @@ export default {
         api.QueryOnlineManagementDetail({
           "pageNo": state.currentPage,
           "pageSize": state.pageSize,
-          "chapterId": props.outchapter,
+          "chapterId": props.datasource.chapterId,
           "status": state.projectName,
           "studentName": state.name,
           "targetId":props.datasource.routerId,
@@ -413,20 +413,20 @@ export default {
           if(res.data.code==200){
             state.tableDataTotalLoading = false;
             let newData = []
-            for(let i=0;i<res.data.data.studyDetailList.length;i++){
+            for(let i=0;i<res.data.data.studyDetailList.records.length;i++){
               // 处理在线课字段和表格中字段保持一致
               let obj = {
-                studentUserNo: res.data.data.studyDetailList[i].studentCode,
-                studentName: res.data.data.studyDetailList[i].studentName,
-                studentDepartName: res.data.data.studyDetailList[i].studentDepartName,
-                studentJobName: res.data.data.studyDetailList[i].studentJobName,
-                lastStudyTime: res.data.data.studyDetailList[i].finishedTime,
-                finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0
+                studentUserNo: res.data.data.studyDetailList.records[i].studentCode,
+                studentName: res.data.data.studyDetailList.records[i].studentName,
+                studentDepartName: res.data.data.studyDetailList.records[i].studentDepartName,
+                studentJobName: res.data.data.studyDetailList.records[i].studentJobName,
+                lastStudyTime: res.data.data.studyDetailList.records[i].finishedTime,
+                finishStatus: res.data.data.studyDetailList.records[i].status?res.data.data.studyDetailList.records[i].status:0
               }
               newData.push(obj)
             }
             state.tabledata = newData;
-            state.tableDataTotal = res.data.data.total;
+            state.tableDataTotal = res.data.data.studyDetailList.total;
           }
         }).catch(err=>{
           console.log(err)
@@ -462,9 +462,12 @@ export default {
 
     // 导出数据
     function exportTaskStu() {
-      console.log(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
-      window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
-      // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`)
+      if(props.datasource.type==1){
+        {/* 在线课导出 */}
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
+      }else{
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
+      }
     }
 
     return {
diff --git a/src/components/project/OrgClassCheck.vue b/src/components/project/OrgClassCheck.vue
index 9c6c0ded..51aa1caa 100644
--- a/src/components/project/OrgClassCheck.vue
+++ b/src/components/project/OrgClassCheck.vue
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-02-23 14:57:21
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2023-02-23 20:42:25
+ * @LastEditTime: 2023-02-24 09:58:42
  * @FilePath: /fe-manage/src/components/project/OrgClassCheck.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -88,7 +88,7 @@ function onLoadData(treeNode) {
 }
 
 function change(e) {
-  // console.log("label", e, emit);
+  console.log("label", e, emit);
   // let label = [];
   // let value = [];
   // for (let i = 0; i < e.length; i++) {
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 128b1483..9b474053 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -85,7 +85,7 @@
                   <div class="tab2">
                     <a-form-item label="组织：">
                       <a-input v-model:value="searchOrgName.keyword"
-                        style="width: 230px; height: 40px; border-radius: 8px" placeholder="请输入组织" />
+                        style="width: 230px; height: 40px; border-radius: 8px" placeholder="请输入组织" @click="orgValue"/>
                       <a-button type="primary" @click="searchOrg" style="margin-left: 20px; border-radius: 4px">
                         <template #icon>
                           <SearchOutlined />
@@ -97,13 +97,13 @@
                     </a-form-item>
                   </div>
                   <div class="boeTree">
-                    <a-tree :tree-data="searchOrgName.keyword ? orgData : treeOrgData" @select="onOrgSelectChange"
+                    <a-tree v-model:selectedKeys="selectedOrgKeys" :tree-data="searchOrgName.keyword ? orgData : treeOrgData" @select="onOrgSelectChange"
                       :loading="orgOrgLoading" :load-data="onLoadOrgData" :fieldNames="{
                         children: 'treeChildList',
                         key: 'id',
                         title: 'name',
                         value: 'name',
-                      }" row-key="id" :row-selection="orgRowSelection" multiple>
+                      }" row-key="id" :row-selection="orgRowSelection"  multiple>
                     </a-tree>
                   </div>
                 </div>
@@ -196,7 +196,7 @@
                   <div v-if="i < 11">
                     <div class="chose1">
                       <div class="span">{{ item.name }}</div>
-                      <div class="ch1" @click="orgDel(i)"></div>
+                      <div class="ch1" @click="orgDel(i)" style="cursor: pointer;"></div>
                     </div>
                   </div>
                   <div v-else>
@@ -295,7 +295,8 @@ import {
   AUDIENCE_LIST,
   ORG_CHILD_LIST,
   ORG_LIST,
-  USER_LIST,
+  // USER_LIST, 
+  USER_LIST_PAGE,
 } from "@/api/ThirdApi";
 import {
   saveStu,
@@ -463,7 +464,7 @@ const {
   loading: stuLoading,
   total: stuTotal,
   reset: stuReset,
-} = useBoeApiPage(USER_LIST, nameSearch.value, {
+} = useBoeApiPage(USER_LIST_PAGE, nameSearch.value, {
   init: false,
   result: (res) => res.result.userInfoList,
   totalPage: (res) => res.result.totalPage,
@@ -613,6 +614,7 @@ const closeDrawer = () => {
   visiable.value = false;
   stuData.value = [];
   nameSearch.value.keyword = "";
+  selectedOrgKeys.value = [];
 };
 
 function onLoadData(treeNode) {
@@ -661,8 +663,16 @@ function stuDel(i) {
   selectsData.value.studentList.splice(i, 1);
 }
 
+const selectedOrgKeys = ref([]);
+
+watch(selectedOrgKeys, () => {
+  console.log('selectedKeys', selectedOrgKeys);
+});
+
 function orgDel(i) {
+  console.log(selectedOrgKeys.value)
   orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
+  selectedOrgKeys.value.splice(i, 1)
   selectsData.value.deptList.splice(i, 1)
 }
 
@@ -685,8 +695,12 @@ function onStuSelectChange(e, l) {
 }
 
 function onOrgSelectChange(e, l) {
+
   orgRowSelection.value = e;
   selectsData.value.deptList = l.selectedNodes;
+
+  // 获取被点击的树节点
+  
 }
 
 function onAuditSelectChange(e, l) {
@@ -727,6 +741,7 @@ const resetStu = () => {
 //清空选择部门信息
 const deleteDepSelect = () => {
   stuSelectKeys.value = [];
+  selectedOrgKeys.value = [];
 };
 //重置组织
 const resetOrg = () => {
@@ -821,6 +836,12 @@ function handleStageOk() {
   // }
 }
 
+// 搜索受众值发生变化
+function orgValue(value) {
+  console.log("", value.target.value);
+  searchOrgName.value.keyword = value.target.value;
+}
+
 watch(visiable, () => {
   stuSelectKeys.value = [];
   orgSelectKeys.value = [];
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index c3f8c63e..2d9bb68f 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -4,18 +4,20 @@
     <slot></slot>
   </div>
   <a-drawer
-      :visible="visible"
-      class="drawerStyle createvoteDrawer"
-      width="800"
-      placement="right"
+    :visible="visible"
+    class="drawerStyle createvoteDrawer"
+    width="800"
+    placement="right"
   >
     <div class="researchadd">
       <div class="header">
-        <div class="headerTitle">{{ options.length ? "编辑投票题干" : "创建投票题干" }}</div>
+        <div class="headerTitle">
+          {{ options.length ? "编辑投票题干" : "创建投票题干" }}
+        </div>
         <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
         />
       </div>
       <div class="main_left">
@@ -23,8 +25,8 @@
           <div class="signbox">
             <div class="sign">
               <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt="asterisk"
+                src="@/assets/images/coursewareManage/asterisk.png"
+                alt="asterisk"
               />
             </div>
             <span>创建题干：</span>
@@ -34,34 +36,35 @@
           </div>
         </div>
       </div>
-      <div v-for="(item, index) in formData" :key="index+Math.random()">
-        <VoteQuestion v-if="!item.deleted" :item="item" :index="index" @del="itemDel"/>
+      <div v-for="(item, index) in formData" :key="index + Math.random()">
+        <VoteQuestion
+          v-if="!item.deleted"
+          :item="item"
+          :index="index"
+          @del="itemDel"
+        />
       </div>
 
       <div class="footer">
         <div class="btn">
           <a-button
-              type="primary"
-              ghost
-              style="
-              width: 100px;
-              height: 40px;
-              border-radius: 8px;
-            "
-              @click="closeDrawer"
+            type="primary"
+            ghost
+            style="width: 100px; height: 40px; border-radius: 8px"
+            @click="closeDrawer"
           >
             取消
           </a-button>
           <a-button
-              type="primary"
-              style="
+            type="primary"
+            style="
               margin-left: 14px;
               width: 100px;
               height: 40px;
               border-radius: 8px;
               background-color: #4ea6ff;
             "
-              @click="confirm"
+            @click="confirm"
           >
             保存
           </a-button>
@@ -71,62 +74,80 @@
   </a-drawer>
 </template>
 <script setup>
-import {defineEmits, defineProps, ref, watch} from "vue";
+import { defineEmits, defineProps, ref, watch } from "vue";
 import VoteQuestion from "./VoteQuestion.vue";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
 
 const props = defineProps({
-  options: []
-})
+  options: [],
+});
 
-const emit = defineEmits({})
-const formData = ref(props.options && props.options.length ? [...props.options] : [{
-  voteStemName: '',
-  optionDetailList: []
-}])
+const emit = defineEmits({});
+const formData = ref(
+  props.options && props.options.length
+    ? [...props.options]
+    : [
+        {
+          voteStemName: "",
+          optionDetailList: [],
+        },
+      ]
+);
 
-const visible = ref(false)
+const visible = ref(false);
 
-watch(() => props.options.length, () => {
-  formData.value = props.options && props.options.length ? [...props.options] : [{
-    voteStemName: '',
-    optionDetailList: []
-  }]
-})
+watch(
+  () => props.options.length,
+  () => {
+    formData.value =
+      props.options && props.options.length
+        ? [...props.options]
+        : [
+            {
+              voteStemName: "",
+              optionDetailList: [],
+            },
+          ];
+  }
+);
 
 function openDrawer() {
-  visible.value = true
+  visible.value = true;
 }
 
 const closeDrawer = () => {
-  visible.value = false
-  formData.value = props.options && props.options.length ? [...props.options] : [{
-    voteStemName: '',
-    optionDetailList: []
-  }]
+  visible.value = false;
+  formData.value =
+    props.options && props.options.length
+      ? [...props.options]
+      : [
+          {
+            voteStemName: "",
+            optionDetailList: [],
+          },
+        ];
 };
 
 async function confirm() {
-  console.log(formData.value)
-  if (formData.value.some(t => !t.voteStemName && !t.deleted)) {
-    message.warning('请输入题干名称')
-    return
+  console.log(formData.value);
+  if (formData.value.some((t) => !t.voteStemName && !t.deleted)) {
+    message.warning("请输入题干名称");
+    return;
   }
-  visible.value = false
-  emit('update:options', formData.value)
+  visible.value = false;
+  emit("update:options", formData.value);
 }
 
 function handleAdd() {
   formData.value.push({
-    voteStemName: '',
-    optionDetailList: []
-  })
+    voteStemName: "",
+    optionDetailList: [],
+  });
 }
 
 function itemDel(i) {
-  formData.value[i].deleted = true
+  formData.value[i].deleted = true;
 }
-
 </script>
 <style lang="scss">
 .researchadd {
diff --git a/src/components/vote/VoteQuestion.vue b/src/components/vote/VoteQuestion.vue
index cefcf1bd..3992d81a 100644
--- a/src/components/vote/VoteQuestion.vue
+++ b/src/components/vote/VoteQuestion.vue
@@ -4,39 +4,47 @@
   <div class="content">
     <div class="tagbox">
       <div class="deleteop" @click="handleDel">
-        <div><img src="../../assets/images/projectadd/delete.png"/></div>
-        <div class="del_text">删除选项</div>
+        <div><img src="../../assets/images/projectadd/delete.png" /></div>
+        <div class="del_text">删除题干</div>
       </div>
     </div>
     <div class="name">
       <div class="namebox">
-        <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
+        <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
         <div class="inname">题干</div>
       </div>
       <div class="in">
         <a-input
-            v-model:value="formData.voteStemName"
-            placeholder="请输入题干名称"
-            show-count
-            :maxlength="20"
-            style="border-radius: 8px"
+          v-model:value="formData.voteStemName"
+          placeholder="请输入题干名称"
+          show-count
+          :maxlength="20"
+          style="border-radius: 8px"
         />
       </div>
     </div>
-    <div v-for="(item, index) in formData.optionDetailList" :key="index+Math.random()">
-      <VoteQuestionItem v-if="!item.deleted" :item="item" :index="index" @del="delItem"/>
+    <div
+      v-for="(item, index) in formData.optionDetailList"
+      :key="index + Math.random()"
+    >
+      <VoteQuestionItem
+        v-if="!item.deleted"
+        :item="item"
+        :index="index"
+        @del="delItem"
+      />
     </div>
     <div class="name">
       <div class="in" style="margin-left: 85px; margin-bottom: 20px">
         <a-button
-            type="primary"
-            style="
+          type="primary"
+          style="
             width: 100px;
             height: 40px;
             border-radius: 8px;
             background-color: #4ea6ff;
           "
-            @click="handleSingleAdd"
+          @click="handleSingleAdd"
         >
           添加选项
         </a-button>
@@ -45,34 +53,33 @@
   </div>
 </template>
 <script setup>
-import {defineEmits, defineProps, ref, watch} from "vue";
+import { defineEmits, defineProps, ref, watch } from "vue";
 import VoteQuestionItem from "./VoteQuestionItem.vue";
 
 const props = defineProps({
   index: Number,
-  item: {}
-})
+  item: {},
+});
 
-const emit = defineEmits(['del'])
+const emit = defineEmits(["del"]);
 
-const formData = ref(props.item)
+const formData = ref(props.item);
 
 watch(props, () => {
-  formData.value = props.item
-})
+  formData.value = props.item;
+});
 
 function handleSingleAdd() {
-  formData.value.optionDetailList.push({})
+  formData.value.optionDetailList.push({});
 }
 
 function delItem(i) {
-  formData.value.optionDetailList[i].deleted = true
+  formData.value.optionDetailList[i].deleted = true;
 }
 
 function handleDel() {
   emit("del", props.index);
 }
-
 </script>
 <style lang="scss">
 .researchadd {
diff --git a/src/utils/dialog.js b/src/utils/dialog.js
new file mode 100644
index 00000000..f98e4ffd
--- /dev/null
+++ b/src/utils/dialog.js
@@ -0,0 +1,14 @@
+import { createApp } from 'vue'
+import CommonAlert from "@/components/common/CommonAlert";
+import Antd from "ant-design-vue";
+
+function mountContent (option = {}) {
+    const dom = document.createElement('div')
+    document.body.appendChild(dom)
+    const app = createApp(CommonAlert, {
+        close: () => { app.unmount(dom); document.body.removeChild(dom) },
+        ...option
+    })
+    app.use(Antd).mount(dom)
+}
+export default mountContent
\ No newline at end of file
diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue
index e9a79873..382a00d6 100644
--- a/src/views/DownLoad.vue
+++ b/src/views/DownLoad.vue
@@ -149,7 +149,7 @@ export default {
       api.DownLoadTotalSize().then(res=>{
         console.log(res)
         if(res.data.code==200){
-          state.capacity = res.data.data;
+          state.capacity = res.data.data && res.data.data !== {} ? res.data.data : 0;
         }else{
           state.capacity = 0;
         }
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index a35bcc18..93ffd476 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -7,54 +7,54 @@
         <div class="filterItems">
           <div class="pathnameInp">
             <a-input
-                v-model:value="createName"
-                style="width: 200px; height: 40px; border-radius: 8px"
-                placeholder="请输入创建人"
+              v-model:value="createName"
+              style="width: 200px; height: 40px; border-radius: 8px"
+              placeholder="请输入创建人"
             />
           </div>
           <div class="pathnameInp">
             <a-input
-                v-model:value="name"
-                style="width: 200px; height: 40px; border-radius: 8px"
-                placeholder="请输入名称"
+              v-model:value="name"
+              style="width: 200px; height: 40px; border-radius: 8px"
+              placeholder="请输入名称"
             />
           </div>
           <div class="pathnameInp">
             <a-input
-                v-model:value="projectName"
-                style="width: 200px; height: 40px; border-radius: 8px"
-                placeholder="请输入所属项目"
+              v-model:value="projectName"
+              style="width: 200px; height: 40px; border-radius: 8px"
+              placeholder="请输入所属项目"
             />
           </div>
           <div class="select">
             <a-select
-                v-model:value="auditStatus"
-                dropdownClassName="dropdown-style"
-                style="width: 200px"
-                placeholder="请选择状态"
-                :options="options1"
-                allowClear
+              v-model:value="auditStatus"
+              dropdownClassName="dropdown-style"
+              style="width: 200px"
+              placeholder="请选择状态"
+              :options="options1"
+              allowClear
             >
             </a-select>
           </div>
           <div class="select">
             <a-tree-select
-                :getPopupContainer="
+              :getPopupContainer="
                 (triggerNode) => triggerNode.parentNode || document.body
               "
-                v-model:value="sysTypeId"
-                show-search
-                style="width: 200px"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                placeholder="请选择内容分类"
-                allow-clear
-                tree-default-expand-all
-                :fieldNames="{
+              v-model:value="sysTypeId"
+              show-search
+              style="width: 200px"
+              :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+              placeholder="请选择内容分类"
+              allow-clear
+              tree-default-expand-all
+              :fieldNames="{
                 children: 'children',
                 label: 'name',
                 value: 'code',
               }"
-                :tree-data="sysTypeOptions"
+              :tree-data="sysTypeOptions"
             >
             </a-tree-select>
           </div>
@@ -62,11 +62,11 @@
             <div class="select addTimeBox">
               <div class="addTime">创建时间：</div>
               <a-range-picker
-                  v-model:value="projectTime"
-                  style="width: 420px"
-                  format="YYYY-MM-DD"
-                  separator="至"
-                  :placeholder="['      开始时间', '        结束时间']"
+                v-model:value="projectTime"
+                style="width: 420px"
+                format="YYYY-MM-DD"
+                separator="至"
+                :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
           </div>
@@ -83,9 +83,9 @@
           <div class="btns">
             <!-- 2022-11-30注释 后面放开 -->
             <div
-                class="btnn btn2"
-                @click="openMessage"
-                style="margin-right: 14px"
+              class="btnn btn2"
+              @click="openMessage"
+              style="margin-right: 14px"
             >
               <div class="daochu"></div>
               <div class="btnText">导出</div>
@@ -102,16 +102,16 @@
     </div>
     <!-- 选择线上还是面授课弹窗 -->
     <a-modal
-        v-model:visible="of_hs"
-        :closable="closableQR"
-        wrapClassName="sofModal"
-        :footer="null"
-        style="margin-top: 400px"
-        @cancel="of_exit"
+      v-model:visible="of_hs"
+      :closable="closableQR"
+      wrapClassName="sofModal"
+      :footer="null"
+      style="margin-top: 400px"
+      @cancel="of_exit"
     >
       <div
-          class="selectonlineface"
-          :style="{ display: of_hs ? 'block' : 'none' }"
+        class="selectonlineface"
+        :style="{ display: of_hs ? 'block' : 'none' }"
       >
         <div class="of_header"></div>
         <div class="of_main">
@@ -125,20 +125,20 @@
               <div class="signbox">
                 <div class="sign">
                   <img
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
                   />
                 </div>
                 <span style="margin-right: 3px">课程名称：</span>
               </div>
               <div class="in b_input">
                 <NameInput
-                    placeholder="请输入课程名称"
-                    v-model:value="xzinputV1"
-                    v-model:validate="validate"
-                    :maxlength="20"
-                    show-count
-                    :type="3"
+                  placeholder="请输入课程名称"
+                  v-model:value="xzinputV1"
+                  v-model:validate="validate"
+                  :maxlength="20"
+                  show-count
+                  :type="3"
                 ></NameInput>
                 <!--                <a-input-->
                 <!--                  v-model:value="xzinputV1"-->
@@ -158,8 +158,8 @@
                 </div>
                 <div class="b_right" @click="hideShow" style="cursor: pointer">
                   <div
-                      class="b_zk"
-                      :style="{ display: hideshow ? 'block' : 'none' }"
+                    class="b_zk"
+                    :style="{ display: hideshow ? 'block' : 'none' }"
                   >
                     <div class="zksqbox" style="display: flex">
                       <span style="color: #4ea6ff; margin-right: 5px">
@@ -167,15 +167,15 @@
                       </span>
                       <div class="b_icon">
                         <img
-                            src="@/assets/images/coursewareManage/up.png"
-                            alt=""
+                          src="@/assets/images/coursewareManage/up.png"
+                          alt=""
                         />
                       </div>
                     </div>
                   </div>
                   <div
-                      class="b_sq"
-                      :style="{ display: hideshow ? 'none' : 'block' }"
+                    class="b_sq"
+                    :style="{ display: hideshow ? 'none' : 'block' }"
                   >
                     <div class="zksqbox" style="display: flex">
                       <span style="color: #4ea6ff; margin-right: 5px">
@@ -183,8 +183,8 @@
                       </span>
                       <div class="b_icon">
                         <img
-                            src="@/assets/images/coursewareManage/down.png"
-                            alt=""
+                          src="@/assets/images/coursewareManage/down.png"
+                          alt=""
                         />
                       </div>
                     </div>
@@ -192,14 +192,14 @@
                 </div>
               </div>
               <div
-                  class="bl_detail"
-                  :style="{ display: hideshow ? 'block' : 'none' }"
+                class="bl_detail"
+                :style="{ display: hideshow ? 'block' : 'none' }"
               >
                 <span style="color: #999ba3">
-                  1、课程名称统一不加书名号。<br/>
+                  1、课程名称统一不加书名号。<br />
                   2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息
                   之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先
-                  看到的是课程内容主题。<br/>
+                  看到的是课程内容主题。<br />
                   3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用
                   版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。
                 </span>
@@ -209,8 +209,8 @@
               <div class="signbox">
                 <div class="sign">
                   <img
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
                   />
                 </div>
 
@@ -234,9 +234,9 @@
                   <div class="bc_boxr">
                     <div class="ol_checkbox">
                       <a-radio
-                          v-model:checked="checked"
-                          :value="2"
-                          @click="clear_valueE1"
+                        v-model:checked="checked"
+                        :value="2"
+                        @click="clear_valueE1"
                       >
                         面授
                       </a-radio>
@@ -251,8 +251,8 @@
                 <div class="signbox">
                   <div class="sign">
                     <img
-                        src="@/assets/images/coursewareManage/asterisk.png"
-                        alt=""
+                      src="@/assets/images/coursewareManage/asterisk.png"
+                      alt=""
                     />
                   </div>
 
@@ -262,18 +262,18 @@
                   <div class="bc_box">
                     <div class="ol_checkbox">
                       <a-radio
-                          v-model:checked="checked"
-                          :value="3"
-                          @click="clear_valueE2"
+                        v-model:checked="checked"
+                        :value="3"
+                        @click="clear_valueE2"
                       >
                         是
                       </a-radio>
                     </div>
                     <div class="ol_checkbox">
                       <a-radio
-                          v-model:checked="checked"
-                          :value="4"
-                          @click="clear_valueE2"
+                        v-model:checked="checked"
+                        :value="4"
+                        @click="clear_valueE2"
                       >
                         否
                       </a-radio>
@@ -297,91 +297,163 @@
     <!-- 选择线上还是面授课弹窗 -->
     <!-- 确定新建面授课弹窗 -->
     <CourseModal
-        ref="CourseModalRef"
-        v-model:xzinputV1="xzinputV1"
-        @visibleClose="closeOnlineCoursevisible"
+      ref="CourseModalRef"
+      v-model:xzinputV1="xzinputV1"
+      @visibleClose="closeOnlineCoursevisible"
     />
 
     <!-- 查看面授课弹框 end -->
     <!-- 确定新建面授课弹窗 -->
     <!-- 表格 -->
-    <div style="padding:10px 35px">
+    <div style="padding: 10px 35px">
       <a-table
-          :header-cell-style="{'text-align':'center'}"
-          style="border: 1px solid #f2f6fe"
-          :columns="columns1"
-          :data-source="tableData1"
-          :loading="tableLoading"
-          :pagination="false"
-          :scroll="{x:'max-content'}"
+        :header-cell-style="{ 'text-align': 'center' }"
+        style="border: 1px solid #f2f6fe"
+        :columns="columns1"
+        :data-source="tableData1"
+        :loading="tableLoading"
+        :pagination="false"
+        :scroll="{ x: 'max-content' }"
       >
-        <template #bodyCell="{ record, column }">
-          <template v-if="column.key === 'operation'">
-            <a-space>
-              <a-button v-if="(record.status===0 || record.status===-1 || !record.kkty) && checkPer(record.permissions)"
-                        @click="() => handleEdit(record, String(record.courseform))" type="link">编辑
+        <template #operation="{ text, record, index }">
+          <a-space>
+            <a-button
+              v-if="record.auditStatus === 2 && checkPer(record.permissions)"
+              @click="() => handlePush(text, index)"
+              type="link"
+              >发布
+            </a-button>
+            <a-button
+              v-if="record.auditStatus === 0 && checkPer(record.permissions)"
+              @click="() => handleSubmit(text, index)"
+              type="link"
+              >提交审核
+            </a-button>
+            <a-button
+              v-if="
+                (record.auditStatus === 0 || record.auditStatus === -1) &&
+                checkPer(record.permissions)
+              "
+              @click="() => handleEdit(record, String(record.courseform))"
+              type="link"
+              >编辑
+            </a-button>
+            <!-- <a-button
+              @click="() => handleEdit(record, String(record.courseform))"
+              type="link"
+              >编辑
+            </a-button> -->
+            <a-button
+              v-if="
+                (record.auditStatus === 2 || record.auditStatus === 3) &&
+                checkPer(record.permissions)
+              "
+              @click="() => handleStart(record, String(record.courseform))"
+              type="link"
+              >开课
+            </a-button>
+            <a-button
+              @click="() => handleLook(record, String(record.courseform))"
+              type="link"
+              >查看
+            </a-button>
+            <a-button
+              v-if="
+                (record.auditStatus === 2 || record.auditStatus === 3) &&
+                checkPer(record.permissions)
+              "
+              @click="() => handleGuan22(record, String(record.courseform))"
+              type="link"
+              >管理
+            </a-button>
+            <DropDown v-if="checkPer(record.permissions)" value="授权">
+              <OwnerTableModelStudent
+                :types="[10, 11, 12]"
+                :id="record.offcourseId"
+                >权限名单</OwnerTableModelStudent
+              >
+              <CommonStudent :type="10" :id="record.offcourseId" title="查看权"
+                >查看权</CommonStudent
+              >
+              <CommonStudent :type="11" :id="record.offcourseId" title="管理权"
+                >管理权</CommonStudent
+              >
+            </DropDown>
+            <DropDown v-if="checkPer(record.permissions)" value="更多">
+              <a-button @click="() => handleCopy(text)" type="link"
+                >复制</a-button
+              >
+              <a-button
+                v-if="
+                  (record.auditStatus === 3 || record.auditStatus === 2) &&
+                  record.status &&
+                  checkPer(record.permissions)
+                "
+                @click="() => handleRejectExit(text, index, record)"
+                type="link"
+                >撤回</a-button
+              >
+              <a-button
+                v-if="
+                  record.auditStatus === 3 &&
+                  record.status &&
+                  checkPer(record.permissions)
+                "
+                @click="() => handleStop(text, index)"
+                type="link"
+                >停用</a-button
+              >
+              <a-button
+                v-if="
+                  record.auditStatus === 3 &&
+                  !record.status &&
+                  checkPer(record.permissions)
+                "
+                @click="() => handleOpen(text, index)"
+                type="link"
+                >启用</a-button
+              >
+              <a-button
+                @click="() => handleDelete(text, index)"
+                type="link"
+                danger
+                >删除
               </a-button>
-              <a-button v-if="record.status===2 && checkPer(record.permissions)"
-                        @click="() => handleStart(record, String(record.courseform))" type="link">开课
-              </a-button>
-              <a-button v-if="record.status===2 && checkPer(record.permissions)"
-                        @click="() => handleLook(record, String(record.courseform))" type="link">查看
-              </a-button>
-              <a-button v-if="record.status===2 && checkPer(record.permissions)"
-                        @click="() => handleGuan22(record, String(record.courseform))" type="link">管理
-              </a-button>
-              <DropDown v-if="checkPer(record.permissions)" value="授权">
-                <OwnerTableModelStudent :types="[10,11,12]" :id="record.offcourseId">权限名单</OwnerTableModelStudent>
-                <CommonStudent :type="10" :id="record.offcourseId" title="查看权">查看权</CommonStudent>
-                <CommonStudent :type="11" :id="record.offcourseId" title="管理权">管理权</CommonStudent>
-              </DropDown>
-              <DropDown v-if="checkPer(record.permissions)" value="更多">
-                <a-button @click="() => handleCopy(record, String(record.courseform))" type="link">复制</a-button>
-                <a-button @click="() => handleRejectExit(record, String(record.courseform))" type="link">撤回</a-button>
-                <a-button v-if="record.status===2 && record.kkty"
-                          @click="() => handleStop(record, String(record.courseform))" type="link">停用
-                </a-button>
-                <a-button v-if="record.status===2 && !record.kkty"
-                          @click="() => handleOpen(record, String(record.courseform))" type="link">启用
-                </a-button>
-                <a-button @click="() => handleDelete(record, String(record.courseform))" type="link" danger>删除
-                </a-button>
-              </DropDown>
-            </a-space>
-          </template>
+            </DropDown>
+          </a-space>
         </template>
       </a-table>
     </div>
     <div class="pa">
       <a-pagination
-          v-if="tableDataTotal1 > 10"
-          :showSizeChanger="false"
-          :showQuickJumper="true"
-          :hideOnSinglePage="true"
-          :pageSize="pageSize1"
-          :current="currentPage1"
-          :total="tableDataTotal1"
-          class="pagination"
-          @change="handelChangePage1"
+        v-if="tableDataTotal1 > 10"
+        :showSizeChanger="false"
+        :showQuickJumper="true"
+        :hideOnSinglePage="true"
+        :pageSize="pageSize1"
+        :current="currentPage1"
+        :total="tableDataTotal1"
+        class="pagination"
+        @change="handelChangePage1"
       />
     </div>
     <!-- 表格 -->
     <!-- 操作 在线面授课程管理 页面 -->
     <a-modal
-        v-model:visible="om_1"
-        title="Title"
-        @ok="closeModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="modalStyle onlmanageModal"
-        width="80%"
-        @cancel="om_exit"
+      v-model:visible="om_1"
+      title="Title"
+      @ok="closeModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="modalStyle onlmanageModal"
+      width="80%"
+      @cancel="om_exit"
     >
       <div class="modalHeader">
         <div class="headerLeft">
           <img
-              style="width: 17px; height: 18px; margin-right: 8px"
-              src="@/assets/images/coursewareManage/pc.png"
+            style="width: 17px; height: 18px; margin-right: 8px"
+            src="@/assets/images/coursewareManage/pc.png"
           />
           <div :style="{ display: ft_1 ? 'none' : 'block' }">
             <span class="headerLeftText">在线课程管理</span>
@@ -392,9 +464,9 @@
         </div>
         <div style="margin-right: 57px; cursor: pointer">
           <img
-              @click="om_exit"
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
+            @click="om_exit"
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close22.png"
           />
         </div>
       </div>
@@ -414,11 +486,11 @@
                 </div>
               </div>
               <a-tabs
-                  class="b_menu"
-                  v-model:activeKey="faceManageTab"
-                  size="large"
-                  :tabBarStyle="{ marginLeft: '10px' }"
-                  @change="faceManageChange"
+                class="b_menu"
+                v-model:activeKey="faceManageTab"
+                size="large"
+                :tabBarStyle="{ marginLeft: '10px' }"
+                @change="faceManageChange"
               >
                 <!-- <a-tab-pane key="1" tab="报名管理">
                   <div class="b_menunav">
@@ -479,15 +551,15 @@
                   <div class="b_menunav">
                     <div class="bm_select">
                       <a-select
-                          class="select"
-                          ref="select"
-                          placeholder="请选择状态"
-                          v-model:value="gl_selectV2"
-                          style="width: 200px"
-                          :options="options11"
-                          allowClear
-                          @focus="focus"
-                          @change="handleChange"
+                        class="select"
+                        ref="select"
+                        placeholder="请选择状态"
+                        v-model:value="gl_selectV2"
+                        style="width: 200px"
+                        :options="options11"
+                        allowClear
+                        @focus="focus"
+                        @change="handleChange"
                       >
                         <!-- <a-select-option value="status">状态</a-select-option>
                         <a-select-option value="passed">已通过</a-select-option>
@@ -501,9 +573,9 @@
                     </div>
                     <div class="bm_input">
                       <a-input
-                          v-model:value="gl_inputV2"
-                          style="width: 200px; height: 40px; border-radius: 8px"
-                          placeholder="姓名"
+                        v-model:value="gl_inputV2"
+                        style="width: 200px; height: 40px; border-radius: 8px"
+                        placeholder="姓名"
                       />
                     </div>
                     <div class="bm_btn">
@@ -519,10 +591,10 @@
                   </div>
                   <div class="bm_table" style="margin-bottom: 20px">
                     <a-table
-                        :columns="columns2"
-                        :data-source="tableData3"
-                        :loading="manageStuLoading"
-                        :pagination="false"
+                      :columns="columns2"
+                      :data-source="tableData3"
+                      :loading="manageStuLoading"
+                      :pagination="false"
                     >
                       <template #bodyCell="{ column }">
                         <template v-if="column.key === 'opacation'">
@@ -533,14 +605,14 @@
                     <div class="tableBox" style="margin-top: 50px">
                       <div class="pa">
                         <a-pagination
-                            :showSizeChanger="false"
-                            showQuickJumper="true"
-                            hideOnSinglePage="true"
-                            :pageSize="pageSize222"
-                            :current="currentPage222"
-                            :total="tableDataTotal222"
-                            class="pagination"
-                            @change="handelChangePage222"
+                          :showSizeChanger="false"
+                          showQuickJumper="true"
+                          hideOnSinglePage="true"
+                          :pageSize="pageSize222"
+                          :current="currentPage222"
+                          :total="tableDataTotal222"
+                          class="pagination"
+                          @change="handelChangePage222"
                         />
                       </div>
                     </div>
@@ -555,42 +627,42 @@
     <!-- 操作 在线面授课程管理 页面 -->
     <!-- 面授课程管理查看详情 页面 -->
     <a-modal
-        v-model:visible="om_ckxq"
-        title="Title"
-        @ok="closeModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="modalStyle coursewareDetail"
-        width="80%"
+      v-model:visible="om_ckxq"
+      title="Title"
+      @ok="closeModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="modalStyle coursewareDetail"
+      width="80%"
     >
       <div class="modalHeader">
         <div class="headerLeft">
           <img
-              style="width: 17px; height: 18px; margin-right: 8px"
-              src="@/assets/images/coursewareManage/detail.png"
+            style="width: 17px; height: 18px; margin-right: 8px"
+            src="@/assets/images/coursewareManage/detail.png"
           />
           <span class="headerLeftText">查看详情</span>
         </div>
         <div style="margin-right: 57px; cursor: pointer">
           <img
-              @click="ftsr_exit"
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
+            @click="ftsr_exit"
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close22.png"
           />
         </div>
       </div>
       <div class="modalMain">
         <div
-            class="ftsturecord"
-            :style="{ display: om_ckxq ? 'block' : 'none' }"
+          class="ftsturecord"
+          :style="{ display: om_ckxq ? 'block' : 'none' }"
         >
           <div class="ftsr_main">
             <div class="ftsr_table">
               <a-table
-                  :columns="columns4"
-                  :data-source="tableData4"
-                  :loading="tableDataTotal === -1 ? true : false"
-                  :pagination="false"
+                :columns="columns4"
+                :data-source="tableData4"
+                :loading="tableDataTotal === -1 ? true : false"
+                :pagination="false"
               >
               </a-table>
             </div>
@@ -604,28 +676,28 @@
     <!-- 面授 课程管理查看详情 页面 -->
     <!--开课页面 -->
     <a-modal
-        v-model:visible="stm_hs"
-        title="Title"
-        @ok="closeModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="modalStyle schtimeModal"
-        width="80%"
-        @cancel="stm_exit"
+      v-model:visible="stm_hs"
+      title="Title"
+      @ok="closeModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="modalStyle schtimeModal"
+      width="80%"
+      @cancel="stm_exit"
     >
       <div class="modalHeader">
         <div class="headerLeft">
           <img
-              style="width: 17px; height: 18px; margin-right: 8px"
-              src="@/assets/images/coursewareManage/scht.png"
+            style="width: 17px; height: 18px; margin-right: 8px"
+            src="@/assets/images/coursewareManage/scht.png"
           />
           <span class="headerLeftText">开课</span>
         </div>
         <div style="margin-right: 57px; cursor: pointer">
           <img
-              @click="stm_exit"
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
+            @click="stm_exit"
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close22.png"
           />
         </div>
       </div>
@@ -634,24 +706,24 @@
           <div class="st_main">
             <div class="stm_inputbtn">
               <a-input
-                  v-model:value="kk_inputV1"
-                  style="
+                v-model:value="kk_inputV1"
+                style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
                 "
-                  placeholder="请输入创建人"
+                placeholder="请输入创建人"
               />
               <a-input
-                  v-model:value="kk_inputV2"
-                  style="
+                v-model:value="kk_inputV2"
+                style="
                   width: 270px;
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
                 "
-                  placeholder="请输入教师名称"
+                placeholder="请输入教师名称"
               />
               <div class="select">
                 <!-- <a-date-picker
@@ -661,11 +733,11 @@
                   style="width: 270px; margin-right: 14px"
                 /> -->
                 <a-range-picker
-                    v-model:value="selectTime"
-                    type="date"
-                    style="width: 300px; margin-right: 14px"
-                    :placeholder="['  课程开始时间', '   课程结束时间']"
-                    :show-time="{
+                  v-model:value="selectTime"
+                  type="date"
+                  style="width: 300px; margin-right: 14px"
+                  :placeholder="['  课程开始时间', '   课程结束时间']"
+                  :show-time="{
                     defaultValue: [
                       moment('00:00', 'HH:mm'),
                       moment('23:59', 'HH:mm'),
@@ -710,13 +782,13 @@
             <!-- 有数据表格 -->
             <div class="tableBox" v-else>
               <a-table
-                  :columns="columns6"
-                  :data-source="tableData6"
-                  :loading="tableCoursePlanLoading"
-                  :scroll="{ x: 700, y: 800 }"
-                  expandRowByClick="true"
-                  @expand="expandTable"
-                  :pagination="false"
+                :columns="columns6"
+                :data-source="tableData6"
+                :loading="tableCoursePlanLoading"
+                :scroll="{ x: 700, y: 800 }"
+                expandRowByClick="true"
+                @expand="expandTable"
+                :pagination="false"
               >
                 <template #bodyCell="{ record, column }">
                   <template v-if="column.key === 'operation'">
@@ -728,8 +800,8 @@
                         </div>
 
                         <div
-                            class="jc"
-                            @click="
+                          class="jc"
+                          @click="
                             () => {
                               handelEditStu(record);
                             }
@@ -738,8 +810,8 @@
                           编辑
                         </div>
                         <div
-                            class="jc"
-                            @click="
+                          class="jc"
+                          @click="
                             () => {
                               handelGuan(record);
                             }
@@ -752,7 +824,7 @@
                         <template #overlay>
                           <a-menu style="margin-left: 20px">
                             <a-menu-item
-                                @click="
+                              @click="
                                 () => {
                                   handleCopyP(record);
                                 }
@@ -761,7 +833,7 @@
                               复制
                             </a-menu-item>
                             <a-menu-item
-                                @click="
+                              @click="
                                 () => {
                                   handleDeleteKaike(record);
                                 }
@@ -778,7 +850,7 @@
                         <div class="fb" style="margin-left: -20px">
                           <div class="jc">
                             更多
-                            <down-outlined/>
+                            <down-outlined />
                           </div>
                         </div>
                       </a-dropdown>
@@ -789,14 +861,14 @@
               <div class="tableBox" style="margin-top: 50px">
                 <div class="pa">
                   <a-pagination
-                      :showSizeChanger="false"
-                      showQuickJumper="true"
-                      hideOnSinglePage="true"
-                      :pageSize="pageSize2"
-                      :current="currentPage2"
-                      :total="tableDataTotal2"
-                      class="pagination"
-                      @change="handelChangePage2"
+                    :showSizeChanger="false"
+                    showQuickJumper="true"
+                    hideOnSinglePage="true"
+                    :pageSize="pageSize2"
+                    :current="currentPage2"
+                    :total="tableDataTotal2"
+                    class="pagination"
+                    @change="handelChangePage2"
                   />
                 </div>
               </div>
@@ -809,13 +881,13 @@
     <!--开课页面 -->
     <!--新建开课页面 -->
     <a-modal
-        v-model:visible="cstm_hs"
-        style="margin-top: 400px"
-        @cancel="handleCancelStu"
+      v-model:visible="cstm_hs"
+      style="margin-top: 400px"
+      @cancel="handleCancelStu"
     >
       <div
-          class="createschooltime"
-          :style="{ display: cstm_hs ? 'block' : 'none' }"
+        class="createschooltime"
+        :style="{ display: cstm_hs ? 'block' : 'none' }"
       >
         <div class="cst_header"></div>
         <div class="cst_main">
@@ -832,18 +904,22 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
                 />
               </div>
               <span style="margin-right: 3px">开课名称</span>
             </div>
             <div class="b_input">
               <NameInput
-                  maxlength="30"
-                  v-model:value="xjkkinputV1" v-model:validate="validate" show-count :id="offcourseId"  :type="2"
-                  style="width: 440px; height: 40px; border-radius: 8px"
-                  placeholder="请输入开课名称"
+                maxlength="30"
+                v-model:value="xjkkinputV1"
+                v-model:validate="validate"
+                show-count
+                :id="offcourseId"
+                :type="2"
+                style="width: 440px; height: 40px; border-radius: 8px"
+                placeholder="请输入开课名称"
               ></NameInput>
             </div>
           </div>
@@ -859,10 +935,10 @@
             </div>
             <div class="b_input">
               <a-input
-                  v-model:value="xjkkinputV2"
-                  maxlength="50"
-                  style="width: 440px; height: 40px; border-radius: 8px"
-                  placeholder="请输入详细地点"
+                v-model:value="xjkkinputV2"
+                maxlength="50"
+                style="width: 440px; height: 40px; border-radius: 8px"
+                placeholder="请输入详细地点"
               />
               <div class="inp_num" style="right: 164px">
                 <span style="color: #c7cbd2">{{ xjkkinputV2.length }}/50</span>
@@ -873,21 +949,21 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
                 />
               </div>
               <span style="margin-right: 3px">面授时间</span>
             </div>
             <div class="select fitems">
               <a-range-picker
-                  style="width: 440px; height: 40px; border-radius: 8px"
-                  :show-time="{ format: 'HH:mm' }"
-                  :disabled-date="disabledDate"
-                  format="YYYY-MM-DD HH:mm"
-                  v-model:value="xjkkinputV3"
-                  separator="至"
-                  :placeholder="['        开始时间', '        结束时间']"
+                style="width: 440px; height: 40px; border-radius: 8px"
+                :show-time="{ format: 'HH:mm' }"
+                :disabled-date="disabledDate"
+                format="YYYY-MM-DD HH:mm"
+                v-model:value="xjkkinputV3"
+                separator="至"
+                :placeholder="['        开始时间', '        结束时间']"
               />
             </div>
           </div>
@@ -896,20 +972,61 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
                 />
               </div>
               <span style="margin-right: 3px">授课教师</span>
             </div>
             <div class="select" style="width: 440px">
               <ProjectManager
-                  v-model:value="member.value"
-                  v-model:name="member.name"
+                v-model:value="member.value"
+                v-model:name="member.name"
               ></ProjectManager>
             </div>
           </div>
-
+          <div class="cstm_items">
+            <div class="signbox">
+              <span style="margin-right: 3px">考勤设置：</span>
+            </div>
+            <div style="display: flex; align-items: center">
+              <div style="margin-right: 10px">签到</div>
+              <div
+                style="display: flex; align-items: center; margin-right: 20px"
+              >
+                <span>开始前：</span>
+                <a-input-number
+                  :min="0"
+                  :max="300"
+                  :precision="0"
+                  style="
+                    width: 100px;
+                    height: 32px;
+                    border-radius: 8px;
+                    overflow: hidden;
+                  "
+                  v-model:value="beforeValue"
+                ></a-input-number>
+                <span style="color: #999999; margin-left: 8px">分钟</span>
+              </div>
+              <div style="display: flex; align-items: center">
+                <span>开始后：</span>
+                <a-input-number
+                  :min="0"
+                  :max="300"
+                  :precision="0"
+                  style="
+                    width: 100px;
+                    height: 32px;
+                    border-radius: 8px;
+                    overflow: hidden;
+                  "
+                  v-model:value="afterStartValue"
+                ></a-input-number>
+                <span style="color: #999999; margin-left: 8px">分钟</span>
+              </div>
+            </div>
+          </div>
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">报名设置</span>
@@ -953,8 +1070,17 @@
           <div v-if="checked4" class="cstm_items main_item">
             <div class="signbox"></div>
             <div class="btnbox">
-              <AssessmentList v-model:assessmentName="assessmentName" v-model:assessmentId="assessmentId">
-                <button class="xkbtn" @click="showAssessment" style="margin-bottom: 0;margin-top: 0">选择评估</button>
+              <AssessmentList
+                v-model:assessmentName="assessmentName"
+                v-model:assessmentId="assessmentId"
+              >
+                <button
+                  class="xkbtn"
+                  @click="showAssessment"
+                  style="margin-bottom: 0; margin-top: 0"
+                >
+                  选择评估
+                </button>
               </AssessmentList>
               <div v-if="assessmentId > 0">
                 <a-tag closable @close="removePG" color="processing">
@@ -970,9 +1096,9 @@
             <div class="signbox"></div>
             <div class="btnbox">
               <add-homework v-model:info="workInfo">
-              <button class="xkbtn" style="margin-bottom: 0;margin-top: 0">
-                配置作业
-              </button>
+                <button class="xkbtn" style="margin-bottom: 0; margin-top: 0">
+                  配置作业
+                </button>
               </add-homework>
               <div v-if="workInfo.workName">
                 <a-tag closable @close="logW" color="processing">
@@ -987,7 +1113,9 @@
             <div class="signbox"></div>
             <div class="btnbox">
               <add-test v-model:info="examInfo">
-                <button class="xkbtn"  style="margin-bottom: 0;margin-top: 0">配置考试</button>
+                <button class="xkbtn" style="margin-bottom: 0; margin-top: 0">
+                  配置考试
+                </button>
               </add-test>
               <div v-if="examInfo.examinationName">
                 <a-tag closable @close="logT" color="processing">
@@ -996,7 +1124,6 @@
                   </span>
                 </a-tag>
               </div>
-
             </div>
           </div>
           <!--
@@ -1024,12 +1151,12 @@
               </a-checkbox>
             </div>
           </div> -->
-          <div class="cstm_items items_fj" style="height:80px">
+          <div class="cstm_items items_fj" style="height: 80px">
             <div class="signbox">
               <span style="margin-right: 3px"></span>
             </div>
             <div class="b_input">
-              <FJUpload v-model:value="attach" @changevalue="changevalue"/>
+              <FJUpload v-model:value="attach" @changevalue="changevalue" />
             </div>
           </div>
 
@@ -1047,35 +1174,35 @@
     <!--新建开课页面 -->
     <!--开课学员管理页面 -->
     <a-modal
-        v-model:visible="sm_hs"
-        title="Title"
-        @ok="closeModal"
-        :footer="null"
-        :closable="false"
-        wrapClassName="modalStyle stusmanageModal"
-        width="90%"
-        @cancel="sm_exit"
+      v-model:visible="sm_hs"
+      title="Title"
+      @ok="closeModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="modalStyle stusmanageModal"
+      width="90%"
+      @cancel="sm_exit"
     >
       <div class="modalHeader">
         <div class="headerLeft">
           <img
-              style="width: 17px; height: 18px; margin-right: 8px"
-              src="@/assets/images/coursewareManage/stum.png"
+            style="width: 17px; height: 18px; margin-right: 8px"
+            src="@/assets/images/coursewareManage/stum.png"
           />
           <span class="headerLeftText">学员管理</span>
         </div>
         <div style="margin-right: 57px; cursor: pointer">
           <img
-              @click="sm_exit"
-              style="width: 22px; height: 22px"
-              src="../../assets/images/basicinfo/close22.png"
+            @click="sm_exit"
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close22.png"
           />
         </div>
       </div>
       <div class="modalMain">
         <div
-            class="studentsmanage"
-            :style="{ display: sm_hs ? 'block' : 'none' }"
+          class="studentsmanage"
+          :style="{ display: sm_hs ? 'block' : 'none' }"
         >
           <div class="stm_main">
             <div class="stmmitems">
@@ -1100,21 +1227,48 @@
               </div>
               <div class="stmm_i5">
                 <TableStudent
-                    :type="3"
-                    :id="offcoursePlanId"
-                    :columns="stuColumns"
-                    :visable="sm_hs"
-                    :isgetStudent="isgetStudent"
+                  :type="3"
+                  :id="offcoursePlanId"
+                  :columns="stuColumns"
+                  :visable="sm_hs"
+                  :isgetStudent="isgetStudent"
                 >
                   <template #extension="{ data: { record } }">
-                    <a-button v-if="record.source === 4 && record.status === 1"
-                              @click="() => {record.status = 0;auditStudent(record);}" type="link">审核通过
+                    <a-button
+                      v-if="record.source === 4 && record.status === 1"
+                      @click="
+                        () => {
+                          record.status = 0;
+                          auditStudent(record);
+                        }
+                      "
+                      type="link"
+                      >审核通过
                     </a-button>
-                    <a-button v-if="record.source === 4 && record.status === 1"
-                              @click="() => {record.status = 2;auditStudent(record);}" type="link">拒绝
+                    <a-button
+                      v-if="record.source === 4 && record.status === 1"
+                      @click="
+                        () => {
+                          record.status = 2;
+                          auditStudent(record);
+                        }
+                      "
+                      type="link"
+                      >拒绝
                     </a-button>
-                    <a-button v-if="record.source === 4 && (record.status === 0 || record.status === 2)"
-                              @click="() => {record.status = 1;auditStudent(record);}" type="link">撤回
+                    <a-button
+                      v-if="
+                        record.source === 4 &&
+                        (record.status === 0 || record.status === 2)
+                      "
+                      @click="
+                        () => {
+                          record.status = 1;
+                          auditStudent(record);
+                        }
+                      "
+                      type="link"
+                      >撤回
                     </a-button>
                   </template>
                 </TableStudent>
@@ -1127,13 +1281,13 @@
     <!--开课学员管理页面 -->
     <!--二维码页面 -->
     <a-modal
-        v-model:visible="QR_hs"
-        :footer="null"
-        :closable="closableQR"
-        wrapClassName="QRModal"
-        style="margin-top: 400px"
-        :zIndex="9999"
-        @cancel="qr_exit"
+      v-model:visible="QR_hs"
+      :footer="null"
+      :closable="closableQR"
+      wrapClassName="QRModal"
+      style="margin-top: 400px"
+      :zIndex="9999"
+      @cancel="qr_exit"
     >
       <div class="QR" :style="{ display: QR_hs ? 'block' : 'none' }">
         <div class="qr_header"></div>
@@ -1178,13 +1332,13 @@
     <!--二维码页面 -->
     <!--录入成绩页面 -->
     <a-modal
-        v-model:visible="rg_hs"
-        :footer="null"
-        :closable="closableQR"
-        wrapClassName="recgradeModal"
-        style="margin-top: 400px"
-        :zIndex="9999"
-        @cancel="rg_exit"
+      v-model:visible="rg_hs"
+      :footer="null"
+      :closable="closableQR"
+      wrapClassName="recgradeModal"
+      style="margin-top: 400px"
+      :zIndex="9999"
+      @cancel="rg_exit"
     >
       <div class="recordgrade" :style="{ display: rg_hs ? 'block' : 'none' }">
         <div class="rg_header"></div>
@@ -1199,18 +1353,18 @@
               <div class="items_left">
                 <div class="sign">
                   <img
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
                   />
                 </div>
                 <span>得分</span>
               </div>
               <div class="rgmb_input">
                 <a-input
-                    v-model:value="lrcj_inputV1"
-                    maxlength="20"
-                    style="width: 440px; height: 40px; border-radius: 8px"
-                    placeholder=""
+                  v-model:value="lrcj_inputV1"
+                  maxlength="20"
+                  style="width: 440px; height: 40px; border-radius: 8px"
+                  placeholder=""
                 />
               </div>
             </div>
@@ -1220,9 +1374,9 @@
               <div class="btnText">取消</div>
             </div>
             <div
-                class="qrm_btn btn2"
-                style="background-color: #4ea6ff; color: #ffffff"
-                @click="handleJoin"
+              class="qrm_btn btn2"
+              style="background-color: #4ea6ff; color: #ffffff"
+              @click="handleJoin"
             >
               <div class="btnText">确定</div>
             </div>
@@ -1233,17 +1387,17 @@
     <!--录入成绩页面 -->
     <!--结业页面 -->
     <a-modal
-        v-model:visible="graduate_hs"
-        :footer="null"
-        :closable="closableQR"
-        wrapClassName="graModal"
-        style="margin-top: 400px"
-        :zIndex="9999"
-        @cancel="graduate_exit"
+      v-model:visible="graduate_hs"
+      :footer="null"
+      :closable="closableQR"
+      wrapClassName="graModal"
+      style="margin-top: 400px"
+      :zIndex="9999"
+      @cancel="graduate_exit"
     >
       <div
-          class="graduate"
-          :style="{ display: graduate_hs ? 'block' : 'none' }"
+        class="graduate"
+        :style="{ display: graduate_hs ? 'block' : 'none' }"
       >
         <div class="gra_header"></div>
         <div class="gra_main">
@@ -1257,8 +1411,8 @@
               <div class="items_left">
                 <div class="sign">
                   <img
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
                   />
                 </div>
                 <span>结业</span>
@@ -1268,18 +1422,18 @@
                   <div class="bc_box">
                     <div class="ol_checkbox">
                       <a-radio
-                          v-model:checked="checked"
-                          :value="1"
-                          @click="clear_jyradioV1"
-                      >结业
+                        v-model:checked="checked"
+                        :value="1"
+                        @click="clear_jyradioV1"
+                        >结业
                       </a-radio>
                     </div>
                     <div class="ol_checkbox">
                       <a-radio
-                          v-model:checked="checked"
-                          :value="2"
-                          @click="clear_jyradioV1"
-                      >不结业
+                        v-model:checked="checked"
+                        :value="2"
+                        @click="clear_jyradioV1"
+                        >不结业
                       </a-radio>
                     </div>
                   </div>
@@ -1301,16 +1455,16 @@
     <!--结业页面 -->
     <!--请确定是否同意拒绝此学员学习此课程弹窗 -->
     <a-modal
-        v-model:visible="agreereject_hs"
-        :footer="null"
-        :closable="closableQR"
-        wrapClassName="agrstudyModal"
-        centered="true"
-        @cancel="agreereject_exit"
+      v-model:visible="agreereject_hs"
+      :footer="null"
+      :closable="closableQR"
+      wrapClassName="agrstudyModal"
+      centered="true"
+      @cancel="agreereject_exit"
     >
       <div
-          class="agreestudy"
-          :style="{ display: agreereject_hs ? 'block' : 'none' }"
+        class="agreestudy"
+        :style="{ display: agreereject_hs ? 'block' : 'none' }"
       >
         <div class="agree_header"></div>
         <div class="agree_main">
@@ -1321,14 +1475,14 @@
           </div>
           <div class="agreem_body">
             <div
-                class="body_box"
-                :style="{ display: agreestudy_hs ? 'block' : 'none' }"
+              class="body_box"
+              :style="{ display: agreestudy_hs ? 'block' : 'none' }"
             >
               <div>请确定是否同意此学员学习此课程</div>
             </div>
             <div
-                class="body_box"
-                :style="{ display: rejectstudy_hs ? 'block' : 'none' }"
+              class="body_box"
+              :style="{ display: rejectstudy_hs ? 'block' : 'none' }"
             >
               <div>请确定是否拒绝此学员学习此课程</div>
             </div>
@@ -1347,34 +1501,43 @@
     <!--请确定是否同意拒绝此学员学习此课程弹窗 -->
     <!--删除 复制 停用弹窗 -->
     <a-modal
-        v-model:visible="delete_hs"
-        :footer="null"
-        :closable="closableQR"
-        wrapClassName="DelModal"
-        style="margin-top: 400px"
-        :zIndex="9999"
-        @cancel="delete_exit1"
+      v-model:visible="delete_hs"
+      :footer="null"
+      :closable="closableQR"
+      wrapClassName="DelModal"
+      style="margin-top: 400px"
+      :zIndex="9999"
+      @cancel="delete_exit1"
     >
       <div
-          class="delete"
-          :style="{
-          display: del_hs || copy_hs || nouse_hs ? 'block' : 'none',
+        class="delete"
+        :style="{
+          display:
+            del_hs ||
+            copy_hs ||
+            nouse_hs ||
+            back_hs ||
+            submit_hs ||
+            useCourse ||
+            push_hs
+              ? 'block'
+              : 'none',
         }"
       >
         <div class="del_header"></div>
         <div class="del_main">
           <div class="header">
             <div
-                class="del-icons"
-                :style="{ display: del_hs ? 'block' : 'none' }"
+              class="del-icons"
+              :style="{ display: del_hs ? 'block' : 'none' }"
             >
-              <img src="@/assets/images/coursewareManage/notice.png" alt=""/>
+              <img src="@/assets/images/coursewareManage/notice.png" alt="" />
             </div>
             <div
-                class="del-icons"
-                :style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }"
+              class="del-icons"
+              :style="{ display: copy_hs || nouse_hs ? 'block' : 'none' }"
             >
-              <img src="@/assets/images/coursewareManage/QR.png" alt=""/>
+              <img src="@/assets/images/coursewareManage/QR.png" alt="" />
             </div>
             <span>提示</span>
             <div class="close_exit" @click="delete_exit1"></div>
@@ -1392,6 +1555,18 @@
             <div :style="{ display: nouse_hs ? 'block' : 'none' }">
               <span>您确定要停用此课程吗</span>
             </div>
+            <div :style="{ display: submit_hs ? 'block' : 'none' }">
+              <span>您确定要提交审核吗</span>
+            </div>
+            <div :style="{ display: back_hs ? 'block' : 'none' }">
+              <span>您确定要撤回吗</span>
+            </div>
+            <div :style="{ display: useCourse ? 'block' : 'none' }">
+              <span>您确定要启用吗</span>
+            </div>
+            <div :style="{ display: push_hs ? 'block' : 'none' }">
+              <span>您确定要发布吗</span>
+            </div>
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="delete_exit1">
@@ -1406,9 +1581,9 @@
     </a-modal>
     <!-- 预览弹窗 -->
     <SeeModal
-        :visible="lookCourseModal"
-        :detail="faceDetailObj"
-        @cancel="ft_exit_see"
+      :visible="lookCourseModal"
+      :detail="faceDetailObj"
+      @cancel="ft_exit_see"
     />
     <!--删除 复制 停用弹窗 -->
     <!-- 学员管理课程库-归属权抽屉 -->
@@ -1429,22 +1604,22 @@
     /> -->
     <!-- 新建在线课弹窗 -->
     <addOnlineCourse
-        v-model:addOnlineCoursevisible="addOnlineCoursevisible"
-        :closeOnlineModal="closeOnlineCoursevisible"
+      v-model:addOnlineCoursevisible="addOnlineCoursevisible"
+      :closeOnlineModal="closeOnlineCoursevisible"
     />
     <!-- 新建在线课弹窗 -->
 
     <!-- 授权名单抽屉 -->
     <proj-power-list
-        v-model:ProjPvisible="corpowerlistvisible"
-        :selectProjectId="selectCourseId"
-        classify="course"
+      v-model:ProjPvisible="corpowerlistvisible"
+      :selectProjectId="selectCourseId"
+      classify="course"
     />
     <!-- 归属权抽屉 -->
     <proj-owner-ship
-        v-model:ProjOwnervisible="ownpowervisible"
-        :selectProjectId="selectCourseId"
-        classify="course"
+      v-model:ProjOwnervisible="ownpowervisible"
+      :selectProjectId="selectCourseId"
+      classify="course"
     />
     <!-- 查看权抽屉 -->
     <!-- <proj-check-ship
@@ -1456,25 +1631,25 @@
     /> -->
     <!--查看权抽屉 管理权抽屉 添加学员抽屉  -->
     <proj-check-ship
-        v-model:ProjCheckvisible="viewpowervisible"
-        :selectProjectId="selectCourseId"
-        v-model:addAuthList="addAuthList"
-        :authClassify="authClassify"
-        classify="course"
-        :type="shipType"
+      v-model:ProjCheckvisible="viewpowervisible"
+      :selectProjectId="selectCourseId"
+      v-model:addAuthList="addAuthList"
+      :authClassify="authClassify"
+      classify="course"
+      :type="shipType"
     />
   </div>
 
   <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-    <a-spin :spinning="addLoading" tip=""/>
+    <a-spin :spinning="addLoading" tip="" />
   </div>
 
   <!-- 二维码弹窗 -->
   <two-dimensional-code
-      v-model:codevisible="codevisible"
-      :codeInfo="codeInfo"
-      :index="codeIndex"
-      :type="codeType == 1 ? '课程二维码' : codeType == 2 ? '签到二维码' : ''"
+    v-model:codevisible="codevisible"
+    :codeInfo="codeInfo"
+    :index="codeIndex"
+    :type="codeType == 1 ? '课程二维码' : codeType == 2 ? '签到二维码' : ''"
   />
   <!-- 二维码弹窗 -->
 </template>
@@ -1492,8 +1667,8 @@ import {
 } from "vue";
 
 import * as apis from "../../api/indexTaskManage";
-import {message} from "ant-design-vue";
-import {useRouter, useRoute} from "vue-router";
+import { message } from "ant-design-vue";
+import { useRouter, useRoute } from "vue-router";
 import CommonStudent from "@/components/student/CommonStudent";
 import OwnerTableModelStudent from "@/components/student/OwnerTableModelStudent";
 import addOnlineCourse from "../../components/Modals/addOnlineCourse.vue";
@@ -1503,6 +1678,7 @@ import NameInput from "../../components/project/NameInput";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import AssessmentList from "../../components/drawers/AssessmentList.vue";
+import dialog from "@/utils/dialog";
 import {
   list,
   detail,
@@ -1515,7 +1691,8 @@ import {
   studentExport,
   handleStudent,
   getMemberInfoApi,
-  copyCoursePlan, copyCourse,
+  copyCoursePlan,
+  copyCourse,
 } from "@/api/indexCourse";
 import {
   traverseArr,
@@ -1524,7 +1701,7 @@ import {
   getdateToDate,
 } from "../../utils/utils";
 import { validateName } from "@/api/index1";
-import {fileUp} from "../../api/indexEval";
+import { fileUp } from "../../api/indexEval";
 import * as api1 from "../../api/index1";
 
 import "@wangeditor/editor/dist/css/style.css";
@@ -1534,220 +1711,21 @@ import SeeModal from "./components/seeModal.vue";
 import CourseModal from "./courseModal.vue";
 import * as moment from "moment";
 import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
-import {codeUrl, toDate} from "@/api/method";
-import {queryWorkDetailById} from "@/api/indexWork";
-import {queryExaminationDetailById} from "@/api/indexExam";
+import { codeUrl, toDate } from "@/api/method";
+import { queryWorkDetailById } from "@/api/indexWork";
+import { queryExaminationDetailById } from "@/api/indexExam";
 import AddHomework from "../../components/drawers/CommonHomework.vue";
 import AddTest from "../../components/drawers/CommonTest.vue";
 import TableStudent from "@/components/student/TableStudent";
 import FJUpload from "@/components/common/FJUpload";
-import {updateStudent} from "@/api/indexProjStu";
-import {useStore} from "vuex";
+import { updateStudent } from "@/api/indexProjStu";
+import { useStore } from "vuex";
 import DropDown from "@/components/common/DropDown";
-import {checkPer} from "@/utils/utils";
+import { checkPer } from "@/utils/utils";
 import dayjs from "dayjs";
 
 //列表表格
-const columns1 = [
-  {
-    title: "名称",
-    width: 400,
-    dataIndex: "name",
-    key: "name",
-    ellipsis: true,
-    align: "left",
-    customRender: ({text}) => {
-      return text ? text : "-";
-    },
-  },
-  {
-    title: "课程编号",
-    width: 130,
-    dataIndex: "offcourseNumber",
-    key: "offcourseNumber",
-    align: "center",
-  },
-  {
-    title: "内容分类",
-    width: 130,
-    dataIndex: "contentTxt",
-    ellipsis: true,
-    key: "contentTxt",
-    align: "center",
-  },
-  {
-    title: "课程形式",
-    width: 130,
-    dataIndex: "courseform",
-    key: "2",
-    align: "center",
-    customRender: ({record}) => {
-      switch (String(record.courseform)) {
-        case "1":
-          return "线上";
-        case "2":
-          return "面授";
-      }
-    },
-  },
-  {
-    title: " 所属项目",
-    width: 250,
-    dataIndex: "projectName",
-    key: "3",
-    align: "center",
-    ellipsis: true,
-    customRender: ({text}) => {
-      return text ? text : "-";
-    },
-  },
-  {
-    title: " 所属路径",
-    width: 250,
-    dataIndex: "routerName",
-    key: "3",
-    align: "center",
-    ellipsis: true,
-    customRender: ({text}) => {
-      return text ? text : "-";
-    },
-  },
-  {
-    title: " 资源归属",
-    width: 250,
-    dataIndex: "sourceBelongFullName",
-    key: "3",
-    align: "center",
-    ellipsis: true,
-    customRender: ({text}) => {
-      return text ? text : "-";
-    },
-  },
-  
-  {
-    title: " 目标人群",
-    width: 250,
-    dataIndex: "targetUser",
-    key: "3",
-    align: "center",
-    ellipsis: true,
-    customRender: ({text}) => {
-      return text ? text : "-";
-    },
-  },
-  {
-    title: "学习人数",
-    width: 130,
-    dataIndex: "studentCnt",
-    key: "4",
-    align: "center",
-    customRender: ({text}) => {
-      return text ? text : "0";
-    },
-  },
-  // {
-  //  title: "评分",
-  //  width: 130,
-  //  dataIndex: "grade",
-  //   key: "5",
-  //  align: "center",
-  // customRender: ({ text }) => {
-  //   return text ? text : "0";
-  //  },
-  // },
-  {
-    title: "状态",
-    width: 130,
-    dataIndex: "status",
-    key: "6",
-    align: "center",
-    customRender: ({record}) => {
-      switch (String(record.status)) {
-        case "0":
-          return "未提交";
-        case "1":
-          return "待审核";
-        case "2":
-          return "已审核";
-        case "-1":
-          return "审核未通过";
-      }
-    },
-  },
-  {
-    title: "是否发布",
-    width: 100,
-    dataIndex: "ynpub",
-    key: "7",
-    align: "center",
-    customRender: ({record}) => {
-      switch (String(record.ynpub)) {
-        case "0":
-          return "未发布";
-        case "1":
-          return "已发布";
-      }
-    },
-  },
-  {
-    title: "创建人",
-    width: 100,
-    dataIndex: "creator",
-    key: "8",
-    ellipsis: true,
-    align: "center",
-    customRender: ({text}) => {
-      return text ? text : "-";
-    },
-  },
-  {
-    title: "创建时间",
-    width: 100,
-    dataIndex: "createtime",
-    key: "9",
-    ellipsis: true,
-    align: "center",
-    customRender: ({text}) => {
-      return text ? text : "-";
-    },
-  },
-  {
-    title: "发布时间",
-    width: 100,
-    ellipsis: true,
-    dataIndex: "pubtime",
-    key: "10",
-    align: "center",
-    customRender: ({text}) => {
-      return text ? text : "-";
-    },
-  },
-  {
-    title: "是否停用",
-    width: 100,
-    key: "either",
-    dataIndex: "kkty",
-    align: "center",
-    customRender: ({record}) => {
-      switch (String(record.kkty)) {
-        case "0":
-          return "停用";
-        case "1":
-          return "启用";
-        case "-1":
-          return "已删除";
-      }
-    },
-  },
-  {
-    title: "操作",
-    width: 250,
-    dataIndex: "operation",
-    key: "operation",
-    fixed: "right",
-    align: "right",
-  },
-];
+
 //列表操作在线面授管理
 const columns2 = [
   {
@@ -1756,7 +1734,7 @@ const columns2 = [
     key: "studentName",
     width: "6%",
     align: "center",
-    customRender: ({record: {studentName}}) => studentName || "-",
+    customRender: ({ record: { studentName } }) => studentName || "-",
   },
   {
     title: "工号",
@@ -1765,7 +1743,7 @@ const columns2 = [
     width: "12%",
     ellipsis: true,
     align: "center",
-    customRender: ({record: {studentUserNo}}) => studentUserNo || "-",
+    customRender: ({ record: { studentUserNo } }) => studentUserNo || "-",
   },
   {
     title: "开课名称",
@@ -1774,7 +1752,7 @@ const columns2 = [
     width: "12%",
     ellipsis: true,
     align: "center",
-    customRender: ({record: {name}}) => name || "-",
+    customRender: ({ record: { name } }) => name || "-",
   },
   {
     title: "地点",
@@ -1783,7 +1761,7 @@ const columns2 = [
     width: "12%",
     ellipsis: true,
     align: "center",
-    customRender: ({record: {address}}) => address || "-",
+    customRender: ({ record: { address } }) => address || "-",
   },
   {
     title: "数据来源",
@@ -1792,8 +1770,8 @@ const columns2 = [
     ellipsis: true,
     width: "12%",
     align: "center",
-    customRender: ({record: {courseName, routerName}}) =>
-        courseName || routerName || "开课",
+    customRender: ({ record: { courseName, routerName } }) =>
+      courseName || routerName || "开课",
   },
   {
     title: "学习时间",
@@ -1802,7 +1780,7 @@ const columns2 = [
     width: "10%",
     align: "center",
     ellipsis: true,
-    customRender: ({record: {lastStudyTime}}) => lastStudyTime || "-",
+    customRender: ({ record: { lastStudyTime } }) => lastStudyTime || "-",
   },
   {
     title: "签到时间",
@@ -1811,7 +1789,7 @@ const columns2 = [
     width: "10%",
     align: "center",
     ellipsis: true,
-    customRender: ({record: {signTime}}) => signTime || "-",
+    customRender: ({ record: { signTime } }) => signTime || "-",
   },
   {
     title: "状态",
@@ -1821,14 +1799,14 @@ const columns2 = [
     align: "center",
     customRender: (text) => {
       return (
-          <div class="racona">
+        <div class="racona">
           <span>
             {" "}
             {text.record.finishStatus == 0 || text.record.finishStatus == null
-                ? "未开始"
-                : "已完成"}
+              ? "未开始"
+              : "已完成"}
           </span>
-          </div>
+        </div>
       );
     },
   },
@@ -1886,7 +1864,7 @@ const columns6 = [
     width: "15%",
     align: "center",
     ellipsis: true,
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -1897,7 +1875,7 @@ const columns6 = [
     width: "15%",
     align: "center",
     ellipsis: true,
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -1908,7 +1886,7 @@ const columns6 = [
     width: "8%",
     align: "center",
     ellipsis: true,
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -1920,7 +1898,7 @@ const columns6 = [
     width: "12%",
     ellipsis: true,
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       // return text ? getdateToTime(text * 1000) : "-";
       return text ? text : "-";
     },
@@ -1932,7 +1910,7 @@ const columns6 = [
     width: "12%",
     ellipsis: true,
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       // return text ? getdateToTime(text * 1000) : "-";
       return text ? text : "-";
     },
@@ -1944,7 +1922,7 @@ const columns6 = [
     width: "8%",
     align: "center",
     ellipsis: true,
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -1955,7 +1933,7 @@ const columns6 = [
     width: 100,
     align: "center",
     ellipsis: true,
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "0";
     },
   },
@@ -1986,7 +1964,7 @@ const columns7 = [
     width: 200,
     dataIndex: "name",
     key: "name",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -1996,7 +1974,7 @@ const columns7 = [
     dataIndex: "number",
     key: "1",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -2006,7 +1984,7 @@ const columns7 = [
     dataIndex: "department",
     key: "2",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -2026,7 +2004,7 @@ const columns7 = [
     dataIndex: "band",
     key: "4",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -2036,7 +2014,7 @@ const columns7 = [
     dataIndex: "status",
     key: "5",
     align: "center",
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       switch (String(record.status)) {
         case "0":
           return "审核通过";
@@ -2053,7 +2031,7 @@ const columns7 = [
     dataIndex: "join",
     key: "6",
     align: "center",
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       switch (String(record.source)) {
         case "1":
           return "导入";
@@ -2152,12 +2130,204 @@ export default defineComponent({
   setup() {
     const CourseModalRef = ref(null);
     const store = useStore();
+    const sysTypeOptions = computed(() => store.state.content_type);
 
     const state = reactive({
-      workInfo:{},
-      examInfo:{},
+      workInfo: {},
+      examInfo: {},
       tableLoading: false,
-      //新加  
+      columns1: [
+        {
+          title: "名称",
+          width: 400,
+          dataIndex: "name",
+          key: "name",
+          ellipsis: true,
+          align: "left",
+          customRender: ({ text }) => {
+            return text ? text : "-";
+          },
+        },
+        {
+          title: "课程编号",
+          width: 130,
+          dataIndex: "offcourseNumber",
+          key: "offcourseNumber",
+          align: "center",
+        },
+        {
+          title: "内容分类",
+          width: 130,
+          dataIndex: "contentTxt",
+          ellipsis: true,
+          key: "contentTxt",
+          align: "center",
+          customRender: ({ record }) =>
+            findClassFullName(sysTypeOptions.value, record.sysTypeId) || "-",
+        },
+        {
+          title: "课程形式",
+          width: 130,
+          dataIndex: "courseform",
+          key: "2",
+          align: "center",
+          customRender: ({ record }) => {
+            switch (String(record.courseform)) {
+              case "1":
+                return "线上";
+              case "2":
+                return "面授";
+            }
+          },
+        },
+        {
+          title: " 所属项目",
+          width: 250,
+          dataIndex: "projectName",
+          key: "3",
+          align: "center",
+          ellipsis: true,
+          customRender: ({ text }) => {
+            return text ? text : "-";
+          },
+        },
+        {
+          title: " 所属路径",
+          width: 250,
+          dataIndex: "routerName",
+          key: "3",
+          align: "center",
+          ellipsis: true,
+          customRender: ({ text }) => {
+            return text ? text : "-";
+          },
+        },
+        {
+          title: " 资源归属",
+          width: 250,
+          dataIndex: "sourceBelongFullName",
+          key: "3",
+          align: "center",
+          ellipsis: true,
+          customRender: ({ text }) => {
+            return text ? text : "-";
+          },
+        },
+
+        {
+          title: " 目标人群",
+          width: 250,
+          dataIndex: "targetUser",
+          key: "3",
+          align: "center",
+          ellipsis: true,
+          customRender: ({ text }) => {
+            return text ? text : "-";
+          },
+        },
+        {
+          title: "学习人数",
+          width: 130,
+          dataIndex: "studentCnt",
+          key: "4",
+          align: "center",
+          customRender: ({ text }) => {
+            return text ? text : "0";
+          },
+        },
+        // {
+        //  title: "评分",
+        //  width: 130,
+        //  dataIndex: "grade",
+        //   key: "5",
+        //  align: "center",
+        // customRender: ({ text }) => {
+        //   return text ? text : "0";
+        //  },
+        // },
+        {
+          title: "状态",
+          width: 130,
+          dataIndex: "auditStatus",
+          key: "6",
+          align: "center",
+          customRender: ({ record }) => {
+            switch (String(record.auditStatus)) {
+              case "0":
+                return "未提交";
+              case "1":
+                return "待审核";
+              case "2":
+                return "已审核";
+              case "3":
+                return "已审核";
+              case "-1":
+                return "审核未通过";
+            }
+          },
+        },
+        {
+          title: "是否发布",
+          width: 100,
+          dataIndex: "auditStatus",
+          key: "7",
+          align: "center",
+          customRender: ({ record }) =>
+            record.auditStatus === 3 ? "已发布" : "未发布",
+        },
+        {
+          title: "创建人",
+          width: 100,
+          dataIndex: "createName",
+          key: "8",
+          ellipsis: true,
+          align: "center",
+          customRender: ({ text }) => {
+            return text ? text : "-";
+          },
+        },
+        {
+          title: "创建时间",
+          width: 100,
+          dataIndex: "createTime",
+          key: "9",
+          ellipsis: true,
+          align: "center",
+          customRender: ({ text }) => {
+            return text ? text : "-";
+          },
+        },
+        {
+          title: "发布时间",
+          width: 100,
+          ellipsis: true,
+          dataIndex: "publishTime",
+          key: "10",
+          align: "center",
+          customRender: ({ text, auditStatus }) => {
+            return auditStatus == 3 ? text || "-" : "-";
+          },
+        },
+        {
+          title: "是否停用",
+          width: 100,
+          key: "status",
+          dataIndex: "status",
+          align: "center",
+          customRender: ({ record }) =>
+            record.auditStatus === 3 ? (record.status ? "启用" : "停用") : "-",
+        },
+        {
+          title: "操作",
+          width: 250,
+          dataIndex: "id",
+          key: "id",
+          fixed: "right",
+          align: "right",
+          slots: { customRender: "operation" },
+        },
+      ],
+      //新加
       stuColumns: [
         {
           title: "岗位",
@@ -2167,13 +2337,13 @@ export default defineComponent({
           align: "center",
           customRender: (text) => {
             return (
-                <div class="racona">
+              <div class="racona">
                 <span>
                   {text && text.record.studentJobName
-                      ? text.record.studentJobName
-                      : "-"}
+                    ? text.record.studentJobName
+                    : "-"}
                 </span>
-                </div>
+              </div>
             );
           },
         },
@@ -2185,11 +2355,11 @@ export default defineComponent({
           align: "center",
           customRender: (record) => {
             return (
-                <div class="racona">
+              <div class="racona">
                 <span>
                   {record.studentBandDesc ? record.studentBandDesc : "-"}
                 </span>
-                </div>
+              </div>
             );
           },
         },
@@ -2199,7 +2369,7 @@ export default defineComponent({
           dataIndex: "status",
           key: "5",
           align: "center",
-          customRender: ({record}) => {
+          customRender: ({ record }) => {
             switch (String(record.status)) {
               case "0":
                 return "审核通过";
@@ -2217,8 +2387,8 @@ export default defineComponent({
           dataIndex: "signstatus",
           key: "7",
           align: "center",
-          customRender: ({record}) =>
-              record.signStatus ? "已签到" : "未签到",
+          customRender: ({ record }) =>
+            record.signStatus ? "已签到" : "未签到",
         },
         {
           title: "评估状态",
@@ -2226,8 +2396,8 @@ export default defineComponent({
           dataIndex: "evastatus",
           key: "8",
           align: "center",
-          customRender: ({record}) =>
-              record.assessmentStatus ? "已评估" : "未评估",
+          customRender: ({ record }) =>
+            record.assessmentStatus ? "已评估" : "未评估",
         },
         {
           title: "作业成绩",
@@ -2235,24 +2405,24 @@ export default defineComponent({
           dataIndex: "workScore",
           key: "7",
           align: "center",
-          customRender: ({record}) => {
+          customRender: ({ record }) => {
             return (
-                <div class="racona">
-                  {record.workScore === -2 ? (
-                      "-"
-                  ) : record.workScore ? (
-                      <span>{record.workScore}</span>
-                  ) : (
-                      <span
-                          style={{color: "#4EA6FF", cursor: "pointer"}}
-                          onClick={() => {
-                            handlJoinStu(record);
-                          }}
-                      >
+              <div class="racona">
+                {record.workScore === -2 ? (
+                  "-"
+                ) : record.workScore ? (
+                  <span>{record.workScore}</span>
+                ) : (
+                  <span
+                    style={{ color: "#4EA6FF", cursor: "pointer" }}
+                    onClick={() => {
+                      handlJoinStu(record);
+                    }}
+                  >
                     成绩录入
                   </span>
-                  )}
-                </div>
+                )}
+              </div>
             );
             // switch (String(record.status)) {
             //   case "0":
@@ -2286,26 +2456,26 @@ export default defineComponent({
           dataIndex: "completionStatus",
           key: "8",
           align: "center",
-          customRender: ({record}) => {
+          customRender: ({ record }) => {
             return (
-                <div>
-                  {record.finishStatus == 1 &&
-                  record.workScore != -2 &&
-                  record.signStatus == 1 ? (
-                      <div
-                          style={{color: "#4EA6FF", cursor: "pointer"}}
-                          onClick={() => {
-                            handleOverStu(record);
-                          }}
-                      >
-                        结业
-                      </div>
-                  ) : record.completionStatus == 1 ? (
-                      <div>已结业</div>
-                  ) : (
-                      <div>-</div>
-                  )}
-                </div>
+              <div>
+                {record.finishStatus == 1 &&
+                record.workScore != -2 &&
+                record.signStatus == 1 ? (
+                  <div
+                    style={{ color: "#4EA6FF", cursor: "pointer" }}
+                    onClick={() => {
+                      handleOverStu(record);
+                    }}
+                  >
+                    结业
+                  </div>
+                ) : record.completionStatus == 1 ? (
+                  <div>已结业</div>
+                ) : (
+                  <div>-</div>
+                )}
+              </div>
             );
           },
         },
@@ -2318,7 +2488,7 @@ export default defineComponent({
       selectedRowKeys7: [],
       auditDescription: "",
       isEdit: 0,
-      member: {name: "", value: ""},
+      member: { name: "", value: "" },
       //列表表格
       tableData1: [
         // {
@@ -2454,6 +2624,9 @@ export default defineComponent({
       agreestudy_hs: false,
       rejectstudy_hs: false,
       delete_hs: false,
+      submit_hs: false,
+      push_hs: false,
+      back_hs: false,
       del_hs: false,
       del_hs_stu: false,
       copy_hs: false,
@@ -2472,6 +2645,9 @@ export default defineComponent({
       faceDetailObj: {},
 
       offcourseId: null,
+      temp: null,
+      useCourse: false,
+      stopCourse: false,
       projectName: "",
       name: "",
       createName: "",
@@ -2524,6 +2700,8 @@ export default defineComponent({
       xjkkinputV2: "",
       xjkkinputV3: "",
       xjkkinputV4: null,
+      beforeValue: null, //考勤 开始前
+      afterStartValue: null, //考勤 开始后
       //开课学员管理
       xygl_inputV1: "",
       //录入成绩
@@ -2730,6 +2908,28 @@ export default defineComponent({
       codeType: null, //二维码类型
     });
 
+    function findClassFullName(list, classify, name = "") {
+      return (
+        (list &&
+          list.length > 0 &&
+          list
+            .map((e) =>
+              classify == e.code
+                ? name
+                  ? name + "-" + e.name
+                  : e.name
+                : findClassFullName(
+                    e.children,
+                    classify,
+                    name ? name + "-" + e.name : e.name
+                  )
+            )
+            .filter((name) => name)
+            .join("")) ||
+        ""
+      );
+    }
+
     const showStuAdd = (record) => {
       state.selectCourseId = record.offcoursePlanId;
       state.shipType = 2;
@@ -2737,54 +2937,18 @@ export default defineComponent({
       state.viewpowervisible = true;
     };
 
-    const sysTypeOptions = computed(() => store.state.content_type);
-
-    // console.log('12344', sysTypeOptions)
-
-    // 处理数据字典
-    // function formateDictT(data) {
-    //   for(let i=0;i<data.length;i++){
-    //     data[i].title = data[i].dictName;
-    //     data[i].value = data[i].dictCode;
-    //     if(data[i].children.length!==0){
-    //       for(let j=0;j<data[i].children.length;j++){
-    //         data[i].children[j].title = data[i].children[j].dictName;
-    //         data[i].children[j].value = data[i].children[j].dictCode;
-    //         if(data[i].children[j].children.length!==0){
-    //           for(let k=0; k<data[i].children[j].children.length; k++) {
-    //             data[i].children[j].children[k].title = data[i].children[j].children[k].dictName;
-    //             data[i].children[j].children[k].value = data[i].children[j].children[k].dictCode;
-    //           }
-    //         }
-    //       }
-    //     }
-    //   }
-    //   return data;
-    // }
-
     //  富文本 sssssssssssssss
     // 编辑器实例，必须用 shallowRef
     const editorRef = shallowRef();
     // 内容 HTML
     const valueHtml = ref("");
     // // 模拟 ajax 异步获取内容
-    onMounted(() => {
-      setTimeout(() => {
-        //     valueHtml.value = "<p>模拟 Ajax 异步设置内容</p>";
-        console.log("toolbar222222222222222");
-        console.log(editorRef.value);
-        // const toolbar = DomEditor.getToolbar(editorRef.value);
-        // const menu = editorRef.value.getAllMenuKeys();
-        // const bar = toolbar.getConfig().toolbarKeys;
-        // console.log(menu);
-        // console.log(bar);
-      }, 3500);
-    });
+    onMounted(() => {});
 
     const toolbarConfig = {
       excludeKeys: ["insertVideo", "insertImage"],
     };
-    const editorConfig = {placeholder: "请输入内容...", MENU_CONF: {}};
+    const editorConfig = { placeholder: "请输入内容...", MENU_CONF: {} };
     editorConfig.MENU_CONF["uploadImage"] = {
       // 自定义上传
       async customUpload(file, insertFn) {
@@ -2819,12 +2983,12 @@ export default defineComponent({
     const beforeUpload = (file) => {
       return new Promise((resolve, reject) => {
         const isJpgOrPng =
-            file.type === "image/jpg" ||
-            file.type === "image/jpeg" ||
-            file.type === "image/png" ||
-            file.type === "image/svg" ||
-            file.type === "image/bmp" ||
-            file.type === "image/gif";
+          file.type === "image/jpg" ||
+          file.type === "image/jpeg" ||
+          file.type === "image/png" ||
+          file.type === "image/svg" ||
+          file.type === "image/bmp" ||
+          file.type === "image/gif";
         if (!isJpgOrPng) {
           message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
           return reject(false);
@@ -2838,7 +3002,7 @@ export default defineComponent({
         }
 
         let w = 0,
-            h = 0;
+          h = 0;
         let reader = new FileReader();
         reader.readAsDataURL(file);
         reader.onload = () => {
@@ -2864,7 +3028,7 @@ export default defineComponent({
               return resolve(true);
             } else {
               message.error(
-                  "图片尺寸错误，只能上传800*450(高宽比例为16：9)横纵比一致的图片"
+                "图片尺寸错误，只能上传800*450(高宽比例为16：9)横纵比一致的图片"
               );
               return reject(false);
             }
@@ -2893,7 +3057,7 @@ export default defineComponent({
       ];
       if (!fileType.includes(file.name.split(".")[1])) {
         message.error(
-            "仅支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip格式!"
+          "仅支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip格式!"
         );
         return false;
       }
@@ -2931,17 +3095,16 @@ export default defineComponent({
     const getTableDate = async () => {
       state.tableLoading = true;
       console.log("我是点击搜索的数据", state.sysTypeId);
-      // let datas = state.tableData1;
       let startTime = "";
       let endTime = "";
       if (state.projectTime) {
         startTime = toDate(
-            new Date(state.projectTime[0].$d).getTime() / 1000,
-            "Y-M-D"
+          new Date(state.projectTime[0].$d).getTime() / 1000,
+          "Y-M-D"
         );
         endTime = toDate(
-            new Date(state.projectTime[1].$d).getTime() / 1000,
-            "Y-M-D"
+          new Date(state.projectTime[1].$d).getTime() / 1000,
+          "Y-M-D"
         );
       }
       let res = await list({
@@ -2956,66 +3119,15 @@ export default defineComponent({
         endTime: endTime,
         beginTime: startTime,
       });
-      console.log("获取面授课列表", res);
-      const {rows, total, pageNo} = res.data.data;
-      console.log(res.data.data);
+      const { rows, total } = res.data.data;
+      state.tableData1 = rows;
       state.tableDataTotal1 = total;
-      for (let i = 0; i < rows.length; i++) {
-        rows[i].num = i + 1 + (state.currentPage1 - 1) * 10;
-      }
-      const datas = traverseArr(
-          rows,
-          {
-            key: "offcourseId",
-            num: "num",
-            name: "name",
-            content: "sysTypeId",
-            courseform: "type",
-            project: "projectName",
-            stunum: "studentCnt",
-            grade: "score",
-            status: "auditStatus",
-            ynpub: "publishStatus",
-            creator: "createName",
-            createtime: "createTime",
-            pubtime: "publishTime",
-            kkty: "status",
-            offcourseId: "offcourseId",
-          },
-          true
-      );
-
-      datas.forEach((itm) => {
-        itm.pageNo = pageNo;
-        itm.contentTxt =
-            findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-";
-      });
-      state.tableData1 = datas;
-      console.log("state.tableData1", state.tableData1);
       state.tableLoading = false;
+      // itm.pageNo = pageNo;
+      // itm.contentTxt = findClassFullName(sysTypeOptions.value, itm.sysTypeId) || "-";
+      console.log("state.tableData1", state.tableData1);
     };
 
-    function findClassFullName(list, classify, name = "") {
-      return (
-          (list &&
-              list.length > 0 &&
-              list.map((e) =>
-                  classify == e.code
-                      ? name
-                          ? name + "-" + e.name
-                          : e.name
-                      : findClassFullName(
-                          e.children,
-                          classify,
-                          name ? name + "-" + e.name : e.name
-                      )
-              )
-                  .filter((name) => name)
-                  .join("")) ||
-          ""
-      );
-    }
-
     getTableDate();
     const handelChangePage1 = (page, pageSize) => {
       state.currentPage1 = page;
@@ -3179,10 +3291,10 @@ export default defineComponent({
       state.addtestvisible = true;
     };
     const logW = () => {
-      state.workInfo = {}
+      state.workInfo = {};
     };
     const logT = () => {
-      state.examInfo = {}
+      state.examInfo = {};
     };
     const removePG = () => {
       console.log("11111");
@@ -3248,7 +3360,7 @@ export default defineComponent({
       console.log("获取学员信息", obj);
       let res = await studentList(obj);
       console.log("获取学员列表", res);
-      const {rows, total, pageNo} = res.data.data;
+      const { rows, total, pageNo } = res.data.data;
       state.tableDataTotal3 = total;
 
       for (let i = 0; i < rows.length; i++) {
@@ -3261,22 +3373,22 @@ export default defineComponent({
         };
       });
       const data2 = traverseArr(
-          rows,
-          {
-            key: "studentId",
-            num: "num",
-            name: "name",
-            number: "studentId",
-            department: "deptName",
-            postion: "jobName",
-            band: "bandDesc",
-            status: "applyStatus",
-            join: "source",
-            signstatus: "signStatus",
-            evastatus: "evalStatus",
-            overstatus: "status",
-          },
-          true
+        rows,
+        {
+          key: "studentId",
+          num: "num",
+          name: "name",
+          number: "studentId",
+          department: "deptName",
+          postion: "jobName",
+          band: "bandDesc",
+          status: "applyStatus",
+          join: "source",
+          signstatus: "signStatus",
+          evastatus: "evalStatus",
+          overstatus: "status",
+        },
+        true
       );
       data2.forEach((itm) => {
         itm.pageNo = pageNo;
@@ -3353,18 +3465,19 @@ export default defineComponent({
     // };
     // 渲染开课操作
     const getTableDate3 = async () => {
+      state.tableLoading = true;
       // let datas = state.tableData6;
       let beginTime = "";
       let endTime = "";
       if (state.selectTime) {
         // beginTime = parseInt(new Date(state.selectTime[0].$d).getTime() / 1000);
         // endTime = parseInt(new Date(state.selectTime[1].$d).getTime() / 1000);
-        beginTime = dayjs(state.selectTime[0]).format('YYYY-MM-DD HH:mm:ss')
+        beginTime = dayjs(state.selectTime[0]).format("YYYY-MM-DD HH:mm:ss");
         // toDate(
         //   new Date(state.selectTime[0].$d).getTime() / 1000,
         //   "Y-M-D h:m:s"
         // );
-        endTime = dayjs(state.selectTime[1]).format('YYYY-MM-DD HH:mm:ss')
+        endTime = dayjs(state.selectTime[1]).format("YYYY-MM-DD HH:mm:ss");
         // toDate(
         //   new Date(state.selectTime[1].$d).getTime() / 1000,
         //   "Y-M-D h:m:s"
@@ -3381,25 +3494,26 @@ export default defineComponent({
       };
       console.log("获取开obj", obj, state.selectTime);
       let res = await planList(obj);
+      state.tableLoading = false;
       console.log("开课res", res);
-      const {rows, total, pageNo} = res.data.data;
+      const { rows, total, pageNo } = res.data.data;
       state.tableDataTotal222 = total;
 
       for (let i = 0; i < rows.length; i++) {
         rows[i].num = i + 1 + (state.currentPage222 - 1) * 10;
       }
       const datas = traverseArr(
-          rows,
-          {
-            key: "offcoursePlanId",
-            num: "num",
-            organization: "name",
-            address: "address",
-            starttime: "beginTime",
-            createtime: "createTime",
-            createName: "createName",
-          },
-          true
+        rows,
+        {
+          key: "offcoursePlanId",
+          num: "num",
+          organization: "name",
+          address: "address",
+          starttime: "beginTime",
+          createtime: "createTime",
+          createName: "createName",
+        },
+        true
       );
       datas.forEach((itm) => {
         itm.pageNo = pageNo;
@@ -3532,9 +3646,9 @@ export default defineComponent({
         return message.warning("该课程名称已存在");
       }
       console.log(
-          "state.bs_hs && state.valueE1 == 2",
-          state.bs_hs,
-          state.valueE1 == 2
+        "state.bs_hs && state.valueE1 == 2",
+        state.bs_hs,
+        state.valueE1 == 2
       );
       if (!state.valueE1 && !state.valueE2) {
         message.destroy();
@@ -3641,27 +3755,33 @@ export default defineComponent({
       state.assessmentId = null;
       state.assessmentName = "";
       state.EditWorkId = null;
+      state.beforeValue = null; //考勤 开始前
+      state.afterStartValue = null; //考勤 开始后
 
       removePG();
     };
     //保存开课
 
-    const handleSureStu = async() => {
+    const handleSureStu = async () => {
       let startTime,
-          endTime = 0;
+        endTime = 0;
       if (state.xjkkinputV3) {
-        startTime = dayjs(state.xjkkinputV3[0]).format('YYYY-MM-DD HH:mm')    //parseInt(state.xjkkinputV3[0].$d.getTime() / 1000);
-        endTime = dayjs(state.xjkkinputV3[1]).format('YYYY-MM-DD HH:mm') //parseInt(state.xjkkinputV3[1].$d.getTime() / 1000);
+        startTime = dayjs(state.xjkkinputV3[0]).format("YYYY-MM-DD HH:mm"); //parseInt(state.xjkkinputV3[0].$d.getTime() / 1000);
+        endTime = dayjs(state.xjkkinputV3[1]).format("YYYY-MM-DD HH:mm"); //parseInt(state.xjkkinputV3[1].$d.getTime() / 1000);
+      }
+      const offName = await validateName({
+        name: state.xjkkinputV1,
+        type: 5,
+        id: state.offcoursePlanId,
+      }).then((res) => {
+        console.log(res, res.data.data);
+        return res.data.data === 1;
+      });
+      console.log("校验重复", offName);
+      if (offName) {
+        message.destroy();
+        return message.warning("开课名称重复，请重新填写");
       }
-    const offName = await validateName({ name: state.xjkkinputV1, type: 5 ,id:state.offcoursePlanId}).then(res => {
-					console.log(res,res.data.data);
-					return res.data.data === 1;
-			});
-			console.log('校验重复',offName)
-			if (offName) {
-				message.destroy();
-				return message.warning("开课名称重复，请重新填写");
-			}
       let t = state.signCom ? "1," : "0,";
       let p = state.comLeave ? "1" : "0";
       let type = t.concat(p);
@@ -3683,8 +3803,10 @@ export default defineComponent({
         // signWordFlag: state.xjkkradioV1 === 1 ? 1 : 0, //签到是否需要口令:1是0否
         teacherId: state.member.value,
         teacher: state.member.name,
-        workInfo: state.workInfo,//提交的作业信息
-        examInfo: state.examInfo//提交的考试信息
+        workInfo: state.workInfo, //提交的作业信息
+        examInfo: state.examInfo, //提交的考试信息
+        beforeStart: state.beforeValue, //考勤 开始前
+        afterStart: state.afterStartValue, //考勤 开始后
       };
       console.log(postData);
       const checkList = [
@@ -3701,15 +3823,17 @@ export default defineComponent({
         console.log("state.addLoading ", state.addLoading);
       }
       state.addLoading = true;
-      editPlan(postData).then(() => {
-        getTableDate3();
-        handleCancelStu();
-        rest();
-        state.addLoading = false;
-      }).catch(err => {
-        state.loading = false
-        console.log(err)
-      })
+      editPlan(postData)
+        .then(() => {
+          getTableDate3();
+          handleCancelStu();
+          rest();
+          state.addLoading = false;
+        })
+        .catch((err) => {
+          state.loading = false;
+          console.log(err);
+        });
       state.cstm_hs = false;
     };
 
@@ -3719,10 +3843,14 @@ export default defineComponent({
       state.offcoursePlanId = item.id;
 
       if (item.homeWorkId) {
-        queryWorkDetailById({workId: item.homeWorkId}).then((res) => state.workInfo = res.data.data);
+        queryWorkDetailById({ workId: item.homeWorkId }).then(
+          (res) => (state.workInfo = res.data.data)
+        );
       }
       if (item.testId) {
-        queryExaminationDetailById({examinationId: item.testId}).then((res) => state.examInfo = res.data.data);
+        queryExaminationDetailById({ examinationId: item.testId }).then(
+          (res) => (state.examInfo = res.data.data)
+        );
       }
 
       console.log("获取面授课开课详情", item);
@@ -3732,8 +3860,8 @@ export default defineComponent({
       let str = "";
       for (let i = 0; i < arrss.length; i++) {
         i == arrss.length - 1
-            ? (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1))
-            : (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1) + ",");
+          ? (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1))
+          : (str += arrss[i].slice(arrss[i].lastIndexOf("/") + 1) + ",");
       }
       console.log(str);
       state.attach = str;
@@ -3745,29 +3873,21 @@ export default defineComponent({
       options4CurId.value = item.teacherId;
       // (state.regisCom = item.completeType.split(",")[0] == "1" ? true : false),
       (state.signCom = item.completeType.split(",")[0] == "1" ? true : false),
-          (state.comLeave =
-              item.completeType.split(",")[1] == "1" ? true : false),
-          (state.checked4 = item.evalFlag === 1 ? true : false);
+        (state.comLeave =
+          item.completeType.split(",")[1] == "1" ? true : false),
+        (state.checked4 = item.evalFlag === 1 ? true : false);
       state.assessmentName = item.assessmentName;
       state.assessmentId = String(item.assessmentId);
       state.EditTestId = Number(item.testId);
       state.EditWorkId = String(item.homeWorkId);
       state.xjkkinputV1 = item.name;
+      state.beforeValue = item.beforeStart; //考勤 开始前
+      state.afterStartValue = item.afterStart; //考勤 开始后
       if (item.signFlag === 1) {
         //是否允许未报名的签到:1是0否
         state.xjkkradioV1 = 0;
       }
-      /*
-            if (item.signWordFlag === 1) {
-                //签到是否需要口令:1是0否
-                state.xjkkradioV1 = 1;
-            }
-            if (item.signFlag === 0 && item.signWordFlag === 0) {
-                state.xjkkradioV1 = "";
-            }
-            */
-      state.member = {value: item.teacherId, name: item.teacher};
-
+      state.member = { value: item.teacherId, name: item.teacher };
       state.cstm_hs = true;
       state.kk_eidt = true;
     };
@@ -3843,25 +3963,25 @@ export default defineComponent({
       state.delete_hs = false;
       state.del_hs = false;
       state.del_hs_stu = false;
+      state.submit_hs = false;
+      state.back_hs = false;
+      state.push_hs = false;
       state.copy_hs = false;
       state.nouse_hs = false;
       state.rg_hs = false;
       state.graduate_hs = false;
       state.addLoading = false;
     };
-    const handleRejectExit = (itm, type) => {
-      if (type === "1") {
-        return;
-      }
-      state.offcourseId = itm.id;
-
-      handle({
-        offcourseId: state.offcourseId,
-        type: 0,
-      }).then((res) => {
-        if (res.data.code === 200) {
-          getTableDate();
-        }
+    const handleRejectExit = (id, index, record) => {
+      dialog({
+        content: "确定撤回吗？",
+        ok: () => {
+          message.success("撤回成功");
+          record.auditStatus === 3
+            ? (state.tableData1[index].auditStatus = 2)
+            : (state.tableData1[index].auditStatus = 0);
+          handle({ offcourseId: id, type: 0 });
+        },
       });
     };
 
@@ -3878,24 +3998,24 @@ export default defineComponent({
           delete_exit1();
         } else {
           api1
-              .updateStudent({
-                workScore: state.lrcj_inputV1,
-                workId: state.homeWorkId,
-                studentId: state.studentId,
-              })
-              .then((res) => {
-                console.log("成绩录入", res);
-                if (res.data.code === 200) {
-                  // getTableDate2();
-                  state.isgetStudent = true;
-                  delete_exit1();
-                  state.lrcj_inputV1 = "";
-                  state.scoreId = null;
-                }
-              })
-              .catch((err) => {
-                console.log("录入失败", err);
-              });
+            .updateStudent({
+              workScore: state.lrcj_inputV1,
+              workId: state.homeWorkId,
+              studentId: state.studentId,
+            })
+            .then((res) => {
+              console.log("成绩录入", res);
+              if (res.data.code === 200) {
+                // getTableDate2();
+                state.isgetStudent = true;
+                delete_exit1();
+                state.lrcj_inputV1 = "";
+                state.scoreId = null;
+              }
+            })
+            .catch((err) => {
+              console.log("录入失败", err);
+            });
         }
       }
     };
@@ -3904,17 +4024,17 @@ export default defineComponent({
         // state.studentItem.id
         // console.log("state.studentItem.id", state.studentItem.id);
         api1
-            .batchUpdateStatus({
-              completionStatus: 1,
-              ids: [state.studentItem?.id],
-              // status: 1,
-            })
-            .then((res) => {
-              if (res.data.code === 200) {
-                getTableDate2();
-                delete_exit1();
-              }
-            });
+          .batchUpdateStatus({
+            completionStatus: 1,
+            ids: [state.studentItem?.id],
+            // status: 1,
+          })
+          .then((res) => {
+            if (res.data.code === 200) {
+              getTableDate2();
+              delete_exit1();
+            }
+          });
       }
     };
     //确认复制
@@ -3949,12 +4069,8 @@ export default defineComponent({
     };
     //确认复制课程 操作
     const handleDeleteExit = async () => {
-      state.addLoading = true;
-
       if (state.del_hs) {
-        console.log(11111111);
         if (state.offcourseId && state.offcoursePlanId && state.studentId) {
-          console.log(111111);
           handleStudent({
             offcoursePlanId: state.offcoursePlanId,
             score: "",
@@ -3967,7 +4083,6 @@ export default defineComponent({
             }
           });
         } else if (state.offcourseId && state.offcoursePlanId) {
-          console.log(2222222);
           deletePlan({
             offcoursePlanId: state.offcoursePlanId,
           }).then((res) => {
@@ -3977,7 +4092,6 @@ export default defineComponent({
             }
           });
         } else if (state.offcourseId) {
-          console.log(3333333);
           handle({
             offcourseId: state.offcourseId,
             type: -1,
@@ -3992,39 +4106,51 @@ export default defineComponent({
         }
       }
       if (state.copy_hs) {
+        state.tableLoading = true;
         if (state.offcourseId && state.offcoursePlanId) {
-          state.tableLoading = true;
-          message.success("复制成功");
-          delete_exit1();
-          rest();
-          await copyCoursePlan({offcoursePlanId: state.offcoursePlanId})
+          await copyCoursePlan({ offcoursePlanId: state.offcoursePlanId });
           getTableDate3();
         } else if (state.offcourseId) {
-          delete_exit1();
-          rest();
-          message.success("复制成功");
-          state.tableLoading = true;
-          await copyCourse({courseId: state.offcourseId})
+          await copyCourse({ courseId: state.offcourseId });
           getTableDate();
         }
+        message.success("复制成功");
+        rest();
       }
       if (state.nouse_hs) {
-        console.log(3333333333);
-        if (state.offcourseId) {
-          console.log(87887);
-          handle({
-            offcourseId: state.offcourseId,
-            type: -2,
-          }).then((res) => {
-            if (res.data.code === 200) {
-              message.destroy();
-              message.success("操作成功");
-              getTableDate();
-              delete_exit1();
-            }
-          });
-        }
+        state.temp.auditStatus = 0;
+        message.success("停用成功");
+        handle({ offcourseId: state.offcourseId, type: -2 });
       }
+      if (state.submit_hs) {
+        state.tableLoading = true;
+        message.success("提交审核成功");
+        handle({ offcourseId: state.offcourseId, type: 1 }).then(() =>
+          getTableDate()
+        );
+      }
+      if (state.back_hs) {
+        state.tableLoading = true;
+        message.success("撤回成功");
+        handle({ offcourseId: state.offcourseId, type: 0 }).then(() =>
+          getTableDate()
+        );
+      }
+      if (state.useCourse) {
+        state.tableLoading = true;
+        message.success("启用成功");
+        handle({ offcourseId: state.offcourseId, type: 2 }).then(() =>
+          getTableDate()
+        );
+      }
+      if (state.push_hs) {
+        state.tableLoading = true;
+        message.success("发布成功");
+        handle({ offcourseId: state.offcourseId, type: 3 }).then(() =>
+          getTableDate()
+        );
+      }
+      delete_exit1();
     };
     const handleDeleteKaike = (value) => {
       state.offcoursePlanId = value.id;
@@ -4042,16 +4168,16 @@ export default defineComponent({
     };
 
     const openMessage = () => {
-      console.log(122222)
+      console.log(122222);
       let startTime = "";
       let endTime = "";
       if (state.projectTime) {
         startTime = parseInt(
-            new Date(state.projectTime[0].$d).getTime() / 1000
+          new Date(state.projectTime[0].$d).getTime() / 1000
         );
         endTime = parseInt(new Date(state.projectTime[1].$d).getTime() / 1000);
       }
-      console.log(startTime, endTime)
+      console.log(startTime, endTime);
 
       // list({
       //   pageNo: 1,
@@ -4091,23 +4217,23 @@ export default defineComponent({
       //         { header: '创建人', key: 'createName', width: 10 },
       //         { header: '创建时间', key: 'createTime', width: 22 },
       //         { header: '上线时间', key: 'publishTime', width: 22 },
-      //         { header: '是否停用', key: 'statusText', width: 10 },              
+      //         { header: '是否停用', key: 'statusText', width: 10 },
       //      ]
       //      commonExport(heads,list,"课程导出")
       // })
 
       window.open(
-          `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
-              state.currentPage1
-          }&pageSize=${state.pageSize1}&auditStatus=${
-              state.auditStatus ? state.auditStatus : ""
-          }&sysTypeId=${state.sysTypeId ? state.sysTypeId : ""}&projectName=${
-              state.projectName ? state.projectName : ""
-          }&name=${state.name ? state.name : ""}&createName=${
-              state.createName ? state.createName : ""
-          }&endTime=${endTime ? endTime : ""}&beginTime=${
-              startTime ? startTime : ""
-          }&type=3`
+        `${process.env.VUE_APP_BASE_API}/admin/offcourse/export?pageNo=${
+          state.currentPage1
+        }&pageSize=${state.pageSize1}&auditStatus=${
+          state.auditStatus ? state.auditStatus : ""
+        }&sysTypeId=${state.sysTypeId ? state.sysTypeId : ""}&projectName=${
+          state.projectName ? state.projectName : ""
+        }&name=${state.name ? state.name : ""}&createName=${
+          state.createName ? state.createName : ""
+        }&endTime=${endTime ? endTime : ""}&beginTime=${
+          startTime ? startTime : ""
+        }&type=3`
       );
 
       // {
@@ -4138,14 +4264,14 @@ export default defineComponent({
         keyWord: options4CurName.value,
         id: options4CurId.value ? options4CurId.value : null,
       })
-          .then((res) => {
-            console.log("获取授课教师", res);
-            if (res.data.code === 200) return res.data.data;
-          })
-          .catch((err) => {
-            console.log("获取授课教师失败", err);
-          });
-      const {rows, total} = item1;
+        .then((res) => {
+          console.log("获取授课教师", res);
+          if (res.data.code === 200) return res.data.data;
+        })
+        .catch((err) => {
+          console.log("获取授课教师失败", err);
+        });
+      const { rows, total } = item1;
       state.tableDataTotalTea1 = total;
       state.tableDataTotalTea2 = total;
       let newArr = [];
@@ -4207,17 +4333,17 @@ export default defineComponent({
       state.teacher = item.teacher;
       state.teacherId = item.teacherId;
       state.qdms_inputV6 = item.intro;
-      state.member = {value: item.teacherId, name: item.teacher};
+      state.member = { value: item.teacherId, name: item.teacher };
       if (item.attach == "") {
         state.imgList = [];
       } else {
         if (item.attach.indexOf(",")) {
           const arr = item.attach.split(",");
           arr.forEach((item) => {
-            state.imgList.push({img: item});
+            state.imgList.push({ img: item });
           });
         } else {
-          state.imgList = [{img: item.attach}];
+          state.imgList = [{ img: item.attach }];
         }
       }
 
@@ -4269,26 +4395,49 @@ export default defineComponent({
     //   //   console.log(item);
     //   // });
     // };
-    const handleDelete = (item, type) => {
-      console.log(item);
-      if (type === "1") {
-        return;
-      }
-      state.offcourseId = item.id;
-
-      state.delete_hs = true;
-      state.del_hs = true;
+    const handleDelete = (id) => {
+      dialog({
+        content: "确定删除该课程吗？",
+        ok: async () => {
+          message.success("删除成功");
+          state.tableLoading = true;
+          await handle({ offcourseId: id, type: -1 });
+          getTableDate();
+        },
+      });
     };
-    const handleCopy = async (itm, type) => {
-      console.log(itm);
-      if (type === "1") {
-        return;
-      }
-      state.offcourseId = itm.id;
-
-      state.delete_hs = true;
-      state.copy_hs = true;
+    const handleCopy = async (id) => {
+      dialog({
+        content: "确定复制该课程吗？",
+        ok: async () => {
+          message.success("复制成功");
+          state.tableLoading = true;
+          await copyCourse({ offcourseId: id });
+          getTableDate();
+        },
+      });
     };
+    const handleSubmit = (id, index) => {
+      dialog({
+        content: "确定提交审核吗？",
+        ok: () => {
+          message.success("提交成功");
+          state.tableData1[index].auditStatus = 1;
+          handle({ offcourseId: id, type: 1 });
+        },
+      });
+    };
+    const handlePush = (id, index) => {
+      dialog({
+        content: "确定发布该课程吗？",
+        ok: () => {
+          message.success("发布成功");
+          state.tableData1[index].auditStatus = 3;
+          handle({ offcourseId: id, type: 3 });
+        },
+      });
+    };
+
     const handleCopyP = async (itm) => {
       console.log(itm);
       state.offcourseId = itm.offcourseId;
@@ -4297,32 +4446,24 @@ export default defineComponent({
       state.delete_hs = true;
       state.copy_hs = true;
     };
-    const handleStop = async (itm, type) => {
-      console.log(itm);
-      if (type === "1") {
-        return;
-      }
-      state.offcourseId = itm.id;
-
-      state.delete_hs = true;
-      state.nouse_hs = true;
+    const handleStop = (id, index) => {
+      dialog({
+        content: "确定停用该课程吗？",
+        ok: () => {
+          message.success("停用成功");
+          state.tableData1[index].status = 0;
+          handle({ offcourseId: id, type: -2 });
+        },
+      });
     };
-    const handleOpen = async (itm, type) => {
-      console.log(itm);
-      if (type === "1") {
-        return;
-      }
-      state.offcourseId = itm.id;
-
-      handle({
-        offcourseId: state.offcourseId,
-        type: 2,
-      }).then((res) => {
-        if (res.data.code === 200) {
-          getTableDate();
-          message.destroy();
-          message.success("启用成功");
-        }
+    const handleOpen = async (id, index) => {
+      dialog({
+        content: "确定起用该课程吗？",
+        ok: () => {
+          message.success("起用成功");
+          state.tableData1[index].status = 1;
+          handle({ offcourseId: id, type: 2 });
+        },
       });
     };
     const handleStart = (item, type) => {
@@ -4397,7 +4538,7 @@ export default defineComponent({
       ];
       if (!fileType.includes(file.name.split(".")[1])) {
         message.error(
-            "仅支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip格式!"
+          "仅支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip格式!"
         );
         return false;
       }
@@ -4453,24 +4594,24 @@ export default defineComponent({
         id: state.currentFaceId,
       });
       apis
-          .GetCourseStudent({
-            pageNo: state.currentPage222,
-            pageSize: 10,
-            status: state.gl_selectV2,
-            studentName: state.gl_inputV2,
-            id: state.currentFaceId,
-          })
-          .then((res) => {
-            console.log("获取开课管理学员信息", res);
-            // tableData3 tableDataTotal222 currentPage222 handelChangePage222
-            state.tableData3 = res.data.data.records;
-            state.tableDataTotal222 = res.data.data.total;
-            state.manageStuLoading = false;
-          })
-          .catch((err) => {
-            console.log(err);
-            state.manageStuLoading = false;
-          });
+        .GetCourseStudent({
+          pageNo: state.currentPage222,
+          pageSize: 10,
+          status: state.gl_selectV2,
+          studentName: state.gl_inputV2,
+          id: state.currentFaceId,
+        })
+        .then((res) => {
+          console.log("获取开课管理学员信息", res);
+          // tableData3 tableDataTotal222 currentPage222 handelChangePage222
+          state.tableData3 = res.data.data.records;
+          state.tableDataTotal222 = res.data.data.total;
+          state.manageStuLoading = false;
+        })
+        .catch((err) => {
+          console.log(err);
+          state.manageStuLoading = false;
+        });
     }
 
     const handlePostSure = (obj) => {
@@ -4566,67 +4707,67 @@ export default defineComponent({
     };
     //添加权限
     watch(
-        () => state.addAuthList,
-        (res) => {
-          console.log("res", res, state.addAuthList);
-          if (state.authClassify === 1 || state.authClassify === 2) {
-            let obj = {
-              type: 3,
-              tag:
-                  state.authClassify === 1
-                      ? 3
-                      : state.authClassify === 2
-                          ? 4
-                          : null,
-              opt: 3,
-              deptList: res[1],
-              groupList: res[2],
-              refId: state.selectCourseId,
-              pageNo: 20,
-              pageSize: 1,
-              studentList: res[0],
-              keyWord: "",
-            };
-            console.log("obj", obj);
-            api1
-                .optionAuthPerm(obj)
-                .then((res) => {
-                  console.log("添加授权成功", res);
-                  message.success("添加授权成功");
-                })
-                .catch((err) => {
-                  console.log("添加授权失败", err);
-                });
-          }
+      () => state.addAuthList,
+      (res) => {
+        console.log("res", res, state.addAuthList);
+        if (state.authClassify === 1 || state.authClassify === 2) {
+          let obj = {
+            type: 3,
+            tag:
+              state.authClassify === 1
+                ? 3
+                : state.authClassify === 2
+                ? 4
+                : null,
+            opt: 3,
+            deptList: res[1],
+            groupList: res[2],
+            refId: state.selectCourseId,
+            pageNo: 20,
+            pageSize: 1,
+            studentList: res[0],
+            keyWord: "",
+          };
+          console.log("obj", obj);
+          api1
+            .optionAuthPerm(obj)
+            .then((res) => {
+              console.log("添加授权成功", res);
+              message.success("添加授权成功");
+            })
+            .catch((err) => {
+              console.log("添加授权失败", err);
+            });
         }
+      }
     );
 
     //添加学员
     watch(
-        () => state.addAuthList,
-        (res) => {
-          console.log("res", res, state.addStudentList);
-          if (state.authClassify === 3) {
-            let obj = {
-              deptList: res[1],
-              groupList: res[2],
-              offcourseId: state.offcourseId,
-              offcoursePlanId: state.offcoursePlanId, //开课id
-              studentList: res[0],
-            };
-            console.log("obj", obj);
-            api1
-                .addStudentCourse(obj)
-                .then((res) => {
-                  console.log("添加学员成功", res);
-                  message.success("添加学员成功");
-                  getTableDate2();
-                })
-                .catch((err) => {
-                  console.log("添加学员失败", err);
-                });
-          }
+      () => state.addAuthList,
+      (res) => {
+        console.log("res", res, state.addStudentList);
+        if (state.authClassify === 3) {
+          let obj = {
+            deptList: res[1],
+            groupList: res[2],
+            offcourseId: state.offcourseId,
+            offcoursePlanId: state.offcoursePlanId, //开课id
+            studentList: res[0],
+          };
+          console.log("obj", obj);
+          api1
+            .addStudentCourse(obj)
+            .then((res) => {
+              console.log("添加学员成功", res);
+              message.success("添加学员成功");
+              getTableDate2();
+            })
+            .catch((err) => {
+              console.log("添加学员失败", err);
+            });
         }
+      }
     );
     const range = (start, end) => {
       const result = [];
@@ -4665,12 +4806,14 @@ export default defineComponent({
         title: type == 1 ? "【课程】二维码" : "【签到】二维码",
         name: record.name ? record.name : "",
         url:
-            type == 1
-                ? window.location.protocol + process.env.VUE_APP_COURSE_STUDY + record.offcourseId
-                : process.env.VUE_APP_BASE_API +
-                `/admin/student/studentSign?taskId=${
-                    record.id
-                }&taskType=${2}&type=${3}`,
+          type == 1
+            ? window.location.protocol +
+              process.env.VUE_APP_COURSE_STUDY +
+              record.offcourseId
+            : process.env.VUE_APP_BASE_API +
+              `/admin/student/studentSign?taskId=${
+                record.id
+              }&taskType=${2}&type=${3}`,
       };
       console.log("codeInfo", state.codeInfo);
       state.codeIndex = 0;
@@ -4679,6 +4822,7 @@ export default defineComponent({
     return {
       ...toRefs(state),
       sysTypeOptions,
+      findClassFullName,
       CourseModalRef,
       auditStudent,
       getdateToDateFn,
@@ -4707,12 +4851,13 @@ export default defineComponent({
       handleStart,
       handleCopyP,
       handleCopy,
+      handleSubmit,
+      handlePush,
       handleStop,
       handleOpen,
       handleEdit,
       handleDelete,
       changevalue,
-      columns1,
       columns2,
       columns4,
       columns6,
@@ -4798,18 +4943,15 @@ export default defineComponent({
       handelChangePageTea2,
       submitReview,
       reviewClick,
-
       showPrower,
       showOwnPrower,
       showViewPrower,
       showManagePrower,
-
       closeOnlineCoursevisible,
       handlelookMs,
       handleLook,
       logW,
       logT,
-
       qrcodeVisible,
     };
   },
@@ -5042,8 +5184,8 @@ export default defineComponent({
     }
 
     .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;
     }
 
@@ -5092,8 +5234,8 @@ export default defineComponent({
     width: 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%
     );
   }
 
@@ -5256,8 +5398,8 @@ export default defineComponent({
     width: 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%
     );
   }
 
@@ -5508,8 +5650,8 @@ export default defineComponent({
             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%
             );
           }
 
@@ -5605,8 +5747,8 @@ export default defineComponent({
             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%
             );
           }
 
@@ -5727,8 +5869,8 @@ export default defineComponent({
             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%
             );
           }
 
@@ -5856,8 +5998,8 @@ export default defineComponent({
             width: 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%
             );
           }
 
@@ -6554,8 +6696,10 @@ export default defineComponent({
               }
 
               .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;
               }
 
@@ -6855,8 +6999,10 @@ export default defineComponent({
               }
 
               .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;
               }
 
@@ -6980,8 +7126,10 @@ export default defineComponent({
                 }
 
                 .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;
                 }
 
@@ -7152,8 +7300,8 @@ export default defineComponent({
             width: calc(100%);
             height: 40px;
             background: linear-gradient(
-                    rgba(78, 166, 255, 0.2) 0%,
-                    rgba(78, 166, 255, 0) 100%
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
             );
           }
 
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index 89e3c172..416ae6f0 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -214,7 +214,7 @@
                     </div>
                     <div style="margin-top: 10px">
                       <a-select
-                        v-model:value="selectBandName"
+                        v-model:value="selectBandId"
                         mode="multiple"
                         style="width: 440px; min-height: 40px"
                         placeholder="请选择Band"
@@ -460,9 +460,6 @@
             <div class="btn btn6" @click="handlePush">
               <div class="btnText">保存</div>
             </div>
-            <div class="btn btn6" v-if="statusTingQi == 1" @click="reviewClick">
-              <div class="btnText">提交审核</div>
-            </div>
           </div>
         </div>
       </div>
@@ -827,15 +824,19 @@ export default defineComponent({
       }
       files = files.slice(0, files.length - 1);
 
-      let orgSelect = [];
+      let orgSelectIds = [];
+      let orgSelectNames = [];
       if (state.orgSelect && state.orgSelect.length) {
         state.orgSelect.forEach((item) => {
-          orgSelect.push({
-            label: item.label,
-            value: item.value,
-          });
+          orgSelectIds += item.value + ",";
+        });
+        state.orgSelect.forEach((item) => {
+          orgSelectNames += item.label + ",";
         });
       }
+      orgSelectIds = orgSelectIds.slice(0, orgSelectIds.length - 1);
+      orgSelectNames = orgSelectNames.slice(0, orgSelectNames.length - 1);
+      console.log("orgSelectIds&orgSelectNames2", orgSelectIds, orgSelectNames);
 
       let selectJobId = "";
       if (state.selectJobId.length) {
@@ -882,7 +883,9 @@ export default defineComponent({
         intro: state.qdms_inputV6,
         attach: state.attach,
         outline: valueHtml.value,
-        organizationIds: orgSelect,
+        // organizationIds: orgSelect, //todo 传的不对
+        organizationIds: orgSelectIds,
+        organizationNames: orgSelectNames,
         jobTypeIds: selectJobId,
         bandIds: selectBandId,
         sourceBelongId: state.sourceBelongId,
@@ -994,6 +997,40 @@ export default defineComponent({
       }
       console.log(str);
       state.attach = str;
+
+      if (item.jobTypeIds) {
+        state.selectJobId = item.jobTypeIds.split(",");
+      }
+      if (item.bandIds) {
+        state.selectBandId = item.bandIds.split(",");
+      }
+      console.log("state.selectBandId", state.selectBandId);
+      state.sourceBelongId = item.sourceBelongId;
+      state.sourceBelongName = item.sourceBelongFullName;
+      if (item.organizationIds && item.organizationNames) {
+        let orgSelectIds = item.organizationIds;
+        let orgSelectNames = item.organizationNames;
+        orgSelectIds = orgSelectIds.split(",");
+        orgSelectNames = orgSelectNames.split(",");
+        console.log(
+          "orgSelectIds&orgSelectNames",
+          orgSelectIds,
+          orgSelectNames
+        );
+        let arrObj = [];
+        arrObj = orgSelectIds.map((item, index) => {
+          return { value: item, lebel: orgSelectNames[index] };
+        });
+        console.log("arrObj-------------", arrObj);
+        state.orgSelect = arrObj;
+      }
+      const imgDict = optionsUrl.value.find(
+        (img) => img.value.split(",")[0] === item.picUrl
+      );
+      console.log("imgDict", imgDict);
+      if (imgDict) {
+        state.pathBgId = imgDict.id;
+      }
     };
 
     const handleTagChange = () => {
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index e27d6ab1..6e252c32 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -1,164 +1,319 @@
 <!---- 创建单层子项目页面 --->
 <template>
-	<div class="sonproject">
-		<div class="header">
-			<span class="title">创建/编辑单层子项目</span>
-			<div @click="backPage" style="cursor: pointer" to="/projectmanage" class="goback">
-				<span class="return"></span><span class="returntext">返回</span>
-			</div>
-		</div>
-		<div class="content">
-			<div class="main">
-				<div class="name" v-if="projectInfo.parentName">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目归属</div>
-					</div>
-					<div class="in">
-						<div style="color: #c7cbd2; font-size: 14px; margin-left: 15px">
-							{{ projectInfo.parentName }}
-						</div>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目名称</div>
-					</div>
-					<div class="in">
-						<NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate"
-							:maxlength="30" show-count :id="projectInfo.projectId"></NameInput>
-					</div>
-				</div>
-				<div class="name flex-top">
-					<div class="namebox" style="margin-top: 10px">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">封面图</div>
-					</div>
-					<div class="in select" style="flex: 1; display: flex">
-						<div :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`" style="
+  <div class="sonproject">
+    <div class="header">
+      <span class="title">创建/编辑单层子项目</span>
+      <div
+        @click="backPage"
+        style="cursor: pointer"
+        to="/projectmanage"
+        class="goback"
+      >
+        <span class="return"></span><span class="returntext">返回</span>
+      </div>
+    </div>
+    <div class="content">
+      <div class="main">
+        <div class="name" v-if="projectInfo.parentName">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目归属</div>
+          </div>
+          <div class="in">
+            <div style="color: #c7cbd2; font-size: 14px; margin-left: 15px">
+              {{ projectInfo.parentName }}
+            </div>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目名称</div>
+          </div>
+          <div class="in">
+            <NameInput
+              placeholder="请输入项目名称"
+              v-model:value="projectInfo.name"
+              v-model:validate="projectInfo.validate"
+              :maxlength="30"
+              show-count
+              :id="projectInfo.projectId"
+            ></NameInput>
+          </div>
+        </div>
+        <div class="name flex-top">
+          <div class="namebox" style="margin-top: 10px">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">封面图</div>
+          </div>
+          <div class="in select" style="flex: 1; display: flex">
+            <div
+              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+              style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
                 cursor: pointer;
                 position: relative;
                 overflow: hidden;
-              " v-for="(src, index) in projectPic" :key="index" @click="() => (projectInfo.picUrl = src.value)">
-							<img style="
+              "
+              v-for="(src, index) in projectPic"
+              :key="index"
+              :style="{
+                display: index >= 3 ? 'none' : 'flex',
+              }"
+              @click="() => (projectInfo.picUrl = src.value)"
+            >
+              <img
+                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
-                " :src="src.value" alt="avatar" />
-						</div>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目时间</div>
-					</div>
+                "
+                :src="src.value"
+                alt="avatar"
+              />
+            </div>
+            <div
+              @click="showLearnBgMore"
+              v-if="projectPic.length > 3"
+              style="
+                width: 100px;
+                height: 100px;
+                padding-left: 15px;
+                border-radius: 5px;
+                cursor: pointer;
+                position: relative;
+                overflow: hidden;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                border: 1px solid #c7cbd2;
+                font-size: 14px;
+                font-weight: 400;
+                color: #4ea6ff;
+                line-height: 36px;
+              "
+            >
+              查看更多
+              <img src="../../assets/images/projectadd/go.png" alt="" />
+            </div>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目时间</div>
+          </div>
 
-					<div class="in">
-						<a-range-picker :show-time="{ format: 'HH:mm' }" :disabled-date="disabledDate"
-							:disabled-time="disabledRangeTime" separator="至" :placeholder="['      开始时间', '        结束时间']"
-							v-model:value="projectInfo.rangeTime" style="width: 100%; height: 40px; border-radius: 5px"
-							valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :disabled="viewDetail ? true : false" />
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目经理</div>
-					</div>
-					<div class="in">
-						<ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"
-							@onChange="managerChange" mode="multiple"></ProjectManager>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">资源归属</div>
-					</div>
+          <div class="in">
+            <a-range-picker
+              :show-time="{ format: 'HH:mm' }"
+              :disabled-date="disabledDate"
+              :disabled-time="disabledRangeTime"
+              separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
+              v-model:value="projectInfo.rangeTime"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              valueFormat="YYYY-MM-DD HH:mm"
+              @change="timeChange"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目经理</div>
+          </div>
+          <div class="in">
+            <ProjectManager
+              v-model:value="projectInfo.managerId"
+              v-model:name="projectInfo.manager"
+              @onChange="managerChange"
+              mode="multiple"
+            ></ProjectManager>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">资源归属</div>
+          </div>
 
-					<div class="in select">
-						<OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName" v-model:fullName="projectInfo.sourceBelongFullName"></OrgClass>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">项目级别</div>
-					</div>
-					<div class="in select">
-						<ProjectLevel v-model:value="projectInfo.level"></ProjectLevel>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">培训分类</div>
-					</div>
-					<div class="in select">
-						<TrainClass v-model:value="projectInfo.systemId"></TrainClass>
-					</div>
-				</div>
-				<div class="name">
-					<div class="namebox">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">是否BOEU实施</div>
-					</div>
-					<div class="in">
-						<a-radio-group v-model:value="projectInfo.boeFlag" :disabled="viewDetail ? true : false">
-							<a-radio :style="radioStyle" :value="1">是</a-radio>
-							<a-radio :style="radioStyle" :value="0">否</a-radio>
-						</a-radio-group>
-					</div>
-				</div>
-				<div class="name name2" v-if="courseSyncFlag">
-					<div class="namebox">
-						<div class="inname">同步学习记录</div>
-					</div>
-					<div class="in">
-						<a-checkbox v-model:checked="courseSyncFlag" :disabled="viewDetail ? true : false"><span style="
+          <div class="in select">
+            <OrgClass
+              v-model:value="projectInfo.sourceBelongId"
+              v-model:name="projectInfo.sourceBelongName"
+              v-model:fullName="projectInfo.sourceBelongFullName"
+            ></OrgClass>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">项目级别</div>
+          </div>
+          <div class="in select">
+            <ProjectLevel v-model:value="projectInfo.level"></ProjectLevel>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">培训分类</div>
+          </div>
+          <div class="in select">
+            <TrainClass v-model:value="projectInfo.systemId"></TrainClass>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
+            <div class="inname">是否BOEU实施</div>
+          </div>
+          <div class="in">
+            <a-radio-group
+              v-model:value="projectInfo.boeFlag"
+              :disabled="viewDetail ? true : false"
+            >
+              <a-radio :style="radioStyle" :value="1">是</a-radio>
+              <a-radio :style="radioStyle" :value="0">否</a-radio>
+            </a-radio-group>
+          </div>
+        </div>
+        <div class="name name2" v-if="courseSyncFlag">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-checkbox
+              v-model:checked="courseSyncFlag"
+              :disabled="viewDetail ? true : false"
+              ><span
+                style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
-                ">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-checkbox>
-					</div>
-				</div>
-				<div class="name name2" v-if="projectInfo.remark">
-					<div class="namebox">
-						<div class="inname" style="margin-top: 13px">项目说明</div>
-					</div>
-					<div class="in">
-						<a-textarea v-model:value="projectInfo.remark" style="height: 80px" placeholder="请输入说明" show-count
-							:maxlength="200" :disabled="viewDetail ? true : false" />
-					</div>
-				</div>
+                "
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-checkbox
+            >
+          </div>
+        </div>
+        <div class="name name2" v-if="projectInfo.remark">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">项目说明</div>
+          </div>
+          <div class="in">
+            <a-textarea
+              v-model:value="projectInfo.remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+              :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
 
-				<div v-if="projectInfo.status == -5" class="name name2">
-					<div class="namebox">
-						<div class="inname" style="margin-top: 13px">审核意见</div>
-					</div>
-					<div class="description">
-						{{ auditDescription }}
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="footer">
-			<div class="btn">
-				<a-button v-on:click="createProject" type="primary" class="btn1">确定
-				</a-button>
-				<a-button @click="backPage" class="btn2">取消</a-button>
-			</div>
-		</div>
-	</div>
+        <div v-if="projectInfo.status == -5" class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">审核意见</div>
+          </div>
+          <div class="description">
+            {{ auditDescription }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="footer">
+      <div class="btn">
+        <a-button
+          :loading="loading"
+          v-on:click="createProject"
+          type="primary"
+          class="btn1"
+          >确定
+        </a-button>
+        <a-button @click="backPage" class="btn2">取消</a-button>
+      </div>
+    </div>
+    <!-- 更多背景图 v-model:visible="learnBgMore"  -->
+    <a-modal
+      :closable="sh"
+      centered="true"
+      v-model:visible="learnBgMore"
+      :footer="null"
+      :width="650"
+      wrapClassName="learnBgMoreModal"
+      :z-index="9999"
+    >
+      <div class="main">
+        <div class="top">
+          <div class="topc">封面图</div>
+        </div>
+        <div class="imagesBox">
+          <!-- <div
+                  @click="() => (projectInfo.picUrl = src.value)"
+                  v-for="item in projectPic"
+                  :key="item.code"
+                  class="learnBgItem"
+            > -->
+          <div
+            @click="chooseImg2(item)"
+            v-for="item in projectPic"
+            :key="item.code"
+            class="learnBgItem"
+            :style="{
+              border:
+                projectInfo.picUrl === item.value
+                  ? '3px solid rgba(78, 166, 255, 1)'
+                  : '1px solid #ccc',
+              'background-image': 'url(' + item.value.split(',')[0] + ')',
+            }"
+          >
+            <!-- <img class="im" :src="item.source" /> -->
+          </div>
+        </div>
+        <div class="btn">
+          <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
+          <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
+        </div>
+      </div>
+    </a-modal>
+  </div>
 </template>
 <script>
-import { reactive, toRefs, ref, computed, onMounted } from "vue";
+import { reactive, toRefs, ref, onMounted } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 import * as api from "../../api/index";
@@ -172,465 +327,584 @@ import { validateName } from "../../api/index1";
 import dayjs from "dayjs";
 
 export default {
-	name: "projectAdd",
-	components: {
-		ProjectManager,
-		ProjectLevel,
-		TrainClass,
-		NameInput,
-		OrgClass,
-	},
-	setup() {
-		const store = useStore();
-		// 编辑页面跳转过来时候，自动填充表格
-		const routers = useRoute();
-		const router = useRouter();
-		const isEdit = ref(false);
+  name: "projectAdd",
+  components: {
+    ProjectManager,
+    ProjectLevel,
+    TrainClass,
+    NameInput,
+    OrgClass,
+  },
+  setup() {
+    const store = useStore();
+    // 编辑页面跳转过来时候，自动填充表格
+    const routers = useRoute();
+    const router = useRouter();
+    const isEdit = ref(false);
 
-		const state = reactive({
-			classifySelect: null,
-			classifySelectId: null,
-			checked: false,
-			checked1: false,
-			valueE: null,
-			valueE1: null,
-			valueE2: null,
-			classifySelect1: [],
-			classifySelect2: null, //选中的资源归属信息
-			classifySelect3: null, //选中的项目级别信息
-			classifySelect4: null, //选中的培训分类信息
-			rangevalue: [],
-			projectAscription: "",
-			viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
+    const state = reactive({
+      classifySelect: null,
+      classifySelectId: null,
+      checked: false,
+      checked1: false,
+      valueE: null,
+      valueE1: null,
+      valueE2: null,
+      classifySelect1: [],
+      classifySelect2: null, //选中的资源归属信息
+      classifySelect3: null, //选中的项目级别信息
+      classifySelect4: null, //选中的培训分类信息
+      rangevalue: [],
+      projectAscription: "",
+      viewDetail: routers.query.viewDetail ? routers.query.viewDetail : null,
 
-			currentPage: 1, //当前页
-			tableDataTotal: -1, //模版列表总数
-			pageSize: 10, //每页10条数据
-			totalPages: 0, //总页数
+      currentPage: 1, //当前页
+      tableDataTotal: -1, //模版列表总数
+      pageSize: 10, //每页10条数据
+      totalPages: 0, //总页数
 
-			currentPage1: 1, //项目经理
-			pageSize1: 10, //项目经理
-			projectInfo: {},
-			courseSyncFlag: false
-		});
+      currentPage1: 1, //项目经理
+      pageSize1: 10, //项目经理
+      projectInfo: {},
+      courseSyncFlag: false,
+      learnBgMore: false,
+      projectPic: [],
+      loading: false,
+    });
 
-		const projectPic = computed(() => store.state.projectPic.map((e) => ({
-			value: e.dictValue,
-			label: e.dictName,
-		})));
+    // const projectPic = computed(() =>
+    //   store.state.project_pic.map((e) => ({
+    //     code: e.id,
+    //     value: e.dictValue,
+    //     label: e.dictName,
+    //   }))
+    // );
 
+    onMounted(() => {
+      state.projectPic = store.state.project_pic.map((e) => ({
+        code: e.id,
+        value: e.value,
+        label: e.name,
+      }));
+      state.viewDetail = routers.query.viewDetail;
+      getProjectInfo();
+    });
 
-		onMounted(() => {
-			state.viewDetail = routers.query.viewDetail;
-			getProjectInfo();
-		});
+    function getProjectInfo() {
+      state.projectInfo.parentName = routers.query.parentName;
+      state.projectInfo.parentId = routers.query.parentId;
+      state.projectInfo.projectId = routers.query.projectId;
+      (state.projectInfo.projectId || state.projectInfo.parentId) &&
+        api
+          .getProjectDetail({
+            projectId: state.projectInfo.projectId,
+          })
+          .then((res) => {
+            state.projectInfo = res.data.data.projectInfo;
+            state.projectInfo.rangeTime = [
+              state.projectInfo.beginTime,
+              state.projectInfo.endTime,
+            ];
+            state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
+          });
+    }
 
-		function getProjectInfo() {
-			state.projectInfo.parentName = routers.query.parentName;
-			state.projectInfo.parentId = routers.query.parentId;
-			state.projectInfo.projectId = routers.query.projectId;
-			(state.projectInfo.projectId || state.projectInfo.parentId) &&
-				api.getProjectDetail({
-					projectId: state.projectInfo.projectId,
-				})
-					.then((res) => {
-						state.projectInfo = res.data.data.projectInfo;
-						state.projectInfo.rangeTime = [
-							state.projectInfo.beginTime,
-							state.projectInfo.endTime,
-						];
-						state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
-					});
-		}
+    const backPage = () => {
+      setTimeout(() => {
+        router.push({
+          path: "/projectmanage",
+        });
+      }, 400);
+    };
 
-		const backPage = () => {
-			setTimeout(() => {
-				router.push({
-					path: "/projectmanage",
-				});
-			}, 400);
-		};
+    const errorMsgs = {
+      name: "请输入项目名称",
+      picUrl: "请选择项目封面图",
+      beginTime: "请选择项目开始时间",
+      endTime: "请选择项目结束时间",
+      manager: "请选择项目经理",
+      managerId: "请选择项目经理",
+      sourceBelongId: "请选择资源归属",
+      level: "请填写项目级别",
+      systemId: "请填写项目培训体系",
+      boeFlag: "请选择是否BOEU实施",
+    };
 
+    function timeChange(e) {
+      if (e && e.length === 2) {
+        state.projectInfo.beginTime = e[0];
+        state.projectInfo.endTime = e[1];
+      }
+    }
 
-		const errorMsgs = {
-			name: "请输入项目名称",
-			picUrl: "请选择项目封面图",
-			beginTime: "请选择项目开始时间",
-			endTime: "请选择项目结束时间",
-			manager: "请选择项目经理",
-			managerId: "请选择项目经理",
-			sourceBelongId: "请选择资源归属",
-			level: "请填写项目级别",
-			systemId: "请填写项目培训体系",
-			boeFlag: "请选择是否BOEU实施",
-		};
+    function validate(obj, errorMsgs) {
+      for (let i in errorMsgs) {
+        if (!obj[i] && obj[i] !== 0) {
+          message.destroy();
+          message.warning(errorMsgs[i]);
+          return false;
+        }
+      }
+      return true;
+    }
 
-		function timeChange(e) {
-			if (e && e.length === 2) {
-				state.projectInfo.beginTime = e[0];
-				state.projectInfo.endTime = e[1];
-			}
-		}
-
-		function validate(obj, errorMsgs) {
-			for (let i in errorMsgs) {
-				if (!obj[i] && obj[i] !== 0) {
-					message.destroy();
-					message.warning(errorMsgs[i]);
-					return false;
-				}
-			}
-			return true;
-		}
-
-		const createProject = async () => {
-			console.log("我是否要编辑项目", isEdit.value);
-			if (!validate(state.projectInfo, errorMsgs)) {
-				return;
-			}
-			/**
+    const createProject = async () => {
+      state.loading = true;
+      console.log("我是否要编辑项目", isEdit.value);
+      if (!validate(state.projectInfo, errorMsgs)) {
+        state.loading = false;
+        return;
+      }
+      /**
 			 if (!state.projectInfo.validate) {
 				message.destroy();
 				message.warning('项目名称重复，请修改名称！');
 				return;
 			}*/
-			const offName = await validateName({
-				name: state.projectInfo.name,
-				type: 1,
-				id: state.projectInfo.projectId
-			}).then(res => {
-				return res.data.data == 1;
-			});
-			if (offName) {
-				message.destroy();
-				return message.warning("项目名称重复，请重新填写");
-			}
-			state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
-			api.createProject(state.projectInfo).then(() => {
-				message.destroy();
-				message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
-				router.back()
-			});
-		};
+      console.log("state.projectInfo", state.projectInfo);
+      const offName = await validateName({
+        name: state.projectInfo.name,
+        type: 1,
+        id: state.projectInfo.id,
+      }).then((res) => {
+        return res.data.data == 1;
+      });
+      if (offName) {
+        message.destroy();
+        state.loading = false;
+        return message.warning("项目名称重复，请重新填写");
+      }
+      state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
+      api.createProject(state.projectInfo).then(() => {
+        state.loading = false;
+        message.destroy();
+        message.success(state.projectInfo.id ? "编辑成功" : "创建成功");
+        router.back();
+      });
+    };
 
-		function managerChange(e, l, d, t,orgName) {
-			state.projectInfo.sourceBelongId = d
-			state.projectInfo.sourceBelongName = t
-      state.projectInfo.sourceBelongFullName = orgName
-		}
-		const disabledDate = (current) => {
-			return current && current < dayjs().startOf('day');
-		};
+    function managerChange(e, l, d, t, orgName) {
+      state.projectInfo.sourceBelongId = d;
+      state.projectInfo.sourceBelongName = t;
+      state.projectInfo.sourceBelongFullName = orgName;
+    }
+    const disabledDate = (current) => {
+      return current && current < dayjs().startOf("day");
+    };
 
-		return {
-			...toRefs(state),
-			disabledDate,
-			managerChange,
-			timeChange,
-			projectPic,
-			createProject,
-			isEdit,
-			backPage,
-		};
-	},
+    //显示更多路径背景弹窗
+    const showLearnBgMore = () => {
+      state.learnBgMore = true;
+    };
+    //关闭更多路径背景弹窗
+    const closeLearnBgMore = () => {
+      state.learnBgMore = false;
+    };
+    const chooseImg2 = (item) => {
+      console.log("itemmmmmmm", item);
+      state.projectInfo.picUrl = item.value;
+    };
+
+    return {
+      ...toRefs(state),
+      disabledDate,
+      managerChange,
+      timeChange,
+      createProject,
+      isEdit,
+      backPage,
+      showLearnBgMore,
+      closeLearnBgMore,
+      chooseImg2,
+    };
+  },
 };
 </script>
 <style lang="scss">
 .active {
-	border: 2px solid rgba(78, 166, 255, 1);
+  border: 2px solid rgba(78, 166, 255, 1);
 }
 
 .sonproject {
-	width: 100%;
-	// height: inherit;
-	// flex: 1;
-	// flex-shrink: 0;
-	// overflow-y: auto;
+  width: 100%;
+  // height: inherit;
+  // flex: 1;
+  // flex-shrink: 0;
+  // overflow-y: auto;
 
-	.header {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
+  .header {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
 
-		.title {
-			color: #000000;
-			font-size: 18px;
-			//line-height: 36px;
-			padding-top: 30px;
-			padding-left: 37px;
-			//font-weight: 500;
-		}
+    .title {
+      color: #000000;
+      font-size: 18px;
+      //line-height: 36px;
+      padding-top: 30px;
+      padding-left: 37px;
+      //font-weight: 500;
+    }
 
-		.goback {
-			padding-right: 70px;
-			//padding-top: 37px;
-			position: relative;
+    .goback {
+      padding-right: 70px;
+      //padding-top: 37px;
+      position: relative;
 
-			.return {
-				display: inline-block;
-				width: 42px;
-				height: 42px;
-				margin-top: 17px;
-				margin-right: 10px;
-				background-image: url("../../assets/images/projectadd/return.png");
-			}
+      .return {
+        display: inline-block;
+        width: 42px;
+        height: 42px;
+        margin-top: 17px;
+        margin-right: 10px;
+        background-image: url("../../assets/images/projectadd/return.png");
+      }
 
-			.returntext {
-				display: inline-block;
-				position: absolute;
-				top: 27px;
-				color: #4ea6ff;
-				font-size: 14px;
-			}
-		}
-	}
+      .returntext {
+        display: inline-block;
+        position: absolute;
+        top: 27px;
+        color: #4ea6ff;
+        font-size: 14px;
+      }
+    }
+  }
 
-	// 修改 antd upload 样式
-	.ant-upload {
-		border-width: 0px;
-	}
+  // 修改 antd upload 样式
+  .ant-upload {
+    border-width: 0px;
+  }
 
-	.content {
-		display: flex;
+  .content {
+    display: flex;
 
-		.main {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			//justify-content: center;
-			float: left;
-			border-right: 1px solid rgba(153, 155, 163, 0.3);
+    .main {
+      width: 50%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      //justify-content: center;
+      float: left;
+      border-right: 1px solid rgba(153, 155, 163, 0.3);
 
-			.name {
-				width: 78%;
-				// background-color: lightcoral;
-				display: flex;
-				margin-top: 20px;
-				align-items: center;
+      .name {
+        width: 78%;
+        // background-color: lightcoral;
+        display: flex;
+        margin-top: 20px;
+        align-items: center;
 
-				//height: 40px;
-				// border: 1px solid black;
-				.namebox {
-					width: 120px;
-					display: flex;
-					align-items: center;
-					justify-content: flex-end;
-					flex-shrink: 0;
+        //height: 40px;
+        // border: 1px solid black;
+        .namebox {
+          width: 120px;
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          flex-shrink: 0;
 
-					.nameimg {
-						width: 10px;
-						height: 10px;
-					}
-				}
+          .nameimg {
+            width: 10px;
+            height: 10px;
+          }
+        }
 
-				.d {
-					margin-top: 8px;
-					font-size: 25px;
-					color: #ff4e4e;
-				}
+        .d {
+          margin-top: 8px;
+          font-size: 25px;
+          color: #ff4e4e;
+        }
 
-				.box {
-					position: relative;
-					margin-left: 14px;
+        .box {
+          position: relative;
+          margin-left: 14px;
 
-					.box1 {
-						position: absolute;
-						left: 50%;
-						top: 50%;
-						width: 50px;
-						margin-left: -25px;
-						margin-top: -5px;
-						border-top: 2px solid rgba(78, 166, 255, 1);
-					}
+          .box1 {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            width: 50px;
+            margin-left: -25px;
+            margin-top: -5px;
+            border-top: 2px solid rgba(78, 166, 255, 1);
+          }
 
-					.box2 {
-						position: absolute;
-						left: 50%;
-						top: 50%;
-						height: 50px;
-						//margin-left: -5px;
-						margin-top: -25px;
-						border-left: 2px solid rgba(78, 166, 255, 1);
-					}
-				}
+          .box2 {
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            height: 50px;
+            //margin-left: -5px;
+            margin-top: -25px;
+            border-left: 2px solid rgba(78, 166, 255, 1);
+          }
+        }
 
-				.inname {
-					color: #6f6f6f;
-					font-size: 14px;
-					margin-left: 7px;
-				}
+        .inname {
+          color: #6f6f6f;
+          font-size: 14px;
+          margin-left: 7px;
+        }
 
-				.in {
-					margin-left: 14px;
-					flex: 1;
+        .in {
+          margin-left: 14px;
+          flex: 1;
 
-					// .ant-radio-wrapper {
-					// }
-					.ant-input-textarea-show-count {
-						position: relative;
-						height: 88px;
-					}
+          // .ant-radio-wrapper {
+          // }
+          .ant-input-textarea-show-count {
+            position: relative;
+            height: 88px;
+          }
 
-					.ant-input-textarea-show-count::after {
-						position: absolute;
-						right: 10px;
-						bottom: 0px;
-					}
+          .ant-input-textarea-show-count::after {
+            position: absolute;
+            right: 10px;
+            bottom: 0px;
+          }
 
-					.ant-input {
-						border-radius: 8px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
+          .ant-input {
+            border-radius: 8px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
 
-					.ant-input-affix-wrapper {
-						padding: 0 11px;
-						border-radius: 8px;
-					}
+          .ant-input-affix-wrapper {
+            padding: 0 11px;
+            border-radius: 8px;
+          }
 
-					.ant-select-selector {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
-				}
+          .ant-select-selector {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
+        }
 
-				.filebox {
-					margin-left: 14px;
-					flex: 1;
+        .filebox {
+          margin-left: 14px;
+          flex: 1;
 
-					.fileimg {
-						width: 15px;
-						height: 15px;
-						margin-right: 6px;
-					}
+          .fileimg {
+            width: 15px;
+            height: 15px;
+            margin-right: 6px;
+          }
 
-					.filetext {
-						font-size: 14px;
-						font-weight: 400;
-						color: #4ea6ff;
-						line-height: 36px;
-					}
+          .filetext {
+            font-size: 14px;
+            font-weight: 400;
+            color: #4ea6ff;
+            line-height: 36px;
+          }
 
-					.support {
-						font-size: 14px;
-						font-weight: 400;
-						color: #999ba3;
-						line-height: 36px;
-						margin-top: 8px;
-						word-break: break-all;
-					}
-				}
-			}
+          .support {
+            font-size: 14px;
+            font-weight: 400;
+            color: #999ba3;
+            line-height: 36px;
+            margin-top: 8px;
+            word-break: break-all;
+          }
+        }
+      }
 
-			.name2 {
-				display: flex;
-				align-items: flex-start;
+      .name2 {
+        display: flex;
+        align-items: flex-start;
 
-				.ant-input-textarea {
-					.ant-input {
-						height: 88px;
-					}
-				}
-			}
-		}
+        .ant-input-textarea {
+          .ant-input {
+            height: 88px;
+          }
+        }
+      }
+    }
 
-		.template {
-			width: 50%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			//justify-content: center;
-			float: right;
+    .template {
+      width: 50%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      //justify-content: center;
+      float: right;
 
-			.name {
-				width: 78%;
-				// background-color: lightcoral;
-				display: flex;
-				margin-top: 20px;
-				align-items: center;
-				height: 40px;
+      .name {
+        width: 78%;
+        // background-color: lightcoral;
+        display: flex;
+        margin-top: 20px;
+        align-items: center;
+        height: 40px;
 
-				// border: 1px solid black;
-				.d {
-					margin-top: 8px;
-					font-size: 25px;
-					color: #ff4e4e;
-				}
+        // border: 1px solid black;
+        .d {
+          margin-top: 8px;
+          font-size: 25px;
+          color: #ff4e4e;
+        }
 
-				.inname {
-					color: #6f6f6f;
-					font-size: 14px;
-					margin-left: 7px;
-					width: 65px;
-				}
+        .inname {
+          color: #6f6f6f;
+          font-size: 14px;
+          margin-left: 7px;
+          width: 65px;
+        }
 
-				.in {
-					margin-left: 14px;
-					width: 81%;
+        .in {
+          margin-left: 14px;
+          width: 81%;
 
-					.ant-input {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
+          .ant-input {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
 
-					.ant-select-selector {
-						border-radius: 5px;
-						// height: 120%;
-						width: 100%;
-						height: 40px;
-					}
-				}
-			}
-		}
-	}
+          .ant-select-selector {
+            border-radius: 5px;
+            // height: 120%;
+            width: 100%;
+            height: 40px;
+          }
+        }
+      }
+    }
+  }
 
-	.footer {
-		width: 100%;
-		margin-top: 31px;
-		margin-bottom: 14px;
-		padding-bottom: 20px;
+  .footer {
+    width: 100%;
+    margin-top: 31px;
+    margin-bottom: 14px;
+    padding-bottom: 20px;
 
-		.btn {
-			display: flex;
-			justify-content: center;
+    .btn {
+      display: flex;
+      justify-content: center;
 
-			.btn1 {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 100px;
-				height: 40px;
-				border-radius: 8px;
-				background: #4ea6ff;
-				color: #ffffff;
-				margin-right: 14px;
-			}
+      .btn1 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        border-radius: 8px;
+        background: #4ea6ff;
+        color: #ffffff;
+        margin-right: 14px;
+      }
 
-			.btn2 {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 100px;
-				height: 40px;
-				border-radius: 8px;
-				border: 1px solid #4ea6ff;
-				background: #ffffff;
-				color: #4ea6ff;
-			}
-		}
+      .btn2 {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100px;
+        height: 40px;
+        border-radius: 8px;
+        border: 1px solid #4ea6ff;
+        background: #ffffff;
+        color: #4ea6ff;
+      }
+    }
 
-		.text {
-			color: rgba(153, 155, 163, 1);
-			font-size: 14px;
-			margin-left: 223px;
-		}
-	}
+    .text {
+      color: rgba(153, 155, 163, 1);
+      font-size: 14px;
+      margin-left: 223px;
+    }
+  }
+}
+.learnBgMoreModal {
+  .ant-modal {
+    width: 680px !important;
+    height: 528px !important;
+
+    .ant-modal-content {
+      width: 680px !important;
+      height: 528px !important;
+
+      .ant-modal-body {
+        width: 680px !important;
+        height: 528px !important;
+        padding: 0 !important;
+
+        .main {
+          display: flex;
+          flex-direction: column;
+
+          .top {
+            padding-left: 51px;
+            padding-right: 51px;
+            padding-top: 28px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            cursor: pointer;
+
+            .topc {
+              font-size: 16px;
+              font-weight: bold;
+              color: #000000;
+              line-height: 36px;
+            }
+          }
+
+          .imagesBox {
+            display: flex;
+            //  justify-content: space-between;
+            flex-wrap: wrap;
+            padding-left: 51px;
+            padding-right: 39px;
+            margin-top: 20px;
+            height: 350px;
+            overflow-y: auto;
+
+            .learnBgItem {
+              border-radius: 8px;
+              width: 136px;
+              height: 106px;
+              background-size: 100%;
+              background-repeat: no-repeat;
+              margin-bottom: 20px;
+              margin-right: 10px;
+            }
+          }
+
+          .btn {
+            width: 100%;
+            position: absolute;
+            bottom: 30px;
+            margin-top: 30px;
+            display: flex;
+            justify-content: center;
+
+            .samtn {
+              width: 100px;
+              height: 40px;
+              font-size: 14px;
+              border: 1px solid #4ea6ff;
+              border-radius: 8px;
+              cursor: pointer;
+            }
+
+            .btn1 {
+              background-color: #fff;
+              color: #4ea6ff;
+            }
+
+            .btn2 {
+              background-color: #4ea6ff;
+              color: #fff;
+              margin-left: 16px;
+            }
+          }
+        }
+      }
+    }
+  }
 }
 </style>
 
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index c4303b9c..68f0c384 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -394,7 +394,7 @@
           <div class="header">
             <div class="icon"></div>
             <span>提示</span>
-            <div class="close_exit" @click="closeCancel"></div>
+            <!-- <div class="close_exit" @click="closeCancel"></div> -->
           </div>
           <div class="body">
             <span>您确定要删除所有阶段吗？</span>
@@ -699,7 +699,14 @@ const closeDelete = () => {
 };
 // 删除所有阶段
 const removeAllLevel = () => {
-
+  console.log(projectInfo.value.stageList)
+  projectInfo.value.stageList.forEach(t => {
+    if(t.id!=='0'){
+      t.checked = false;
+      t.deleted = true;
+    }
+  })
+  cancelModal.value = false;
 };
 //全选任务或全不选任务
 const selectRowAll = () => {
@@ -723,6 +730,7 @@ const closeDeAll = () => {
 //暂存
 const temporaryStorage = async () => {
   templateLoading.value = true
+  console.log(projectInfo.value)
   await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
   await getTask()
   message.success("暂存成功");
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 7d5ba1e0..7ad64ebf 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -12,9 +12,9 @@
         <div class="fort">项目经理：{{ manager }}</div>
         <div class="fort">起止时间：{{ startTime }}至{{ endTime }}</div>
       </div>
-    <div class="right">
-      <!-- 2022-12-10注释 后面放开 -->
-      <!-- <img
+      <div class="right">
+        <!-- 2022-12-10注释 后面放开 -->
+        <!-- <img
           class="img1"
           src="../../assets/images/leveladd/ma.png"
           @click="showCodeModel2()"
@@ -30,37 +30,74 @@
                 "
               ></div>-->
         <!-- 显示发布图标 -->
-        <img v-if="action == 2 && checkPer(permissions)" class="img2" src="../../assets/images/leveladd/pub.png" />
+        <img
+          v-if="action == 2 && checkPer(permissions)"
+          class="img2"
+          src="../../assets/images/leveladd/pub.png"
+        />
         <!-- 显示撤回发布图标 -->
-        <img v-if="action == 3 && checkPer(permissions)" class="img2" src="../../assets/images/project/finish.png" />
+        <img
+          v-if="action == 3 && checkPer(permissions)"
+          class="img2"
+          src="../../assets/images/project/finish.png"
+        />
         <!-- 显示审核图标 -->
-        <img v-if="(action == 0 || action == -2) && checkPer(permissions)" class="img2"
-          src="../../assets/images/project/reviewsubmit.png" />
+        <img
+          v-if="(action == 0 || action == -2) && checkPer(permissions)"
+          class="img2"
+          src="../../assets/images/project/reviewsubmit.png"
+        />
         <!-- 显示撤回审核图标 -->
-        <img v-if="action == 1 && checkPer(permissions)" class="img2"
-          src="../../assets/images/project/reviewrecall.png" />
+        <img
+          v-if="action == 1 && checkPer(permissions)"
+          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) && checkPer(permissions)"
-          @click="submitExamine">
+        <div
+          class="pub"
+          style="width: 56px; color: #a497ff"
+          v-if="(action == 0 || action == -2) && checkPer(permissions)"
+          @click="submitExamine"
+        >
           {{ act }}
         </div>
         <!-- 显示撤回审核 -->
-        <div class="pub" style="width: 56px; color: #a497ff" v-if="action == 1 && checkPer(permissions)"
-          @click="showRecallReviewModal">
+        <div
+          class="pub"
+          style="width: 56px; color: #a497ff"
+          v-if="action == 1 && checkPer(permissions)"
+          @click="showRecallReviewModal"
+        >
           {{ act }}
         </div>
         <!-- 显示发布 -->
-        <div class="pub" style="width: 28px" v-if="action == 2 && checkPer(permissions)" @click="showProjectPub">
+        <div
+          class="pub"
+          style="width: 28px"
+          v-if="action == 2 && checkPer(permissions)"
+          @click="showProjectPub"
+        >
           {{ act }}
         </div>
         <!-- 显示撤回发布 -->
-        <div class="pub" style="width: 56px; color: #57c887" v-if="action == 3 && checkPer(permissions)"
-          @click="showBackModal">
+        <div
+          class="pub"
+          style="width: 56px; color: #57c887"
+          v-if="action == 3 && checkPer(permissions)"
+          @click="showBackModal"
+        >
           {{ act }}
         </div>
         <!-- 项目提交审核弹窗 -->
-        <a-modal v-model:visible="reviewModal" :footer="null" :closable="false" wrapClassName="CopyModal" centered="true">
+        <a-modal
+          v-model:visible="reviewModal"
+          :footer="null"
+          :closable="false"
+          wrapClassName="CopyModal"
+          centered="true"
+        >
           <div class="delete">
             <div class="del_header"></div>
             <div class="del_main">
@@ -83,9 +120,9 @@
               </div>
             </div>
           </div>
-      </a-modal>
-      <!-- 已结束的显示 -->
-      <!-- <div class="pub" style="width: 28px" v-if="action == -1">
+        </a-modal>
+        <!-- 已结束的显示 -->
+        <!-- <div class="pub" style="width: 28px" v-if="action == -1">
           {{ act }}
         </div>
         <div class="line"></div>
@@ -94,7 +131,7 @@
                 class="img2"
           src="../../assets/images/leveladd/more.png"
         />-->
-      <!-- <div class="more">
+        <!-- <div class="more">
           <span style="color: #7096e3; cursor: pointer">更多</span>
           <div class="moreArrow"></div>
           <div class="moreItems">
@@ -102,7 +139,7 @@
                   <div class="sammo">复制</div>
           </div>
         </div> -->
-      <!-- 草稿/未发布的显示
+        <!-- 草稿/未发布的显示
         <div class="more" v-if="action == 0">
           <span style="color: #7096e3; cursor: pointer">更多</span>
           <div class="moreArrow"></div>
@@ -111,7 +148,7 @@
                   <div class="sammo" @click="showStartModal">存为模板</div>
           </div>
         </div>-->
-      <!-- 已发布的显示
+        <!-- 已发布的显示
         <div class="more" v-if="action == 1">
           <span style="color: #7096e3; cursor: pointer">更多</span>
           <div class="moreArrow"></div>
@@ -121,12 +158,12 @@
                   <div class="sammo" @click="showStartModal">存为模板</div>
           </div>
         </div>-->
-      <!-- 已结束的显示
+        <!-- 已结束的显示
         <div class="more" v-if="action == -1">
                 <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">复制</div>
               <div class="sammo" @click="showStartModal">存为模板</div>
             </div>
@@ -142,8 +179,13 @@
     </div>
     <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">
+      <a-tabs
+        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>
           <!-- 概览（无数据） -->
@@ -153,14 +195,18 @@
             </div>
             <div v-if="checkPer(permissions)" class="second">
               <!-- @click="totask" -->
-              <div class="taskbox" @click="
-                () => {
-                  routered.push({
-                    path: `/taskadd`,
-                    query: { projectId: projectId },
-                  });
-                }
-              " style="background: linear-gradient(180deg, #fef3dd, #fffaf0)">
+              <div
+                class="taskbox"
+                @click="
+                  () => {
+                    routered.push({
+                      path: `/taskadd`,
+                      query: { projectId: projectId },
+                    });
+                  }
+                "
+                style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
+              >
                 <div class="leftt">
                   <img src="../../assets/images/taskpage/left1.png" />
                 </div>
@@ -175,7 +221,11 @@
                 </div>
                 <div class="centermain">快速添加任务/阶段</div>
               </div>
-              <div class="taskbox" @click="tostudent" style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)">
+              <div
+                class="taskbox"
+                @click="tostudent"
+                style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
+              >
                 <div class="leftt">
                   <img src="../../assets/images/taskpage/left2.png" />
                 </div>
@@ -189,9 +239,9 @@
                   添加学员
                 </div>
                 <div class="centermain">快速添加学员</div>
-            </div>
-            <!-- 2022-12-2注释 后面放开 -->
-            <!-- <div
+              </div>
+              <!-- 2022-12-2注释 后面放开 -->
+              <!-- <div
                 class="taskbox"
                 @click="showModal"
                 style="background: linear-gradient(180deg, #e5f6ec, #eef9f3)"
@@ -224,13 +274,25 @@
                     <span style="color: #999999">{{ name }}</span>
                   </div>
                   <div class="setc_name"><span>项目说明：</span></div>
-                  <div class="setc_main">
+                  <div class="setc_main" style="width: 400px">
                     <span style="color: #999999">{{ remark }}</span>
                   </div>
                 </template>
-                <div style="display:flex;justify-content: flex-start;margin-left: 10px;padding: 6px;">
-                  <div class="script" style="border: 1px solid #40a9ff;padding: 2px;">
-                    <span style="font-size: 16px; color: #40a9ff">项目说明</span>
+                <div
+                  style="
+                    display: flex;
+                    justify-content: flex-start;
+                    margin-left: 10px;
+                    padding: 6px;
+                  "
+                >
+                  <div
+                    class="script"
+                    style="border: 1px solid #40a9ff; padding: 2px"
+                  >
+                    <span style="font-size: 16px; color: #40a9ff"
+                      >项目说明</span
+                    >
                   </div>
                 </div>
               </a-popover>
@@ -276,24 +338,30 @@
                 <div>
                   <span class="nub1" style="color: #a497ff">{{
                     projectInfoOverview.completeRatio
-                  }}</span><span style="color: #a497ff; font-size: 14px">%</span>
+                  }}</span
+                  ><span style="color: #a497ff; font-size: 14px">%</span>
                 </div>
                 <div class="nub2">总完成率</div>
               </div>
             </div>
             <div class="onerow">
-            <div class="taskmain">阶段信息</div>
-          </div>
-          <!-- <div class="stagemess">
+              <div class="taskmain">阶段信息</div>
+            </div>
+            <!-- <div class="stagemess">
                     <div class="stage1">阶段1</div>
                     <div class="stage2">阶段2</div>
                   </div> -->
             <div class="stagemess">
-              <div v-for="(item, index) in stageList" :class="{
-                stage1: index === choosedStageIndex,
-                stage2: index !== choosedStageIndex,
-              }" :key="item.stageId" @click="stageChange(item, index)">
-              {{ item.name || "无阶段" }}
+              <div
+                v-for="(item, index) in stageList"
+                :class="{
+                  stage1: index === choosedStageIndex,
+                  stage2: index !== choosedStageIndex,
+                }"
+                :key="item.stageId"
+                @click="stageChange(item, index)"
+              >
+                {{ item.name || "无阶段" }}
               </div>
               <!-- <div class="stage1">阶段1</div>
                     <div class="stage2">阶段2</div> -->
@@ -304,20 +372,34 @@
             </div>
             <div class="stagelast">
               <div class="stagepro">
-                <a-progress type="dashboard" gapDegree="0" :percent="
-                  stageOverviewList[choosedStageIndex]?.completeCourseRatio
-                " :width="140" />
+                <a-progress
+                  type="dashboard"
+                  gapDegree="0"
+                  :percent="
+                    stageOverviewList[choosedStageIndex]?.completeCourseRatio
+                  "
+                  :width="140"
+                />
                 <div class="protext">课程完成率</div>
               </div>
               <div class="stagepro">
-                <a-progress type="dashboard" gapDegree="0" :percent="
-                  stageOverviewList[choosedStageIndex]?.completeExamRatio
-                " :width="140" />
+                <a-progress
+                  type="dashboard"
+                  gapDegree="0"
+                  :percent="
+                    stageOverviewList[choosedStageIndex]?.completeExamRatio
+                  "
+                  :width="140"
+                />
                 <div class="protext">考试通过率</div>
               </div>
               <div class="stagepro" style="margin-right: 0">
-                <a-progress type="dashboard" gapDegree="0" :percent="stageOverviewList[choosedStageIndex]?.completeRatio"
-                  :width="140" />
+                <a-progress
+                  type="dashboard"
+                  gapDegree="0"
+                  :percent="stageOverviewList[choosedStageIndex]?.completeRatio"
+                  :width="140"
+                />
                 <div class="protext">作业完成率</div>
               </div>
               <div class="proright">
@@ -326,23 +408,32 @@
                 </div>
                 <div class="proright1">
                   <span class="textpro">阶段任务总数</span>
-                  <a-progress :percent="
-                    stageOverviewList[choosedStageIndex]?.totalTaskCnt
-                  " style="width: 369px" />
+                  <a-progress
+                    :percent="
+                      stageOverviewList[choosedStageIndex]?.totalTaskCnt
+                    "
+                    style="width: 369px"
+                  />
                 </div>
                 <div class="pronub" style="margin-left: 142px">
                   {{ stageOverviewList[choosedStageIndex]?.totalReqCnt }}
                 </div>
                 <div class="proright1">
                   <span class="textpro">必修课</span>
-                  <a-progress :percent="stageOverviewList[choosedStageIndex]?.totalReqCnt" style="width: 369px" />
+                  <a-progress
+                    :percent="stageOverviewList[choosedStageIndex]?.totalReqCnt"
+                    style="width: 369px"
+                  />
                 </div>
                 <div class="pronub" style="margin-left: 142px">
                   {{ stageOverviewList[choosedStageIndex]?.totalOptCnt }}
                 </div>
                 <div class="proright1">
                   <span class="textpro">选修课</span>
-                  <a-progress :percent="stageOverviewList[choosedStageIndex]?.totalOptCnt" style="width: 369px" />
+                  <a-progress
+                    :percent="stageOverviewList[choosedStageIndex]?.totalOptCnt"
+                    style="width: 369px"
+                  />
                 </div>
               </div>
             </div>
@@ -354,19 +445,28 @@
             <div class="split"></div>
             <div class="onerow">
               <div class="taskmain">任务大纲</div>
-              <ImpoterGroupLeader title="批量面授报名" :data="{ targetId: projectId, type: 1 }"
+              <ImpoterGroupLeader
+                title="批量面授报名"
+                :data="{ targetId: projectId, type: 1 }"
                 :url="`/admin/offcourse/importCourse`"
-                :template-url="`/admin/project/exportTaskCoursePlan/${projectId}?type=1&taskType=2&thirdType=3`">
+                :template-url="`/admin/project/exportTaskCoursePlan/${projectId}?type=1&taskType=2&thirdType=3`"
+              >
                 <button class="btn">批量面授报名</button>
               </ImpoterGroupLeader>
-              <router-link v-if="checkPer(permissions)" :to="{ path: `/taskadd`, query: { projectId: projectId } }">
+              <router-link
+                v-if="checkPer(permissions)"
+                :to="{ path: `/taskadd`, query: { projectId: projectId } }"
+              >
                 <button class="edit">
-                  <img class="editimg" src="../../assets/images/projectadd/edit.png" />
+                  <img
+                    class="editimg"
+                    src="../../assets/images/projectadd/edit.png"
+                  />
                   <span class="editext">编辑</span>
                 </button>
-            </router-link>
-          </div>
-          <!-- <div class="taskSyllabus">
+              </router-link>
+            </div>
+            <!-- <div class="taskSyllabus">
             <a-collapse v-model:activeKey="taskSyllabusActive" accordion>
               <template #expandIcon="{ isActive }">
                 <img
@@ -376,65 +476,83 @@
                       <span class="editext">编辑</span>
                     </router-link>
                   </div> -->
-            <div class="taskSyllabus" v-if="
-              taskSyllabus &&
-              taskSyllabus.length &&
-              (taskSyllabus.length > 1 || taskSyllabus[0].name)
-            ">
+            <div
+              class="taskSyllabus"
+              v-if="
+                taskSyllabus &&
+                taskSyllabus.length &&
+                (taskSyllabus.length > 1 || taskSyllabus[0].name)
+              "
+            >
               <a-collapse v-model:activeKey="taskSyllabusActive" accordion>
                 <template #expandIcon="{ isActive }">
-                  <img :style="{
-                    width: isActive ? 9.1 : 8.1,
-                    height: isActive ? 8.1 : 9.1,
-                    'margin-right': isActive ? '12px' : '13px',
-                  }" :src="
-  isActive
-    ? require('../../assets/images/projectadd/open.png')
-    : require('../../assets/images/projectadd/close.png')
-" />
+                  <img
+                    :style="{
+                      width: isActive ? 9.1 : 8.1,
+                      height: isActive ? 8.1 : 9.1,
+                      'margin-right': isActive ? '12px' : '13px',
+                    }"
+                    :src="
+                      isActive
+                        ? require('../../assets/images/projectadd/open.png')
+                        : require('../../assets/images/projectadd/close.png')
+                    "
+                  />
                   <div></div>
                 </template>
                 <template v-for="(value, index) in taskSyllabus">
-                  <a-collapse-panel :key="index" v-if="value.name" :header="value.name">
-                    <div class="course" v-for="(item, key) in value.taskList" :key="key">
+                  <a-collapse-panel
+                    :key="index"
+                    v-if="value.name"
+                    :header="value.name"
+                  >
+                    <div
+                      class="course"
+                      v-for="(item, key) in value.taskList"
+                      :key="key"
+                    >
                       <div class="first">
                         <div class="icon">
-                          <div style="
-                                    width: 31px;
-                                    height: 28px;
-                                    display: flex;
-                                    align-items: center;
-                                    justify-content: center;
-                                  ">
-                            <img :src="
-                              item.type == 1
-                                ? require('../../assets/images/leveladd/zai.png')
-                                : item.type == 2
+                          <div
+                            style="
+                              width: 31px;
+                              height: 28px;
+                              display: flex;
+                              align-items: center;
+                              justify-content: center;
+                            "
+                          >
+                            <img
+                              :src="
+                                item.type == 1
+                                  ? require('../../assets/images/leveladd/zai.png')
+                                  : item.type == 2
                                   ? require('../../assets/images/leveladd/mian.png')
                                   : item.type == 3
-                                    ? require('../../assets/images/leveladd/an.png')
-                                    : item.type == 4
-                                      ? require('../../assets/images/leveladd/zuo.png')
-                                      : item.type == 5
-                                        ? require('../../assets/images/leveladd/kao.png')
-                                        : item.type == 6
-                                          ? require('../../assets/images/leveladd/zhi.png')
-                                          : item.type == 7
-                                            ? require('../../assets/images/leveladd/wai.png')
-                                            : item.type == 8
-                                              ? require('../../assets/images/leveladd/tao.png')
-                                              : item.type == 9
-                                                ? require('../../assets/images/leveladd/huo.png')
-                                                : item.type == 10
-                                                  ? require('../../assets/images/leveladd/ce.png')
-                                                  : item.type == 11
-                                                    ? require('../../assets/images/leveladd/pinggu.png')
-                                                    : item.type == 12
-                                                      ? require('../../assets/images/leveladd/tou.png')
-                                                      : item.type == 13
-                                                        ? require('../../assets/images/leveladd/tou.png')
-                                                        : require('../../assets/images/leveladd/xiangmu.png')
-                            " />
+                                  ? require('../../assets/images/leveladd/an.png')
+                                  : item.type == 4
+                                  ? require('../../assets/images/leveladd/zuo.png')
+                                  : item.type == 5
+                                  ? require('../../assets/images/leveladd/kao.png')
+                                  : item.type == 6
+                                  ? require('../../assets/images/leveladd/zhi.png')
+                                  : item.type == 7
+                                  ? require('../../assets/images/leveladd/wai.png')
+                                  : item.type == 8
+                                  ? require('../../assets/images/leveladd/tao.png')
+                                  : item.type == 9
+                                  ? require('../../assets/images/leveladd/huo.png')
+                                  : item.type == 10
+                                  ? require('../../assets/images/leveladd/ce.png')
+                                  : item.type == 11
+                                  ? require('../../assets/images/leveladd/pinggu.png')
+                                  : item.type == 12
+                                  ? require('../../assets/images/leveladd/tou.png')
+                                  : item.type == 13
+                                  ? require('../../assets/images/leveladd/tou.png')
+                                  : require('../../assets/images/leveladd/xiangmu.png')
+                              "
+                            />
                           </div>
                         </div>
                         <div>
@@ -445,7 +563,9 @@
                         </div>
                       </div>
                       <div class="type">
-                        <div :class="item.flag == true ? 'typename1' : 'typename'">
+                        <div
+                          :class="item.flag == true ? 'typename1' : 'typename'"
+                        >
                           <span v-if="item.flag">必修</span>
                           <span v-else>选修</span>
                         </div>
@@ -463,66 +583,93 @@
                           }}人
                         </div>
                         <div style="display: flex">
-                          <a-progress :showInfo="false" :percent="
-                            parseInt(
-                              (item.finishStuCnt / item.totalStuCnt) * 100
-                            )
-                          " strokeColor="#FFC067" trailColor="rgba(253, 209, 98, 0.2)" />
-                          <span class="progresstext" style="margin-left: 10px">{{
-                            parseInt(
-                              (item.finishStuCnt / item.totalStuCnt) * 100
-                            ) || 0
-                          }}%</span>
+                          <a-progress
+                            :showInfo="false"
+                            :percent="
+                              parseInt(
+                                (item.finishStuCnt / item.totalStuCnt) * 100
+                              )
+                            "
+                            strokeColor="#FFC067"
+                            trailColor="rgba(253, 209, 98, 0.2)"
+                          />
+                          <span class="progresstext" style="margin-left: 10px"
+                            >{{
+                              parseInt(
+                                (item.finishStuCnt / item.totalStuCnt) * 100
+                              ) || 0
+                            }}%</span
+                          >
                         </div>
                       </div>
                       <div v-if="checkPer(permissions)" class="operations">
-                        <div class="operation" style="cursor: pointer" @click="showFS(item)" v-if="item.type == 2">
+                        <div
+                          class="operation"
+                          style="cursor: pointer"
+                          @click="showFS(item)"
+                          v-if="item.type == 2"
+                        >
                           学员
                         </div>
-                        <div class="operation" style="cursor: pointer" @click="showAA(item.type, item.name, item)"
-                          v-if="item.type == 6 || item.type == 9">
+                        <div
+                          class="operation"
+                          style="cursor: pointer"
+                          @click="showAA(item.type, item.name, item)"
+                          v-if="item.type == 6 || item.type == 9"
+                        >
                           考勤
                         </div>
-                        <div class="operation" v-if="
-                          item.type != 2 && item.type != 6 && item.type != 9
-                        "></div>
-                        <div class="operation" style="cursor: pointer" @click="showCodeModel(item)">
+                        <div
+                          class="operation"
+                          v-if="
+                            item.type != 2 && item.type != 6 && item.type != 9
+                          "
+                        ></div>
+                        <div
+                          class="operation"
+                          style="cursor: pointer"
+                          @click="showCodeModel(item)"
+                        >
                           二维码
                         </div>
-                        <div class="operation" style="cursor: pointer; margin-right: 10px" @click="
-                          item.type == '1' ||
+                        <div
+                          class="operation"
+                          style="cursor: pointer; margin-right: 10px"
+                          @click="
+                            item.type == '1' ||
                             item.type == '3' ||
                             item.type == '6' ||
                             item.type == '7' ||
                             item.type == '8' ||
                             item.type == '9' ||
                             item.type == '11'
-                            ? showOnline(
-                              item.name,
-                              item.projectTaskId,
-                              item.type,
-                              item,
-                              value.name
-                            )
-                            : item.type == '2'
+                              ? showOnline(
+                                  item.name,
+                                  item.projectTaskId,
+                                  item.type,
+                                  item,
+                                  value.name
+                                )
+                              : item.type == '2'
                               ? showFace(item.name, item.projectTaskId, item)
                               : item.type == '4'
-                                ? showWork(item.name, item.projectTaskId, item)
-                                : item.type == '5'
-                                  ? showTest(item.name, item.projectTaskId, item)
-                                  : item.type == '10'
-                                    ? showEval(
-                                      item.name,
-                                      item.projectTaskId,
-                                      item.type,
-                                      item
-                                    )
-                                    : item.type == '12'
-                                      ? showVote(item.name, item.projectTaskId, item)
-                                      : item.type == '13'
-                                        ? showWork(item.name, item.projectTaskId)
-                                        : null
-                        ">
+                              ? showWork(item.name, item.projectTaskId, item)
+                              : item.type == '5'
+                              ? showTest(item.name, item.projectTaskId, item)
+                              : item.type == '10'
+                              ? showEval(
+                                  item.name,
+                                  item.projectTaskId,
+                                  item.type,
+                                  item
+                                )
+                              : item.type == '12'
+                              ? showVote(item.name, item.projectTaskId, item)
+                              : item.type == '13'
+                              ? showWork(item.name, item.projectTaskId)
+                              : null
+                          "
+                        >
                           管理
                         </div>
                       </div>
@@ -531,10 +678,15 @@
                 </template>
               </a-collapse>
               <!-- 无数据创建任务  v-if="taskSyllabus.length == 0"-->
-              <router-link :to="{ path: `/taskadd`, query: { projectId: projectId } }" class="taskbox" style="
-                        background: linear-gradient(180deg, #ddeaff, #f0f8fe);
-                        display: block;
-                      " v-if="taskSyllabus.length == 0">
+              <router-link
+                :to="{ path: `/taskadd`, query: { projectId: projectId } }"
+                class="taskbox"
+                style="
+                  background: linear-gradient(180deg, #ddeaff, #f0f8fe);
+                  display: block;
+                "
+                v-if="taskSyllabus.length == 0"
+              >
                 <div class="leftt">
                   <img src="../../assets/images/taskpage/left2.png" />
                 </div>
@@ -552,14 +704,18 @@
               <!-- 无数据创建任务 -->
             </div>
             <div v-else-if="checkPer(permissions)">
-              <div class="taskbox" @click="
-                () => {
-                  routered.push({
-                    path: `/taskadd`,
-                    query: { projectId: projectId },
-                  });
-                }
-              " style="background: linear-gradient(180deg, #fef3dd, #fffaf0)">
+              <div
+                class="taskbox"
+                @click="
+                  () => {
+                    routered.push({
+                      path: `/taskadd`,
+                      query: { projectId: projectId },
+                    });
+                  }
+                "
+                style="background: linear-gradient(180deg, #fef3dd, #fffaf0)"
+              >
                 <div class="leftt">
                   <img src="../../assets/images/taskpage/left1.png" />
                 </div>
@@ -583,14 +739,24 @@
           <div class="content3">
             <a-tabs v-model:activeKey="activeKey1">
               <a-tab-pane key="8" tab="学员管理">
-                <TableStudent :permissions="permissions" :type="1" :id="projectId" :columns="stuColumns" :stage="stage"
-                  :visable="tabFlag" :groupList="groupList">
+                <TableStudent
+                  :permissions="permissions"
+                  :type="1"
+                  :id="projectId"
+                  :columns="stuColumns"
+                  :stage="stage"
+                  :visable="tabFlag"
+                  :groupList="groupList"
+                >
                   <template #extension="{ data: { record } }">
-                    <a-button @click="showStudent(record)" type="link">查看
+                    <a-button @click="showStudent(record)" type="link"
+                      >查看
                     </a-button>
-                    <a-button @click="settingTopFlag(record)" type="link">{{ record.topFlag ? "取消优秀" : "优秀学员" }}
+                    <a-button @click="settingTopFlag(record)" type="link"
+                      >{{ record.topFlag ? "取消优秀" : "优秀学员" }}
                     </a-button>
-                    <a-button type="link" @click="showChangeGroupModal(record)">换组
+                    <a-button type="link" @click="showChangeGroupModal(record)"
+                      >换组
                     </a-button>
                   </template>
                 </TableStudent>
@@ -599,7 +765,10 @@
                 <div class="group">
                   <div class="groupleft">
                     <div class="groupname">小组名称：</div>
-                    <a-input v-model:value="valuestugn" placeholder="请输入小组名称" />
+                    <a-input
+                      v-model:value="valuestugn"
+                      placeholder="请输入小组名称"
+                    />
                   </div>
                   <div class="groupright">
                     <div class="btn1" @click="searchGroup">
@@ -624,24 +793,33 @@
                   <div class="btn2" @click="exportGroup">
                     <span class="btn2text">导出小组</span>
                   </div>
-                  <ImpoterGroupLeader :data="{ targetId: projectId, type: 1 }" :url="`/admin/studentGroup/importGroup`"
-                    :template-url="`/admin/studentGroup/exportGroup/${projectId}`">
+                  <ImpoterGroupLeader
+                    :data="{ targetId: projectId, type: 1 }"
+                    :url="`/admin/studentGroup/importGroup`"
+                    :template-url="`/admin/studentGroup/exportGroup/${projectId}`"
+                  >
                     <div class="btn2">
                       <span class="btn2text">导入小组长</span>
                     </div>
                   </ImpoterGroupLeader>
-
                 </div>
                 <!-- 小组列表  -->
                 <div class="groupmain">
-                  <div class="groupbox" v-for="item in groupPageList" :key="item.projectGroupId">
+                  <div
+                    class="groupbox"
+                    v-for="item in groupPageList"
+                    :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>
+                          <span
+                            style="color: rgba(0, 0, 0, 0.45); cursor: pointer"
+                            >. . .</span
+                          >
                           <div class="moreItems" v-if="checkPer(permissions)">
-                            <div class="sammo" @click="showModal2(item)">
+                            <div class="sammo" @click="showModal2(item, true)">
                               编辑
                             </div>
                             <div class="sammo" @click="deleteGroupBtn(item.id)">
@@ -653,17 +831,22 @@
                       <div class="leader">组长：{{ item.leaderName }}</div>
                       <div class="grocenter">
                         <div class="leader1">进度</div>
-                        <a-progress :percent="(item.completeRatio || 0) * 100" />
+                        <a-progress
+                          :percent="(item.completeRatio || 0) * 100"
+                        />
                       </div>
-                      <div class="grofooter" @click="
-                        showMemberList(
-                          item.id,
-                          item.groupName,
-                          item.groupMemberCount
-                        )
-                      ">
-                      <div class="ftext">组员名单 ></div>
-                      <!-- <div class="peoples">
+                      <div
+                        class="grofooter"
+                        @click="
+                          showMemberList(
+                            item.id,
+                            item.groupName,
+                            item.groupMemberCount
+                          )
+                        "
+                      >
+                        <div class="ftext">组员名单 ></div>
+                        <!-- <div class="peoples">
                           <div class="people1">
                             <img
                               src="../../assets/images/taskpage/people1.png"
@@ -697,15 +880,24 @@
           <div class="split"></div>
           <a-tabs v-model:activeKey="activeKeyNotice">
             <a-tab-pane key="11" tab="公告">
-              <NoticePub :permissions="permissions" v-model:projectId="projectId"></NoticePub>
+              <NoticePub
+                :permissions="permissions"
+                v-model:projectId="projectId"
+              ></NoticePub>
             </a-tab-pane>
             <a-tab-pane key="12" tab="历史公告" force-render>
-              <NoticeHis v-model:projectId="projectId" :show="activeKeyNotice"></NoticeHis>
+              <NoticeHis
+                v-model:projectId="projectId"
+                :show="activeKeyNotice"
+              ></NoticeHis>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
         <a-tab-pane key="5" tab="项目积分">
-          <ProjectScore :permissions="permissions" :projectId="projectId"></ProjectScore>
+          <ProjectScore
+            :permissions="permissions"
+            :projectId="projectId"
+          ></ProjectScore>
         </a-tab-pane>
         <a-tab-pane key="6" tab="排行榜">
           <div class="split"></div>
@@ -716,16 +908,28 @@
               <div class="left">
                 <div class="time">
                   <div class="text">选择时间：</div>
-                  <a-range-picker v-model:value="valueDate" style="border-radius: 8px; height: 40px; margin-left: 5px"
-                    :placeholder="['      开始时间', '        结束时间']" @change="rankTimeChange" />
+                  <a-range-picker
+                    v-model:value="valueDate"
+                    style="border-radius: 8px; height: 40px; margin-left: 5px"
+                    :placeholder="['      开始时间', '        结束时间']"
+                    @change="rankTimeChange"
+                  />
                 </div>
               </div>
               <div class="right">
-                <div class="btn btn1" @click="rankSearch" style="cursor: pointer">
+                <div
+                  class="btn btn1"
+                  @click="rankSearch"
+                  style="cursor: pointer"
+                >
                   <div class="img1"></div>
                   <div class="te">搜索</div>
                 </div>
-                <div class="btn btn2" @click="rankReset" style="cursor: pointer">
+                <div
+                  class="btn btn2"
+                  @click="rankReset"
+                  style="cursor: pointer"
+                >
                   <div class="img2"></div>
                   <div class="te">重置</div>
                 </div>
@@ -738,17 +942,32 @@
                     <div class="left">进度排行 Top10</div>
                     <div class="icon"></div>
                     <div class="right">
-                      <a-select v-model:value="valuestu1" @change="jdSelectChange" style="width: 80px; margin-right: 16px"
-                        :options="rankjindu">
+                      <a-select
+                        v-model:value="valuestu1"
+                        @change="jdSelectChange"
+                        style="width: 80px; margin-right: 16px"
+                        :options="rankjindu"
+                      >
                       </a-select>
-                      <a-select v-model:value="valuestu2" @change="jdSelectChange1" style="width: 112px"
-                        :options="rankjieduan"></a-select>
+                      <a-select
+                        v-model:value="valuestu2"
+                        @change="jdSelectChange1"
+                        style="width: 112px"
+                        :options="rankjieduan"
+                      ></a-select>
                     </div>
                   </div>
                 </div>
                 <div class="tab">
-                  <a-table :columns="jindutablecolumns" :data-source="jindutabledata" :loading="processRankLoading"
-                    expandRowByClick="true" :scroll="{ y: 330 }" @expand="expandTable" :pagination="false" />
+                  <a-table
+                    :columns="jindutablecolumns"
+                    :data-source="jindutabledata"
+                    :loading="processRankLoading"
+                    expandRowByClick="true"
+                    :scroll="{ y: 330 }"
+                    @expand="expandTable"
+                    :pagination="false"
+                  />
                 </div>
               </div>
               <div class="rank">
@@ -756,14 +975,25 @@
                   <div class="inhead">
                     <div class="left">积分排行 Top10</div>
                     <div class="right">
-                      <a-select v-model:value="valuestu3" style="width: 80px" @change="jfSelectChange"
-                        :options="rankxuefen"></a-select>
+                      <a-select
+                        v-model:value="valuestu3"
+                        style="width: 80px"
+                        @change="jfSelectChange"
+                        :options="rankxuefen"
+                      ></a-select>
                     </div>
                   </div>
                 </div>
                 <div class="tab">
-                  <a-table :columns="xuefentablecolumns" :data-source="xuefentabledata" :loading="scoreRankLoading"
-                    expandRowByClick="true" :scroll="{ y: 330 }" @expand="expandTable" :pagination="false" />
+                  <a-table
+                    :columns="xuefentablecolumns"
+                    :data-source="xuefentabledata"
+                    :loading="scoreRankLoading"
+                    expandRowByClick="true"
+                    :scroll="{ y: 330 }"
+                    @expand="expandTable"
+                    :pagination="false"
+                  />
                 </div>
               </div>
               <div class="rank">
@@ -771,14 +1001,25 @@
                   <div class="inhead">
                     <div class="left">学时排行 Top10</div>
                     <div class="right">
-                      <a-select v-model:value="valuestu4" @change="xsSelectChange" style="width: 80px"
-                        :options="rankxueshi"></a-select>
+                      <a-select
+                        v-model:value="valuestu4"
+                        @change="xsSelectChange"
+                        style="width: 80px"
+                        :options="rankxueshi"
+                      ></a-select>
                     </div>
                   </div>
                 </div>
                 <div class="tab">
-                  <a-table :columns="xueshitablecolumns" :data-source="xueshitabledata" :loading="studytimeRankLoading"
-                    expandRowByClick="true" :scroll="{ y: 330 }" @expand="expandTable" :pagination="false" />
+                  <a-table
+                    :columns="xueshitablecolumns"
+                    :data-source="xueshitabledata"
+                    :loading="studytimeRankLoading"
+                    expandRowByClick="true"
+                    :scroll="{ y: 330 }"
+                    @expand="expandTable"
+                    :pagination="false"
+                  />
                 </div>
               </div>
             </div>
@@ -788,15 +1029,21 @@
           <div class="split"></div>
           <div v-if="!ischeckCertificate">
             <!-- 没有证书显示的页面 -->
-            <div v-if="3 > 7" style="
-                      display: flex;
-                      justify-content: center;
-                      align-items: center;
-                      height: 600px;
-                      flex-direction: column;
-                    ">
+            <div
+              v-if="3 > 7"
+              style="
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                height: 600px;
+                flex-direction: column;
+              "
+            >
               <div class="certificate" @click="addCertificate">
-                <img style="width: 68px; height: 79px" src="../../assets/images/taskpage/nocertificate2.png" />
+                <img
+                  style="width: 68px; height: 79px"
+                  src="../../assets/images/taskpage/nocertificate2.png"
+                />
                 <div style="font-size: 20px; color: #409eff; margin-top: 16px">
                   无证书
                 </div>
@@ -810,54 +1057,77 @@
               <div class="addcertificate1" @click="addCertificate">
                 <div class="addcertext">+添加证书</div>
               </div>
-              <div class="certificatelist" v-for="(item, index) in certificatelist" :key="index">
+              <div
+                class="certificatelist"
+                v-for="(item, index) in certificatelist"
+                :key="index"
+              >
                 <div class="certificatelistMain">
-                  <img @click="previewPic" style="cursor: pointer; width: 140px; height: 200px" :src="fileUrl + item.url"
-                    alt="" srcset="" />
+                  <img
+                    @click="previewPic"
+                    style="cursor: pointer; width: 140px; height: 200px"
+                    :src="fileUrl + item.url"
+                    alt=""
+                    srcset=""
+                  />
                   <div class="cergetrules">
                     <div class="cergetrulesText">获取规则</div>
                     <div class="cergetrulesMain">
                       {{
                         item.finishType === 1
-                        ? "完成项目"
-                        : item.finishType === 2
+                          ? "完成项目"
+                          : item.finishType === 2
                           ? "完成阶段"
                           : item.finishType === 3
-                            ? "完成任务"
-                            : item.finishType === 4
-                              ? "考试合格"
-                              : item.finishType === 5
-                                ? "获得积分"
-                                : "-"
+                          ? "完成任务"
+                          : item.finishType === 4
+                          ? "考试合格"
+                          : item.finishType === 5
+                          ? "获得积分"
+                          : "-"
                       }}
                     </div>
                     <a-popover class="certificateMorebox">
                       <template #content>
-                        <div class="certificateMore" style="
-                                  font-size: 12px;
-                                  font-weight: 400;
-                                  color: #333333;
-                                ">
-                          <div class="certificateMore1" style="line-height: 22px; cursor: pointer"
-                            @click="checkCertificate(item)">
+                        <div
+                          class="certificateMore"
+                          style="
+                            font-size: 12px;
+                            font-weight: 400;
+                            color: #333333;
+                          "
+                        >
+                          <div
+                            class="certificateMore1"
+                            style="line-height: 22px; cursor: pointer"
+                            @click="checkCertificate(item)"
+                          >
                             查看
                           </div>
-                          <div class="certificateMore2" style="line-height: 22px; cursor: pointer"
-                            @click="editCertificate(item)">
+                          <div
+                            class="certificateMore2"
+                            style="line-height: 22px; cursor: pointer"
+                            @click="editCertificate(item)"
+                          >
                             编辑
                           </div>
-                          <div class="certificateMore3" style="line-height: 22px; cursor: pointer"
-                            @click="deleteCertificate(item)">
+                          <div
+                            class="certificateMore3"
+                            style="line-height: 22px; cursor: pointer"
+                            @click="deleteCertificate(item)"
+                          >
                             删除
                           </div>
                         </div>
                       </template>
                       <div>
                         更多
-                        <img style="width: 11px; height: 8px; margin-left: 2px"
-                          src="../../assets/images/project/triangle.png" />
-                    </div>
-                  </a-popover>
+                        <img
+                          style="width: 11px; height: 8px; margin-left: 2px"
+                          src="../../assets/images/project/triangle.png"
+                        />
+                      </div>
+                    </a-popover>
                     <!-- <div class="certificateMorebox">
                           更多
                         </div> -->
@@ -868,25 +1138,33 @@
             </div>
           </div>
           <!-- 查看证书显示的页面 -->
-          <TableCertificateStudent :projectId="projectId" :ACertificateCheckId="ACertificateCheckId"
-            v-if="ischeckCertificate" v-model:ischeckCertificate="ischeckCertificate">
+          <TableCertificateStudent
+            :projectId="projectId"
+            :ACertificateCheckId="ACertificateCheckId"
+            v-if="ischeckCertificate"
+            v-model:ischeckCertificate="ischeckCertificate"
+          >
           </TableCertificateStudent>
         </a-tab-pane>
         <a-tab-pane key="8" tab="设置">
           <div class="split"></div>
           <a-tabs v-model:activeKey="activeSetKey">
-          <a-tab-pane key="12" tab="基本信息">
-            <div class="content7">
+            <a-tab-pane key="12" tab="基本信息">
+              <div class="content7">
                 <!-- <div class="set_tit">
                     <span>基本信息</span>
                   </div> -->
-              <!-- <div class="line"></div> -->
-              <div class="set_body">
-                <!-- <div class="edit" @click="showEditProj">
+                <!-- <div class="line"></div> -->
+                <div class="set_body">
+                  <!-- <div class="edit" @click="showEditProj">
                       <div class="img"></div>
                       <div class="ed">编辑</div>
                     </div> -->
-                  <div class="edit" v-if="status != 3 && checkPer(permissions)" @click="toEdit">
+                  <div
+                    class="edit"
+                    v-if="status != 3 && checkPer(permissions)"
+                    @click="toEdit"
+                  >
                     <div class="img"></div>
                     <div class="ed">编辑</div>
                   </div>
@@ -899,13 +1177,19 @@
                   <div class="set_content">
                     <div class="setc_name"><span>封面图：</span></div>
                     <div class="setc_main">
-                      <img style="width: 151px; height: 84px" :src="picUrl" alt="" />
+                      <img
+                        style="width: 151px; height: 84px"
+                        :src="picUrl"
+                        alt=""
+                      />
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目时间：</span></div>
                     <div class="setc_main">
-                      <span style="color: #999999">{{ startTime }} ～ {{ endTime }}</span>
+                      <span style="color: #999999"
+                        >{{ startTime }} ～ {{ endTime }}</span
+                      >
                     </div>
                   </div>
                   <div class="set_content">
@@ -924,7 +1208,10 @@
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999">
-                        <ProjectLevel v-model:value="level" :tag="true"></ProjectLevel>
+                        <ProjectLevel
+                          v-model:value="level"
+                          :tag="true"
+                        ></ProjectLevel>
                       </span>
                     </div>
                   </div>
@@ -932,22 +1219,29 @@
                     <div class="setc_name"><span>培训体系：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999">
-                        <TrainClass v-model:value="systemId" :tag="true"></TrainClass>
+                        <TrainClass
+                          v-model:value="systemId"
+                          :tag="true"
+                        ></TrainClass>
                       </span>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>同步学习记录：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="checkedSty" :disabled="true"><span
-                          style="color: #333333">同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span></a-radio>
+                      <a-radio v-model:checked="checkedSty" :disabled="true"
+                        ><span style="color: #333333"
+                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                        ></a-radio
+                      >
                     </div>
                   </div>
                   <div class="set_content">
                     <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>
+                      <a-radio v-model:checked="checkedBOEU" :disabled="true"
+                        ><span style="color: #333333">BOEU实施</span></a-radio
+                      >
                     </div>
                   </div>
                   <div class="set_content" v-if="remark">
@@ -974,34 +1268,60 @@
                       <div class="box"></div>
                       <div class="onetitle">上传共享文档</div>
                       <div class="oneedi">
-                        <a-switch size="small" v-model:checked="docChecked" @change="checkedClose"></a-switch>
+                        <a-switch
+                          size="small"
+                          v-model:checked="docChecked"
+                          @change="checkedClose"
+                        ></a-switch>
                       </div>
                     </div>
                     <div class="btnbox" style="margin: 20px">
-                      <a-upload v-if="docChecked == true" v-model:file-list="fileList" name="file"
-                        action="/manageApi/file/upload" @change="handleChange">
-                        <span class="xkbtn" style="cursor: pointer; font-size: 17px">上传</span>
-                        <img src="@/assets/images/basicinfo/cloud.png" style="
-                                  cursor: pointer;
-                                  width: 24px;
-                                  height: 24px;
-                                  margin-left: 8px;
-                                  margin-bottom: 3px;
-                                " alt="" />
+                      <a-upload
+                        v-if="docChecked == true"
+                        v-model:file-list="fileList"
+                        name="file"
+                        action="/manageApi/file/upload"
+                        @change="handleChange"
+                      >
+                        <span
+                          class="xkbtn"
+                          style="cursor: pointer; font-size: 17px"
+                          >上传</span
+                        >
+                        <img
+                          src="@/assets/images/basicinfo/cloud.png"
+                          style="
+                            cursor: pointer;
+                            width: 24px;
+                            height: 24px;
+                            margin-left: 8px;
+                            margin-bottom: 3px;
+                          "
+                          alt=""
+                        />
                       </a-upload>
-                      <div v-if="docChecked == true" class="btnbox" style="margin: 20px">
+                      <div
+                        v-if="docChecked == true"
+                        class="btnbox"
+                        style="margin: 20px"
+                      >
                         <span style="color: #999999">
                           支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
                         </span>
                       </div>
-                      <div v-for="item in fileList" :key="item.uid" style="
-                                width: 500px;
-                                display: flex;
-                                margin-bottom: 30px;
-                                justify-content: space-between;
+                      <div
+                        v-for="item in fileList"
+                        :key="item.uid"
+                        style="
+                          width: 500px;
+                          display: flex;
+                          margin-bottom: 30px;
+                          justify-content: space-between;
                           align-items: center;
-                        " class="docListStyle">
-                      <!-- <img
+                        "
+                        class="docListStyle"
+                      >
+                        <!-- <img
                           src="@/assets/images/basicinfo/download.png"
                           style="
                             cursor: pointer;
@@ -1011,66 +1331,106 @@
                                 "
                                 alt=""
                               /> -->
-                        <img v-if="
-                          item.name.indexOf('jpg') !== -1 ||
-                          item.name.indexOf('jpeg') !== -1 ||
-                          item.name.indexOf('png') !== -1
-                        " style="width: 27px; height: 32px; margin-right: 40px"
-                          src="@/assets/images/coursewareManage/pngpic.png" />
+                        <img
+                          v-if="
+                            item.name.indexOf('jpg') !== -1 ||
+                            item.name.indexOf('jpeg') !== -1 ||
+                            item.name.indexOf('png') !== -1
+                          "
+                          style="width: 27px; height: 32px; margin-right: 40px"
+                          src="@/assets/images/coursewareManage/pngpic.png"
+                        />
                         <div v-else>
-                          <img v-if="item.name.indexOf('doc') !== -1" style="
+                          <img
+                            v-if="item.name.indexOf('doc') !== -1"
+                            style="
+                              width: 27px;
+                              height: 32px;
+                              margin-right: 40px;
+                            "
+                            src="@/assets/images/coursewareManage/docpic.png"
+                          />
+                          <div v-else>
+                            <img
+                              v-if="item.name.indexOf('xls') !== -1"
+                              style="
+                                width: 27px;
+                                height: 32px;
+                                margin-right: 40px;
+                              "
+                              src="@/assets/images/coursewareManage/xlspic.png"
+                            />
+                            <div v-else>
+                              <img
+                                v-if="item.name.indexOf('ppt') !== -1"
+                                style="
+                                  width: 27px;
+                                  height: 32px;
+                                  margin-right: 40px;
+                                "
+                                src="@/assets/images/coursewareManage/pptpic.png"
+                              />
+                              <div v-else>
+                                <img
+                                  v-if="item.name.indexOf('pdf') !== -1"
+                                  style="
                                     width: 27px;
                                     height: 32px;
                                     margin-right: 40px;
-                                  " src="@/assets/images/coursewareManage/docpic.png" />
-                          <div v-else>
-                            <img v-if="item.name.indexOf('xls') !== -1" style="
+                                  "
+                                  src="@/assets/images/coursewareManage/pdfpic.png"
+                                />
+                                <div v-else>
+                                  <img
+                                    v-if="item.name.indexOf('zip') !== -1"
+                                    style="
                                       width: 27px;
                                       height: 32px;
                                       margin-right: 40px;
-                                    " src="@/assets/images/coursewareManage/xlspic.png" />
-                            <div v-else>
-                              <img v-if="item.name.indexOf('ppt') !== -1" style="
-                                        width: 27px;
-                                        height: 32px;
-                                        margin-right: 40px;
-                                      " src="@/assets/images/coursewareManage/pptpic.png" />
-                              <div v-else>
-                                <img v-if="item.name.indexOf('pdf') !== -1" style="
-                                          width: 27px;
-                                          height: 32px;
-                                          margin-right: 40px;
-                                        " src="@/assets/images/coursewareManage/pdfpic.png" />
-                                <div v-else>
-                                  <img v-if="item.name.indexOf('zip') !== -1" style="
-                                            width: 27px;
-                                            height: 32px;
-                                            margin-right: 40px;
-                                          " src="@/assets/images/coursewareManage/zippic.png" />
-                                  <img v-else style="
-                                            width: 27px;
-                                            height: 32px;
-                                            margin-right: 40px;
-                                          " src="@/assets/images/coursewareManage/docpic.png" />
+                                    "
+                                    src="@/assets/images/coursewareManage/zippic.png"
+                                  />
+                                  <img
+                                    v-else
+                                    style="
+                                      width: 27px;
+                                      height: 32px;
+                                      margin-right: 40px;
+                                    "
+                                    src="@/assets/images/coursewareManage/docpic.png"
+                                  />
                                 </div>
                               </div>
                             </div>
                           </div>
                         </div>
-                        <span style="
-                                  font: oblique bold 16px Sans-serif;
-                                  width: 300px;
-                                  display: block;
-                                  overflow: hidden;
-                                  white-space: nowrap;
-                                  text-overflow: ellipsis;
-                                " :title="item.name">{{ item.name }}</span>
-                        <a href="javascript:void(0);" @click="
-                          downloadFile(
-                            item.response ? item.response.data : ''
-                          )
-                        " style="margin-left: 5px">下载</a>
-                        <span style="color: #4ea6ff; float: right; cursor: pointer" @click="deFile(item.uid)">删除</span>
+                        <span
+                          style="
+                            font: oblique bold 16px Sans-serif;
+                            width: 300px;
+                            display: block;
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis;
+                          "
+                          :title="item.name"
+                          >{{ item.name }}</span
+                        >
+                        <a
+                          href="javascript:void(0);"
+                          @click="
+                            downloadFile(
+                              item.response ? item.response.data : ''
+                            )
+                          "
+                          style="margin-left: 5px"
+                          >下载</a
+                        >
+                        <span
+                          style="color: #4ea6ff; float: right; cursor: pointer"
+                          @click="deFile(item.uid)"
+                          >删除</span
+                        >
                       </div>
                     </div>
                   </div>
@@ -1082,86 +1442,190 @@
       </a-tabs>
     </div>
     <!-- 时间管理抽屉 -->
-    <time-manage v-model:Tvisible="visible" :projectTaskId="projectTaskId" :title="showTimeText" :itemsType="itemstype" />
+    <time-manage
+      v-model:Tvisible="visible"
+      :projectTaskId="projectTaskId"
+      :title="showTimeText"
+      :itemsType="itemstype"
+    />
     <!-- 在线、案例等管理抽屉 -->
-    <ProjectOnlineManage v-model:Tvisible="onlineVisible" :projectTaskId="projectTaskId" :title="showTimeText"
-      :itemsType="itemstype" :datasource="commonData" :levelName="commonLevelName" />
+    <ProjectOnlineManage
+      v-model:Tvisible="onlineVisible"
+      :projectTaskId="projectTaskId"
+      :title="showTimeText"
+      :itemsType="itemstype"
+      :datasource="commonData"
+      :levelName="commonLevelName"
+    />
     <!-- 面授管理抽屉 -->
-    <ProjectFaceTaskManage v-model:Fvisible="FaceVisivle" :projectTaskId="projectTaskId" :title="showFaceText"
-      :projectTaskInfo="projectTaskInfo" />
+    <ProjectFaceTaskManage
+      v-model:Fvisible="FaceVisivle"
+      :projectTaskId="projectTaskId"
+      :title="showFaceText"
+      :projectTaskInfo="projectTaskInfo"
+    />
     <!-- 作业管理抽屉 -->
-    <ProjectHomeWorkManage v-model:Wvisible="Wvisible" :projectTaskId="projectTaskId" :title="showWorkText"
-      :projectTaskInfo="projectTaskInfo" />
+    <ProjectHomeWorkManage
+      v-model:Wvisible="Wvisible"
+      :projectTaskId="projectTaskId"
+      :title="showWorkText"
+      :projectTaskInfo="projectTaskInfo"
+    />
     <!-- 系统考试管理抽屉 -->
-    <ProjectExamManage v-model:TMvisible="TMvisible" :title="showTestText" :projectTaskId="projectTaskId"
-      :datasource="examData" />
+    <ProjectExamManage
+      v-model:TMvisible="TMvisible"
+      :title="showTestText"
+      :projectTaskId="projectTaskId"
+      :datasource="examData"
+    />
     <!-- 外部考试管理抽屉 -->
-    <ProjectExternalExamManage v-model:TMvisibleExternal="TMvisibleExternal" :title="showTestText"
-      :projectTaskId="projectTaskId" :datasource="examData" />
+    <ProjectExternalExamManage
+      v-model:TMvisibleExternal="TMvisibleExternal"
+      :title="showTestText"
+      :projectTaskId="projectTaskId"
+      :datasource="examData"
+    />
     <!-- 投票管理抽屉 -->
-    <ProjectVoteManage v-model:ProjectVoteModelVisible="projectVoteModelVisible" :title="voteModelVisibleTitle"
-      :levelName="voteLevelName" :datasource="voteData" />
+    <ProjectVoteManage
+      v-model:ProjectVoteModelVisible="projectVoteModelVisible"
+      :title="voteModelVisibleTitle"
+      :levelName="voteLevelName"
+      :datasource="voteData"
+    />
     <!-- 测评抽屉 -->
-    <ProjectEvalManage v-model:Evalvisible="Evalvisible" :title="showTestText" :projectTaskId="projectTaskId"
-      :itemsType="evaltype" :datasource="evalData" />
+    <ProjectEvalManage
+      v-model:Evalvisible="Evalvisible"
+      :title="showTestText"
+      :projectTaskId="projectTaskId"
+      :itemsType="evaltype"
+      :datasource="evalData"
+    />
     <!-- 添加证书抽屉 -->
-    <AddCertificate v-model:ACertificate="ACertificate" v-model:projectId="projectId"
-      v-model:ACertificateEdit="ACertificateEdit" :getCertificate="getCertificate"
-      :ACertificateEditId="ACertificateEditId" />
+    <AddCertificate
+      v-model:ACertificate="ACertificate"
+      v-model:projectId="projectId"
+      v-model:ACertificateEdit="ACertificateEdit"
+      :getCertificate="getCertificate"
+      :ACertificateEditId="ACertificateEditId"
+    />
     <!-- 创建证书抽屉 -->
     <CreateCertificate v-model:CCertificate="CCertificate" />
     <!-- 预览 -->
-    <a-modal :title="null" width="60%" :footer="null" v-model:visible="modal1Visible"
-      style="display: flex; justify-content: center; align-items: center" @ok="setModal1Visible(false)">
-      <img :width="screenWidth * 0.55" src="https://picb6.photophoto.cn/32/552/32552236_1.jpg" alt="" srcset="" />
+    <a-modal
+      :title="null"
+      width="60%"
+      :footer="null"
+      v-model:visible="modal1Visible"
+      style="display: flex; justify-content: center; align-items: center"
+      @ok="setModal1Visible(false)"
+    >
+      <img
+        :width="screenWidth * 0.55"
+        src="https://picb6.photophoto.cn/32/552/32552236_1.jpg"
+        alt=""
+        srcset=""
+      />
     </a-modal>
     <!-- 学员（小组管理）创建小组抽屉 -->
-    <subset-manage v-model:Svisible="subsetVisivle" :projectId="projectId" v-model:getGroup="getGroup" />
+    <subset-manage
+      v-model:Svisible="subsetVisivle"
+      :projectId="projectId"
+      v-model:getGroup="getGroup"
+    />
     <!-- 学员管理-添加学员抽屉 -->
     <!-- <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" />
+    <proj-check-ship
+      v-model:ProjCheckvisible="Stuvisible"
+      :selectProjectId="projectId"
+      v-model:addAuthList="addAuthList"
+      :authClassify="authClassify"
+      classify="project"
+      :type="2"
+    />
     <!-- 学员管理-导入学员抽屉 -->
     <import-stu v-model:Importvisible="Importvisible" />
     <!-- 查看学员 传入查看学员的id-->
-    <see-stu v-model:Seevisible="Seevisible" v-model:checkStuId="checkStuId" v-model:projectId="projectId" />
+    <see-stu
+      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" />
+    <change-group
+      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:chooseGroupName="chooseGroupName" v-model:groupMemberCount="groupMemberCount"
-      v-model:projectId="projectId" />
+    <member-list
+      v-model:Lvisible="Lvisible"
+      v-model:chooseGroupId="chooseGroupId"
+      v-model:chooseGroupName="chooseGroupName"
+      v-model:groupMemberCount="groupMemberCount"
+      v-model:projectId="projectId"
+    />
     <!-- 面授学员抽屉 -->
-    <ProjectFaceStu v-model:FSvisible="FSvisible" :projectTaskInfo="facestudent" />
+    <ProjectFaceStu
+      v-model:FSvisible="FSvisible"
+      :projectTaskInfo="facestudent"
+    />
     <!-- 活动直播考勤抽屉 -->
-    <active-attendance v-model:AAvisible="AAvisible" :datasource="liveData" :title="showKaoqinText" types="2"
-      classify="2" />
+    <active-attendance
+      v-model:AAvisible="AAvisible"
+      :datasource="liveData"
+      :title="showKaoqinText"
+      types="2"
+      classify="2"
+    />
     <!-- 概览（无数据）-项目发布弹窗 -->
     <div>
-      <a-modal v-model:visible="pubproject" :title="null" @ok="closeModal" :footer="null" :closable="false"
-        :centered="true" wrapClassName="pubproject" width="679px" height="437px">
-        <div class="modalHeader" style="
-                  width: 100%;
-                  height: 68px;
-                  display: flex;
-                  align-items: center;
-                  justify-content: space-between;
-                ">
+      <a-modal
+        v-model:visible="pubproject"
+        :title="null"
+        @ok="closeModal"
+        :footer="null"
+        :closable="false"
+        :centered="true"
+        wrapClassName="pubproject"
+        width="679px"
+        height="437px"
+      >
+        <div
+          class="modalHeader"
+          style="
+            width: 100%;
+            height: 68px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+          "
+        >
           <div class="headerLeft" style="margin-left: 32px">
-            <span style="width: 15px; height: 15px"><img src="../../assets/images/taskpage/pub.png" /></span>
-            <span class="headerLeftText" style="font-size: 16px; margin-left: 10px">项目发布</span>
+            <span style="width: 15px; height: 15px"
+              ><img src="../../assets/images/taskpage/pub.png"
+            /></span>
+            <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" />
+            <img
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
+            />
           </div>
         </div>
         <div class="modalMain">
           <div class="projectname">管理者进阶-腾飞班1</div>
           <div class="projecttime">
-            <span class="timeti">项目时间：</span><span class="timeme">2022/08/01-2022/08/30</span>
+            <span class="timeti">项目时间：</span
+            ><span class="timeme">2022/08/01-2022/08/30</span>
           </div>
           <div class="projectbox">
             <div class="promessage">
@@ -1178,8 +1642,12 @@
             <span class="sendtext">发送项目通知</span>
           </div>
           <div class="ckb">
-            <a-checkbox v-model:checked="checked1"><span class="sendpeo">发给老师</span></a-checkbox>
-            <a-checkbox v-model:checked="checked2"><span class="sendpeo">发给学员</span></a-checkbox>
+            <a-checkbox v-model:checked="checked1"
+              ><span class="sendpeo">发给老师</span></a-checkbox
+            >
+            <a-checkbox v-model:checked="checked2"
+              ><span class="sendpeo">发给学员</span></a-checkbox
+            >
           </div>
           <div class="pubtn">
             <a-button class="pubtn1" @click="closeModal">取消</a-button>
@@ -1191,53 +1659,89 @@
     <!-- 概览（无数据）-项目发布弹窗 -->
     <!-- 学员-创建小组弹窗 -->
     <div>
-      <a-modal v-model:visible="stugroup" :title="null" @ok="closeModal2" :footer="null" :closable="false"
-        :centered="true" wrapClassName="doublepro" width="624px" height="332px">
-        <div class="modalHeader" style="
-                  width: 100%;
-                  height: 68px;
-                  display: flex;
-                  align-items: center;
-                  justify-content: space-between;
-                ">
+      <a-modal
+        v-model:visible="stugroup"
+        :title="null"
+        @ok="closeModal2"
+        :footer="null"
+        :closable="false"
+        :centered="true"
+        wrapClassName="doublepro"
+        width="624px"
+        height="332px"
+      >
+        <div
+          class="modalHeader"
+          style="
+            width: 100%;
+            height: 68px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+          "
+        >
           <div class="headerLeft" style="margin-left: 32px">
             <span class="headerLeftText" style="font-size: 16px">{{
               !groupInfo?.id ? "创建小组" : "编辑小组"
             }}</span>
           </div>
           <div style="cursor: pointer; margin-right: 32px" @click="closeModal2">
-            <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
+            <img
+              style="width: 22px; height: 22px"
+              src="../../assets/images/basicinfo/close22.png"
+            />
           </div>
         </div>
         <div class="modalMain">
           <div class="name">
             <div class="star" style="margin-top: -4px">
-              <img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
             </div>
             <div class="inname">小组名称:</div>
             <div class="in">
-              <a-input v-model:value="groupInfo.groupName" placeholder="请输入小组名称" style="border-radius: 8px; height: 40px"
-                :maxlength="100" show-count />
+              <a-input
+                v-model:value="groupInfo.groupName"
+                placeholder="请输入小组名称"
+                style="border-radius: 8px; height: 40px"
+                :maxlength="100"
+                show-count
+              />
             </div>
           </div>
           <div class="name">
             <div class="star" style="margin-top: -4px">
-              <img style="width: 10px; height: 10px" src="../../assets/images/basicinfo/asterisk.png" />
+              <img
+                style="width: 10px; height: 10px"
+                src="../../assets/images/basicinfo/asterisk.png"
+              />
             </div>
             <div class="inname">组员人数:</div>
             <div class="in">
-              <a-input-number :min="0" :max="300" :precision="0" style="width: 395px; height: 40px; border-radius: 8px"
-                v-model:value="groupInfo.groupMemberCount"></a-input-number>
+              <a-input-number
+                :min="0"
+                :max="300"
+                :precision="0"
+                style="width: 395px; height: 40px; border-radius: 8px"
+                v-model:value="groupInfo.groupMemberCount"
+              ></a-input-number>
             </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" />
+              <img
+                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="groupInfo.leaderId" v-model:name="groupInfo.leaderName"></ProjectManager>
+              <ProjectManager
+                v-model:value="groupInfo.leaderId"
+                v-model:name="groupInfo.leaderName"
+              ></ProjectManager>
             </div>
           </div>
           <div class="pubtn">
@@ -1250,8 +1754,14 @@
     <!-- 学员-创建小组弹窗 -->
     <!-- 取消学员弹窗 -->
     <div>
-      <a-modal v-model:visible="canclestu" :footer="null" :closable="close" wrapClassName="canclestu" centered="true"
-        @cancel="cancelyou">
+      <a-modal
+        v-model:visible="canclestu"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu"
+        centered="true"
+        @cancel="cancelyou"
+      >
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
@@ -1277,7 +1787,13 @@
     <!-- 取消学员弹窗 -->
     <!-- 优秀学员弹窗 -->
     <div>
-      <a-modal v-model:visible="canclestu1" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
+      <a-modal
+        v-model:visible="canclestu1"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu1"
+        centered="true"
+      >
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
@@ -1303,7 +1819,13 @@
     <!-- 取消学员弹窗 -->
     <!-- 删除学员弹窗 -->
     <div>
-      <a-modal v-model:visible="deleteOneStu" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
+      <a-modal
+        v-model:visible="deleteOneStu"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu1"
+        centered="true"
+      >
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
@@ -1329,8 +1851,14 @@
     <!-- 删除学员弹窗 -->
     <!-- 删除弹窗 -->
     <div>
-      <a-modal v-model:visible="delete_hs" :footer="null" :closable="closableQR" wrapClassName="DelModal"
-        style="margin-top: 400px" @cancel="delete_exit">
+      <a-modal
+        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>
           <div class="del_main">
@@ -1357,7 +1885,13 @@
     <!-- 删除弹窗 -->
     <!-- 批量删除弹窗 -->
     <div>
-      <a-modal v-model:visible="allDelete" :footer="null" :closable="close" wrapClassName="canclestu1" centered="true">
+      <a-modal
+        v-model:visible="allDelete"
+        :footer="null"
+        :closable="close"
+        wrapClassName="canclestu1"
+        centered="true"
+      >
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
@@ -1383,27 +1917,50 @@
     <!-- 编辑项目弹窗 -->
     <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">
-      <div class="modalHeader" style="
-                width: 100%;
-                height: 68px;
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-              ">
+    <a-modal
+      v-model:visible="projectPub"
+      :title="null"
+      :footer="null"
+      :closable="false"
+      wrapClassName="projectPub"
+      width="679px"
+      height="437px"
+    >
+      <div
+        class="modalHeader"
+        style="
+          width: 100%;
+          height: 68px;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+        "
+      >
         <div class="headerLeft" style="margin-left: 32px">
-          <span style="width: 15px; height: 15px"><img src="../../assets/images/taskpage/pub.png" /></span>
-          <span class="headerLeftText" style="font-size: 16px; margin-left: 10px">项目发布</span>
+          <span style="width: 15px; height: 15px"
+            ><img src="../../assets/images/taskpage/pub.png"
+          /></span>
+          <span
+            class="headerLeftText"
+            style="font-size: 16px; margin-left: 10px"
+            >项目发布</span
+          >
         </div>
-        <div style="cursor: pointer; margin-right: 32px" @click="closeProjectPub">
-          <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png" />
+        <div
+          style="cursor: pointer; margin-right: 32px"
+          @click="closeProjectPub"
+        >
+          <img
+            style="width: 22px; height: 22px"
+            src="../../assets/images/basicinfo/close22.png"
+          />
         </div>
       </div>
       <div class="modalMain">
         <div class="projectname">{{ releaseProjectName }}</div>
         <div class="projecttime" v-if="startTime">
-          <span class="timeti">项目时间：</span><span class="timeme">{{ startTime }}~{{ endTime }}</span>
+          <span class="timeti">项目时间：</span
+          ><span class="timeme">{{ startTime }}~{{ endTime }}</span>
         </div>
         <div class="projectbox">
           <div class="promessage">
@@ -1415,9 +1972,9 @@
           <div class="stumessage">
             <div class="messageme1">学员信息</div>
             <div class="messagege1">项目共{{ projectStudentsNum }}名学员</div>
+          </div>
         </div>
-      </div>
-      <!-- <div class="send">
+        <!-- <div class="send">
           <a-switch v-model:checked="checked" size="small" />
           <span class="sendtext">发送路径通知</span>
         </div>
@@ -1435,12 +1992,21 @@
         </div>
       </div>
       <!--  加载动画 -->
-      <div class="aeLoading" :style="{ display: projectPubLoading ? 'flex' : 'none' }">
+      <div
+        class="aeLoading"
+        :style="{ display: projectPubLoading ? 'flex' : 'none' }"
+      >
         <a-spin :spinning="projectPubLoading" />
       </div>
     </a-modal>
     <!-- 撤回弹窗 -->
-    <a-modal v-model:visible="backModal" :footer="null" :closable="closeBack" wrapClassName="CopyModal" centered="true">
+    <a-modal
+      v-model:visible="backModal"
+      :footer="null"
+      :closable="closeBack"
+      wrapClassName="CopyModal"
+      centered="true"
+    >
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -1465,8 +2031,13 @@
       </div>
     </a-modal>
     <!-- 项目撤回审核弹窗 -->
-    <a-modal v-model:visible="recallReviewModal" :footer="null" :closable="false" wrapClassName="CopyModal"
-      centered="true">
+    <a-modal
+      v-model:visible="recallReviewModal"
+      :footer="null"
+      :closable="false"
+      wrapClassName="CopyModal"
+      centered="true"
+    >
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -1491,7 +2062,13 @@
       </div>
     </a-modal>
     <!-- 结束项目弹窗 -->
-    <a-modal v-model:visible="stopModal" :footer="null" :closable="closeStop" wrapClassName="CopyModal" centered="true">
+    <a-modal
+      v-model:visible="stopModal"
+      :footer="null"
+      :closable="closeStop"
+      wrapClassName="CopyModal"
+      centered="true"
+    >
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -1518,7 +2095,13 @@
       </div>
     </a-modal>
     <!-- 存为模版弹窗 -->
-    <a-modal v-model:visible="startModal" :footer="null" :closable="closeStart" wrapClassName="CopyModal" centered="true">
+    <a-modal
+      v-model:visible="startModal"
+      :footer="null"
+      :closable="closeStart"
+      wrapClassName="CopyModal"
+      centered="true"
+    >
       <div class="delete">
         <div class="del_header"></div>
         <div class="del_main">
@@ -1542,10 +2125,19 @@
       </div>
     </a-modal>
     <!-- 二维码弹窗 -->
-    <two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" index="0" type="课程二维码" />
+    <two-dimensional-code
+      v-model:codevisible="codevisible"
+      :codeInfo="codeInfo"
+      index="0"
+      type="课程二维码"
+    />
     <!-- 二维码弹窗 -->
     <!-- 换组弹窗 -->
-    <ChangeGroupModal v-model:changegroupV="changegroupV" :groupList="groupList" :checkgroupStuId="checkgroupStuId" />
+    <ChangeGroupModal
+      v-model:changegroupV="changegroupV"
+      :groupList="groupList"
+      :checkgroupStuId="checkgroupStuId"
+    />
     <!-- 换组弹窗 -->
   </div>
 </template>
@@ -1674,7 +2266,7 @@ export default {
           width: 80,
           align: "center",
           className: "h",
-          ellipsis: true
+          ellipsis: true,
         },
         {
           title: "证书数量",
@@ -1683,7 +2275,7 @@ export default {
           width: 80,
           align: "center",
           className: "h",
-          ellipsis: true
+          ellipsis: true,
         },
         {
           title: "状态",
@@ -1698,8 +2290,8 @@ export default {
               {record.finishTaskNum == 0
                 ? "未开始"
                 : record.finishTaskNum == record.totalTaskNum
-                  ? "已完成"
-                  : "进行中"}
+                ? "已完成"
+                : "进行中"}
             </div>
           ),
         },
@@ -1828,6 +2420,7 @@ export default {
       allDelete: false, //批量删除弹窗
       pubproject: false,
       stugroup: false,
+      isEdit: false,
       canclestu: false,
       canclestu1: false,
       deleteOneStu: false, //删除单个学员弹窗
@@ -1847,7 +2440,7 @@ export default {
       inputValue3: 5,
       valueaddm: "", //创建小组输入小组长
       valueaddg: "", //创建小组输入名称
-      groupInfo: { leaderName: '', leaderId: '' }, //创建小组
+      groupInfo: { leaderName: "", leaderId: "" }, //创建小组
       groupPageList: [], //小组列表
       groupNumber: 0, //组员人数
       valuestun: "", //学员管理姓名
@@ -2479,7 +3072,8 @@ export default {
       console.log("点击换组", record.studentId);
       state.checkgroupStuId = record.studentId;
     };
-    const showModal2 = (item) => {
+    const showModal2 = (item, isEdit) => {
+      state.isEdit = isEdit;
       state.stugroup = true;
       state.groupInfo = item || {};
     };
@@ -2916,7 +3510,9 @@ export default {
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
-                          {/* console.log("点击了111", text); */ }
+                          {
+                            /* console.log("点击了111", text); */
+                          }
                           showDeleteOne(text.record.studentId);
                         }}
                       >
@@ -3111,12 +3707,12 @@ export default {
             value.source == 0
               ? "报名加入"
               : value.source == 1
-                ? "指定添加"
-                : value.source == 2
-                  ? "组织添加"
-                  : value.source == 3
-                    ? "受众添加"
-                    : "-", //加入方式
+              ? "指定添加"
+              : value.source == 2
+              ? "组织添加"
+              : value.source == 3
+              ? "受众添加"
+              : "-", //加入方式
           stutime: toDate(value.beginStudyTime, "Y-M-D"), //开始学习时间
         };
         array.push(obj);
@@ -3160,10 +3756,10 @@ export default {
           state.valuegood == "优秀学员"
             ? 1
             : state.valuegood == "普通学员"
-              ? 0
-              : state.valuegood == "全部"
-                ? ""
-                : "",
+            ? 0
+            : state.valuegood == "全部"
+            ? ""
+            : "",
       };
       //重新获取列表
       getStu(obj);
@@ -3305,8 +3901,8 @@ export default {
       };
       getGroupList(objf).then((res) => {
         state.groupPageList = res.data.data.rows;
-        setGroupList(res.data.data.rows)
-      })
+        setGroupList(res.data.data.rows);
+      });
     };
     //删除小组
     const deleteGroupBtn = (projectGroupId) => {
@@ -3317,19 +3913,27 @@ export default {
     };
     //创建小组
     const createGroup = async () => {
-      console.log("state.groupPageList" + state.groupPageList)
-      const d = state.groupPageList.filter(item => item.leaderId === state.groupInfo.leaderId);
+      console.log("state.groupPageList" + state.groupPageList);
+      const d = state.groupPageList.filter(
+        (item) => item.leaderId === state.groupInfo.leaderId
+      );
       const id = state.groupInfo.id;
-      // 过滤掉编辑时候，只修改了组员最大值时候
-      if(id !== d[0].id) {
-        if (d.length > 0 ) {
+      if (state.isEdit) {
+        if (d.length > 0 && d[0].id !== id) {
+          return message.warn(d[0].leaderName + "已是小组长，请重新选择");
+        }
+      } else {
+        if (d.length > 0) {
           return message.warn(d[0].leaderName + "已是小组长，请重新选择");
         }
       }
-      await editGroup({ ...state.groupInfo, projectId: state.projectId })
-      message.success(id ? '小组编辑成功' : "小组创建成功");
+      // 过滤掉编辑时候，只修改了组员最大值时候
+
+      state.isEdit = false;
+      await editGroup({ ...state.groupInfo, projectId: state.projectId });
+      message.success(id ? "小组编辑成功" : "小组创建成功");
       getGroup();
-      console.log("state.groupPageList:")
+      console.log("state.groupPageList:");
       getStu();
     };
     //搜索小组重置
@@ -3542,14 +4146,14 @@ export default {
           state.action == 2
             ? "发布"
             : state.action == 0
-              ? "提交审核"
-              : state.action == 1
-                ? "撤回审核"
-                : state.action == 3
-                  ? "撤回发布"
-                  : state.action == -1
-                    ? ""
-                    : "-";
+            ? "提交审核"
+            : state.action == 1
+            ? "撤回审核"
+            : state.action == 3
+            ? "撤回发布"
+            : state.action == -1
+            ? ""
+            : "-";
       });
     };
     //打开发布弹窗
@@ -3832,36 +4436,36 @@ export default {
           status == -1
             ? (isEnd = true)
             : nowTime > endTime
-              ? (isEnd = true)
-              : (isEnd = false);
+            ? (isEnd = true)
+            : (isEnd = false);
           break;
         case 3:
           status == -1
             ? (isEnd = true)
             : nowTime > endTime
-              ? (isEnd = true)
-              : (isEnd = false);
+            ? (isEnd = true)
+            : (isEnd = false);
           break;
         case 5:
           status == -1
             ? (isEnd = true)
             : nowTime > endTime
-              ? (isEnd = true)
-              : (isEnd = false);
+            ? (isEnd = true)
+            : (isEnd = false);
           break;
         case 7:
           status == -1
             ? (isEnd = true)
             : nowTime > endTime
-              ? (isEnd = true)
-              : (isEnd = false);
+            ? (isEnd = true)
+            : (isEnd = false);
           break;
         case 10:
           status == -1
             ? (isEnd = true)
             : nowTime > endTime
-              ? (isEnd = true)
-              : (isEnd = false);
+            ? (isEnd = true)
+            : (isEnd = false);
           break;
       }
       return isEnd;
@@ -3880,9 +4484,9 @@ export default {
           return message.error("该任务无法学习，请联系管理员进行替换。");
         window.open(
           window.location.protocol +
-          import.meta.env.VUE_APP_BOE_API_URL +
-          "/mobile/pages/study/courseStudy?id=" +
-          item.targetId,
+            import.meta.env.VUE_APP_BOE_API_URL +
+            "/mobile/pages/study/courseStudy?id=" +
+            item.targetId,
           "_top"
         );
       }
@@ -4258,16 +4862,20 @@ export default {
   .ant-modal {
     .ant-modal-body {
       .modalHeader {
-        background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-            rgba(78, 166, 255, 0) 100%);
+        background: linear-gradient(
+          rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%
+        );
       }
 
       padding: 0;
 
       .modalHeader {
-        background: linear-gradient(0deg,
-            rgba(78, 166, 255, 0) 0%,
-            rgba(78, 166, 255, 0.2) 100%);
+        background: linear-gradient(
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
+        );
       }
 
       .modalMain {
@@ -4303,9 +4911,11 @@ export default {
           .promessage {
             width: 280px;
             height: 110px;
-            background: linear-gradient(180deg,
-                rgba(254, 243, 221, 1),
-                rgba(255, 250, 240, 1));
+            background: linear-gradient(
+              180deg,
+              rgba(254, 243, 221, 1),
+              rgba(255, 250, 240, 1)
+            );
             border-radius: 10px;
             margin-right: 7px;
 
@@ -4327,9 +4937,11 @@ export default {
           .stumessage {
             width: 280px;
             height: 110px;
-            background: linear-gradient(180deg,
-                rgba(221, 234, 255, 1),
-                rgba(240, 248, 254, 1));
+            background: linear-gradient(
+              180deg,
+              rgba(221, 234, 255, 1),
+              rgba(240, 248, 254, 1)
+            );
             border-radius: 10px;
 
             .messageme1 {
@@ -4458,8 +5070,10 @@ export default {
             position: absolute;
             width: calc(100%);
             height: 68px;
-            background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%);
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
           }
 
           .del_main {
@@ -4582,8 +5196,10 @@ export default {
             position: absolute;
             width: calc(100%);
             height: 68px;
-            background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%);
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
           }
 
           .del_main {
@@ -4711,8 +5327,10 @@ export default {
             position: absolute;
             width: calc(100%);
             height: 68px;
-            background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%);
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
           }
 
           .del_main {
@@ -4809,9 +5427,11 @@ export default {
   .ant-modal {
     .ant-modal-body {
       .modalHeader {
-        background: linear-gradient(0deg,
-            rgba(78, 166, 255, 0) 0%,
-            rgba(78, 166, 255, 0.2) 100%);
+        background: linear-gradient(
+          0deg,
+          rgba(78, 166, 255, 0) 0%,
+          rgba(78, 166, 255, 0.2) 100%
+        );
       }
 
       padding: 0;
@@ -4908,8 +5528,10 @@ export default {
       padding: 0;
 
       .modalHeader {
-        background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-            rgba(78, 166, 255, 0) 100%);
+        background: linear-gradient(
+          rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%
+        );
       }
 
       .modalMain {
@@ -4946,9 +5568,11 @@ export default {
           .promessage {
             width: 280px;
             height: 110px;
-            background: linear-gradient(180deg,
-                rgba(254, 243, 221, 1),
-                rgba(255, 250, 240, 1));
+            background: linear-gradient(
+              180deg,
+              rgba(254, 243, 221, 1),
+              rgba(255, 250, 240, 1)
+            );
             border-radius: 10px;
             margin-right: 7px;
 
@@ -4970,9 +5594,11 @@ export default {
           .stumessage {
             width: 280px;
             height: 110px;
-            background: linear-gradient(180deg,
-                rgba(221, 234, 255, 1),
-                rgba(240, 248, 254, 1));
+            background: linear-gradient(
+              180deg,
+              rgba(221, 234, 255, 1),
+              rgba(240, 248, 254, 1)
+            );
             border-radius: 10px;
 
             .messageme1 {
@@ -5239,7 +5865,7 @@ export default {
   .tableBox {
     margin: 20px 38px 30px;
 
-    .ant-table-thead>tr>th {
+    .ant-table-thead > tr > th {
       font-size: 14px;
       font-weight: 400;
       color: #999ba3;
@@ -5256,12 +5882,11 @@ export default {
   }
 
   .content {
-
     //margin: 0 37px;
-    .ant-tabs-top>.ant-tabs-nav::before,
-    .ant-tabs-bottom>.ant-tabs-nav::before,
-    .ant-tabs-top>div>.ant-tabs-nav::before,
-    .ant-tabs-bottom>div>.ant-tabs-nav::before {
+    .ant-tabs-top > .ant-tabs-nav::before,
+    .ant-tabs-bottom > .ant-tabs-nav::before,
+    .ant-tabs-top > div > .ant-tabs-nav::before,
+    .ant-tabs-bottom > div > .ant-tabs-nav::before {
       border-bottom: 0px;
     }
 
@@ -5537,12 +6162,12 @@ export default {
         min-width: 1040px;
       }
 
-      .ant-collapse-content>.ant-collapse-content-box {
+      .ant-collapse-content > .ant-collapse-content-box {
         padding-top: 0px;
         padding-bottom: 0px;
       }
 
-      .ant-collapse>.ant-collapse-item {
+      .ant-collapse > .ant-collapse-item {
         border: 0px;
       }
 
@@ -5924,12 +6549,12 @@ export default {
     }
 
     .tab {
-      .ant-table-thead>tr>th {
+      .ant-table-thead > tr > th {
         background-color: rgba(239, 244, 252, 1);
         color: rgba(0, 0, 0, 0.85);
       }
 
-      .ant-table-tbody>tr>td {
+      .ant-table-tbody > tr > td {
         border-bottom: 1px solid #f0f6fc;
         color: rgba(0, 0, 0, 0.65);
       }
@@ -5938,7 +6563,9 @@ export default {
         background-color: #eff4fc !important;
       }
 
-      .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
+      .ant-table-tbody
+        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+        > td {
         background: rgba(250, 250, 250, 1);
       }
 
@@ -6051,7 +6678,9 @@ export default {
         margin-left: 8px;
         display: inline-block;
 
-        .ant-select:not(.ant-select-customize-input) .ant-select-selector .ant-select-selection-search-input {
+        .ant-select:not(.ant-select-customize-input)
+          .ant-select-selector
+          .ant-select-selection-search-input {
           background-color: rgba(255, 255, 255, 0);
           border: none;
         }
@@ -6061,11 +6690,15 @@ export default {
           border: none;
         }
 
-        .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
+        .ant-select-single:not(.ant-select-customize-input)
+          .ant-select-selector {
           padding: 0;
         }
 
-        .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
+        .ant-select-focused:not(.ant-select-disabled).ant-select:not(
+            .ant-select-customize-input
+          )
+          .ant-select-selector {
           box-shadow: none;
         }
 
@@ -6482,7 +7115,9 @@ export default {
             background-color: #eff4fc !important;
           }
 
-          .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
+          .ant-table-tbody
+            > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+            > td {
             background: #f6f9fd;
           }
         }
@@ -7214,8 +7849,10 @@ export default {
             position: absolute;
             width: calc(100%);
             height: 40px;
-            background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%);
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
           }
 
           .del_main {
diff --git a/vue.config.js b/vue.config.js
index 4c22a764..26253a7e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-14 17:38:38
+ * @LastEditTime: 2023-02-24 09:03:55
  * @FilePath: /fe-manage/vue.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */