From 57c8d3074f2c7a7b487c9a9146f3940f26032245 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 24 Feb 2023 18:22:28 +0800
Subject: [PATCH 01/28] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE/=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?-=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=81=E7=BB=84=E7=BB=87=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=81=E5=85=B3=E9=97=AD=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 128b1483..ab186c22 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>
@@ -661,8 +661,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 +693,12 @@ function onStuSelectChange(e, l) {
 }
 
 function onOrgSelectChange(e, l) {
+
   orgRowSelection.value = e;
   selectsData.value.deptList = l.selectedNodes;
+
+  // 获取被点击的树节点
+  
 }
 
 function onAuditSelectChange(e, l) {
@@ -821,6 +833,12 @@ function handleStageOk() {
   // }
 }
 
+// 搜索受众值发生变化
+function orgValue(value) {
+  console.log("", value.target.value);
+  searchOrgName.value.keyword = value.target.value;
+}
+
 watch(visiable, () => {
   stuSelectKeys.value = [];
   orgSelectKeys.value = [];

From 7d4adf0a2704bfafaee45e136813773265976209 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 24 Feb 2023 18:25:08 +0800
Subject: [PATCH 02/28] =?UTF-8?q?fix:=E7=A1=AE=E5=AE=9A=E5=90=8E=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E7=BB=84=E7=BB=87=E6=A0=91=E9=80=89=E4=B8=AD=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index ab186c22..44f51d85 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -613,6 +613,7 @@ const closeDrawer = () => {
   visiable.value = false;
   stuData.value = [];
   nameSearch.value.keyword = "";
+  selectedOrgKeys.value = [];
 };
 
 function onLoadData(treeNode) {
@@ -739,6 +740,7 @@ const resetStu = () => {
 //清空选择部门信息
 const deleteDepSelect = () => {
   stuSelectKeys.value = [];
+  selectedOrgKeys.value = [];
 };
 //重置组织
 const resetOrg = () => {

From 1eab54dbe23a6b113ec1a0ffc5cd80103dbf606d Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 24 Feb 2023 18:37:29 +0800
Subject: [PATCH 03/28] =?UTF-8?q?fix:=E8=AF=81=E4=B9=A6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0upload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/AddCertificate.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/AddCertificate.vue b/src/components/drawers/project/AddCertificate.vue
index 2aa0b3f5..3b0c8f27 100644
--- a/src/components/drawers/project/AddCertificate.vue
+++ b/src/components/drawers/project/AddCertificate.vue
@@ -501,8 +501,8 @@ 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 + file.name; 
         }
       });
       return false;

From 035b348d5d9c3dfe7743bbdd2ca06dcafba2d6a9 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 24 Feb 2023 19:10:28 +0800
Subject: [PATCH 04/28] =?UTF-8?q?fix:=E8=AF=81=E4=B9=A6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawers/project/AddCertificate.vue        | 28 +++----------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/components/drawers/project/AddCertificate.vue b/src/components/drawers/project/AddCertificate.vue
index 3b0c8f27..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 = process.env.VUE_APP_FILE_PATH + 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 = process.env.VUE_APP_FILE_PATH + res.data.data;
-          state.imageName = process.env.VUE_APP_FILE_PATH + 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,

From dec6af748a92410be9abef01a69a344bd25364d7 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 24 Feb 2023 19:19:56 +0800
Subject: [PATCH 05/28] -- fix bug

---
 src/components/common/CommonAlert.vue        |  70 ++++++
 src/utils/dialog.js                          |  14 ++
 src/views/courselibrary/CoursewareManage.vue | 249 ++++++++-----------
 3 files changed, 186 insertions(+), 147 deletions(-)
 create mode 100644 src/components/common/CommonAlert.vue
 create mode 100644 src/utils/dialog.js

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/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/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 0ce365df..57395fe2 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -315,40 +315,40 @@
           :pagination="false"
           :scroll="{x:'max-content'}"
       >
-          <template #operation="{ record }">
-            <a-space>
-              <a-button v-if="record.auditStatus===2 && checkPer(record.permissions)"
-                        @click="() => handlePush(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 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.auditStatus===0 && checkPer(record.permissions)"
-                        @click="() => handleSubmit(record, String(record.courseform))" 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 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(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" @click="() => handleStop(record, String(record.courseform))" type="link">停用</a-button>
-                <a-button v-else @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">
@@ -1514,6 +1514,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,
@@ -2136,7 +2137,7 @@ export default defineComponent({
           dataIndex: "publishTime",
           key: "10",
           align: "center",
-          customRender: ({text,auditStatus}) => {
+          customRender: ({text, auditStatus}) => {
             return auditStatus == 3 ? (text || '-') : "-";
           },
         },
@@ -2146,14 +2147,7 @@ export default defineComponent({
           key: "status",
           dataIndex: "status",
           align: "center",
-          customRender: ({record}) => {
-            switch (String(record.status)) {
-              case "0":
-                return "停用";
-              case "1":
-                return "启用";
-            }
-          },
+          customRender: ({record}) => (record.auditStatus === 3 ? (record.status?'启用':'停用'): '-')
         },
         {
           title: "操作",
@@ -2162,7 +2156,7 @@ export default defineComponent({
           key: "id",
           fixed: "right",
           align: "right",
-          slots: { customRender: 'operation' }
+          slots: {customRender: 'operation'}
         },
       ],
       //新加  
@@ -2772,30 +2766,6 @@ export default defineComponent({
       state.viewpowervisible = true;
     };
 
-
-    // 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();
@@ -2803,16 +2773,7 @@ export default defineComponent({
     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);
+
     });
 
     const toolbarConfig = {
@@ -3741,17 +3702,7 @@ export default defineComponent({
         //是否允许未报名的签到: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.cstm_hs = true;
       state.kk_eidt = true;
     };
@@ -3836,13 +3787,14 @@ export default defineComponent({
       state.graduate_hs = false;
       state.addLoading = false;
     };
-    const handleRejectExit = (itm, type) => {
-      if (type === "1") {
-        return;
-      }
-      state.offcourseId = itm.id;
-      state.delete_hs = true;
-      state.back_hs = true;
+    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})
+        }})
     };
 
     const handleJoin = async () => {
@@ -3952,7 +3904,8 @@ export default defineComponent({
             }
           });
         } else if (state.offcourseId) {
-          handle({offcourseId: state.offcourseId, type: -1,
+          handle({
+            offcourseId: state.offcourseId, type: -1,
           }).then((res) => {
             if (res.data.code === 200) {
               message.destroy();
@@ -4245,41 +4198,46 @@ export default defineComponent({
     //   //   console.log(item);
     //   // });
     // };
-    const handleDelete = (item, type) => {
-      console.log(item);
-      if (type === "1") {
-        return;
-      }
-      state.offcourseId = item.id;
+    const handleDelete = (id) => {
+      dialog({
+        content: '确定删除该课程吗？'
+        , ok: async () => {
+          message.success("删除成功");
+          state.tableLoading = true
+          await handle({offcourseId: id,type:-1})
+          getTableDate();
+        }})
+    };
+    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})
+        }})
+    };
 
-      state.delete_hs = true;
-      state.del_hs = true;
-    };
-    const handleCopy = async (itm, type) => {
-      if (type === "1") {
-        return;
-      }
-      state.offcourseId = itm.id;
 
-      state.delete_hs = true;
-      state.copy_hs = true;
-    };
-    const handleSubmit = async (itm, type) => {
-      if (type === "1") {
-        return;
-      }
-      state.offcourseId = itm.id;
-      state.submit_hs = true;
-      state.delete_hs = true;
-    };
-    const handlePush = async (itm, type) => {
-      if (type === "1") {
-        return;
-      }
-      state.offcourseId = itm.id;
-      state.push_hs = true;
-      state.delete_hs = true;
-    };
     const handleCopyP = async (itm) => {
       console.log(itm);
       state.offcourseId = itm.offcourseId;
@@ -4288,23 +4246,23 @@ export default defineComponent({
       state.delete_hs = true;
       state.copy_hs = true;
     };
-    const handleStop = (itm, type) => {
-      console.log(itm);
-      if (type === "1") {
-        return;
-      }
-      state.temp = itm;
-      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) => {
-      if (type === "1") {
-        return;
-      }
-      state.offcourseId = itm.id;
-      state.useCourse = true;
-      state.delete_hs = true;
+    const handleOpen = async (id, index) => {
+      dialog({
+        content: '确定起用该课程吗？'
+        , ok: () => {
+          message.success("起用成功");
+          state.tableData1[index].status = 1
+          handle({offcourseId: id, type: 2})
+        }})
     };
     const handleStart = (item, type) => {
       console.log(item);
@@ -4781,18 +4739,15 @@ export default defineComponent({
       handelChangePageTea2,
       submitReview,
       reviewClick,
-
       showPrower,
       showOwnPrower,
       showViewPrower,
       showManagePrower,
-
       closeOnlineCoursevisible,
       handlelookMs,
       handleLook,
       logW,
       logT,
-
       qrcodeVisible,
     };
   },

From 7bcae5724fefd2438ccad2c8e59905045772e110 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 24 Feb 2023 20:32:18 +0800
Subject: [PATCH 06/28] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 1683 ++++++++++--------
 src/views/courselibrary/courseModal.vue      |   47 +-
 2 files changed, 975 insertions(+), 755 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 0ce365df..eb8e0d41 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,90 +297,150 @@
     <!-- 选择线上还是面授课弹窗 -->
     <!-- 确定新建面授课弹窗 -->
     <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 #operation="{ record }">
-            <a-space>
-              <a-button v-if="record.auditStatus===2 && checkPer(record.permissions)"
-                        @click="() => handlePush(record, String(record.courseform))" type="link">发布
+        <template #operation="{ record }">
+          <a-space>
+            <a-button
+              v-if="record.auditStatus === 2 && checkPer(record.permissions)"
+              @click="() => handlePush(record, String(record.courseform))"
+              type="link"
+              >发布
+            </a-button>
+            <a-button
+              v-if="record.auditStatus === 0 && checkPer(record.permissions)"
+              @click="() => handleSubmit(record, String(record.courseform))"
+              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
+              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(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"
+                @click="() => handleStop(record, String(record.courseform))"
+                type="link"
+                >停用</a-button
+              >
+              <a-button
+                v-else
+                @click="() => handleOpen(record, String(record.courseform))"
+                type="link"
+                >启用</a-button
+              >
+              <a-button
+                @click="() => handleDelete(record, String(record.courseform))"
+                type="link"
+                danger
+                >删除
               </a-button>
-              <a-button v-if="record.auditStatus===0 && checkPer(record.permissions)"
-                        @click="() => handleSubmit(record, String(record.courseform))" 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 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(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" @click="() => handleStop(record, String(record.courseform))" type="link">停用</a-button>
-                <a-button v-else @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>
@@ -391,9 +451,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>
@@ -413,11 +473,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">
@@ -478,15 +538,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>
@@ -500,9 +560,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">
@@ -518,10 +578,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'">
@@ -532,14 +592,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>
@@ -554,42 +614,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>
@@ -603,28 +663,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>
@@ -633,24 +693,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
@@ -660,11 +720,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'),
@@ -709,13 +769,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'">
@@ -727,8 +787,8 @@
                         </div>
 
                         <div
-                            class="jc"
-                            @click="
+                          class="jc"
+                          @click="
                             () => {
                               handelEditStu(record);
                             }
@@ -737,8 +797,8 @@
                           编辑
                         </div>
                         <div
-                            class="jc"
-                            @click="
+                          class="jc"
+                          @click="
                             () => {
                               handelGuan(record);
                             }
@@ -751,7 +811,7 @@
                         <template #overlay>
                           <a-menu style="margin-left: 20px">
                             <a-menu-item
-                                @click="
+                              @click="
                                 () => {
                                   handleCopyP(record);
                                 }
@@ -760,7 +820,7 @@
                               复制
                             </a-menu-item>
                             <a-menu-item
-                                @click="
+                              @click="
                                 () => {
                                   handleDeleteKaike(record);
                                 }
@@ -777,7 +837,7 @@
                         <div class="fb" style="margin-left: -20px">
                           <div class="jc">
                             更多
-                            <down-outlined/>
+                            <down-outlined />
                           </div>
                         </div>
                       </a-dropdown>
@@ -788,14 +848,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>
@@ -808,13 +868,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">
@@ -831,18 +891,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>
@@ -858,10 +922,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>
@@ -872,21 +936,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>
@@ -895,20 +959,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>
@@ -952,8 +1057,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">
@@ -969,7 +1083,7 @@
             <div class="signbox"></div>
             <div class="btnbox">
               <add-homework v-model:info="workInfo">
-                <button class="xkbtn" style="margin-bottom: 0;margin-top: 0">
+                <button class="xkbtn" style="margin-bottom: 0; margin-top: 0">
                   配置作业
                 </button>
               </add-homework>
@@ -986,7 +1100,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">
@@ -995,7 +1111,6 @@
                   </span>
                 </a-tag>
               </div>
-
             </div>
           </div>
           <!--
@@ -1023,12 +1138,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>
 
@@ -1046,35 +1161,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">
@@ -1099,21 +1214,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>
@@ -1126,13 +1268,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>
@@ -1177,13 +1319,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>
@@ -1198,18 +1340,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>
@@ -1219,9 +1361,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>
@@ -1232,17 +1374,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">
@@ -1256,8 +1398,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>
@@ -1267,18 +1409,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>
@@ -1300,16 +1442,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">
@@ -1320,14 +1462,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>
@@ -1346,34 +1488,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 || back_hs || submit_hs || useCourse || push_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>
@@ -1417,9 +1568,9 @@
     </a-modal>
     <!-- 预览弹窗 -->
     <SeeModal
-        :visible="lookCourseModal"
-        :detail="faceDetailObj"
-        @cancel="ft_exit_see"
+      :visible="lookCourseModal"
+      :detail="faceDetailObj"
+      @cancel="ft_exit_see"
     />
     <!--删除 复制 停用弹窗 -->
     <!-- 学员管理课程库-归属权抽屉 -->
@@ -1440,22 +1591,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
@@ -1467,25 +1618,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>
@@ -1503,8 +1654,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";
@@ -1526,7 +1677,8 @@ import {
   studentExport,
   handleStudent,
   getMemberInfoApi,
-  copyCoursePlan, copyCourse,
+  copyCoursePlan,
+  copyCourse,
 } from "@/api/indexCourse";
 import {
   traverseArr,
@@ -1534,8 +1686,8 @@ import {
   newFile,
   getdateToDate,
 } from "../../utils/utils";
-import {validateName} from "@/api/index1";
-import {fileUp} from "../../api/indexEval";
+import { validateName } from "@/api/index1";
+import { fileUp } from "../../api/indexEval";
 import * as api1 from "../../api/index1";
 
 import "@wangeditor/editor/dist/css/style.css";
@@ -1545,17 +1697,17 @@ 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";
 
 //列表表格
@@ -1568,7 +1720,7 @@ const columns2 = [
     key: "studentName",
     width: "6%",
     align: "center",
-    customRender: ({record: {studentName}}) => studentName || "-",
+    customRender: ({ record: { studentName } }) => studentName || "-",
   },
   {
     title: "工号",
@@ -1577,7 +1729,7 @@ const columns2 = [
     width: "12%",
     ellipsis: true,
     align: "center",
-    customRender: ({record: {studentUserNo}}) => studentUserNo || "-",
+    customRender: ({ record: { studentUserNo } }) => studentUserNo || "-",
   },
   {
     title: "开课名称",
@@ -1586,7 +1738,7 @@ const columns2 = [
     width: "12%",
     ellipsis: true,
     align: "center",
-    customRender: ({record: {name}}) => name || "-",
+    customRender: ({ record: { name } }) => name || "-",
   },
   {
     title: "地点",
@@ -1595,7 +1747,7 @@ const columns2 = [
     width: "12%",
     ellipsis: true,
     align: "center",
-    customRender: ({record: {address}}) => address || "-",
+    customRender: ({ record: { address } }) => address || "-",
   },
   {
     title: "数据来源",
@@ -1604,8 +1756,8 @@ const columns2 = [
     ellipsis: true,
     width: "12%",
     align: "center",
-    customRender: ({record: {courseName, routerName}}) =>
-        courseName || routerName || "开课",
+    customRender: ({ record: { courseName, routerName } }) =>
+      courseName || routerName || "开课",
   },
   {
     title: "学习时间",
@@ -1614,7 +1766,7 @@ const columns2 = [
     width: "10%",
     align: "center",
     ellipsis: true,
-    customRender: ({record: {lastStudyTime}}) => lastStudyTime || "-",
+    customRender: ({ record: { lastStudyTime } }) => lastStudyTime || "-",
   },
   {
     title: "签到时间",
@@ -1623,7 +1775,7 @@ const columns2 = [
     width: "10%",
     align: "center",
     ellipsis: true,
-    customRender: ({record: {signTime}}) => signTime || "-",
+    customRender: ({ record: { signTime } }) => signTime || "-",
   },
   {
     title: "状态",
@@ -1633,14 +1785,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>
       );
     },
   },
@@ -1698,7 +1850,7 @@ const columns6 = [
     width: "15%",
     align: "center",
     ellipsis: true,
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -1709,7 +1861,7 @@ const columns6 = [
     width: "15%",
     align: "center",
     ellipsis: true,
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -1720,9 +1872,9 @@ const columns6 = [
     width: "8%",
     align: "center",
     ellipsis: true,
-    customRender: ({text}) => {
-      return text ? text : "-"
-    }
+    customRender: ({ text }) => {
+      return text ? text : "-";
+    },
   },
 
   {
@@ -1732,7 +1884,7 @@ const columns6 = [
     width: "12%",
     ellipsis: true,
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       // return text ? getdateToTime(text * 1000) : "-";
       return text ? text : "-";
     },
@@ -1744,7 +1896,7 @@ const columns6 = [
     width: "12%",
     ellipsis: true,
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       // return text ? getdateToTime(text * 1000) : "-";
       return text ? text : "-";
     },
@@ -1756,7 +1908,7 @@ const columns6 = [
     width: "8%",
     align: "center",
     ellipsis: true,
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -1767,7 +1919,7 @@ const columns6 = [
     width: 100,
     align: "center",
     ellipsis: true,
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "0";
     },
   },
@@ -1798,7 +1950,7 @@ const columns7 = [
     width: 200,
     dataIndex: "name",
     key: "name",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -1808,7 +1960,7 @@ const columns7 = [
     dataIndex: "number",
     key: "1",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -1818,7 +1970,7 @@ const columns7 = [
     dataIndex: "department",
     key: "2",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -1838,7 +1990,7 @@ const columns7 = [
     dataIndex: "band",
     key: "4",
     align: "center",
-    customRender: ({text}) => {
+    customRender: ({ text }) => {
       return text ? text : "-";
     },
   },
@@ -1848,7 +2000,7 @@ const columns7 = [
     dataIndex: "status",
     key: "5",
     align: "center",
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       switch (String(record.status)) {
         case "0":
           return "审核通过";
@@ -1865,7 +2017,7 @@ const columns7 = [
     dataIndex: "join",
     key: "6",
     align: "center",
-    customRender: ({record}) => {
+    customRender: ({ record }) => {
       switch (String(record.source)) {
         case "1":
           return "导入";
@@ -1978,7 +2130,7 @@ export default defineComponent({
           key: "name",
           ellipsis: true,
           align: "left",
-          customRender: ({text}) => {
+          customRender: ({ text }) => {
             return text ? text : "-";
           },
         },
@@ -1996,7 +2148,8 @@ export default defineComponent({
           ellipsis: true,
           key: "contentTxt",
           align: "center",
-          customRender: ({record}) => (findClassFullName(sysTypeOptions.value, record.sysTypeId) || "-")
+          customRender: ({ record }) =>
+            findClassFullName(sysTypeOptions.value, record.sysTypeId) || "-",
         },
         {
           title: "课程形式",
@@ -2004,7 +2157,7 @@ export default defineComponent({
           dataIndex: "courseform",
           key: "2",
           align: "center",
-          customRender: ({record}) => {
+          customRender: ({ record }) => {
             switch (String(record.courseform)) {
               case "1":
                 return "线上";
@@ -2020,7 +2173,7 @@ export default defineComponent({
           key: "3",
           align: "center",
           ellipsis: true,
-          customRender: ({text}) => {
+          customRender: ({ text }) => {
             return text ? text : "-";
           },
         },
@@ -2031,7 +2184,7 @@ export default defineComponent({
           key: "3",
           align: "center",
           ellipsis: true,
-          customRender: ({text}) => {
+          customRender: ({ text }) => {
             return text ? text : "-";
           },
         },
@@ -2042,7 +2195,7 @@ export default defineComponent({
           key: "3",
           align: "center",
           ellipsis: true,
-          customRender: ({text}) => {
+          customRender: ({ text }) => {
             return text ? text : "-";
           },
         },
@@ -2054,7 +2207,7 @@ export default defineComponent({
           key: "3",
           align: "center",
           ellipsis: true,
-          customRender: ({text}) => {
+          customRender: ({ text }) => {
             return text ? text : "-";
           },
         },
@@ -2064,7 +2217,7 @@ export default defineComponent({
           dataIndex: "studentCnt",
           key: "4",
           align: "center",
-          customRender: ({text}) => {
+          customRender: ({ text }) => {
             return text ? text : "0";
           },
         },
@@ -2084,7 +2237,7 @@ export default defineComponent({
           dataIndex: "auditStatus",
           key: "6",
           align: "center",
-          customRender: ({record}) => {
+          customRender: ({ record }) => {
             switch (String(record.auditStatus)) {
               case "0":
                 return "未提交";
@@ -2097,7 +2250,7 @@ export default defineComponent({
               case "-1":
                 return "审核未通过";
             }
-          }
+          },
         },
         {
           title: "是否发布",
@@ -2105,7 +2258,8 @@ export default defineComponent({
           dataIndex: "auditStatus",
           key: "7",
           align: "center",
-          customRender: ({record}) => record.auditStatus === 3 ? '已发布' : '未发布',
+          customRender: ({ record }) =>
+            record.auditStatus === 3 ? "已发布" : "未发布",
         },
         {
           title: "创建人",
@@ -2114,7 +2268,7 @@ export default defineComponent({
           key: "8",
           ellipsis: true,
           align: "center",
-          customRender: ({text}) => {
+          customRender: ({ text }) => {
             return text ? text : "-";
           },
         },
@@ -2125,7 +2279,7 @@ export default defineComponent({
           key: "9",
           ellipsis: true,
           align: "center",
-          customRender: ({text}) => {
+          customRender: ({ text }) => {
             return text ? text : "-";
           },
         },
@@ -2136,8 +2290,8 @@ export default defineComponent({
           dataIndex: "publishTime",
           key: "10",
           align: "center",
-          customRender: ({text,auditStatus}) => {
-            return auditStatus == 3 ? (text || '-') : "-";
+          customRender: ({ text, auditStatus }) => {
+            return auditStatus == 3 ? text || "-" : "-";
           },
         },
         {
@@ -2146,7 +2300,7 @@ export default defineComponent({
           key: "status",
           dataIndex: "status",
           align: "center",
-          customRender: ({record}) => {
+          customRender: ({ record }) => {
             switch (String(record.status)) {
               case "0":
                 return "停用";
@@ -2162,10 +2316,10 @@ export default defineComponent({
           key: "id",
           fixed: "right",
           align: "right",
-          slots: { customRender: 'operation' }
+          slots: { customRender: "operation" },
         },
       ],
-      //新加  
+      //新加
       stuColumns: [
         {
           title: "岗位",
@@ -2175,13 +2329,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>
             );
           },
         },
@@ -2193,11 +2347,11 @@ export default defineComponent({
           align: "center",
           customRender: (record) => {
             return (
-                <div class="racona">
+              <div class="racona">
                 <span>
                   {record.studentBandDesc ? record.studentBandDesc : "-"}
                 </span>
-                </div>
+              </div>
             );
           },
         },
@@ -2207,7 +2361,7 @@ export default defineComponent({
           dataIndex: "status",
           key: "5",
           align: "center",
-          customRender: ({record}) => {
+          customRender: ({ record }) => {
             switch (String(record.status)) {
               case "0":
                 return "审核通过";
@@ -2225,8 +2379,8 @@ export default defineComponent({
           dataIndex: "signstatus",
           key: "7",
           align: "center",
-          customRender: ({record}) =>
-              record.signStatus ? "已签到" : "未签到",
+          customRender: ({ record }) =>
+            record.signStatus ? "已签到" : "未签到",
         },
         {
           title: "评估状态",
@@ -2234,8 +2388,8 @@ export default defineComponent({
           dataIndex: "evastatus",
           key: "8",
           align: "center",
-          customRender: ({record}) =>
-              record.assessmentStatus ? "已评估" : "未评估",
+          customRender: ({ record }) =>
+            record.assessmentStatus ? "已评估" : "未评估",
         },
         {
           title: "作业成绩",
@@ -2243,24 +2397,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":
@@ -2294,26 +2448,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>
             );
           },
         },
@@ -2326,7 +2480,7 @@ export default defineComponent({
       selectedRowKeys7: [],
       auditDescription: "",
       isEdit: 0,
-      member: {name: "", value: ""},
+      member: { name: "", value: "" },
       //列表表格
       tableData1: [
         // {
@@ -2538,6 +2692,8 @@ export default defineComponent({
       xjkkinputV2: "",
       xjkkinputV3: "",
       xjkkinputV4: null,
+      beforeValue: null, //考勤 开始前
+      afterStartValue: null, //考勤 开始后
       //开课学员管理
       xygl_inputV1: "",
       //录入成绩
@@ -2746,22 +2902,23 @@ export default defineComponent({
 
     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("")) ||
-          ""
+        (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("")) ||
+        ""
       );
     }
 
@@ -2772,7 +2929,6 @@ export default defineComponent({
       state.viewpowervisible = true;
     };
 
-
     // console.log('12344', sysTypeOptions)
 
     // 处理数据字典
@@ -2818,7 +2974,7 @@ export default defineComponent({
     const toolbarConfig = {
       excludeKeys: ["insertVideo", "insertImage"],
     };
-    const editorConfig = {placeholder: "请输入内容...", MENU_CONF: {}};
+    const editorConfig = { placeholder: "请输入内容...", MENU_CONF: {} };
     editorConfig.MENU_CONF["uploadImage"] = {
       // 自定义上传
       async customUpload(file, insertFn) {
@@ -2853,12 +3009,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);
@@ -2872,7 +3028,7 @@ export default defineComponent({
         }
 
         let w = 0,
-            h = 0;
+          h = 0;
         let reader = new FileReader();
         reader.readAsDataURL(file);
         reader.onload = () => {
@@ -2898,7 +3054,7 @@ export default defineComponent({
               return resolve(true);
             } else {
               message.error(
-                  "图片尺寸错误，只能上传800*450(高宽比例为16：9)横纵比一致的图片"
+                "图片尺寸错误，只能上传800*450(高宽比例为16：9)横纵比一致的图片"
               );
               return reject(false);
             }
@@ -2927,7 +3083,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;
       }
@@ -2969,12 +3125,12 @@ export default defineComponent({
       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({
@@ -2989,7 +3145,7 @@ export default defineComponent({
         endTime: endTime,
         beginTime: startTime,
       });
-      const {rows, total} = res.data.data;
+      const { rows, total } = res.data.data;
       state.tableData1 = rows;
       state.tableDataTotal1 = total;
       state.tableLoading = false;
@@ -3161,10 +3317,10 @@ export default defineComponent({
       state.addtestvisible = true;
     };
     const logW = () => {
-      state.workInfo = {}
+      state.workInfo = {};
     };
     const logT = () => {
-      state.examInfo = {}
+      state.examInfo = {};
     };
     const removePG = () => {
       console.log("11111");
@@ -3230,7 +3386,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++) {
@@ -3243,22 +3399,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;
@@ -3342,12 +3498,12 @@ export default defineComponent({
       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"
@@ -3366,24 +3522,24 @@ export default defineComponent({
       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;
@@ -3516,9 +3672,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();
@@ -3625,6 +3781,8 @@ export default defineComponent({
       state.assessmentId = null;
       state.assessmentName = "";
       state.EditWorkId = null;
+      state.beforeValue = null; //考勤 开始前
+      state.afterStartValue = null; //考勤 开始后
 
       removePG();
     };
@@ -3632,16 +3790,20 @@ export default defineComponent({
 
     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 => {
+      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)
+      console.log("校验重复", offName);
       if (offName) {
         message.destroy();
         return message.warning("开课名称重复，请重新填写");
@@ -3667,8 +3829,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 = [
@@ -3685,15 +3849,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;
     };
 
@@ -3703,10 +3869,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);
@@ -3716,8 +3886,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;
@@ -3729,14 +3899,16 @@ 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;
@@ -3750,7 +3922,7 @@ export default defineComponent({
                 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;
@@ -3858,24 +4030,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);
+            });
         }
       }
     };
@@ -3884,17 +4056,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();
+            }
+          });
       }
     };
     //确认复制
@@ -3952,8 +4124,7 @@ export default defineComponent({
             }
           });
         } else if (state.offcourseId) {
-          handle({offcourseId: state.offcourseId, type: -1,
-          }).then((res) => {
+          handle({ offcourseId: state.offcourseId, type: -1 }).then((res) => {
             if (res.data.code === 200) {
               message.destroy();
               message.success("删除成功");
@@ -3966,39 +4137,47 @@ export default defineComponent({
       if (state.copy_hs) {
         state.tableLoading = true;
         if (state.offcourseId && state.offcoursePlanId) {
-          await copyCoursePlan({offcoursePlanId: state.offcoursePlanId})
+          await copyCoursePlan({ offcoursePlanId: state.offcoursePlanId });
           getTableDate3();
         } else if (state.offcourseId) {
-          await copyCourse({courseId: state.offcourseId})
+          await copyCourse({ courseId: state.offcourseId });
           getTableDate();
         }
         message.success("复制成功");
         rest();
       }
       if (state.nouse_hs) {
-        state.temp.auditStatus = 0
+        state.temp.auditStatus = 0;
         message.success("停用成功");
-        handle({offcourseId: state.offcourseId, type: -2,})
+        handle({ offcourseId: state.offcourseId, type: -2 });
       }
       if (state.submit_hs) {
         state.tableLoading = true;
         message.success("提交审核成功");
-        handle({offcourseId: state.offcourseId, type: 1}).then(() => getTableDate());
+        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());
+        handle({ offcourseId: state.offcourseId, type: 0 }).then(() =>
+          getTableDate()
+        );
       }
       if (state.useCourse) {
         state.tableLoading = true;
         message.success("启用成功");
-        handle({offcourseId: state.offcourseId, type: 2}).then(() => getTableDate());
+        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());
+        handle({ offcourseId: state.offcourseId, type: 3 }).then(() =>
+          getTableDate()
+        );
       }
       delete_exit1();
     };
@@ -4018,16 +4197,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,
@@ -4067,23 +4246,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`
       );
 
       // {
@@ -4114,14 +4293,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 = [];
@@ -4183,17 +4362,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 }];
         }
       }
 
@@ -4378,7 +4557,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;
       }
@@ -4434,24 +4613,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) => {
@@ -4547,67 +4726,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 = [];
@@ -4646,12 +4825,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;
@@ -5025,8 +5206,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;
     }
 
@@ -5075,8 +5256,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%
     );
   }
 
@@ -5239,8 +5420,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%
     );
   }
 
@@ -5491,8 +5672,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%
             );
           }
 
@@ -5588,8 +5769,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%
             );
           }
 
@@ -5710,8 +5891,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%
             );
           }
 
@@ -5839,8 +6020,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%
             );
           }
 
@@ -6537,8 +6718,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;
               }
 
@@ -6838,8 +7021,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;
               }
 
@@ -6963,8 +7148,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;
                 }
 
@@ -7135,8 +7322,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 5788cf0d..f8aaa9e6 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"
@@ -824,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) {
@@ -880,10 +884,12 @@ export default defineComponent({
         attach: state.attach,
         outline: valueHtml.value,
         // organizationIds: orgSelect, //todo 传的不对
+        organizationIds: orgSelectIds,
+        organizationNames: orgSelectNames,
         jobTypeIds: selectJobId,
         bandIds: selectBandId,
         sourceBelongId: state.sourceBelongId,
-        sourceBelongFullName: state.sourceBelongName
+        sourceBelongFullName: state.sourceBelongName,
       };
       console.log("postData", postData);
       const checkList = [
@@ -991,6 +997,33 @@ 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 handleTagChange = () => {

From 3c6ec2b9e9beb613a4b743df7d75c9603072b8c6 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 24 Feb 2023 20:44:09 +0800
Subject: [PATCH 07/28] -- fix bug

---
 src/api/ThirdApi.js                      | 4 +++-
 src/components/student/CommonStudent.vue | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 44f51d85..fb10da02 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -295,7 +295,7 @@ import {
   AUDIENCE_LIST,
   ORG_CHILD_LIST,
   ORG_LIST,
-  USER_LIST,
+  USER_LIST, USER_LIST_PAGE,
 } from "@/api/ThirdApi";
 import {
   saveStu,
@@ -463,7 +463,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,

From 910ab8eb696f5faf42fc511c4fdf5cde5899e06e Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 24 Feb 2023 20:50:53 +0800
Subject: [PATCH 08/28] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E5=B0=81=E9=9D=A2=E5=9B=BE=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 215 +++++++++++++------
 src/views/courselibrary/courseModal.vue      |   7 +
 2 files changed, 155 insertions(+), 67 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index f38ad1ca..93ffd476 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -315,36 +315,109 @@
         :pagination="false"
         :scroll="{ x: 'max-content' }"
       >
-        <template #operation="{ text,record,index }">
+        <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
+              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
+              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
+              v-if="
+                (record.auditStatus === 0 || record.auditStatus === -1) &&
+                checkPer(record.permissions)
+              "
+              @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
+              @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
+              @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
+              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>
+              <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 @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>
             </DropDown>
           </a-space>
@@ -2231,8 +2304,8 @@ export default defineComponent({
           dataIndex: "publishTime",
           key: "10",
           align: "center",
-          customRender: ({text, auditStatus}) => {
-            return auditStatus == 3 ? (text || '-') : "-";
+          customRender: ({ text, auditStatus }) => {
+            return auditStatus == 3 ? text || "-" : "-";
           },
         },
         {
@@ -2241,7 +2314,8 @@ export default defineComponent({
           key: "status",
           dataIndex: "status",
           align: "center",
-          customRender: ({record}) => (record.auditStatus === 3 ? (record.status?'启用':'停用'): '-')
+          customRender: ({ record }) =>
+            record.auditStatus === 3 ? (record.status ? "启用" : "停用") : "-",
         },
         {
           title: "操作",
@@ -2250,7 +2324,7 @@ export default defineComponent({
           key: "id",
           fixed: "right",
           align: "right",
-          slots: {customRender: 'operation'}
+          slots: { customRender: "operation" },
         },
       ],
       //新加
@@ -2869,9 +2943,7 @@ export default defineComponent({
     // 内容 HTML
     const valueHtml = ref("");
     // // 模拟 ajax 异步获取内容
-    onMounted(() => {
-
-    });
+    onMounted(() => {});
 
     const toolbarConfig = {
       excludeKeys: ["insertVideo", "insertImage"],
@@ -3815,7 +3887,7 @@ export default defineComponent({
         //是否允许未报名的签到:1是0否
         state.xjkkradioV1 = 0;
       }
-      state.member = {value: item.teacherId, name: item.teacher};
+      state.member = { value: item.teacherId, name: item.teacher };
       state.cstm_hs = true;
       state.kk_eidt = true;
     };
@@ -3900,14 +3972,17 @@ export default defineComponent({
       state.graduate_hs = false;
       state.addLoading = false;
     };
-    const handleRejectExit = (id, index,record) => {
+    const handleRejectExit = (id, index, record) => {
       dialog({
-        content: '确定撤回吗？'
-        , ok: () => {
+        content: "确定撤回吗？",
+        ok: () => {
           message.success("撤回成功");
-          record.auditStatus === 3 ? (state.tableData1[index].auditStatus = 2) : (state.tableData1[index].auditStatus = 0)
-          handle({offcourseId: id, type: 0})
-        }})
+          record.auditStatus === 3
+            ? (state.tableData1[index].auditStatus = 2)
+            : (state.tableData1[index].auditStatus = 0);
+          handle({ offcourseId: id, type: 0 });
+        },
+      });
     };
 
     const handleJoin = async () => {
@@ -4018,7 +4093,8 @@ export default defineComponent({
           });
         } else if (state.offcourseId) {
           handle({
-            offcourseId: state.offcourseId, type: -1,
+            offcourseId: state.offcourseId,
+            type: -1,
           }).then((res) => {
             if (res.data.code === 200) {
               message.destroy();
@@ -4321,44 +4397,47 @@ export default defineComponent({
     // };
     const handleDelete = (id) => {
       dialog({
-        content: '确定删除该课程吗？'
-        , ok: async () => {
+        content: "确定删除该课程吗？",
+        ok: async () => {
           message.success("删除成功");
-          state.tableLoading = true
-          await handle({offcourseId: id,type:-1})
+          state.tableLoading = true;
+          await handle({ offcourseId: id, type: -1 });
           getTableDate();
-        }})
+        },
+      });
     };
     const handleCopy = async (id) => {
       dialog({
-        content: '确定复制该课程吗？'
-        , ok: async () => {
+        content: "确定复制该课程吗？",
+        ok: async () => {
           message.success("复制成功");
-          state.tableLoading = true
-          await copyCourse({offcourseId: id})
+          state.tableLoading = true;
+          await copyCourse({ offcourseId: id });
           getTableDate();
-        }})
+        },
+      });
     };
     const handleSubmit = (id, index) => {
       dialog({
-        content: '确定提交审核吗？'
-        , ok: () => {
+        content: "确定提交审核吗？",
+        ok: () => {
           message.success("提交成功");
-          state.tableData1[index].auditStatus = 1
-          handle({offcourseId: id, type: 1})
-        }})
+          state.tableData1[index].auditStatus = 1;
+          handle({ offcourseId: id, type: 1 });
+        },
+      });
     };
-    const handlePush = (id,index) => {
+    const handlePush = (id, index) => {
       dialog({
-        content: '确定发布该课程吗？'
-        , ok: () => {
+        content: "确定发布该课程吗？",
+        ok: () => {
           message.success("发布成功");
-          state.tableData1[index].auditStatus = 3
-          handle({offcourseId: id, type: 3})
-        }})
+          state.tableData1[index].auditStatus = 3;
+          handle({ offcourseId: id, type: 3 });
+        },
+      });
     };
 
-
     const handleCopyP = async (itm) => {
       console.log(itm);
       state.offcourseId = itm.offcourseId;
@@ -4369,21 +4448,23 @@ export default defineComponent({
     };
     const handleStop = (id, index) => {
       dialog({
-        content: '确定停用该课程吗？'
-        , ok: () => {
+        content: "确定停用该课程吗？",
+        ok: () => {
           message.success("停用成功");
-          state.tableData1[index].status = 0
-          handle({offcourseId: id, type: -2})
-        }})
+          state.tableData1[index].status = 0;
+          handle({ offcourseId: id, type: -2 });
+        },
+      });
     };
     const handleOpen = async (id, index) => {
       dialog({
-        content: '确定起用该课程吗？'
-        , ok: () => {
+        content: "确定起用该课程吗？",
+        ok: () => {
           message.success("起用成功");
-          state.tableData1[index].status = 1
-          handle({offcourseId: id, type: 2})
-        }})
+          state.tableData1[index].status = 1;
+          handle({ offcourseId: id, type: 2 });
+        },
+      });
     };
     const handleStart = (item, type) => {
       console.log(item);
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index f8aaa9e6..416ae6f0 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -1024,6 +1024,13 @@ export default defineComponent({
         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 = () => {

From b75a3b93bda8fc0a180906a6dbc19edf3d465366 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 24 Feb 2023 20:59:03 +0800
Subject: [PATCH 09/28] =?UTF-8?q?fix:=E4=B8=8B=E8=BD=BD=E4=B8=AD=E5=BF=83N?=
 =?UTF-8?q?AN=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 3 ++-
 src/views/DownLoad.vue                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index fb10da02..9b474053 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -295,7 +295,8 @@ import {
   AUDIENCE_LIST,
   ORG_CHILD_LIST,
   ORG_LIST,
-  USER_LIST, USER_LIST_PAGE,
+  // USER_LIST, 
+  USER_LIST_PAGE,
 } from "@/api/ThirdApi";
 import {
   saveStu,
diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue
index af7fe54b..07ff8bf9 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;
         }

From 2e2dac19d4066fa5df1029d1ad45e00b69496c4b Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 24 Feb 2023 21:13:57 +0800
Subject: [PATCH 10/28] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE/=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=9B=BE-=E8=AF=84=E4=BC=B0=E4=BB=BB=E5=8A=A1=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AF=84=E4=BC=B0=E7=AD=94=E9=A2=98=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue
index 4d29d6dc..7bce6344 100644
--- a/src/components/drawers/ViewAssess.vue
+++ b/src/components/drawers/ViewAssess.vue
@@ -194,7 +194,7 @@ export default {
         console.log('我是传递过来的参数', props.datasource)
         console.log('我是传递过来的参数2', props.basicdata)
         api.QueryAssessmentDetail({
-          "assessmentSubmitId": props.datasource.assessmentSubmitId,
+          "assessmentSubmitId": props.datasource.assessmentSubmitId?props.datasource.assessmentSubmitId:props.datasource.assessmentResultIds,
           "courseId": props.basicdata.id,
           "studentId": props.datasource.studentId
         }).then(res=>{

From 5c551c79b8b71f8a1d09d22a95d01fe5acfff7cf Mon Sep 17 00:00:00 2001
From: caozc <zcz963852@qq.com>
Date: Fri, 24 Feb 2023 21:21:53 +0800
Subject: [PATCH 11/28] =?UTF-8?q?fix:=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E5=B7=B2=E5=AE=A1=E6=A0=B8=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=A0=B8=E6=97=A5=E5=BF=97=E6=9F=A5=E5=88=B0?=
 =?UTF-8?q?=E4=B8=A4=E6=9D=A1=E7=9B=B8=E5=90=8C=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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,

From 48076bbbbb44a59002c5036b01cb3844ea788346 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 24 Feb 2023 21:29:32 +0800
Subject: [PATCH 12/28] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=E6=8F=90=E7=A4=BA=E6=A1=86=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskPage.vue | 1691 ++++++++++++++++++--------
 1 file changed, 1160 insertions(+), 531 deletions(-)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index e47063ed..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,true)">
+                            <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,7 +2420,7 @@ export default {
       allDelete: false, //批量删除弹窗
       pubproject: false,
       stugroup: false,
-            isEdit: false,
+      isEdit: false,
       canclestu: false,
       canclestu1: false,
       deleteOneStu: false, //删除单个学员弹窗
@@ -1848,7 +2440,7 @@ export default {
       inputValue3: 5,
       valueaddm: "", //创建小组输入小组长
       valueaddg: "", //创建小组输入名称
-      groupInfo: { leaderName: '', leaderId: '' }, //创建小组
+      groupInfo: { leaderName: "", leaderId: "" }, //创建小组
       groupPageList: [], //小组列表
       groupNumber: 0, //组员人数
       valuestun: "", //学员管理姓名
@@ -2480,7 +3072,7 @@ export default {
       console.log("点击换组", record.studentId);
       state.checkgroupStuId = record.studentId;
     };
-    const showModal2 = (item,isEdit) => {
+    const showModal2 = (item, isEdit) => {
       state.isEdit = isEdit;
       state.stugroup = true;
       state.groupInfo = item || {};
@@ -2918,7 +3510,9 @@ export default {
                     <a-select-option value="删除" label="删除">
                       <div
                         onClick={() => {
-                          {/* console.log("点击了111", text); */ }
+                          {
+                            /* console.log("点击了111", text); */
+                          }
                           showDeleteOne(text.record.studentId);
                         }}
                       >
@@ -3113,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);
@@ -3162,10 +3756,10 @@ export default {
           state.valuegood == "优秀学员"
             ? 1
             : state.valuegood == "普通学员"
-              ? 0
-              : state.valuegood == "全部"
-                ? ""
-                : "",
+            ? 0
+            : state.valuegood == "全部"
+            ? ""
+            : "",
       };
       //重新获取列表
       getStu(obj);
@@ -3307,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) => {
@@ -3319,25 +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 (state.isEdit) {
-        if (d.length > 0 && d[0].id !== id ) {
+        if (d.length > 0 && d[0].id !== id) {
           return message.warn(d[0].leaderName + "已是小组长，请重新选择");
         }
-      }else{
-        if (d.length > 0 ) {
+      } else {
+        if (d.length > 0) {
           return message.warn(d[0].leaderName + "已是小组长，请重新选择");
         }
       }
       // 过滤掉编辑时候，只修改了组员最大值时候
 
       state.isEdit = false;
-      await editGroup({ ...state.groupInfo, projectId: state.projectId })
-      message.success(id ? '小组编辑成功' : "小组创建成功");
+      await editGroup({ ...state.groupInfo, projectId: state.projectId });
+      message.success(id ? "小组编辑成功" : "小组创建成功");
       getGroup();
-      console.log("state.groupPageList:")
+      console.log("state.groupPageList:");
       getStu();
     };
     //搜索小组重置
@@ -3550,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
+            ? ""
+            : "-";
       });
     };
     //打开发布弹窗
@@ -3840,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;
@@ -3888,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"
         );
       }
@@ -4266,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 {
@@ -4311,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;
 
@@ -4335,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 {
@@ -4466,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 {
@@ -4590,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 {
@@ -4719,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 {
@@ -4817,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;
@@ -4916,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 {
@@ -4954,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;
 
@@ -4978,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 {
@@ -5247,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;
@@ -5264,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;
     }
 
@@ -5545,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;
       }
 
@@ -5932,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);
       }
@@ -5946,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);
       }
 
@@ -6059,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;
         }
@@ -6069,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;
         }
 
@@ -6490,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;
           }
         }
@@ -7222,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 {

From 85eeceff3d0066ab31175eb183fa618bbcdf4136 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Fri, 24 Feb 2023 21:35:13 +0800
Subject: [PATCH 13/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/DownLoad.vue | 1 +
 vue.config.js          | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue
index af7fe54b..e9a79873 100644
--- a/src/views/DownLoad.vue
+++ b/src/views/DownLoad.vue
@@ -177,6 +177,7 @@ export default {
     }
 
     function formatCapacityGB(data) {
+      debugger
       let num = Number(data);
       let CMB = (num / (1048576*1024)).toFixed(2);
       return CMB
diff --git a/vue.config.js b/vue.config.js
index 56f9b80f..4c22a764 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,8 +15,8 @@ module.exports = defineConfig({
         port: 8070,
         proxy: {
             "/manageApi": {
-                target: 'http:' + process.env.VUE_APP_PROXY_URL,
-                // target: 'http://localhost:30001',
+                //target: 'http:' + process.env.VUE_APP_PROXY_URL,
+                 target: 'http://localhost:30001',
                 changeOrigin: true, //表示是否改变原域名
                 pathRewrite: {
                     "^/manageApi": "",

From fe37c6e2735467b829561b3fe15a9951543e619f Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 24 Feb 2023 21:53:46 +0800
Subject: [PATCH 14/28] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
index 75c9d5fe..0f035ae4 100644
--- a/src/components/drawers/ProjectAudit.vue
+++ b/src/components/drawers/ProjectAudit.vue
@@ -437,7 +437,8 @@ export default {
         });
     };
     const getDictList = async (param) =>
-      api1.getDict({
+      api1
+        .getDict({
           pageNo: 1,
           pageSize: 20,
           setCode: param,
@@ -648,7 +649,6 @@ export default {
           background-color: #fafafa;
         }
         .reworkCon {
-          height: 56px;
           display: flex;
           align-items: center;
           border-bottom: 1px solid #f0f6fc;

From a663f4711d17db61440d8dff6c79b5843abdb846 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Fri, 24 Feb 2023 22:39:03 +0800
Subject: [PATCH 15/28] =?UTF-8?q?=E6=8D=A2=E7=BB=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/ChangeGroupModal.vue | 10 +++++++---
 src/components/student/TableStudent.vue     |  6 +++++-
 src/views/projectcenter/TaskPage.vue        |  9 ++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/components/student/ChangeGroupModal.vue b/src/components/student/ChangeGroupModal.vue
index 4d5f770d..ab4fa38f 100644
--- a/src/components/student/ChangeGroupModal.vue
+++ b/src/components/student/ChangeGroupModal.vue
@@ -48,6 +48,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  checkBatch: {
+    type: Boolean,
+    default: false,
+  },
   groupList: {
     type: Array,
     default: () => [],
@@ -56,10 +60,10 @@ const props = defineProps({
     type: Number,
     default: null,
   },
+
 });
 
 const option = computed(() => {
-  debugger
   console.log("props.groupList", props.groupList);
   return props.groupList.map((e) => ({
     label: e.groupName,
@@ -81,13 +85,13 @@ const selectGroup = (e, v) => {
 };
 //确认换组
 const changeGroup = (item) => {
-  // debugger
+  debugger
   console.log("换组", selectGroupId.value, item);
   props.checkgroupStuId.forEach(stu => {
     let obj = {
       groupId: selectGroupId.value,
       groupName: selectGroupName.value,
-      studentId: stu,
+      id: stu,
     };
     console.log("换组obj", obj);
     api
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index da45de94..e6ce26d4 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -164,7 +164,7 @@
   <ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys" @finash="submitCall" />
 
   <!-- 换组弹窗 -->
-  <ChangeGroupModal v-model:changegroupV="checkgroupParam.changegroupV" :groupList="groupList"
+  <ChangeGroupModal v-model:changegroupV="checkgroupParam.changegroupV" :groupList="groupList" :checkBatch="checkgroupParam.checkBatch"
     :checkgroupStuId="stuSelectKeys" />
   <!-- 批量调整关卡弹窗 -->
   <!-- 取消学员弹窗 -->
@@ -407,6 +407,7 @@ const checkgroupParam = ref({
   changegroupV: false, //学员名称
   checkgroupList: "", //学员小组
   checkgroupStuId: null,
+  checkBatch: true
 });
 
 const stuSelectKeys = ref([]);
@@ -426,10 +427,13 @@ const stuRowSelection = computed(() => ({
 
 //显示学员换组弹窗
 function showChangeGroupModal() {
+  debugger
+  console.log("批量")
   const d = props.groupList
   console.log("d" + d)
   // debugger
   checkgroupParam.value.changegroupV = true;
+  checkgroupParam.value.checkBatch = true;
 }
 
 // 导出数据
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 7ad64ebf..d0d28411 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -2356,6 +2356,7 @@ export default {
       ],
       //小组信息列表
       groupList: [],
+       isBatch: false, // 批量
       // stuName: "", //搜索的学员姓名
       // stuGroup: "", //搜索的学员小组名称
       // stuBum: "", //搜索的学员小组部门
@@ -3068,9 +3069,12 @@ export default {
     };
     //显示学员换组弹窗
     const showChangeGroupModal = (record) => {
+      debugger
+      console.log("单个")
       state.changegroupV = true;
-      console.log("点击换组", record.studentId);
-      state.checkgroupStuId = record.studentId;
+      console.log("点击换组", record.id);
+      state.checkgroupStuId = [];
+      state.checkgroupStuId.push(record.id) ;
     };
     const showModal2 = (item, isEdit) => {
       state.isEdit = isEdit;
@@ -3147,7 +3151,6 @@ export default {
     }
     //考勤的抽屉
     const showAA = (course, a, data) => {
-      // debugger;
       state.AAvisible = true;
       state.liveData = data;
       state.showKaoqinText = "直播";

From b198c310575d2f6d035c8cc4762831b3ef79e4ff Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 24 Feb 2023 22:55:22 +0800
Subject: [PATCH 16/28] -- fix bug

---
 src/components/common/CommonAlert.vue | 118 ++++++++-
 src/views/projectcenter/TaskAdd.vue   | 355 ++++++++------------------
 2 files changed, 217 insertions(+), 256 deletions(-)

diff --git a/src/components/common/CommonAlert.vue b/src/components/common/CommonAlert.vue
index 46b81112..f2847e0b 100644
--- a/src/components/common/CommonAlert.vue
+++ b/src/components/common/CommonAlert.vue
@@ -2,8 +2,9 @@
   <a-modal
       :visible="true"
       :footer="null"
+      :title="null"
+      :centere="true"
       :closable="false"
-      wrapClassName="DelModal"
       style="margin-top: 400px"
       :zIndex="9999"
       @cancel="close"
@@ -66,5 +67,118 @@ function handleConfirm() {
   props.ok()
   props.close()
 }
-
 </script>
+<style lang="scss" scoped>
+.delete {
+  min-width: 424px;
+  background: #ffffff;
+  box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+  border-radius: 4px;
+  position: absolute;
+  left: 50%;
+  top: 10%;
+  transform: translate(-50%, -50%);
+
+  .del_header {
+    position: absolute;
+    width: calc(100%);
+    height: 40px;
+    background: linear-gradient(
+            rgba(78, 166, 255, 0.2) 0%,
+            rgba(78, 166, 255, 0) 100%
+    );
+  }
+
+  .del_main {
+    width: 100%;
+    position: relative;
+
+    .header {
+      display: flex;
+      align-items: center;
+      padding-top: 20px;
+      padding-left: 26px;
+      font-size: 16px;
+
+      .del-icons {
+        width: 16px;
+        height: 16px;
+        position: relative;
+        margin-right: 10px;
+
+        img {
+          width: 100%;
+          height: 100%;
+          position: absolute;
+          top: 0px;
+          left: 0px;
+          background-size: 100% 100%;
+        }
+
+      }
+
+      .close_exit {
+        position: absolute;
+        right: 42px;
+        cursor: pointer;
+        width: 20px;
+        height: 20px;
+        background-image: url(@/assets/images/coursewareManage/close.png);
+        background-size: 100% 100%;
+      }
+
+    }
+
+    .body {
+      width: 100%;
+      padding: 0 30px;
+      margin: 34px auto 56px auto;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+
+    .del_btnbox {
+      display: flex;
+      margin: 30px auto;
+      justify-content: center;
+
+      .del_btn {
+        width: 100px;
+        height: 40px;
+        background: rgba(64, 158, 255, 0);
+        border-radius: 8px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
+        cursor: pointer;
+
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          line-height: 40px;
+        }
+
+      }
+
+      .btn1 {
+        border: 1px solid rgba(64, 158, 255, 1);
+        color: #4ea6ff;
+      }
+
+      .btn2 {
+        background-color: #4ea6ff;
+        color: #ffffff;
+      }
+
+    }
+  }
+}
+</style>
+<style lang="scss">
+.ant-modal-body {
+  padding: 0 !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 68f0c384..1ce6fe65 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -5,8 +5,8 @@
         <div class="leftmain">
           <div class="tit">
             阶段
-              <img src="../../assets/images/projectadd/right.png" style="margin-left: 10px; cursor: pointer"
-                  @click="showCancel" v-show="projectInfo.stageList[0].id != '0'" />
+            <img src="../../assets/images/projectadd/right.png" style="margin-left: 10px; cursor: pointer"
+                 @click="removeAllLevel" v-show="projectInfo.stageList[0].id != '0'"/>
           </div>
           <div class="btn btn3" @click="showModal" style="margin-left: 19px">
             <div class="search"></div>
@@ -14,8 +14,9 @@
           </div>
           <div class="maincon" style="background-color: #fff">
             <Draggable v-model="projectInfo.stageList" chosenClass="chosen" ghostClass="ghost" forceFallback="true"
-                       group="stage" animation="500" v-if="JSON.stringify(projectInfo.stageList[0].taskDraftDtoList[0]) != '{}'">
-              <template #item="{ element,index }" >
+                       group="stage" animation="500"
+                       v-if="JSON.stringify(projectInfo.stageList[0].taskDraftDtoList[0]) != '{}'">
+              <template #item="{ element,index }">
                 <div class="items" v-if="element.id !=='0' && !element.deleted"
                      :class="activeIndex === index ? 'active' : ''"
                      @click="changeStageIndex(index)">
@@ -37,7 +38,7 @@
                       <div class="imgIcon" @click="showModal(index)"></div>
                     </div>
                     <div class="boxs_right">
-                      <div class="imgIcon" @click="showDeleteStage(index)"></div>
+                      <div class="imgIcon" @click="deleteStage(index)"></div>
                     </div>
                   </div>
                   <div class="items2">
@@ -101,13 +102,13 @@
             <div v-if="key!=13">
               <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key"
                          v-model:task-list="projectInfo.stageList[activeIndex].taskDraftDtoList">
-              <div class="itcon">
-                <div class="img">
-                  <img :src="value.img"/>
+                <div class="itcon">
+                  <div class="img">
+                    <img :src="value.img"/>
+                  </div>
+                  <div class="text">{{ value.name }}</div>
                 </div>
-                <div class="text">{{ value.name }}</div>
-              </div>
-            </component>
+              </component>
             </div>
             <div>
             </div>
@@ -121,7 +122,7 @@
               <button class="btn" @click="showChangeModal">
                 移动任务到阶段
               </button>
-              <div class="edit" @click="showdeAll">
+              <div class="edit" @click="deleteTaskAll">
                 <img class="editimg" src="../../assets/images/projectadd/delete.png"/>
                 <span class="editext">批量删除</span>
               </div>
@@ -250,20 +251,14 @@
                         ">
                         <div class="opa">
                           <div class="opacation">
-								<span  style="
+								<span style="
                                 color: #4ea6ff;
                                 margin-right: 25px;
                                 cursor: pointer;
                               " @click="editTaskForType(element,index)">
 															编辑
 														</span>
-                            <!--<span v-else style="-->
-															<!--color: #4ea6ff;-->
-															<!--margin-right: 55px;-->
-															<!--cursor: pointer;-->
-															<!--">-->
-														<!--</span>-->
-                            <span style="color: #4ea6ff; cursor: pointer" @click="showDelete(index)">
+                            <span style="color: #4ea6ff; cursor: pointer" @click="confirmDelTask(index)">
 															删除
 														</span>
                           </div>
@@ -281,58 +276,57 @@
 
     <div class="footbtn">
       <div class="btnbox">
-        <a-button class="btn btn2" @click="temporaryStorage" :loading="templateLoading">暂存</a-button>
+        <a-button class="btn btn2" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
         <a-button class="btn btn2" @click="submitStorage" :loading="confirmLoading">确定</a-button>
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>
 
     <!-- 添加阶段弹窗 -->
-    <div>
-      <a-modal v-model:visible="stage" :title="null" @ok="closeModal" :footer="null" :closable="false"
-               wrapClassName="addstage" width="624px" height="388px" :centered="true" @cancel="closeModal">
-        <div class="modalHeader" style="
+    <a-modal v-model:visible="stage" :title="null" @ok="closeModal" :footer="null" :closable="false"
+             wrapClassName="addstage" width="624px" height="388px" :centered="true" @cancel="closeModal">
+      <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">编辑/添加阶段</span>
+        <div class="headerLeft" style="margin-left: 32px">
+          <span class="headerLeftText" style="font-size: 16px">编辑/添加阶段</span>
+        </div>
+        <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
+          <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png"/>
+        </div>
+      </div>
+      <div class="modalMain" style="width: 100%">
+        <div class="name">
+          <div class="namebox">
+            <div>
+              <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
+            </div>
+            <div class="inname">阶段名称：</div>
           </div>
-          <div style="cursor: pointer; margin-right: 32px" @click="closeModal">
-            <img style="width: 22px; height: 22px" src="../../assets/images/basicinfo/close22.png"/>
+          <div class="in">
+            <a-input v-model:value="formValue.name" show-count :maxlength="20" placeholder="请输入阶段名称"/>
           </div>
         </div>
-        <div class="modalMain" style="width: 100%">
-          <div class="name">
-            <div class="namebox">
-              <div>
-                <img src="@/assets/images/coursewareManage/asterisk.png" alt=""/>
-              </div>
-              <div class="inname">阶段名称：</div>
-            </div>
-            <div class="in">
-              <a-input v-model:value="formValue.name" show-count :maxlength="20" placeholder="请输入阶段名称"/>
-            </div>
+        <div class="name" style="display: flex; align-items: flex-start">
+          <div class="namebox">
+            <div class="inname">阶段说明：</div>
           </div>
-          <div class="name" style="display: flex; align-items: flex-start">
-            <div class="namebox">
-              <div class="inname">阶段说明：</div>
-            </div>
-            <div class="intext" style="margin-left: 14px">
-              <a-textarea v-model:value="formValue.remark" style="height: 88px" show-count :maxlength="100"
-                          placeholder="请输入阶段说明"/>
-            </div>
+          <div class="intext" style="margin-left: 14px">
+            <a-textarea v-model:value="formValue.remark" style="height: 88px" show-count :maxlength="100"
+                        placeholder="请输入阶段说明"/>
           </div>
-          <div style="
+        </div>
+        <div style="
               display: flex;
               width: 100%;
               justify-content: center;
               margin-top: 40px;
             ">
-            <button @click="closeModal" style="
+          <button @click="closeModal" style="
                 cursor: pointer;
                 height: 40px;
                 width: 100px;
@@ -341,9 +335,9 @@
                 color: #4ea6ff;
                 background-color: #ffffff;
               ">
-              取消
-            </button>
-            <button @click="editStage" style="
+            取消
+          </button>
+          <button @click="editStage" style="
                 cursor: pointer;
                 margin-left: 16px;
                 margin-bottom: 40px;
@@ -354,107 +348,8 @@
                 color: #ffffff;
                 background-color: #4ea6ff;
               ">
-              确定
-            </button>
-          </div>
-        </div>
-      </a-modal>
-    </div>
-    <!-- 确认添加阶段弹窗 -->
-    <a-modal v-model:visible="confirmModal" :footer="null" wrapClassName="ConfirmModal"
-             centered="true">
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span>提示</span>
-            <div class="close_exit" @click="closeConfirm"></div>
-          </div>
-          <div class="body">
-            <span>您确定要添加阶段吗</span>
-          </div>
-          <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeConfirm">
-              <div class="btnText">取消</div>
-            </div>
-            <div class="del_btn btn2" @click="showModal">
-              <div class="btnText">确定</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
-    <!-- 确认取消阶段弹窗 -->
-    <a-modal v-model:visible="cancelModal" :footer="null" wrapClassName="ConfirmModal"
-             centered="true">
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span>提示</span>
-            <!-- <div class="close_exit" @click="closeCancel"></div> -->
-          </div>
-          <div class="body">
-            <span>您确定要删除所有阶段吗？</span>
-          </div>
-          <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeCancel">
-              <div class="btnText">取消</div>
-            </div>
-            <div class="del_btn btn2" @click="removeAllLevel">
-              <div class="btnText">确定</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
-    <!-- 确认删除任务弹窗 -->
-    <a-modal v-model:visible="deleteModal" :footer="null" wrapClassName="ConfirmModal"
-             centered="true">
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span>提示</span>
-            <div class="close_exit" @click="closeDelete"></div>
-          </div>
-          <div class="body">
-            <span>您确定要删除此任务吗</span>
-          </div>
-          <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDelete">
-              <div class="btnText">取消</div>
-            </div>
-            <div class="del_btn btn2" @click="confirmDelTask">
-              <div class="btnText">确定</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
-    <a-modal v-model:visible="deAll" :footer="null" :closable="cC" wrapClassName="ConfirmModal" :centered="true">
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span>提示</span>
-            <div class="close_exit" @click="closeDeAll"></div>
-          </div>
-          <div class="body">
-            <span>您确定要批量删除任务吗</span>
-          </div>
-          <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDeAll">
-              <div class="btnText">取消</div>
-            </div>
-            <div class="del_btn btn2" @click="deleteTaskAll">
-              <div class="btnText">确定</div>
-            </div>
-          </div>
+            确定
+          </button>
         </div>
       </div>
     </a-modal>
@@ -490,34 +385,6 @@
         </div>
       </div>
     </a-modal>
-
-    <!-- 是否删除阶段弹窗 -->
-    <a-modal v-model:visible="deleteStageModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal"
-             centered="true">
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span>提示</span>
-            <!-- <div class="close_exit" @click="closeDeleteStage"></div> -->
-          </div>
-          <div class="body">
-            <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{
-                projectInfo.stageList?.length === 1 ? "当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?" : "您确定要删除此阶段"
-              }}</span>
-          </div>
-          <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDeleteStage">
-              <div class="btnText">取消</div>
-            </div>
-            <div class="del_btn btn2" @click="deleteStage">
-              <div class="btnText">确定</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
   </div>
 </template>
 
@@ -531,23 +398,17 @@ import {useRoute} from "vue-router";
 import {TASK_TYPE} from "@/utils/const";
 import {request} from "@/api/request";
 import {PROJECT_DETAIL_MODIFY, PROJECT_RELEASE} from "@/api/apis";
+import dialog from "@/utils/dialog";
 
 const route = useRoute();
 const courseRef = ref({})
 const visiblene = ref(false);
-const deAll = ref(false);
-const deleteModal = ref(false);
-const confirmModal = ref(false);
 const stage = ref(false);
-const cancelModal = ref(false);
-const deleteStageModal = ref(false);
-const templateLoading = ref(false);
 const confirmLoading = ref(false);
 const cancleLoading = ref(false);
 const projectInfo = ref({stageList: [{taskDraftDtoList: [{}]}], projectInfo: {}});
 const activeIndex = ref(0);
 const moveChapterIndex = ref(0);
-const deleteIndex = ref(0);
 const formValue = ref({taskDraftDtoList: []});
 
 
@@ -611,16 +472,34 @@ const moveTask = () => {
 };
 //批量删除
 const deleteTaskAll = () => {
-  projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.filter(t => t.checked).forEach(t => {
-    t.checked = false;
-    t.deleted = true;
-  })
-  deAll.value = false;
+  if (!projectInfo.value?.stageList[activeIndex.value]?.taskDraftDtoList?.filter(t => t.checked)?.length) {
+    message.warning("请选择要删除的任务！");
+    return
+  }
+  dialog({
+    content: '确定要批量删除任务吗?',
+    ok: () => {
+      projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.filter(t => t.checked).forEach((t,i) => {
+        if(t.id){
+          t.checked = false;
+          t.deleted = true;
+        }else{
+          projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.splice(i,1)
+        }
+
+      })
+    },
+  });
 };
 
-const confirmDelTask = () => {
-  projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[deleteIndex.value].deleted = true
-  deleteModal.value = false
+const confirmDelTask = (index) => {
+  dialog({
+    content: '确定要删除此任务吗?',
+    ok: () => {
+      message.success("删除成功");
+      projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[index].id?(projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[index].deleted = true):projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.splice(index,1)
+    },
+  });
 };
 //关闭添加阶段弹窗
 const closeModal = () => {
@@ -650,26 +529,16 @@ function editStage() {
   stage.value = false
 }
 
-//打开删除阶段弹窗
-const showDeleteStage = (index) => {
-  deleteStageModal.value = true;
-  deleteIndex.value = index;
-};
-//关闭删除阶段弹窗
-const closeDeleteStage = () => {
-  deleteStageModal.value = false;
-};
 //删除阶段
 const deleteStage = () => {
-  console.log(12345);
-  if (projectInfo.value.stageList.length === 1) {
-    projectInfo.value.stageList = [{id: '0', stageId: '0', name: '', remark: '', taskDraftDtoList: []}];
-    deleteStageModal.value = false;
-    return
-  }
-  projectInfo.value.stageList.splice(activeIndex.value, 1);
-  activeIndex.value && (activeIndex.value = activeIndex.value-1);
-  deleteStageModal.value = false;
+  dialog({
+    content: projectInfo.value.stageList.length === 1 ? "当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?" : '确认删除此阶段吗?',
+    ok: () => {
+      message.success("删除成功");
+      projectInfo.value.stageList[activeIndex.value].id?(projectInfo.value.stageList[activeIndex.value].deleted = true):projectInfo.value.stageList.splice(activeIndex.value,1)
+      activeIndex.value && (activeIndex.value = activeIndex.value - 1);
+    },
+  });
 };
 onMounted(() => {
   document.getElementsByTagName("main")[0].style.background = "rgb(245, 247, 250,1)";
@@ -681,32 +550,22 @@ onUnmounted(() => {
   document.getElementsByTagName("main")[0].style.background = "#ffffff";
   document.getElementsByTagName("main")[0].style.boxShadow = "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
 });
-const closeConfirm = () => {
-  confirmModal.value = false;
-};
-const showCancel = () => {
-  cancelModal.value = true;
-};
-const closeCancel = () => {
-  cancelModal.value = false;
-};
-const showDelete = (index) => {
-  deleteModal.value = true;
-  deleteIndex.value = index
-};
-const closeDelete = () => {
-  deleteModal.value = false;
-};
 // 删除所有阶段
 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;
+  dialog({
+    content: '确定要删除所有阶段吗?',
+    ok: () => {
+      message.success("删除成功");
+      projectInfo.value.stageList.forEach((t,i) => {
+        if(t.id){
+          t.checked = false;
+          t.deleted = true;
+        }else{
+          projectInfo.value.stageList.splice(i,1)
+        }
+      })
+    },
+  });
 };
 //全选任务或全不选任务
 const selectRowAll = () => {
@@ -716,29 +575,17 @@ const selectRowAll = () => {
   }
   projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.forEach(t => t.checked = true)
 };
-const showdeAll = () => {
-  if (!projectInfo.value?.stageList[activeIndex.value]?.taskDraftDtoList?.filter(t => t.checked)?.length) {
-    message.warning("请选择要删除的任务！");
-    return
-  }
-  deAll.value = true
-};
-const closeDeAll = () => {
-  deAll.value = false;
-};
 
 //暂存
 const temporaryStorage = async () => {
-  templateLoading.value = true
-  console.log(projectInfo.value)
+  confirmLoading.value = true
   await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
   await getTask()
   message.success("暂存成功");
-  templateLoading.value = false
+  confirmLoading.value = false
 };
 //确定
 const submitStorage = async () => {
-  // debugger
   confirmLoading.value = true
   projectInfo.value.projectInfo.status === 3 ? await request(PROJECT_RELEASE, {projectId: route.query.projectId}) : await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
   message.success("阶段和任务数据已保存")
@@ -1717,7 +1564,7 @@ const cancelStorage = async () => {
 
         .bi {
           width: 63px;
-          height: 23;
+          height: 23px;
           background-color: #5dc988;
           line-height: 23px;
           position: absolute;

From b917c626dd9707480681df13e32b194414a7263e Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 24 Feb 2023 22:56:21 +0800
Subject: [PATCH 17/28] =?UTF-8?q?feat:=E9=9D=A2=E6=8E=88=E8=AF=BE=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=A2=9E=E5=8A=A0=E7=9B=AE=E6=A0=87=E4=BA=BA=E7=BE=A4?=
 =?UTF-8?q?=E5=8F=8A=E8=B5=84=E6=BA=90=E5=BD=92=E5=B1=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/OrgClassCheck.vue      |   2 +-
 .../courselibrary/components/seeModal.vue     | 169 ++++++++++++++++--
 2 files changed, 155 insertions(+), 16 deletions(-)

diff --git a/src/components/project/OrgClassCheck.vue b/src/components/project/OrgClassCheck.vue
index 51aa1caa..4033a65a 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-24 09:58:42
+ * @LastEditTime: 2023-02-24 22:54:03
  * @FilePath: /fe-manage/src/components/project/OrgClassCheck.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue
index 22aa8931..cf46de03 100644
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -65,19 +65,84 @@
                 />
               </div>
               <div class="mbl_items">
-                <div class="item_nam">
+                <div class="item_nam" style="margin-bottom: 102px">
                   <div class="asterisk_icon">
                     <img
                       style="width: 10px; height: 10px"
                       src="@/assets/images/coursewareManage/asterisk.png"
-                      alt="img"
+                      alt=""
                     />
                   </div>
-                  <span style="margin-right: 14px">目标人群：</span>
+                  <span style="margin-right: 14px">目标人群</span>
                 </div>
                 <div class="item_inp">
                   <div class="i1_input">
-                    {{ filterTxt(detail.targetUser) }}
+                    <!-- <a-input v-model:value="qdms_inputV2" maxlength="50"
+											style="width: 440px; height: 40px; border-radius: 8px" placeholder="请输入目标人群" />
+										<div class="inp_num">
+											<span style="color: #c7cbd2">
+												{{ qdms_inputV2.length }}/50
+											</span>
+										</div> -->
+                    <div>
+                      <OrgClassCheck
+                        v-model:value="orgSelect"
+                        v-model:name="orgSelectName"
+                        :disabled="true"
+                      ></OrgClassCheck>
+                    </div>
+                    <div style="margin-top: 10px">
+                      <a-select
+                        v-model:value="selectJobId"
+                        mode="multiple"
+                        style="width: 440px; min-height: 40px"
+                        placeholder="请选择岗位"
+                        :options="jobType"
+                        @change="handleChangeJob"
+                        :fieldNames="{
+                          key: 'id',
+                          label: 'name',
+                          value: 'id',
+                        }"
+                        disabled
+                      ></a-select>
+                    </div>
+                    <div style="margin-top: 10px">
+                      <a-select
+                        v-model:value="selectBandId"
+                        mode="multiple"
+                        style="width: 440px; min-height: 40px"
+                        placeholder="请选择Band"
+                        :options="bandList"
+                        @change="handleChangeBand"
+                        :fieldNames="{
+                          key: 'id',
+                          label: 'name',
+                          value: 'id',
+                        }"
+                        disabled
+                      ></a-select>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="mbl_items">
+                <div class="item_nam">
+                  <div class="asterisk_icon">
+                    <img
+                      src="@/assets/images/coursewareManage/asterisk.png"
+                      alt="asterisk"
+                    />
+                  </div>
+                  <span style="margin-right: 14px">资源归属</span>
+                </div>
+                <div class="item_inp">
+                  <div class="select i6_input" style="width: 440px">
+                    <OrgClass
+                      v-model:value="sourceBelongId"
+                      v-model:name="sourceBelongName"
+                      :disabled="true"
+                    ></OrgClass>
                   </div>
                 </div>
               </div>
@@ -249,11 +314,7 @@
                       </div>
                     </div>
                   </div>
-                  <a
-                   @click="openDown(item)"
-                    style="margin-left: 5px"
-                    >下载</a
-                  >
+                  <a @click="openDown(item)" style="margin-left: 5px">下载</a>
                 </div>
               </div>
             </div>
@@ -281,7 +342,9 @@
 <script>
 import { reactive, toRefs, defineComponent, watch, computed } from "vue";
 import { useStore } from "vuex";
-
+import OrgClassCheck from "@/components/project/OrgClassCheck";
+import OrgClass from "@/components/project/OrgClass";
+import { detail } from "@/api/indexCourse";
 export default defineComponent({
   props: {
     visible: {
@@ -293,6 +356,10 @@ export default defineComponent({
       default: () => ({}),
     },
   },
+  components: {
+    OrgClassCheck,
+    OrgClass,
+  },
   setup(props, { emit }) {
     console.log("props", props);
     const store = useStore();
@@ -304,20 +371,89 @@ export default defineComponent({
         location.href.indexOf("http://") !== -1
           ? "http://43.143.139.204:12016/"
           : location.href.slice(0, location.href.indexOf("/m")) + "/upload/",
+
+      //目标任务
+      orgSelect: [],
+      orgSelectName: [],
+      orgSelectFullName: [],
+      selectJobName: [],
+      selectJobId: [],
+      selectBandName: [],
+      selectBandId: [],
+      //资源归属
+      sourceBelongId: [],
+      sourceBelongName: [],
+      sourceBelongFullName: [],
     });
 
     const sysTypeOptions = computed(() => store.state.content_type);
-
+    //获取岗位
+    const jobType = computed(() => store.state.job_type);
+    //获取band
+    const bandList = computed(() => store.state.band);
     watch(
       () => props.detail.sysTypeId,
       () => {
         state.categoryName = findClassFullName(sysTypeOptions.value);
       }
     );
+    watch(
+      () => props.detail.id,
+      () => {
+        detail({
+          offcourseId: Number(props.detail.id),
+        }).then((res) => {
+          if (res.data.code === 200) {
+            let item = res.data.data;
+            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;
+            }
+          }
+        });
+      }
+    );
 
     function findClassFullName(list, name = "") {
       return (
-        (list && list.length && list.map((e) => props.detail.sysTypeId == e.code ? name ? name + "-" + e.name : e.name : findClassFullName(e.children, name ? name + "-" + e.name : e.name)).filter((name) => name).join("")) || ""
+        (list &&
+          list.length &&
+          list
+            .map((e) =>
+              props.detail.sysTypeId == e.code
+                ? name
+                  ? name + "-" + e.name
+                  : e.name
+                : findClassFullName(
+                    e.children,
+                    name ? name + "-" + e.name : e.name
+                  )
+            )
+            .filter((name) => name)
+            .join("")) ||
+        ""
       );
     }
 
@@ -329,12 +465,13 @@ export default defineComponent({
       }
     };
     const handleCancel = () => {
+      console.log("关闭");
       emit("cancel");
     };
 
-    function openDown(link){
-      window.open(process.env.VUE_APP_FILE_PATH + link)
-    //:href="item.indexOf('http') !== -1 ? item : locationHref + item"
+    function openDown(link) {
+      window.open(process.env.VUE_APP_FILE_PATH + link);
+      //:href="item.indexOf('http') !== -1 ? item : locationHref + item"
     }
 
     return {
@@ -342,6 +479,8 @@ export default defineComponent({
       filterTxt,
       openDown,
       handleCancel,
+      jobType,
+      bandList,
     };
   },
 });

From 806e1b8bf4b5e85bb14c09b141afe55184aad034 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Fri, 24 Feb 2023 23:11:49 +0800
Subject: [PATCH 18/28] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddTest.vue | 45 +++++++++++++++++-------------
 src/views/DownLoad.vue             |  7 +++--
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 2f38e378..d94cfdd0 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -10,13 +10,23 @@
           @click="closeDrawer" />
       </div>
       <div style="display: flex; flex-direction: row; padding-top: 0px; margin-top: 20px; margin-left: 32px;">
-        <div>
-          <button style="width: 100px; cursor: pointer;" @click="changeOuter(1)"
-            :class="formData.examType === 1 ? 'outer' : 'notOuter'">
+        <div v-if="taskIndex >= 0">
+          <button v-show="formData.examType === 1" style="width: 100px; cursor: pointer;"
+                  :class="formData.examType === 1 ? 'outer' : 'notOuter'">
             系统考试
           </button>
-          <button :disabled="taskIndex >= 0" style="width: 100px; cursor: pointer;" @click="changeOuter(2)"
-            :class="formData.examType === 2 ? 'outer' : 'notOuter'">
+          <button v-show="formData.examType === 2" style="width: 100px; cursor: pointer;"
+                  :class="formData.examType === 2 ? 'outer' : 'notOuter'">
+            外部考试
+          </button>
+        </div>
+        <div  v-else>
+          <button style="width: 100px; cursor: pointer;" @click="changeOuter(1)"
+                  :class="formData.examType === 1 ? 'outer' : 'notOuter'">
+            系统考试
+          </button>
+          <button  style="width: 100px; cursor: pointer;" @click="changeOuter(2)"
+                  :class="formData.examType === 2 ? 'outer' : 'notOuter'">
             外部考试
           </button>
         </div>
@@ -44,18 +54,18 @@
               </div>
               <span style="margin-right: 3px">选择试卷：</span>
             </div>
-            <s-test v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
-              <div class="btnbox">
-                <button class="xkbtn" style="margin:0" :disabled="taskIndex >= 0">
-                  {{ formData.examinationPaperId ? "重选" : "选择" }}试卷
-                </button>
-              </div>
-            </s-test>
             <div v-if="formData.examinationPaperId">
               <a-tag closable color="processing" @close="delTag" :closeIcon="true">
                 <span style="font-size: 14px; line-height: 33px">{{ formData.examinationTestName }}</span>
               </a-tag>
             </div>
+            <s-test v-else v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
+              <div class="btnbox">
+                <button class="xkbtn" style="margin:0" >
+                  {{ formData.examinationPaperId ? "重选" : "选择" }}试卷
+                </button>
+              </div>
+            </s-test>
           </div>
 
           <div class="main_item">
@@ -189,7 +199,7 @@
               <span style="margin-right: 3px">考试名称：</span>
             </div>
             <div class="btnbox">
-              <a-input v-model:value="formData.examinationName" style="width: 400px; height: 40px; border-radius: 8px"
+              <a-input v-model:value="formData.examinationName" style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0"
                 placeholder="请输入考试名称" :maxlength="20" />
             </div>
           </div>
@@ -201,7 +211,7 @@
               <span style="margin-right: 3px">数据来源：</span>
             </div>
             <div class="btnbox">
-              <a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px"
+              <a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0"
                 placeholder="请输入数据来源" :maxlength="20" />
             </div>
           </div>
@@ -210,7 +220,7 @@
               <span style="margin-right: 3px">考试说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea v-model:value="formData.externalExplain" placeholder="请输入考试说明" allow-clear show-count
+              <a-textarea v-model:value="formData.externalExplain" placeholder="请输入考试说明" allow-clear show-count :disabled="taskIndex >= 0"
                 :maxlength="200" :rows="6" />
             </div>
           </div>
@@ -355,7 +365,7 @@ async function confirm() {
   }).catch(err => {
     console.log(err)
   })
-  
+
   emit('update:taskList', [...props.taskList])
   closeDrawer()
 }
@@ -374,9 +384,6 @@ const delTag = () => {
 }
 
 function changeOuter(v) {
-  if (taskIndex.value >= 0) {
-    return message.warn("编辑状态不允许切换。")
-  }
   formData.value.examType = v;
 }
 
diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue
index 382a00d6..b8fc3990 100644
--- a/src/views/DownLoad.vue
+++ b/src/views/DownLoad.vue
@@ -165,7 +165,8 @@ export default {
     function formatCapacity(data) {
       let num = Number(data);
       let CMB = (num / 1048576).toFixed(2);
-      let countCMB = (num / 1048576*1024).toFixed(2);
+      let total = Number(1048576*1024);
+      let countCMB = (num / total).toFixed(2);
       state.countCMB = countCMB;
       if(CMB%1024>1){
         CMB = (CMB/1024).toFixed(2) + 'GB';
@@ -177,9 +178,9 @@ export default {
     }
 
     function formatCapacityGB(data) {
-      debugger
       let num = Number(data);
-      let CMB = (num / (1048576*1024)).toFixed(2);
+      let total = Number(1048576*1024);
+      let CMB = (num / total).toFixed(2);
       return CMB
     }
 

From 606ec95c66400d5f5a92cc9994ab9945b0bd6d26 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 24 Feb 2023 23:23:24 +0800
Subject: [PATCH 19/28] -- fix bug

---
 src/views/learningpath/LevelAddDetail.vue | 189 ++++++----------------
 src/views/projectcenter/TaskAdd.vue       |  33 ++--
 2 files changed, 66 insertions(+), 156 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 272ef10d..f989dd6b 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -33,11 +33,10 @@
                           </div>
                         </div>
                       </a-popover>
-
                       <div class="imgIcon" @click="showModal(element)"></div>
                     </div>
                     <div class="boxs_right">
-                      <div class="imgIcon" @click="showDeleteChapter"></div>
+                      <div class="imgIcon" @click="deleteChapter"></div>
                     </div>
                   </div>
                   <div class="items2">
@@ -124,12 +123,6 @@
                     routerInfo.routerInfo.unlockMode == 1 ? '自由学习模式' : routerInfo.routerInfo.unlockMode == 2 || routerInfo.routerInfo.unlockMode == 3 ? '闯关模式' : ''
                   }}
                 </span>
-                <!-- <a-select v-model:value="routerInfo.routerInfo.unlockMode" ref="select" size="small"
-                          style="width: 150px" disabled>
-                  <a-select-option :value="1">自由学习模式</a-select-option>
-                  <a-select-option :value="2">闯关模式</a-select-option>
-                  <a-select-option :value="3">闯关模式</a-select-option>
-                </a-select> -->
                 <unlock-mode :routerInfo="routerInfo.routerInfo" :types="types">
                   <a-button type="primary" size="large" style="border-radius: 8px;margin-left: 24px;">切换模式
                   </a-button>
@@ -172,7 +165,7 @@
                 <div class="btn btn1" @click="showChangeModal">
                   <div class="btnText">移动任务到关卡</div>
                 </div>
-                <div class="btn btn2" @click="showDeleteALLModal">
+                <div class="btn btn2" @click="subdeleteAll">
                   <div class="imgIcon"></div>
                   <div class="btnText">批量删除</div>
                 </div>
@@ -281,10 +274,6 @@
                     <div style="width: 87px; text-align: center">
                       {{ element.duration ? element.duration + "分钟" : "-" }}
                     </div>
-
-                    <!--                    <div style="width: 87px; text-align: center">-->
-                    <!--                      {{ element.status === 0 ? '草稿' : element.status === 1 ? '已发布' : '' }}-->
-                    <!--                    </div>-->
                     <div style="
                         width: 120px;
                         text-align: center;
@@ -298,7 +287,7 @@
                               @click="editTaskForType(element,index)">
                             编辑
                           </span>
-                          <span style="color: #4ea6ff; cursor: pointer" @click="showDeleteModal(element,index)">
+                          <span style="color: #4ea6ff; cursor: pointer" @click="deleteTask(element,index)">
                             删除
                           </span>
                         </div>
@@ -337,56 +326,6 @@
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>
-    <!-- 批量删除学员弹窗 -->
-    <a-modal v-model:visible="deleteAll" :footer="null" :closable="closedeleteAll" wrapClassName="CopyModal"
-             :centered="true">
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span>提示</span>
-            <div class="close_exit" @click="closedeleteAll"></div>
-          </div>
-          <div class="body">
-            <span>请确认是否批量删除任务</span>
-          </div>
-          <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closedeleteAll">
-              <div class="btnText">取消</div>
-            </div>
-            <div class="del_btn btn2" @click="subdeleteAll">
-              <div class="btnText">确定</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
-    <!-- 是否确认删除任务弹窗 -->
-    <!-- 确认删除阶段弹窗 -->
-    <a-modal v-model:visible="deleteModal" :footer="null" wrapClassName="ConfirmModal" :centered="true">
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span>提示</span>
-            <div class="close_exit" @click="closeConfirm"></div>
-          </div>
-          <div class="body">
-            <span>您确定要删除此任务吗</span>
-          </div>
-          <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeConfirm">
-              <div class="btnText">取消</div>
-            </div>
-            <div class="del_btn btn2" @click="deleteLevelTask">
-              <div class="btnText">确定</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
     <!-- 移动任务到阶段 -->
     <a-modal style="padding: 0" v-model:visible="visiblene" :footer="null" :centered="true"
              wrapClassName="moveModal">
@@ -419,36 +358,10 @@
         </div>
       </div>
     </a-modal>
-
-    <!-- 是否删除关卡弹窗 -->
-    <a-modal v-model:visible="deleteChapterModal" :footer="null" :closable="cC" wrapClassName="ConfirmModal"
-             centered="true">
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span>提示</span>
-            <div class="close_exit" @click="closeDeleteChapter"></div>
-          </div>
-          <div class="body">
-            <span>您确定要删除此关卡</span>
-          </div>
-          <div class="del_btnbox">
-            <div class="del_btn btn1" @click="closeDeleteChapter">
-              <div class="btnText">取消</div>
-            </div>
-            <div class="del_btn btn2" @click="deleteChapter">
-              <div class="btnText">确定</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
   </div>
 </template>
 <script setup>
-import {computed, onMounted, onUnmounted, ref, watch} from "vue";
+import {computed, onMounted, ref, watch} from "vue";
 import {GetRouterDraftDetail, releaseRouter} from "@/api/indexTask";
 import {message} from "ant-design-vue";
 import {useRoute} from "vue-router";
@@ -457,19 +370,16 @@ import {TASK_TYPE} from "@/utils/const";
 import Draggable from "vuedraggable";
 import {ROUTER_DETAIL_MODIFY} from "@/api/apis";
 import {request} from "@/api/request";
+import dialog from "@/utils/dialog";
 
 const {query: {routerId}} = useRoute();
 const modal = ref(false)
 const visiblene = ref(false)
-const deleteAll = ref(false)
-const deleteModal = ref(false)
-const deleteChapterModal = ref(false)
 const cancleLoading = ref(false)
 const templateLoading = ref(false)
 const confirmLoading = ref(false)
 const moveChapterIndex = ref('')
 const activeIndex = ref(0)
-const deleteIndex = ref(0)
 const types = 1 // 1 路径图 2 项目
 
 const courseRef = ref({})
@@ -509,27 +419,24 @@ const editChapter = () => {
   if (!formValue.value.name) {
     return message.warning("请输入关卡名称");
   }
-  routerInfo.value.chapterList.push({...formValue.value,draftTaskList: []})
+  routerInfo.value.chapterList.push({...formValue.value, draftTaskList: []})
   formValue.value = {draftTaskList: []}
   closeModal()
 };
-//打开删除关卡弹窗
-const showDeleteChapter = () => {
-  deleteChapterModal.value = true;
-};
-//关闭删除关卡弹窗
-const closeDeleteChapter = () => {
-  deleteChapterModal.value = false;
-};
 //删除关卡
 const deleteChapter = () => {
-  if (routerInfo.value.chapterList.length === 1) {
-    message.warning("至少保留一个关卡");
-    return
-  }
-  routerInfo.value.chapterList.splice(activeIndex.value, 1);
-  activeIndex.value && (activeIndex.value = activeIndex.value-1);
-  deleteChapterModal.value = false;
+  dialog({
+    content: '确定要删除关卡吗?',
+    ok: () => {
+      if (routerInfo.value.chapterList.length === 1) {
+        message.warning("至少保留一个关卡");
+        return
+      }
+      routerInfo.value.chapterList[activeIndex.value].id ? (routerInfo.value.chapterList[activeIndex.value].deleted = true) : routerInfo.value.chapterList.splice(activeIndex.value, 1);
+      activeIndex.value && (activeIndex.value = activeIndex.value - 1);
+      message.info("删除关卡成功");
+    },
+  });
 };
 
 const getDetail = async () => {
@@ -539,46 +446,36 @@ const getDetail = async () => {
 };
 
 onMounted(() => {
-  document.getElementsByTagName("main")[0].style.background = "rgb(245, 247, 250,1)";
-  document.getElementsByTagName("main")[0].style.boxShadow = "none";
   getDetail();
 });
-onUnmounted(() => {
-  document.getElementsByTagName("main")[0].style.background = "#ffffff";
-  document.getElementsByTagName("main")[0].style.boxShadow = "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
-});
+
 const changebgc = (index) => {
   activeIndex.value = index
 };
-const showDeleteALLModal = () => {
+
+const subdeleteAll = () => {
   if (!routerInfo.value?.chapterList[activeIndex.value]?.draftTaskList?.filter(t => t.checked)?.length) {
     message.warning("请选择要删除的任务！");
     return
   }
-  deleteAll.value = true
+  dialog({
+    content: '确定要删除所选任务吗?',
+    ok: () => {
+      for (let i = 0; i < routerInfo.value.chapterList[activeIndex.value].draftTaskList.length; i++) {
+        const t = routerInfo.value.chapterList[activeIndex.value].draftTaskList[i]
+        if (t.checked) {
+          if (t.id) {
+            t.checked = false;
+            t.deleted = true;
+          } else {
+            routerInfo.value.chapterList[activeIndex.value].draftTaskList.splice(i, 1);
+            i--;
+          }
+        }
+      }
+    },
+  });
 };
-const closedeleteAll = () => {
-  deleteAll.value = false
-};
-const subdeleteAll = () => {
-  routerInfo.value.chapterList[activeIndex.value].draftTaskList.filter(t => t.checked).forEach(t => {
-    t.checked = false;
-    t.deleted = true;
-  })
-  closedeleteAll()
-};
-const showDeleteModal = (_, index) => {
-  deleteModal.value = true;
-  deleteIndex.value = index;
-};
-const closeConfirm = () => {
-  deleteModal.value = false;
-};
-
-function deleteLevelTask() {
-  routerInfo.value.chapterList[activeIndex.value].draftTaskList[deleteIndex.value].deleted = true
-  closeConfirm()
-}
 
 //全选任务或全不选任务
 const selectRowAll = () => {
@@ -602,6 +499,16 @@ const editTaskForType = (ele, index) => {
   courseRef.value['el' + ele.type].openDrawer(index, ele)
 };
 
+function deleteTask(element, index) {
+  dialog({
+    content: '确定要删除此任务吗?',
+    ok: () => {
+      message.success("删除成功");
+      routerInfo.value.chapterList[activeIndex.value].draftTaskList[index].id ? (element.deleted = true) : routerInfo.value.chapterList[activeIndex.value].draftTaskList.splice(index, 1)
+    },
+  });
+}
+
 const showChangeModal = () => {
   if (routerInfo.value?.chapterList?.length <= 1) {
     message.warning("请添加关卡！");
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 1ce6fe65..c3e6656c 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -477,17 +477,20 @@ const deleteTaskAll = () => {
     return
   }
   dialog({
-    content: '确定要批量删除任务吗?',
+    content: '确定要删除所选任务吗?',
     ok: () => {
-      projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.filter(t => t.checked).forEach((t,i) => {
-        if(t.id){
-          t.checked = false;
-          t.deleted = true;
-        }else{
-          projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.splice(i,1)
+      for (let i = 0; i < projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.length; i++) {
+        const t = projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[i]
+        if (t.checked) {
+          if (t.id) {
+            t.checked = false;
+            t.deleted = true;
+          } else {
+            projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.splice(i, 1);
+            i--;
+          }
         }
-
-      })
+      }
     },
   });
 };
@@ -497,7 +500,7 @@ const confirmDelTask = (index) => {
     content: '确定要删除此任务吗?',
     ok: () => {
       message.success("删除成功");
-      projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[index].id?(projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[index].deleted = true):projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.splice(index,1)
+      projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[index].id ? (projectInfo.value.stageList[activeIndex.value].taskDraftDtoList[index].deleted = true) : projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.splice(index, 1)
     },
   });
 };
@@ -535,7 +538,7 @@ const deleteStage = () => {
     content: projectInfo.value.stageList.length === 1 ? "当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?" : '确认删除此阶段吗?',
     ok: () => {
       message.success("删除成功");
-      projectInfo.value.stageList[activeIndex.value].id?(projectInfo.value.stageList[activeIndex.value].deleted = true):projectInfo.value.stageList.splice(activeIndex.value,1)
+      projectInfo.value.stageList[activeIndex.value].id ? (projectInfo.value.stageList[activeIndex.value].deleted = true) : projectInfo.value.stageList.splice(activeIndex.value, 1)
       activeIndex.value && (activeIndex.value = activeIndex.value - 1);
     },
   });
@@ -556,12 +559,12 @@ const removeAllLevel = () => {
     content: '确定要删除所有阶段吗?',
     ok: () => {
       message.success("删除成功");
-      projectInfo.value.stageList.forEach((t,i) => {
-        if(t.id){
+      projectInfo.value.stageList.forEach((t, i) => {
+        if (t.id) {
           t.checked = false;
           t.deleted = true;
-        }else{
-          projectInfo.value.stageList.splice(i,1)
+        } else {
+          projectInfo.value.stageList.splice(i, 1)
         }
       })
     },

From e512cffc9c2ddf8d8de3209b76e4ad725b1686dd Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 25 Feb 2023 00:40:06 +0800
Subject: [PATCH 20/28] -- fix bug

---
 src/views/learningpath/LevelAddDetail.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index f989dd6b..83690301 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -321,7 +321,7 @@
 
     <div class="footbtn">
       <div class="btnbox">
-        <a-button class="btn btn2" @click="temporaryStorage" :loading="templateLoading">暂存</a-button>
+        <a-button class="btn btn2" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
         <a-button class="btn btn2" @click="submitStorage" :loading="confirmLoading">确定</a-button>
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
@@ -376,7 +376,6 @@ const {query: {routerId}} = useRoute();
 const modal = ref(false)
 const visiblene = ref(false)
 const cancleLoading = ref(false)
-const templateLoading = ref(false)
 const confirmLoading = ref(false)
 const moveChapterIndex = ref('')
 const activeIndex = ref(0)
@@ -526,12 +525,11 @@ const closeChangeModal = () => {
 
 //暂存
 const temporaryStorage = async () => {
-  // debugger
-  templateLoading.value = true
+  confirmLoading.value = true
   await request(ROUTER_DETAIL_MODIFY, routerInfo.value)
   await getDetail()
   message.success("暂存成功");
-  templateLoading.value = false
+  confirmLoading.value = false
 };
 
 const submitStorage = async () => {

From 6c4326aca022e8017a8be4b4734e84e98aace6fb Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 25 Feb 2023 01:04:19 +0800
Subject: [PATCH 21/28] =?UTF-8?q?=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ActiveAttendance.vue      | 16 ++++++++++------
 src/components/drawers/ImportStu.vue             |  4 ++--
 src/components/drawers/TaskFaceIn.vue            |  2 +-
 .../drawers/project/ImpoterGroupLeader.vue       |  6 +++---
 src/views/learningpath/LevelAdd.vue              |  4 ++--
 src/views/projectcenter/TaskPage.vue             |  5 +++--
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index cfd25dc2..caa01c8e 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -3,7 +3,7 @@
     @after-visible-change="afterVisibleChange">
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">【{{ datasource.type == 6 ? "直播" : "活动" }}】考勤1</div>
+        <div class="headerTitle">【{{ datasource.type == 6 ? "直播" : "活动" }}】考勤</div>
         <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
           @click="closeDrawer" />
       </div>
@@ -243,6 +243,7 @@ export default {
   },
 
   setup(props, ctx) {
+    debugger
     const state = reactive({
       Evisible: false, //录入成绩抽屉
       name: null,
@@ -689,15 +690,17 @@ export default {
               <div class="opa" style='display:flex;justify-content:center;align-items:center;'>
                 <div
                   onClick={() => {
+                    debugger
                     {/* debugger */ }
                     console.log("点击签到", value);
                     // 获取当前时间
                     {/* showsingleqdModal(); */ }
                     {/* AttendanceSign */ }
 
-                    let obj = {
+
+                    let obj1 = {
                       courseId: Number(props.datasource.courseId),
-                      routerId: Number(props.datasource.routerId),
+                      routerId: Number(props.datasource.projectId),
                       ids: [value.record.studentId],
                       taskId: Number(props.datasource.id),
                       taskType: Number(props.datasource.type),
@@ -706,15 +709,16 @@ export default {
 
                     let obj2 = {
                       courseId: Number(props.datasource.courseId),
-                      routerId: Number(props.datasource.projectId),
+                      routerId: Number(props.datasource.routerId),
                       ids: [value.record.studentId],
                       taskId: Number(props.datasource.id),
                       taskType: Number(props.datasource.type),
                       type: 2,
                     };
-                    console.log(obj, obj2)
+                    // 1是项目 2路径图 3开课
+                    console.log(obj1, obj2)
                     state.tableDataTotalLoading = true;
-                    api.AttendanceSign(props.types == 1 ? obj : obj2).then(res => {
+                    api.AttendanceSign(props.types === 1 ? obj1 : obj2).then(res => {
                       console.log('res----签到是否成功', res)
                       message.destroy()
                       message.info('签到成功')
diff --git a/src/components/drawers/ImportStu.vue b/src/components/drawers/ImportStu.vue
index 0f1ba90a..fc21b270 100644
--- a/src/components/drawers/ImportStu.vue
+++ b/src/components/drawers/ImportStu.vue
@@ -282,7 +282,7 @@ export default {
       template: process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE,
     });
     const closeDrawer = () => {
-     
+
       ctx.emit("closeDraw", true);
       ctx.emit("update:TaskFaceImpStuvisible", false);
       state.fileList = [];
@@ -719,4 +719,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/drawers/TaskFaceIn.vue b/src/components/drawers/TaskFaceIn.vue
index 581f9ca8..731f17ee 100644
--- a/src/components/drawers/TaskFaceIn.vue
+++ b/src/components/drawers/TaskFaceIn.vue
@@ -224,7 +224,7 @@ export default {
       template: process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE,
     });
     const closeDrawer = () => {
-     
+
       ctx.emit("closeDraw", true);
       ctx.emit("update:TaskFaceImpStuvisible", false);
       state.fileList = [];
diff --git a/src/components/drawers/project/ImpoterGroupLeader.vue b/src/components/drawers/project/ImpoterGroupLeader.vue
index 556b6bdd..213b50ea 100644
--- a/src/components/drawers/project/ImpoterGroupLeader.vue
+++ b/src/components/drawers/project/ImpoterGroupLeader.vue
@@ -66,7 +66,7 @@
                         <div class="curloading">
                           <div style="color: #387df7; margin-left: 20px; cursor: pointer"
                                v-if="file.uploadState?.status === 'FAILED'" @click="downloadErrorData(file.uploadState?.url)">
-                            下载失败数据
+                            下载失败数据1
                           </div>
                         </div>
                       </div>
@@ -136,7 +136,7 @@ function downTemplate() {
 }
 
 function downloadErrorData(url) {
-  window.open(process.env.VUE_APP_BASE_API + url)
+  window.open(process.env.VUE_APP_FILE_PATH + url)
 }
 
 function handleChange({file}) {
@@ -481,4 +481,4 @@ function handleChange({file}) {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 0e1063be..69792c4a 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -324,7 +324,7 @@
           <!-- 路径管理 -->
           <div style="flex: 1">
             <div class="onerow">
-              <div class="taskmain">任务大纲</div>
+              <div class="taskmain">任务大纲2</div>
               <ImpoterGroupLeader title="批量面授报名" :data="{targetId:routerId,type:2}" :url="`/admin/offcourse/importCourse`" :template-url="`/admin/router/exportTaskCoursePlan/${routerId}?type=1&taskType=2&thirdType=3`">
                 <button class="btn">批量面授报名</button>
               </ImpoterGroupLeader>
@@ -1077,7 +1077,7 @@
         v-model:AAvisible="AAvisible"
         :datasource="liveData"
         :title="showKaoqinText"
-        types="1"
+        types="2"
         classify="2"
       />
       <!-- 时间管理抽屉 -->
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index d0d28411..9d91390d 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -444,7 +444,7 @@
           <div style="flex: 1">
             <div class="split"></div>
             <div class="onerow">
-              <div class="taskmain">任务大纲</div>
+              <div class="taskmain">任务大纲1</div>
               <ImpoterGroupLeader
                 title="批量面授报名"
                 :data="{ targetId: projectId, type: 1 }"
@@ -1578,7 +1578,7 @@
       v-model:AAvisible="AAvisible"
       :datasource="liveData"
       :title="showKaoqinText"
-      types="2"
+      types="1"
       classify="2"
     />
     <!-- 概览（无数据）-项目发布弹窗 -->
@@ -3151,6 +3151,7 @@ export default {
     }
     //考勤的抽屉
     const showAA = (course, a, data) => {
+      debugger
       state.AAvisible = true;
       state.liveData = data;
       state.showKaoqinText = "直播";

From 876831635b3cc5660fcc5f10875881ed5015c745 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 25 Feb 2023 01:09:35 +0800
Subject: [PATCH 22/28] -- fix bug

---
 src/views/learningpath/LevelAddDetail.vue |  9 +++++++--
 src/views/projectcenter/TaskAdd.vue       | 11 ++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 83690301..3e17c52b 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -319,13 +319,14 @@
       </div>
     </div>
 
-    <div class="footbtn">
+    <div class="footbtn footBox">
       <div class="btnbox">
         <a-button class="btn btn2" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
         <a-button class="btn btn2" @click="submitStorage" :loading="confirmLoading">确定</a-button>
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>
+    <div><div style="height:80px;width:100%;" /></div>
     <!-- 移动任务到阶段 -->
     <a-modal style="padding: 0" v-model:visible="visiblene" :footer="null" :centered="true"
              wrapClassName="moveModal">
@@ -1963,7 +1964,7 @@ const cancelStorage = async () => {
 
     .btnbox {
       display: flex;
-      margin-right: 36px;
+      margin-right: 275px;
       height: 80px;
 
       .btn {
@@ -2131,4 +2132,8 @@ const cancelStorage = async () => {
     }
   }
 }
+.footBox {
+  position: fixed;
+  bottom: 0;
+}
 </style>
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index c3e6656c..3ee813f9 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -274,14 +274,14 @@
       </div>
     </div>
 
-    <div class="footbtn">
+    <div class="footbtn footBox">
       <div class="btnbox">
         <a-button class="btn btn2" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
         <a-button class="btn btn2" @click="submitStorage" :loading="confirmLoading">确定</a-button>
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>
-
+    <div><div style="height:80px;width:100%;" /></div>
     <!-- 添加阶段弹窗 -->
     <a-modal v-model:visible="stage" :title="null" @ok="closeModal" :footer="null" :closable="false"
              wrapClassName="addstage" width="624px" height="388px" :centered="true" @cancel="closeModal">
@@ -1617,7 +1617,7 @@ const cancelStorage = async () => {
 
     .btnbox {
       display: flex;
-      margin-right: 36px;
+      margin-right: 275px;
       height: 80px;
 
       .btn {
@@ -1661,4 +1661,9 @@ const cancelStorage = async () => {
     }
   }
 }
+
+.footBox {
+  position: fixed;
+  bottom: 0;
+}
 </style>

From d34189fd7ea0631c4eb9fcb7eb9aa3b1bbe7c471 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 25 Feb 2023 01:25:01 +0800
Subject: [PATCH 23/28] -- fix bug

---
 src/views/learningpath/LevelAddDetail.vue |  7 ++++---
 src/views/projectcenter/TaskAdd.vue       | 16 +++++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 3e17c52b..6f4b2b11 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -154,8 +154,7 @@
             <div class="lin"></div>
           </div>
         </div>
-        <div class="boom"
-             :style="{ minHeight: routerInfo?.chapterList[activeIndex]?.draftTaskList?.length > 6 ? ((routerInfo?.chapterList[activeIndex]?.draftTaskList?.length - 6) * 106 + 512) + 'px' : 512 + 'px' }">
+        <div class="boom">
           <div class="boomcen">
             <div class="title">
               <div class="tit_left">
@@ -1292,7 +1291,9 @@ const cancelStorage = async () => {
       display: flex;
       align-items: center;
       flex-wrap: wrap;
-
+      position: sticky;
+      top:0;
+      z-index: 999;
       .item {
         height: 115px;
         // width: 7.7%;
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 3ee813f9..d32d1d0e 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -281,7 +281,9 @@
         <a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
       </div>
     </div>
-    <div><div style="height:80px;width:100%;" /></div>
+    <div>
+      <div style="height:80px;width:100%;"/>
+    </div>
     <!-- 添加阶段弹窗 -->
     <a-modal v-model:visible="stage" :title="null" @ok="closeModal" :footer="null" :closable="false"
              wrapClassName="addstage" width="624px" height="388px" :centered="true" @cancel="closeModal">
@@ -389,7 +391,7 @@
 </template>
 
 <script setup>
-import {computed, onMounted, onUnmounted, ref, watch,} from "vue";
+import {computed, onMounted, ref, watch,} from "vue";
 import {message} from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
 import UnlockMode from "../../components/drawers/UnlockMode.vue";
@@ -544,15 +546,8 @@ const deleteStage = () => {
   });
 };
 onMounted(() => {
-  document.getElementsByTagName("main")[0].style.background = "rgb(245, 247, 250,1)";
-  document.getElementsByTagName("main")[0].style.boxShadow = "none";
   getTask();
 });
-
-onUnmounted(() => {
-  document.getElementsByTagName("main")[0].style.background = "#ffffff";
-  document.getElementsByTagName("main")[0].style.boxShadow = "0px 1px 35px 0px rgba(118, 136, 166, 0.07)";
-});
 // 删除所有阶段
 const removeAllLevel = () => {
   dialog({
@@ -1286,6 +1281,9 @@ const cancelStorage = async () => {
       display: flex;
       align-items: center;
       flex-wrap: wrap;
+      position: sticky;
+      top: 0;
+      z-index: 999;
 
       .item {
         height: 115px;

From fc897e9129353225306426d370b804a6d697146b Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 25 Feb 2023 01:34:34 +0800
Subject: [PATCH 24/28] =?UTF-8?q?=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ActiveAttendance.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index caa01c8e..b9269969 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -394,10 +394,11 @@ export default {
     };
 
     const getTableData = () => {
+      debugger
       // debugger
-      console.log('当前是项目还是路径图 1 路径图 2 项目', props)
-      console.log('当前是项目还是路径图 1 路径图 2 项目', props.types)
-      if (props.datasource.type == 6 && props.types == 1 || props.datasource.type == 9 && props.types == 1) {
+      console.log('当前是项目还是路径图 1 项目 2 路径图', props)
+      console.log('当前是项目还是路径图 1 项目 2 路径图', props.types)
+      if (props.datasource.type == 6 && props.types == 2 || props.datasource.type == 9 && props.types == 2) {
         // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
         console.log("我是传递的查询参数", {
           pageNo: state.currentPage,
@@ -442,14 +443,14 @@ export default {
             state.tableDataTotalLoading = false;
             state.tableData = [];
           });
-      } else if (props.datasource.type == 6 && props.types == 2 || props.datasource.type == 9 && props.types == 2) {
+      } else if (props.datasource.type == 6 && props.types == 1 || props.datasource.type == 9 && props.types == 1) {
         // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
         console.log("我是传递的查询参数", {
           pageNo: state.currentPage,
           pageSize: state.pageSize,
           currentStageId: props.datasource.stageId,
           type: 1,
-          pid: props.datasource.projectId,
+          pid: props.datasource.id,
           taskId: props.datasource.id,
           taskType: props.datasource.type,
           status: state.projectName,

From ca126adb7c0b4f6f5fbb69309f35c65c7d846156 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 25 Feb 2023 01:49:54 +0800
Subject: [PATCH 25/28] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ActiveAttendance.vue | 3 +--
 src/components/drawers/MemberList.vue       | 8 ++++----
 src/views/learningpath/LevelAdd.vue         | 2 +-
 src/views/projectcenter/TaskPage.vue        | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index b9269969..b40ab272 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -243,7 +243,6 @@ export default {
   },
 
   setup(props, ctx) {
-    debugger
     const state = reactive({
       Evisible: false, //录入成绩抽屉
       name: null,
@@ -719,7 +718,7 @@ export default {
                     // 1是项目 2路径图 3开课
                     console.log(obj1, obj2)
                     state.tableDataTotalLoading = true;
-                    api.AttendanceSign(props.types === 1 ? obj1 : obj2).then(res => {
+                    api.AttendanceSign(props.types === '1' ? obj1 : obj2).then(res => {
                       console.log('res----签到是否成功', res)
                       message.destroy()
                       message.info('签到成功')
diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index 8155c1b3..52f00722 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -64,7 +64,7 @@
                   style="margin-right: 10px"
                   src="../../assets/images/courseManage/add0.png"
               /></template>
-              添加组员
+              添加组员1
             </a-button></CommonStudent
           >
           <div class="btn btn2" @click="showModal">
@@ -72,10 +72,10 @@
             <div class="wz">批量删除</div>
           </div>
           <!-- 2022-11-30注释 后面放开 -->
-          <!-- <div class="btn btn2">
+           <div class="btn btn2">
             <div class="img2"></div>
-            <div class="wz">导出信息</div>
-          </div> -->
+            <div class="wz">导出组员</div>
+          </div>
         </div>
         <div class="line">
           <div class="inline">
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 69792c4a..7273571e 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -324,7 +324,7 @@
           <!-- 路径管理 -->
           <div style="flex: 1">
             <div class="onerow">
-              <div class="taskmain">任务大纲2</div>
+              <div class="taskmain">任务大纲</div>
               <ImpoterGroupLeader title="批量面授报名" :data="{targetId:routerId,type:2}" :url="`/admin/offcourse/importCourse`" :template-url="`/admin/router/exportTaskCoursePlan/${routerId}?type=1&taskType=2&thirdType=3`">
                 <button class="btn">批量面授报名</button>
               </ImpoterGroupLeader>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 9d91390d..125557fc 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -444,7 +444,7 @@
           <div style="flex: 1">
             <div class="split"></div>
             <div class="onerow">
-              <div class="taskmain">任务大纲1</div>
+              <div class="taskmain">任务大纲</div>
               <ImpoterGroupLeader
                 title="批量面授报名"
                 :data="{ targetId: projectId, type: 1 }"

From b47e1163d4b105e1dd6576f5185658be0dbfe81f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 25 Feb 2023 01:56:21 +0800
Subject: [PATCH 26/28] -- fix bug

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

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 6f4b2b11..208131bd 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1027,7 +1027,10 @@ const cancelStorage = async () => {
     .leftmain {
       // width: 86%;
       margin-top: 20px;
-
+      position: sticky;
+      top:0;
+      height: 80vh;
+      overflow-y: auto;
       .tit {
         font-size: 18px;
         color: #363636;
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index d32d1d0e..c143908d 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -948,8 +948,10 @@ const cancelStorage = async () => {
 
     .leftmain {
       margin-top: 20px;
-      min-height: 800px;
-
+      position: sticky;
+      top:0;
+      height: 80vh;
+      overflow-y: auto;
       .tit {
         margin-left: 20px;
         font-size: 18px;
@@ -1283,7 +1285,7 @@ const cancelStorage = async () => {
       flex-wrap: wrap;
       position: sticky;
       top: 0;
-      z-index: 999;
+      z-index: 99999;
 
       .item {
         height: 115px;

From 88cae415b59421073e27e0affe5756bb772c76b9 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 25 Feb 2023 08:07:54 +0800
Subject: [PATCH 27/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=84=E9=95=BF=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/MemberList.vue          |  2 +-
 .../drawers/project/ImpoterGroupLeader.vue     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index 52f00722..5824371a 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -64,7 +64,7 @@
                   style="margin-right: 10px"
                   src="../../assets/images/courseManage/add0.png"
               /></template>
-              添加组员1
+              添加组员
             </a-button></CommonStudent
           >
           <div class="btn btn2" @click="showModal">
diff --git a/src/components/drawers/project/ImpoterGroupLeader.vue b/src/components/drawers/project/ImpoterGroupLeader.vue
index 213b50ea..39dc4180 100644
--- a/src/components/drawers/project/ImpoterGroupLeader.vue
+++ b/src/components/drawers/project/ImpoterGroupLeader.vue
@@ -19,12 +19,12 @@
       </div>
       <div class="main">
         <div class="minatitl">
-          <div class="up1">请下载</div>
-          <div class="up2" @click="downTemplate" style="cursor: pointer">
-            模板
-          </div>
-          <div class="up1">，按要求填写数据并导入</div>
+          <div class="up1" style="font-weight: bolder">导入小组长</div>
+          <!--<div class="up2" @click="downTemplate" style="cursor: pointer">-->
+            <!--模板-->
+          <!--</div>-->
         </div>
+        <div class="up1">请先导出小组填写小组长，按要求填写数据并导入</div>
         <div class="upload">
           <div class="text">上传：</div>
           <div class="right">
@@ -130,10 +130,10 @@ const closeDrawer = () => {
 function openDrawer() {
   visible.value = true
 }
-
-function downTemplate() {
-  window.open(process.env.VUE_APP_BASE_API + props.templateUrl);
-}
+//
+// function downTemplate() {
+//   window.open(process.env.VUE_APP_BASE_API + props.templateUrl);
+// }
 
 function downloadErrorData(url) {
   window.open(process.env.VUE_APP_FILE_PATH + url)

From 2c6e09445fb5f8e672e475cabed7c474e92774f4 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Sat, 25 Feb 2023 09:02:29 +0800
Subject: [PATCH 28/28] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=BB=84=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/MemberList.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index 5824371a..fe295f68 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -72,7 +72,7 @@
             <div class="wz">批量删除</div>
           </div>
           <!-- 2022-11-30注释 后面放开 -->
-           <div class="btn btn2">
+           <div class="btn btn2" @click="exportGroupMember">
             <div class="img2"></div>
             <div class="wz">导出组员</div>
           </div>
@@ -541,6 +541,15 @@ export default {
         //   });
       }
     );
+
+    // 导出数据
+    function exportGroupMember() {
+      console.log("props.datasource", props);
+      window.open(
+              `${process.env.VUE_APP_BASE_API}/admin/studentGroup/exportGroupMember/${props.projectId}/${props.chooseGroupId}`
+      );
+    }
+
     function submitCall(flag) {
       flag && getStu();
     }
@@ -563,6 +572,7 @@ export default {
       closedeleone,
       yesdele,
       submitCall,
+      exportGroupMember
     };
   },
 };