From 6c8045ff599979eafc7b25a0f7826a17a4fd0276 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 20 Dec 2022 19:33:57 +0800
Subject: [PATCH 01/11] -- bug

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

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index ead2234a..5066e198 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -461,7 +461,6 @@ export default {
     }
 
     const createProject = async () => {
-      state.loading = true
       console.log("保存", state.projectInfo);
       if (!validate(state.projectInfo, errorMsgs)) {
         return;
@@ -485,6 +484,7 @@ export default {
       }
       state.projectInfo.type = 3;
       state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
+      state.loading = true
       api.createProject(state.projectInfo).then((res) => {
         state.loading = false
         state.projectInfo.projectId ||

From 207a453c279992cf4d423d4778da54d1091eeb9d Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 20 Dec 2022 21:38:58 +0800
Subject: [PATCH 02/11] -- bug

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

diff --git a/src/api/method.js b/src/api/method.js
index f304aa34..d4cd4a3a 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -236,7 +236,7 @@ const setCookie = (name, value, perpetual) => {
     console.log('存储token到cookie')
     let exdate = new Date()
     exdate.setDate(perpetual * 24 * 60 * 60 * 1000)  //exdate.setDate(exdate.getDate() + 365)
-    document.cookie = name + '=' + value + ';expires=' + exdate.toGMTString()
+    document.cookie = `${name}=${value};expires=${exdate.toGMTString()};path=/`
     //永久有效
     //document.cookie = name + '=' + value + ';expires=' + 'Fri, 31 Dec 9999 23:59:59 GMT'    
 }

From 22663e7e13a37e07fc4034612ed36ed72d395663 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 21 Dec 2022 08:47:55 +0800
Subject: [PATCH 03/11] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 770 +++++++++++------------
 src/components/student/TableStudent.vue  |  12 +-
 2 files changed, 381 insertions(+), 401 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 4fc39d25..2ea271a3 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -3,70 +3,94 @@
 <template>
   <div class="CommonStudent">
     <a-drawer
-        :visible="visiable"
-        class="drawerStyle ProjCheckship"
-        placement="right"
-        width="60%"
+      :visible="visiable"
+      class="drawerStyle ProjCheckship"
+      placement="right"
+      width="60%"
     >
       <div class="drawerMain" id="ProjCheckship">
         <div class="header">
           <div class="headerTitle">
-            {{ {1: '添加学员', 2: '添加学员', 3: '添加学员'}[type] || '' }}
+            {{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || "" }}
           </div>
           <img
-              style="width: 29px; height: 29px; cursor: pointer"
-              src="../../assets/images/basicinfo/close.png"
-              @click="closeDrawer"
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
           />
         </div>
-        <div style="width:100%;display: grid;grid-template-columns: 750px auto;">
-          <div class="tabs" style="min-height:800px;">
+        <div
+          style="width: 100%; display: grid; grid-template-columns: 750px auto"
+        >
+          <div class="tabs" style="min-height: 800px">
             <a-tabs v-model:activeKey="activeKey">
               <a-tab-pane :key="1" tab="快速选人">
                 <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div class="tab1">
                     <a-form-item label="姓名">
                       <a-input
-                          v-model:value="nameSearch.keyword"
-                          style="width: 270px; height: 40px; border-radius: 8px"
-                          placeholder="请输入姓名"
+                        v-model:value="nameSearch.keyword"
+                        style="width: 270px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
                       />
-                      <a-button type="primary" @click="onSearchStu" style="margin-left: 20px;border-radius: 4px">
+                      <a-button
+                        type="primary"
+                        @click="onSearchStu"
+                        style="margin-left: 20px; border-radius: 4px"
+                      >
                         <template #icon>
-                          <SearchOutlined/>
+                          <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button @click="resetStu" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                      <a-button
+                        @click="resetStu"
+                        style="margin-left: 20px; border-radius: 4px"
+                        >重置</a-button
+                      >
                     </a-form-item>
                   </div>
-                  <div class="chooseLeft" style="display: grid;grid-template-columns: 250px auto">
-                    <div :style="{ height: screenHeight - 180 + 'px' ,overflowY:'auto'}"
-                         style="border: 1px solid #f0f0f0; ;">
-                      <div class="tree" style="margin: 10px 4px 220px 10px;">
+                  <div
+                    class="chooseLeft"
+                    style="display: grid; grid-template-columns: 250px auto"
+                  >
+                    <div
+                      :style="{
+                        height: screenHeight - 180 + 'px',
+                        overflowY: 'auto',
+                      }"
+                      style="border: 1px solid #f0f0f0"
+                    >
+                      <div class="tree" style="margin: 10px 4px 220px 10px">
                         <a-tree
-                            allow-clear
-                            tree-default-expand-all
-                            :tree-data="treeData"
-                            :fieldNames="{
-                          children: 'treeChildList',
-                          key: 'id',
-                          title: 'name',
-                          value: 'name',
-                        }"
-                            @select="stuStuOrgSelect"
+                          allow-clear
+                          tree-default-expand-all
+                          :tree-data="treeData"
+                          :fieldNames="{
+                            children: 'treeChildList',
+                            key: 'id',
+                            title: 'name',
+                            value: 'name',
+                          }"
+                          @select="stuStuOrgSelect"
                         >
                         </a-tree>
                       </div>
                     </div>
-                    <div class="tableBox tabb" style="margin: 0px 4px 120px 10px; border: 1px solid #f0f0f0;">
+                    <div
+                      class="tableBox tabb"
+                      style="
+                        margin: 0px 4px 120px 10px;
+                        border: 1px solid #f0f0f0;
+                      "
+                    >
                       <a-table
-                          :columns="stuColumns"
-                          :data-source="stuData"
-                          :pagination="stuPagination"
-                          :loading="stuLoading"
-                          row-key="id"
-                          :row-selection="stuRowSelection"
+                        :columns="stuColumns"
+                        :data-source="stuData"
+                        :pagination="stuPagination"
+                        :loading="stuLoading"
+                        row-key="id"
+                        :row-selection="stuRowSelection"
                       />
                     </div>
                   </div>
@@ -111,34 +135,40 @@
               <!--                </div>-->
               <!--              </a-tab-pane>-->
               <a-tab-pane :key="3" tab="受众关联">
-                <div
-                    :style="{ height: screenHeight - 235 + 'px' }"
-                >
+                <div :style="{ height: screenHeight - 235 + 'px' }">
                   <div>
                     <a-form-item label="受众名称：">
                       <a-input
-                          v-model:value="audienceName.keyword"
-                          style="width: 260px; height: 40px; border-radius: 8px"
-                          placeholder="请输入受众名称"
+                        v-model:value="audienceName.keyword"
+                        style="width: 260px; height: 40px; border-radius: 8px"
+                        placeholder="请输入受众名称"
                       />
-                      <a-button type="primary" @click="searchAudi" style="margin-left: 20px;border-radius: 4px">
+                      <a-button
+                        type="primary"
+                        @click="searchAudi"
+                        style="margin-left: 20px; border-radius: 4px"
+                      >
                         <template #icon>
-                          <SearchOutlined/>
+                          <SearchOutlined />
                         </template>
                         搜索
                       </a-button>
-                      <a-button @click="resetAudienceInfo" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                      <a-button
+                        @click="resetAudienceInfo"
+                        style="margin-left: 20px; border-radius: 4px"
+                        >重置</a-button
+                      >
                     </a-form-item>
                   </div>
                   <div class="tableBox tabb">
                     <a-table
-                        style="border: 1px solid #f2f6fe"
-                        row-key="id"
-                        :columns="audiColums"
-                        :data-source="audiData"
-                        :loading="audiLoading"
-                        :pagination="auditPagination"
-                        :row-selection="auditRowSelection"
+                      style="border: 1px solid #f2f6fe"
+                      row-key="id"
+                      :columns="audiColums"
+                      :data-source="audiData"
+                      :loading="audiLoading"
+                      :pagination="auditPagination"
+                      :row-selection="auditRowSelection"
                     />
                   </div>
                 </div>
@@ -149,18 +179,16 @@
             <div class="onerow">
               <div class="onleft">
                 <div class="already">已选</div>
-
               </div>
-
             </div>
             <div
-                class="selecteds"
-                :style="{ 'max-height': screenHeight - 235 + 'px' }"
-                style="overflow-y: auto"
+              class="selecteds"
+              :style="{ 'max-height': screenHeight - 235 + 'px' }"
+              style="overflow-y: auto"
             >
               <div class="person">快速选人</div>
-              <div v-for="(item,i) in selectsData.studentList">
-                <div v-if="i<11">
+              <div v-for="(item, i) in selectsData.studentList">
+                <div v-if="i < 11">
                   <div class="chose">
                     {{ item.realName }}
                     <div class="ch" @click="stuDel(i)"></div>
@@ -173,17 +201,20 @@
                       <div class="ch" @click="stuDel(i)"></div>
                     </div>
                   </div>
-
                 </div>
-
               </div>
-              <div v-if="!person && selectsData.studentList.length >10" class="ifsw">
-                <div @click="person = !person" class=“sw”>查看更多></div>
+              <div
+                v-if="!person && selectsData.studentList.length > 10"
+                class="ifsw"
+              >
+                <div @click="person = !person" class="“sw”">查看更多></div>
               </div>
-              <div v-if="person && selectsData.studentList.length >10" class="ifsw">
-                <div @click="person = !person" class="sw"> 收起&lt;</div>
+              <div
+                v-if="person && selectsData.studentList.length > 10"
+                class="ifsw"
+              >
+                <div @click="person = !person" class="sw">收起&lt;</div>
               </div>
-
               <!--组织-->
               <!--          <div  class="dept">添加组织</div>-->
               <!--          <div v-for="(item,i) in selectsData.deptList"  >-->
@@ -206,36 +237,33 @@
               <!--          </div>-->
               <!--          <div v-if="!dept && selectsData.deptList.length >10" class="ifsw"><div @click="dept = !dept" class=“sw”>查看更多></div></div>-->
               <!--          <div v-if="dept && selectsData.deptList.length >10" class="ifsw" ><div @click="dept = !dept" class="sw"> 收起&lt;  </div></div>-->
-
-
               <!--受众-->
               <div class="group">受众关联</div>
-              <div v-for="(item,i) in selectsData.groupList">
-                <div v-if="i<11">
+              <div v-for="(item, i) in selectsData.groupList">
+                <div v-if="i < 11">
                   <div class="chose2">
-                    <div class="span"> {{ item.audienceName }}</div>
+                    <div class="span">{{ item.audienceName }}</div>
                     <div class="ch2" @click="AuditDel(i)"></div>
                   </div>
                 </div>
                 <div v-else>
                   <div v-if="group">
                     <div class="chose2">
-                      <div class="span"> {{ item.audienceName }}</div>
+                      <div class="span">{{ item.audienceName }}</div>
                       <div class="ch2" @click="AuditDel(i)"></div>
                     </div>
                   </div>
-
                 </div>
-
               </div>
-              <div v-if="!group && selectsData.groupList.length >10" class="ifsw">
-                <div @click="group = !group" class=“sw”>查看更多></div>
+              <div
+                v-if="!group && selectsData.groupList.length > 10"
+                class="ifsw"
+              >
+                <div @click="group = !group" class="“sw”">查看更多></div>
               </div>
-              <div v-if="group && selectsData.groupList >10" class="ifsw">
-                <div @click="group = !group" class="sw"> 收起&lt;</div>
+              <div v-if="group && selectsData.groupList > 10" class="ifsw">
+                <div @click="group = !group" class="sw">收起&lt;</div>
               </div>
-
-
             </div>
           </div>
           <!-- <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
@@ -243,7 +271,6 @@
                <div style="margin-top: 20px">快速选人</div>
                // eslint-disable-next-line vue/require-v-for-key
                <div v-for="(item,i) in selectsData.studentList" >
-
                <a-tag v-if="i < 10" :closable="true" color="#4ea6ff" @close="stuDel(i)"
                       :key="i" style="margin-top:20px">
                  {{ item.realName }}
@@ -252,7 +279,6 @@
                        style="margin-top:20px">
                  {{ item.realName }}
                </a-tag>
-
                <div></div>
              </div>
              </div>
@@ -283,100 +309,103 @@
       <slot></slot>
     </div>
   </div>
-  <a-modal v-model:visible="stageVisible" width="1000px" title="选择阶段" @ok="handleStageOk">
+  <a-modal
+    v-model:visible="stageVisible"
+    width="1000px"
+    title="选择阶段"
+    @ok="handleStageOk"
+  >
     <div>
-      {{ type === 1 ? '选择阶段' : '选择关卡' }}
-      <a-select style="width: 150px" :placeholder="type===1?'选择阶段':'选择关卡'" v-model:value="selectsData.stageId"
-                className="cus-select">
-        <a-select-option v-for="(item,i) in stageIds" :key="i" :value="item.id">{{
-            item.name || '默认'
-          }}
+      {{ type === 1 ? "选择阶段" : "选择关卡" }}
+      <a-select
+        style="width: 150px"
+        :placeholder="type === 1 ? '选择阶段' : '选择关卡'"
+        v-model:value="selectsData.stageId"
+        className="cus-select"
+      >
+        <a-select-option v-for="(item, i) in stageIds" :key="i" :value="item.id"
+          >{{ item.name || "默认" }}
         </a-select-option>
       </a-select>
     </div>
   </a-modal>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, ref, watch} from "vue";
-import {useStore} from "vuex";
-import {useBoeApiPage} from "@/api/request";
-import {AUDIENCE_LIST, USER_LIST} from "@/api/ThirdApi";
-import {saveStu} from "@/api/index1";
-
+import { computed, defineEmits, defineProps, ref, watch } from "vue";
+import { useStore } from "vuex";
+import { useBoeApiPage } from "@/api/request";
+import { AUDIENCE_LIST, USER_LIST } from "@/api/ThirdApi";
+import { saveStu } from "@/api/index1";
 const store = useStore();
-const emit = defineEmits({})
+const emit = defineEmits({});
 const props = defineProps({
   type: Number,
   id: String,
   stage: {
     type: Array,
-    default: () => []
-  }
-})
-const person = ref(false)
+    default: () => [],
+  },
+});
+const person = ref(false);
 // const dept =ref(false)
-const group = ref(false)
-const visiable = ref(false)
-const activeKey = ref(1)
-const stageVisible = ref(false)
+const group = ref(false);
+const visiable = ref(false);
+const activeKey = ref(1);
+const stageVisible = ref(false);
 const selectsData = ref({
-  stageId: '',
+  stageId: "",
   studentList: [],
   deptList: [],
-  groupList: []
-})
+  groupList: [],
+});
 const nameSearch = ref({
-  keyword: '',
+  keyword: "",
   departId: null,
   page: 1,
-  pageSize: 10
-})
+  pageSize: 10,
+});
 const audienceName = ref({
-  keyword: '',
+  keyword: "",
   page: 1,
-  pageSize: 10
-})
+  pageSize: 10,
+});
 // const searchOrgName = ref({
 //   keyword: '',
 //   page: 1,
 //   pageSize: 10
 // })
-
-const stageIds = computed(() => props.stage)
-
+const stageIds = computed(() => props.stage);
 const {
   data: stuData,
   fetch: searchStu,
   page: stuPageNo,
   pageSize: stuPageSize,
   loading: stuLoading,
-  total: stuTotal
+  total: stuTotal,
 } = useBoeApiPage(USER_LIST, nameSearch.value, {
   init: false,
-  result: res => res.result.userInfoList,
-  totalPage: res => res.result.totalPage,
-  total: res => res.result.totalElement
-})
-
+  result: (res) => res.result.userInfoList,
+  totalPage: (res) => res.result.totalPage,
+  total: (res) => res.result.totalElement,
+});
 // const {
 //   data: orgData,
 //   fetch: searchOrg,
 // } = useBoeApi(ORG_LIST, searchOrgName.value)
-
 const {
   data: audiData,
   fetch: searchAudi,
   page: audiPageNo,
   pageSize: audiPageSize,
   loading: audiLoading,
-  total: audiTotal
+  total: audiTotal,
 } = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
   init: true,
-  result: res => res.result.audienceList.map(e => ({...e, id: e.id + ''})),
-  totalPage: res => res.result.totalPage,
-  total: res => res.result.totalElement
-})
-
+  result: (res) =>
+    res.result.audienceList.map((e) => ({ ...e, id: e.id + "" })),
+  totalPage: (res) => res.result.totalPage,
+  total: (res) => res.result.totalElement,
+});
 const stuColumns = ref([
   {
     title: "姓名",
@@ -414,7 +443,7 @@ const stuColumns = ref([
     className: "h",
     ellipsis: true,
   },
-])
+]);
 const audiColums = ref([
   {
     title: "受众名称",
@@ -441,142 +470,125 @@ const audiColums = ref([
     align: "center",
     className: "h",
   },
-])
-const stuSelectKeys = ref([])
-const orgSelectKeys = ref([])
-const auditSelectKeys = ref([])
-const screenHeight = ref(document.body.clientHeight)
+]);
+const stuSelectKeys = ref([]);
+const orgSelectKeys = ref([]);
+const auditSelectKeys = ref([]);
+const screenHeight = ref(document.body.clientHeight);
 const stuRowSelection = computed(() => ({
   columnWidth: 20,
   selectedRowKeys: stuSelectKeys.value,
   onChange: onStuSelectChange,
   preserveSelectedRowKeys: true,
-}))
+}));
 const orgRowSelection = computed(() => ({
   columnWidth: 20,
   selectedRowKeys: orgSelectKeys.value,
   onChange: onOrgSelectChange,
   preserveSelectedRowKeys: true,
-}))
-
+}));
 const stuPagination = computed(() => ({
   total: stuTotal.value,
   showSizeChanger: false,
   current: stuPageNo.value,
   pageSize: stuPageSize.value,
-  onChange: changePagination
-}))
-
+  onChange: changePagination,
+}));
 const auditPagination = computed(() => ({
   total: audiTotal.value,
   showSizeChanger: false,
   current: audiPageNo.value,
   pageSize: audiPageSize.value,
-  onChange: auditChangePagination
-}))
-
+  onChange: auditChangePagination,
+}));
 const auditRowSelection = computed(() => ({
   columnWidth: 20,
   selectedRowKeys: auditSelectKeys.value,
   onChange: onAuditSelectChange,
   preserveSelectedRowKeys: true,
-}))
-
+}));
 const closeDrawer = () => {
-  visiable.value = false
+  visiable.value = false;
 };
 const openDrawer = () => {
-  visiable.value = true
+  visiable.value = true;
 };
 //获取组织树
 const treeData = computed(() => {
   return store.state.orgtreeList ? store.state.orgtreeList : [];
 });
-
 function onSearchStu() {
-  nameSearch.value.page = 1
-  searchStu()
+  nameSearch.value.page = 1;
+  searchStu();
 }
-
 function stuStuOrgSelect(e) {
-  nameSearch.value.departId = e.join('')
-  searchStu()
+  nameSearch.value.departId = e.join("");
+  searchStu();
 }
-
 function stuDel(i) {
-  stuSelectKeys.value = stuSelectKeys.value.filter(e => e !== selectsData.value.studentList[i].id)
-  selectsData.value.studentList.splice(i, 1)
+  stuSelectKeys.value = stuSelectKeys.value.filter(
+    (e) => e !== selectsData.value.studentList[i].id
+  );
+  selectsData.value.studentList.splice(i, 1);
 }
-
 // function orgDel(i) {
 //   orgSelectKeys.value = orgSelectKeys.value.filter(e => e !== selectsData.value.deptList[i].id)
 //   selectsData.value.deptList.splice(i, 1)
 // }
-
 function AuditDel(i) {
-  auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id)
-  selectsData.value.groupList.splice(i, 1)
+  auditSelectKeys.value = auditSelectKeys.value.filter(
+    (e) => e !== selectsData.value.groupList[i].id
+  );
+  selectsData.value.groupList.splice(i, 1);
 }
-
-
 // function orgSelect(key, obj) {
 // console.log(obj)
 //request(ORG_CHILD_LIST, {orgId: null}).then(res => {
 //console.log(res.result)
 //})
 //}
-
 function onStuSelectChange(e, l) {
-  stuSelectKeys.value = e
-  selectsData.value.studentList = l
+  stuSelectKeys.value = e;
+  selectsData.value.studentList = l;
 }
-
 function onOrgSelectChange(e, l) {
-  orgRowSelection.value = e
-  selectsData.value.deptList = l.selectedNodes
+  orgRowSelection.value = e;
+  selectsData.value.deptList = l.selectedNodes;
 }
-
 function onAuditSelectChange(e, l) {
-  auditSelectKeys.value = e
-  selectsData.value.groupList = l
+  auditSelectKeys.value = e;
+  selectsData.value.groupList = l;
 }
-
 // const stuDepartmentSelect = (e) => {
 //   nameSearch.value.orgId = e.join('')
 //   searchStu()
 // };
-
 //分页获取学员
 const changePagination = (page) => {
   nameSearch.value.page = page;
-  searchStu()
+  searchStu();
 };
-
 const auditChangePagination = (page) => {
   audienceName.value.page = page;
-  searchAudi()
+  searchAudi();
 };
-
 //重置
 const resetStu = () => {
   deleteDepSelect();
-  nameSearch.value = {keyword: '', page: 1, pageSize: 10}
+  nameSearch.value = { keyword: "", page: 1, pageSize: 10 };
 };
 //清空选择部门信息
 const deleteDepSelect = () => {
-  stuSelectKeys.value = []
+  stuSelectKeys.value = [];
 };
-
 //重置组织
 // const resetOrg = () => {
 //   searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
 // };
-
 //重置受众
 const resetAudienceInfo = () => {
-  audienceName.value = {keyword: '', page: 1, pageSize: 10}
+  audienceName.value = { keyword: "", page: 1, pageSize: 10 };
 };
-
 //全部清除
 // const deleteAll = () => {
 //   selectsData.value = {
@@ -588,57 +600,52 @@ const resetAudienceInfo = () => {
 //确定添加授权
 const submitAuth = () => {
   if (props.type === 2) {
-    stageVisible.value = true
+    stageVisible.value = true;
   } else {
-    handleStageOk()
+    handleStageOk();
   }
 };
-
 function handleStageOk() {
-  stageVisible.value = false
-  visiable.value = false
-  emit('finash', false)
+  stageVisible.value = false;
+  visiable.value = false;
+  emit("finash", false);
   saveStu({
     targetId: props.id,
     type: props.type,
-    deptIds: selectsData.value.deptList?.map(e => e.id),
+    deptIds: selectsData.value.deptList?.map((e) => e.id),
     stageId: selectsData.value.stageId,
-    groupIds: selectsData.value.groupList?.map(e => e.id),
-    studentList: selectsData.value.studentList
+    groupIds: selectsData.value.groupList?.map((e) => e.id),
+    studentList: selectsData.value.studentList,
   }).then(() => {
-    emit('finash', true)
-  })
+    emit("finash", true);
+  });
 }
-
 watch(visiable, () => {
-  stuSelectKeys.value = []
-  orgSelectKeys.value = []
-  auditSelectKeys.value = []
-  stuData.value = []
-  audienceName.value.keyword = ''
-  audienceName.value.page = 1
-  audienceName.value.pageSize = 10
+  stuSelectKeys.value = [];
+  orgSelectKeys.value = [];
+  auditSelectKeys.value = [];
+  stuData.value = [];
+  audienceName.value.keyword = "";
+  audienceName.value.page = 1;
+  audienceName.value.pageSize = 10;
   selectsData.value = {
-    stageId: '',
+    stageId: "",
     studentList: [],
     deptList: [],
-    groupList: []
-  }
-  searchAudi()
-})
-
+    groupList: [],
+  };
+  searchAudi();
+});
 </script>
 <style lang="scss">
 .CommonStudent {
   .ant-btn-primary {
     background-color: #4ea6ff !important;
   }
-
   .cus-select {
     height: 40px;
     border-radius: 8px;
   }
-
   .tableBox .ant-table-row .ant-table-cell {
     height: 48px;
     font-size: 14px;
@@ -647,210 +654,183 @@ watch(visiable, () => {
     line-height: 29px;
     padding: 0px;
   }
-
   .tableBox .ant-table-thead tr th {
     font-size: 14px;
   }
-
   .ant-tabs-tabpane {
     height: 100%;
   }
-
   .ant-tabs {
     overflow: visible;
   }
-
-  .right1 {
-    border-left: 1px solid #f2f6fe;
+}
+.right1 {
+  border-left: 1px solid #f2f6fe;
+  width: 100%;
+  margin-left: 20px;
+  .onerow {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-right: 40px;
+    flex-wrap: wrap;
     width: 100%;
-    margin-left: 20px;
-
-    .onerow {
+    .onleft {
       display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-right: 40px;
-      flex-wrap: wrap;
-
-      width: 100%;
-
-      .onleft {
-        display: flex;
-        text-align: center;
-
-        .already {
-          color: rgba(51, 51, 51, 1);
-          font-size: 16px;
-          font-weight: 500;
-          margin-left: 32px;
-          white-space: nowrap;
-          // margin-bottom: 20px;
-        }
-
-        .count {
-          color: #4ea6ff;
-          font-size: 16px;
-          margin: 0 6px;
-        }
-
-        .peo {
-          color: rgba(51, 51, 51, 1);
-          font-size: 16px;
-          font-weight: 500;
-        }
+      text-align: center;
+      .already {
+        color: rgba(51, 51, 51, 1);
+        font-size: 16px;
+        font-weight: 500;
+        margin-left: 32px;
+        white-space: nowrap;
+        // margin-bottom: 20px;
       }
-
-      .clbox {
-        margin-right: 50px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        cursor: pointer;
-        width: 104px;
-        height: 32px;
-        border-radius: 4px;
-        background: #4ea6ff;
-
-        .colose {
-          width: 16px;
-          height: 16px;
-          // border-radius: 8px;
-          // background: #ffffff;
-          // position: relative;
-          background-image: url(../../assets/images/basicinfo/ch.png);
-          background-size: 100%;
-          margin-right: 4px;
-        }
-
-        .allclear {
-          color: rgba(255, 255, 255, 1);
-          font-size: 14px;
-        }
+      .count {
+        color: #4ea6ff;
+        font-size: 16px;
+        margin: 0 6px;
+      }
+      .peo {
+        color: rgba(51, 51, 51, 1);
+        font-size: 16px;
+        font-weight: 500;
       }
     }
-
-    .selecteds {
+    .clbox {
+      margin-right: 50px;
       display: flex;
-      flex-wrap: wrap;
-      margin-left: 32px;
-
-      .person {
-        width: 100%;
-        margin-top: 20px;
-        border-top: 1px solid #f2f6fe;
+      justify-content: center;
+      align-items: center;
+      cursor: pointer;
+      width: 104px;
+      height: 32px;
+      border-radius: 4px;
+      background: #4ea6ff;
+      .colose {
+        width: 16px;
+        height: 16px;
+        // border-radius: 8px;
+        // background: #ffffff;
+        // position: relative;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        background-size: 100%;
+        margin-right: 4px;
       }
-
-      .chose {
-        width: 64px;
-        height: 24px;
-        margin-top: 25px;
-        margin-right: 25px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 2px;
-        border: 1px solid rgba(56, 139, 225, 1);
-        color: rgba(56, 139, 225, 1);
-        font-size: 12px;
-        position: relative;
-
-        .ch {
-          position: absolute;
-          width: 18px;
-          height: 18px;
-          background-image: url(../../assets/images/basicinfo/ch.png);
-          right: -8px;
-          top: -8px;
-        }
+      .allclear {
+        color: rgba(255, 255, 255, 1);
+        font-size: 14px;
       }
-
-      .ifsw {
-        display: flex;
-        align-items: end;
-        justify-content: center;
-        color: #4ea6ff;
+    }
+  }
+  .selecteds {
+    display: flex;
+    flex-wrap: wrap;
+    margin-left: 32px;
+    .person {
+      width: 100%;
+      margin-top: 20px;
+      border-top: 1px solid #f2f6fe;
+    }
+    .chose {
+      width: 64px;
+      height: 24px;
+      margin-top: 25px;
+      margin-right: 25px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 2px;
+      border: 1px solid rgba(56, 139, 225, 1);
+      color: rgba(56, 139, 225, 1);
+      font-size: 12px;
+      position: relative;
+      .ch {
+        position: absolute;
+        width: 18px;
+        height: 18px;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        right: -8px;
+        top: -8px;
       }
-
-      .sw {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        text-align: justify;
-        color: #4ea6ff;
-        margin-top: 23px;
-        margin-left: 10px;
+    }
+    .ifsw {
+      display: flex;
+      align-items: end;
+      justify-content: center;
+      color: #4ea6ff;
+    }
+    .sw {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      text-align: justify;
+      color: #4ea6ff;
+      margin-top: 23px;
+      margin-left: 10px;
+    }
+    .dept {
+      width: 100%;
+      margin-top: 30px;
+      border-top: 1px solid #f2f6fe;
+    }
+    .chose1 {
+      //width: 90px;
+      height: 24px;
+      margin-top: 25px;
+      margin-right: 25px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 2px;
+      border: 1px solid rgba(56, 139, 225, 1);
+      color: rgba(56, 139, 225, 1);
+      font-size: 12px;
+      position: relative;
+      .span {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
-
-      .dept {
-        width: 100%;
-        margin-top: 30px;
-        border-top: 1px solid #f2f6fe;
+      .ch1 {
+        position: absolute;
+        width: 18px;
+        height: 18px;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        right: -8px;
+        top: -8px;
       }
-
-      .chose1 {
-        //width: 90px;
-        height: 24px;
-        margin-top: 25px;
-        margin-right: 25px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 2px;
-        border: 1px solid rgba(56, 139, 225, 1);
-        color: rgba(56, 139, 225, 1);
-        font-size: 12px;
-        position: relative;
-
-        .span {
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-
-        .ch1 {
-          position: absolute;
-          width: 18px;
-          height: 18px;
-          background-image: url(../../assets/images/basicinfo/ch.png);
-          right: -8px;
-          top: -8px;
-        }
+    }
+    .group {
+      width: 100%;
+      margin-top: 30px;
+      border-top: 1px solid #f2f6fe;
+    }
+    .chose2 {
+      //width: 120px;
+      height: 24px;
+      margin-top: 25px;
+      margin-right: 25px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 2px;
+      border: 1px solid rgba(56, 139, 225, 1);
+      color: rgba(56, 139, 225, 1);
+      font-size: 12px;
+      position: relative;
+      .span {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
-
-      .group {
-        width: 100%;
-        margin-top: 30px;
-        border-top: 1px solid #f2f6fe;
-      }
-
-      .chose2 {
-        //width: 120px;
-        height: 24px;
-        margin-top: 25px;
-        margin-right: 25px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border-radius: 2px;
-        border: 1px solid rgba(56, 139, 225, 1);
-        color: rgba(56, 139, 225, 1);
-        font-size: 12px;
-        position: relative;
-
-        .span {
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-
-        .ch2 {
-          position: absolute;
-          width: 18px;
-          height: 18px;
-          background-image: url(../../assets/images/basicinfo/ch.png);
-          right: -8px;
-          top: -8px;
-        }
+      .ch2 {
+        position: absolute;
+        width: 18px;
+        height: 18px;
+        background-image: url(../../assets/images/basicinfo/ch.png);
+        right: -8px;
+        top: -8px;
       }
     }
   }
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index d55921c6..3bbe3583 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -63,12 +63,12 @@
           批量删除
         </a-button>
       </a-col>
-      <a-col :span="1.5" v-if="type == 2">
+      <!-- <a-col :span="1.5" v-if="type == 2">
         <a-button class="cus-btn white" @click="showChangeModal">
           <template #icon></template>
           批量调整关卡
         </a-button>
-      </a-col>
+      </a-col> -->
     </a-row>
     <div style="margin-top: 20px">
       <a-table
@@ -259,10 +259,10 @@ function submitCall(flag) {
 }
 
 //调整关卡
-const visiblene = ref(false);
-const showChangeModal = () => {
-  visiblene.value = true;
-};
+// const visiblene = ref(false);
+// const showChangeModal = () => {
+//   visiblene.value = true;
+// };
 </script>
 <style>
 .studentopea1 {

From a862d18f18d2274497bb314b15f2a9ebac5e9036 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 21 Dec 2022 09:54:44 +0800
Subject: [PATCH 04/11] =?UTF-8?q?style:=E4=BF=AE=E6=94=B9=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=A6=E5=91=98=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 339 +++++++++++------------
 1 file changed, 168 insertions(+), 171 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 4dfb47b0..7767d488 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -4,11 +4,11 @@
   <div class="CommonStudent">
     <a-drawer
       :visible="visiable"
-      class="drawerStyle ProjCheckship"
+      class="drawerStyle ProjCheckship CommonStudent"
       placement="right"
       width="60%"
     >
-      <div class="drawerMain" id="ProjCheckship">
+      <div class="drawerMain" id="ProjCheckship" style="">
         <div class="header">
           <div class="headerTitle">
             {{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || "" }}
@@ -19,10 +19,8 @@
             @click="closeDrawer"
           />
         </div>
-        <div
-          style="width: 100%; display: grid; grid-template-columns: 750px auto"
-        >
-          <div class="tabs" style="min-height: 800px">
+        <div style="display: flex; overflow-x: auto; overflow-y: auto">
+          <div class="tabs" style="min-width: 800px">
             <a-tabs v-model:activeKey="activeKey">
               <a-tab-pane :key="1" tab="快速选人">
                 <div :style="{ height: screenHeight - 235 + 'px' }">
@@ -175,7 +173,7 @@
               </a-tab-pane>
             </a-tabs>
           </div>
-          <div class="right1">
+          <div class="right1" style="min-width: 200px">
             <div class="onerow">
               <div class="onleft">
                 <div class="already">已选</div>
@@ -663,179 +661,178 @@ watch(visiable, () => {
   .ant-tabs {
     overflow: visible;
   }
-}
-.right1 {
-  border-left: 1px solid #f2f6fe;
-  width: 100%;
-  margin-left: 20px;
-  .onerow {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-right: 40px;
-    flex-wrap: wrap;
-
-    width: 100%;
-
-    .onleft {
+  .right1 {
+    border-left: 1px solid #f2f6fe;
+    margin-left: 20px;
+    .onerow {
       display: flex;
-      text-align: center;
+      justify-content: space-between;
+      align-items: center;
+      margin-right: 40px;
+      flex-wrap: wrap;
 
-      .already {
-        color: rgba(51, 51, 51, 1);
-        font-size: 16px;
-        font-weight: 500;
-        margin-left: 32px;
-        white-space: nowrap;
-        // margin-bottom: 20px;
+      width: 100%;
+
+      .onleft {
+        display: flex;
+        text-align: center;
+
+        .already {
+          color: rgba(51, 51, 51, 1);
+          font-size: 16px;
+          font-weight: 500;
+          margin-left: 32px;
+          white-space: nowrap;
+          // margin-bottom: 20px;
+        }
+
+        .count {
+          color: #4ea6ff;
+          font-size: 16px;
+          margin: 0 6px;
+        }
+
+        .peo {
+          color: rgba(51, 51, 51, 1);
+          font-size: 16px;
+          font-weight: 500;
+        }
       }
-
-      .count {
+      .clbox {
+        margin-right: 50px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        cursor: pointer;
+        width: 104px;
+        height: 32px;
+        border-radius: 4px;
+        background: #4ea6ff;
+        .colose {
+          width: 16px;
+          height: 16px;
+          // border-radius: 8px;
+          // background: #ffffff;
+          // position: relative;
+          background-image: url(../../assets/images/basicinfo/ch.png);
+          background-size: 100%;
+          margin-right: 4px;
+        }
+        .allclear {
+          color: rgba(255, 255, 255, 1);
+          font-size: 14px;
+        }
+      }
+    }
+    .selecteds {
+      display: flex;
+      flex-wrap: wrap;
+      margin-left: 32px;
+      .person {
+        width: 100%;
+        margin-top: 20px;
+        border-top: 1px solid #f2f6fe;
+      }
+      .chose {
+        width: 64px;
+        height: 24px;
+        margin-top: 25px;
+        margin-right: 25px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 2px;
+        border: 1px solid rgba(56, 139, 225, 1);
+        color: rgba(56, 139, 225, 1);
+        font-size: 12px;
+        position: relative;
+        .ch {
+          position: absolute;
+          width: 18px;
+          height: 18px;
+          background-image: url(../../assets/images/basicinfo/ch.png);
+          right: -8px;
+          top: -8px;
+        }
+      }
+      .ifsw {
+        display: flex;
+        align-items: end;
+        justify-content: center;
         color: #4ea6ff;
-        font-size: 16px;
-        margin: 0 6px;
       }
-
-      .peo {
-        color: rgba(51, 51, 51, 1);
-        font-size: 16px;
-        font-weight: 500;
+      .sw {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        text-align: justify;
+        color: #4ea6ff;
+        margin-top: 23px;
+        margin-left: 10px;
       }
-    }
-    .clbox {
-      margin-right: 50px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      cursor: pointer;
-      width: 104px;
-      height: 32px;
-      border-radius: 4px;
-      background: #4ea6ff;
-      .colose {
-        width: 16px;
-        height: 16px;
-        // border-radius: 8px;
-        // background: #ffffff;
-        // position: relative;
-        background-image: url(../../assets/images/basicinfo/ch.png);
-        background-size: 100%;
-        margin-right: 4px;
+      .dept {
+        width: 100%;
+        margin-top: 30px;
+        border-top: 1px solid #f2f6fe;
       }
-      .allclear {
-        color: rgba(255, 255, 255, 1);
-        font-size: 14px;
+      .chose1 {
+        //width: 90px;
+        height: 24px;
+        margin-top: 25px;
+        margin-right: 25px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 2px;
+        border: 1px solid rgba(56, 139, 225, 1);
+        color: rgba(56, 139, 225, 1);
+        font-size: 12px;
+        position: relative;
+        .span {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+        .ch1 {
+          position: absolute;
+          width: 18px;
+          height: 18px;
+          background-image: url(../../assets/images/basicinfo/ch.png);
+          right: -8px;
+          top: -8px;
+        }
       }
-    }
-  }
-  .selecteds {
-    display: flex;
-    flex-wrap: wrap;
-    margin-left: 32px;
-    .person {
-      width: 100%;
-      margin-top: 20px;
-      border-top: 1px solid #f2f6fe;
-    }
-    .chose {
-      width: 64px;
-      height: 24px;
-      margin-top: 25px;
-      margin-right: 25px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border-radius: 2px;
-      border: 1px solid rgba(56, 139, 225, 1);
-      color: rgba(56, 139, 225, 1);
-      font-size: 12px;
-      position: relative;
-      .ch {
-        position: absolute;
-        width: 18px;
-        height: 18px;
-        background-image: url(../../assets/images/basicinfo/ch.png);
-        right: -8px;
-        top: -8px;
+      .group {
+        width: 100%;
+        margin-top: 30px;
+        border-top: 1px solid #f2f6fe;
       }
-    }
-    .ifsw {
-      display: flex;
-      align-items: end;
-      justify-content: center;
-      color: #4ea6ff;
-    }
-    .sw {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      text-align: justify;
-      color: #4ea6ff;
-      margin-top: 23px;
-      margin-left: 10px;
-    }
-    .dept {
-      width: 100%;
-      margin-top: 30px;
-      border-top: 1px solid #f2f6fe;
-    }
-    .chose1 {
-      //width: 90px;
-      height: 24px;
-      margin-top: 25px;
-      margin-right: 25px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border-radius: 2px;
-      border: 1px solid rgba(56, 139, 225, 1);
-      color: rgba(56, 139, 225, 1);
-      font-size: 12px;
-      position: relative;
-      .span {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-      .ch1 {
-        position: absolute;
-        width: 18px;
-        height: 18px;
-        background-image: url(../../assets/images/basicinfo/ch.png);
-        right: -8px;
-        top: -8px;
-      }
-    }
-    .group {
-      width: 100%;
-      margin-top: 30px;
-      border-top: 1px solid #f2f6fe;
-    }
-    .chose2 {
-      //width: 120px;
-      height: 24px;
-      margin-top: 25px;
-      margin-right: 25px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border-radius: 2px;
-      border: 1px solid rgba(56, 139, 225, 1);
-      color: rgba(56, 139, 225, 1);
-      font-size: 12px;
-      position: relative;
-      .span {
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-      .ch2 {
-        position: absolute;
-        width: 18px;
-        height: 18px;
-        background-image: url(../../assets/images/basicinfo/ch.png);
-        right: -8px;
-        top: -8px;
+      .chose2 {
+        //width: 120px;
+        height: 24px;
+        margin-top: 25px;
+        margin-right: 25px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 2px;
+        border: 1px solid rgba(56, 139, 225, 1);
+        color: rgba(56, 139, 225, 1);
+        font-size: 12px;
+        position: relative;
+        .span {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+        .ch2 {
+          position: absolute;
+          width: 18px;
+          height: 18px;
+          background-image: url(../../assets/images/basicinfo/ch.png);
+          right: -8px;
+          top: -8px;
+        }
       }
     }
   }

From b62eb3ae33d4bac15d8d75d761441568440f9156 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 21 Dec 2022 15:01:37 +0800
Subject: [PATCH 05/11] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=97=B6=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddCase.vue        |   91 +-
 src/components/drawers/AddOnline.vue      | 1632 +++++++++++----------
 src/components/drawers/EvList.vue         |   61 +-
 src/views/learningpath/LevelAddDetail.vue |   61 +-
 src/views/projectcenter/TaskAdd.vue       |   90 +-
 src/views/projectcenter/temTask.vue       |   57 +-
 6 files changed, 1026 insertions(+), 966 deletions(-)

diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue
index 9941c82c..c2e38b3f 100644
--- a/src/components/drawers/AddCase.vue
+++ b/src/components/drawers/AddCase.vue
@@ -46,7 +46,7 @@
         </div>
 
         <div class="main_table">
-        <!--
+          <!--
           <a-table
             v-if="edit"
             class="ant-table-striped"
@@ -64,7 +64,6 @@
             :pagination="false"
           />-->
           <a-table
-            
             class="ant-table-striped"
             :row-class-name="
               (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
@@ -80,19 +79,20 @@
             :pagination="false"
           />
           <div class="tableBox">
-          <div class="pa">
-            <a-pagination
-            v-if="tableDataTotal > 10"
-              :showSizeChanger="false"
-              showQuickJumper="true"
-              hideOnSinglePage="true"
-              :pageSize="pageSize"
-              :current="currentPage"
-              :total="tableDataTotal"
-              class="pagination"
-              @change="handelChangePage"
-            />
-          </div></div>
+            <div class="pa">
+              <a-pagination
+                v-if="tableDataTotal > 10"
+                :showSizeChanger="false"
+                showQuickJumper="true"
+                hideOnSinglePage="true"
+                :pageSize="pageSize"
+                :current="currentPage"
+                :total="tableDataTotal"
+                class="pagination"
+                @change="handelChangePage"
+              />
+            </div>
+          </div>
         </div>
       </div>
       <div class="main_btns">
@@ -171,7 +171,7 @@ export default {
       time: undefined,
       caseId: null,
       caseName: "",
-      isClick: false
+      isClick: false,
     });
     const closeDrawer = () => {
       ctx.emit("update:addcaseVisible", false);
@@ -202,13 +202,13 @@ export default {
           width: "200px",
           align: "center",
         },
-      //  {
-       //   title: "导入时间",
-       //   dataIndex: "time",
-       //   key: "time",
-       //   width: "400px",
-       //   align: "center",
-       // },
+        //  {
+        //   title: "导入时间",
+        //   dataIndex: "time",
+        //   key: "time",
+        //   width: "400px",
+        //   align: "center",
+        // },
       ];
       return columns;
     };
@@ -218,6 +218,7 @@ export default {
       }
       state.selectedRowKeys = selectedRowKeys;
       state.apiTaskList = selectedRows;
+      console.log("selectedRows", selectedRows);
     };
     const handelChangePage = (page, pageSize) => {
       state.selectedRowKeys = [];
@@ -276,16 +277,16 @@ export default {
     };
     const updateTask = () => {
       if (props.isLevel == 1) {
-        if(!props.isactive){
+        if (!props.isactive) {
           message.destroy();
           return message.warning("请先选中关卡");
         }
-        if(state.isClick){
-					message.destroy();
-					message.error('请勿频繁点击')
-					return
-					}
-				state.isClick = true;
+        if (state.isClick) {
+          message.destroy();
+          message.error("请勿频繁点击");
+          return;
+        }
+        state.isClick = true;
         for (let i = 0; i < state.apiTaskList.length; i++) {
           RouterEditTask({
             chapterId: props.isactive,
@@ -308,12 +309,12 @@ export default {
             });
         }
       } else if (props.isLevel == 2) {
-        if(state.isClick){
-					message.destroy();
-					message.error('请勿频繁点击')
-					return
-					}
-				state.isClick = true;
+        if (state.isClick) {
+          message.destroy();
+          message.error("请勿频繁点击");
+          return;
+        }
+        state.isClick = true;
         for (let i = 0; i < state.apiTaskList.length; i++) {
           apiTask
             .addTask({
@@ -338,19 +339,21 @@ export default {
             });
         }
       } else if (props.isLevel == 3) {
-        if(state.isClick){
-					message.destroy();
-					message.error('请勿频繁点击')
-					return
-					}
-				state.isClick = true;
+        if (state.isClick) {
+          message.destroy();
+          message.error("请勿频繁点击");
+          return;
+        }
+        state.isClick = true;
         for (let i = 0; i < state.apiTaskList.length; i++) {
           apiTask
             .addTaskTemplate({
               courseId: Number(state.apiTaskList[i].casesId),
               name: state.apiTaskList[i].title,
               projectTaskId: props.projectTaskId,
-              projectTemplateId: Number(localStorage.getItem("projectTemplateId")),
+              projectTemplateId: Number(
+                localStorage.getItem("projectTemplateId")
+              ),
               stageId: Number(props.chooseStageId) || 0,
               type: 3,
             })
@@ -432,7 +435,7 @@ export default {
       .main_items {
         margin-top: 32px;
         display: flex;
-      
+
         margin-bottom: 12px;
         flex-wrap: wrap;
         .mi_ipts {
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index f22ce374..963c697c 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -1,34 +1,46 @@
 <template>
-	<a-drawer :visible="addonlineVisible" class="drawerStyle addonlineDrawer" width="80%" title="添加在线" placement="right"
-		@after-visible-change="afterVisibleChange">
-		<div class="drawerMain">
-			<div class="header">
-				<div v-if="edit" class="headerTitle">编辑在线</div>
-				<div v-else class="headerTitle">添加在线</div>
-				<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-					@click="closeDrawer" />
-			</div>
-			<div class="contentMain">
-				<div class="main_items">
-					<div class="mi_ipts">
-						<div class="mii_ipt">
-							<div class="ipt_name"></div>
-							<div class="fi_input">
-								<a-input v-model:value="inputV1" style="
+  <a-drawer
+    :visible="addonlineVisible"
+    class="drawerStyle addonlineDrawer"
+    width="80%"
+    title="添加在线"
+    placement="right"
+    @after-visible-change="afterVisibleChange"
+  >
+    <div class="drawerMain">
+      <div class="header">
+        <div v-if="edit" class="headerTitle">编辑在线</div>
+        <div v-else class="headerTitle">添加在线</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer"
+        />
+      </div>
+      <div class="contentMain">
+        <div class="main_items">
+          <div class="mi_ipts">
+            <div class="mii_ipt">
+              <div class="ipt_name"></div>
+              <div class="fi_input">
+                <a-input
+                  v-model:value="inputV1"
+                  style="
                     width: 280px;
                     height: 40px;
                     border-radius: 8px;
                     padding-right: 49px;
-                  " placeholder="请输入课程名称" maxlength="20" />
-								<div class="inp_num" style="position: absolute; right: 7px">
-									<span style="color: #c7cbd2">
-
-									</span>
-								</div>
-							</div>
-						</div>
-						<!-- 2022-12-10注释 后面放开 李晓鸽 -->
-						<!-- <div class="mii_ipt">
+                  "
+                  placeholder="请输入课程名称"
+                  maxlength="20"
+                />
+                <div class="inp_num" style="position: absolute; right: 7px">
+                  <span style="color: #c7cbd2"> </span>
+                </div>
+              </div>
+            </div>
+            <!-- 2022-12-10注释 后面放开 李晓鸽 -->
+            <!-- <div class="mii_ipt">
               <div class="ipt_name">课程分类：</div>
               <div class="select">
                 <a-select
@@ -42,19 +54,19 @@
                 />
               </div>
             </div> -->
-					</div>
-					<div class="mi_btns">
-						<div class="btn btn1" @click="searchList()">
-							<div class="search"></div>
-							<div class="btnText">搜索</div>
-						</div>
-						<div class="btn btn2" @click="resetOnline()">
-							<div class="search"></div>
-							<div class="btnText">重置</div>
-						</div>
-					</div>
-				</div>
-				<!--
+          </div>
+          <div class="mi_btns">
+            <div class="btn btn1" @click="searchList()">
+              <div class="search"></div>
+              <div class="btnText">搜索</div>
+            </div>
+            <div class="btn btn2" @click="resetOnline()">
+              <div class="search"></div>
+              <div class="btnText">重置</div>
+            </div>
+          </div>
+        </div>
+        <!--
         <div class="main_notice">
           <div class="mntc_left">
             <div class="notice_icon"></div>
@@ -75,28 +87,43 @@
           </div>
         </div>
 -->
-				<div class="main_table">
-					<!-- 编辑的表格 -->
-					<div>
-						<div>
-							<a-table class="ant-table-striped" :row-class-name="
-								(_record, index) => (index % 2 === 1 ? 'table-striped' : null)
-							" :row-selection="{
-	type: 'radio',
-	selectedRowKeys: selectedRowKeys,
-	onChange: onSelectChange,
-}" :columns="tableDataFunc()" :data-source="tableData" :loading="tableDataTotal === -1 ? true : false"
-								:pagination="false" />
-							<div class="tableBox" style="margin-top:85px;">
-								<div class="pa">
-									<a-pagination v-if="tableDataTotal > 10" :showSizeChanger="false" showQuickJumper="true"
-										hideOnSinglePage="true" :pageSize="pageSize" :current="currentPage" :total="tableDataTotal"
-										class="pagination" @change="handelChangePage" />
-								</div>
-							</div>
-						</div>
-					</div>
-					<!--  <div v-else>
+        <div class="main_table">
+          <!-- 编辑的表格 -->
+          <div>
+            <div>
+              <a-table
+                class="ant-table-striped"
+                :row-class-name="
+                  (_record, index) => (index % 2 === 1 ? 'table-striped' : null)
+                "
+                :row-selection="{
+                  type: 'radio',
+                  selectedRowKeys: selectedRowKeys,
+                  onChange: onSelectChange,
+                }"
+                :columns="tableDataFunc()"
+                :data-source="tableData"
+                :loading="tableDataTotal === -1 ? true : false"
+                :pagination="false"
+              />
+              <div class="tableBox" style="margin-top: 85px">
+                <div class="pa">
+                  <a-pagination
+                    v-if="tableDataTotal > 10"
+                    :showSizeChanger="false"
+                    showQuickJumper="true"
+                    hideOnSinglePage="true"
+                    :pageSize="pageSize"
+                    :current="currentPage"
+                    :total="tableDataTotal"
+                    class="pagination"
+                    @change="handelChangePage"
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+          <!--  <div v-else>
             <a-table
               class="ant-table-striped"
               :row-class-name="
@@ -131,17 +158,17 @@
 
 
           -->
-				</div>
-			</div>
-			<div class="main_btns">
-				<button class="btn1" @click="closeDrawer">取消</button>
-				<button class="btn2" @click="updateTask">确定</button>
-			</div>
-		</div>
-		<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-			<a-spin :spinning="addLoading" tip="" />
-		</div>
-	</a-drawer>
+        </div>
+      </div>
+      <div class="main_btns">
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="updateTask">确定</button>
+      </div>
+    </div>
+    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+      <a-spin :spinning="addLoading" tip="" />
+    </div>
+  </a-drawer>
 </template>
 <script>
 import { onMounted, reactive, toRefs } from "vue";
@@ -150,780 +177,785 @@ import * as apiTask from "../../api/indexTaskadd";
 // import { setCookie } from "../../api/method"
 import { message } from "ant-design-vue";
 import {
-	RouterEditTask,
-	IsExistence,
-	IsExistenceProject,
-	IsExistenceProjectTemplate,
+  RouterEditTask,
+  IsExistence,
+  IsExistenceProject,
+  IsExistenceProjectTemplate,
 } from "@/api/indexTask";
 import { addTempTask } from "../../api/indexTaskadd";
 export default {
-	name: "AddOnline",
-	props: {
-		addonlineVisible: {
-			type: Boolean,
-			default: false,
-		},
-		EditOnlineId: {
-			type: Number,
-			default: null,
-		},
-		edit: {
-			//  是否为编辑
-			type: Boolean,
-			default: null,
-		},
-		projectId: {
-			type: Number,
-			default: null,
-		},
-		chooseStageId: {
-			type: Number,
-			default: null,
-		},
-		routerTaskId: {
-			type: Number,
-			default: 0,
-		},
-		isLevel: {
-			// 是否是关卡页面触发
-			type: Number,
-			default: null,
-		},
-		projectTaskId: {
-			// 要编辑的projectId
-			type: Number,
-			default: null,
-		},
-		routerId: {
-			type: Number,
-			default: null,
-		},
-		isactive: {
-			type: Number,
-			default: null,
-		},
-		projectTemplateId: {
-			type: Number,
-			default: null,
-		},
-	},
-	setup(props, ctx) {
-		const state = reactive({
-			inputV1: null,
-			options1: [
-				{
-					value: "微课",
-					label: "微课",
-				},
-				{
-					value: "录播课",
-					label: "录播课",
-				},
-			],
-			time: undefined,
-			onlineClassesId: null,
-			onlineName: "",
-			selectV: null,
-			selectedRowKeys: [],
-			tableData: [],
-			addOnlineList: [],
-			currentPage: 1,
-			tableDataTotal: 0,
-			pageSize: 10,
-			choicecourse: true,
-			ddLoading: false,
-			isClick: false
-		});
-		const ChoiceCourse = () => {
-			state.choicecourse = false;
-		};
-		const closeDrawer = () => {
-			state.choicecourse = true;
-			ctx.emit("update:addonlineVisible", false);
-			ctx.emit("update:edit", false);
-			state.inputV1 = null;
-			state.selectV = null;
-			state.selectedRowKeys = [];
-			state.addOnlineList = [];
-			state.currentPage = 1;
-			localStorage.setItem("stageId", props.chooseStageId);
-			localStorage.setItem("chapterId", props.isactive);
-		};
-		const afterVisibleChange = (bol) => {
-			if (bol == true) {
-				getAllOnlineText();
-				getOnlineById();
-			}
-		};
-		//TODO 根据id 获取在线课信息
-		const getOnlineById = () => {
-
-		}
-		const tableDataFunc = () => {
-			const columns = [
-				// {
-				//   title: "课程编号",
-				//  dataIndex: "num",
-				//   key: "num",
-				//  width: "80px",
-				//  align: "center",
-				//  },
-				{
-					title: "名称",
-					dataIndex: "name",
-					key: "name",
-					width: "30%",
-					ellipsis: true,
-				},
-				{
-					title: "课程分类",
-					dataIndex: "contenttype",
-					key: "contenttype",
-					width: "15%",
-					align: "center",
-					ellipsis: true,
-				},
-				//   {
-				//    title: "授课教师",
-				//    dataIndex: "teacher",
-				//    key: "teacher",
-				//   width: "15%",
-				//   align: "center",
-				//  },
-				{
-					title: "创建人",
-					dataIndex: "sysCreateBy",
-					key: "sysCreateBy",
-					width: "15%x",
-					align: "center",
-					ellipsis: true,
-				},
-				//   {
-				//    title: "创建时间",
-				//   dataIndex: "createTime",
-				//    key: "createTime",
-				//   width: "15%",
-				//   align: "center",
-				// },
-				{
-					title: "发布时间",
-					dataIndex: "publishTime",
-					key: "publishTime",
-					width: "25%",
-					align: "center",
-					ellipsis: true,
-				},
-			];
-			return columns;
-		};
-		const onSelectChange = (selectedRowKeys, selectedRows) => {
-			state.selectedRowKeys = selectedRowKeys;
-			state.addOnlineList = selectedRows;
-			console.log(selectedRowKeys, selectedRows);
-			if (props.edit && selectedRows.length > 0) {
-				selectedRows.map((value) => {
-					console.log(props, value);
-					if (value.courseId == props.EditOnlineId) {
-						message.destroy();
-						message.error("选项相同，请重新选择");
-						state.selectedRowKeys = [];
-						state.addOnlineList = [];
-					}
-				});
-			}
-		};
-		//清空所选
-		const clearLine = () => {
-			state.selectedRowKeys = [];
-			state.addOnlineList = [];
-		};
-		const handelChangePage = (page) => {
-			state.currentPage = page;
-			state.selectedRowKeys = [];
-			getAllOnlineText();
-		};
-		const getTableDate = (tableData) => {
-			let data = tableData;
-			let array = [];
-			data.map((value, index) => {
-				{
-					let obj = {
-						key: index + 1,
-						num: value.onlineClassesId,
-						name: value.name,
-						contenttype: value.contentType == 10 ? "微课" : "录播课",
-						teacher: value.teacher,
-						sysCreateBy: value.sysCreateBy,
-						createTime: value.sysCreateTime,
-						publishTime: value.publishTime,
-						courseId: Number(value.onlineClassesId),
-					};
-					array.push(obj);
-				}
-			});
-			state.tableData = array;
-		};
-		//获取全部在线信息接口
-		const getAllOnlineText = () => {
-			api
-				.queryOnlinelList({
-					createUser: "",
-					keyword: state.inputV1,
-					orderAsc: true,
-					orderField: "",
-					pageIndex: state.currentPage,
-					pageSize: state.pageSize,
-					publish: true,
-					status: 0,
-					sysType1: "",
-					sysType2: "",
-					sysType3: "",
-				})
-				.then((res) => {
-					let arr = res.data.data.list;
-					state.tableDataTotal = res.data.data.count;
-					if (res.status === 200) {
-						console.log("获取在线课列表数据", res);
-						for (let i = 0; i < res.data.data.list.length; i++) {
-							if (
-								Number(res.data.data.list[i].onlineClassesId) ==
-								props.EditOnlineId
-							) {
-								state.selectedRowKeys = [i + 1];
-							}
-						}
-						getTableDate(arr);
-					}
-				})
-				.catch((err) => {
-					console.log(err, "请求失败在线");
-				});
-		};
-		// 校验当前在线课是否已经添加进来了
-		const isExistence = (id) => {
-			console.log({
-				chapterId: Number(props.isactive),
-				courseTaskId: Number(id),
-				routerId: props.routerId,
-				type: 1,
-			});
-			IsExistence({
-				chapterId: Number(props.isactive),
-				courseTaskId: Number(id),
-				routerId: props.routerId,
-				type: 1,
-			})
-				.then((res) => {
-					console.log("我是不是已经添加了", res);
-				})
-				.catch((err) => {
-					console.log(err);
-				});
-		};
-		// 判断项目中是否添加当前在线课
-		const IsExistenceProjects = (id) => {
-			console.log("参数传递", {
-				courseTaskId: id,
-				projectId: props.projectId,
-				stageId: props.chooseStageId || 0,
-				type: 1,
-			});
-			IsExistenceProject({
-				courseTaskId: id,
-				projectId: Number(props.projectId),
-				stageId: props.chooseStageId || 0,
-				type: 1,
-			})
-				.then((res) => {
-					console.log("项目中是否包含此在线课了", res);
-				})
-				.catch((err) => {
-					console.log(err);
-				});
-		};
-		const updateTask = () => {
-			state.addLoading = true;
-			if (props.isLevel == 1) {
-				if (!props.isactive) {
-					state.addLoading = false;
-					message.destroy();
-					return message.warning("请先选中关卡");
-				}
-				console.log("我是要便利的数据2", state.addOnlineList);
-				let l_data = state.addOnlineList;
-				let l_data_id = [];
-				l_data.map((item) => {
-					l_data_id.push(item["courseId"]);
-				});
-				console.log("需要查询的在线课ID", l_data_id);
-				if(state.isClick){
-					message.destroy();
-					message.error('请勿频繁点击')
-					return
-					}
-				state.isClick = true;
-				IsExistence({
-					chapterId: Number(props.isactive),
-					courseTaskId: l_data_id,
-					routerId: props.routerId,
-					type: 1,
-				})
-					.then((res) => {
-						console.log("路径图中是否包含此在线课了", res);
-						if (res.data.data.length) {
-							let strdata = res.data.data;
-							let tipStr = "";
-							for (let i = 0; i < strdata.length; i++) {
-								if (i == strdata.length - 1) {
-									tipStr += strdata[i].courseName;
-								} else {
-									tipStr += strdata[i].courseName + "/";
-								}
-							}
-							message.destroy();
-							message.warning("在线课（" + tipStr + "）重复添加");
-							state.isClick = false;
-							state.addLoading = false;
-							return;
-						} else {
-							state.addOnlineList.map((value) => {
-								console.log(value);
-								RouterEditTask({
-									chapterId: Number(props.isactive),
-									courseId: value.num,
-									name: value.name,
-									routerId: props.routerId,
-									routerTaskId: props.routerTaskId || 0,
-									type: 1,
-								})
-									.then((res) => {
-										if (res.data.code == 200) {
-											message.destroy();
-											message.success(
-												`${props.edit ? "编辑" : "新增"}关卡任务成功`
-											);
-										}
-										ctx.emit("changeData", false);
-										closeDrawer();
-										state.addLoading = false;
-										state.isClick = false;
-									})
-									.catch(() => {
-										state.addLoading = false;
-										message.destroy();
-										message.error(
-											`${props.edit ? "编辑" : "新增"}关卡任务失败`
-										);
-										state.isClick = false;
-									});
-							});
-						}
-					})
-					.catch((err) => {
-						console.log(err);
-						state.isClick = false;
-					});
-			} else if (props.isLevel == 2) {
-				console.log("我是要便利的数据2", state.addOnlineList);
-				let p_data = state.addOnlineList;
-				let p_data_id = [];
-				p_data.map((item) => {
-					p_data_id.push(item["courseId"]);
-				});
-				console.log("需要查询的在线课ID", p_data_id);
-				if(state.isClick){
-					message.destroy();
-					message.error('请勿频繁点击')
-					return
-					}
-				state.isClick = true;
-				IsExistenceProject({
-					courseTaskId: p_data_id,
-					projectId: Number(props.projectId),
-					stageId: props.chooseStageId || 0,
-					type: 1,
-				})
-					.then((res) => {
-						console.log("项目中是否包含此在线课了", res);
-						if (res.data.data.length) {
-							let strdata = res.data.data;
-							let tipStr = "";
-							for (let i = 0; i < strdata.length; i++) {
-								if (i == strdata.length - 1) {
-									tipStr += strdata[i].courseName;
-								} else {
-									tipStr += strdata[i].courseName + "/";
-								}
-							}
-							message.destroy();
-							message.warning("在线课（" + tipStr + "）重复添加");
-							state.isClick = false;
-							return;
-						} else {
-							state.addOnlineList.map((value) => {
-								apiTask
-									.addTask({
-										courseId: value.num,
-										name: value.name,
-										projectId: props.projectId,
-										projectTaskId: props.projectTaskId || 0,
-										stageId: props.chooseStageId || 0,
-										type: 1,
-									})
-									.then(() => {
-										message.destroy();
-										message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
-										ctx.emit("changeData", false);
-										closeDrawer();
-										state.isClick = false;
-									})
-									.catch(() => {
-										message.destroy();
-										message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
-										state.isClick = false;
-									});
-							});
-						}
-					})
-					.catch((err) => {
-						console.log(err);
-					});
-			} else if (props.isLevel == 3) {
-
-				let p_data = state.addOnlineList;
-				let p_data_id = [];
-				p_data.map((item) => {
-					p_data_id.push(item["courseId"]);
-				});
-				console.log("需要查询的在线课ID", p_data_id);
-				if(state.isClick){
-					message.destroy();
-					message.error('请勿频繁点击')
-					return
-					}
-				state.isClick = true;
-				IsExistenceProjectTemplate({
-					courseTaskId: p_data_id,
-					projectTemplateId: props.projectTemplateId,
-					templateStageId: props.chooseStageId || 0,
-					type: 1,
-				}).then((res) => {
-					console.log("项目中是否包含此在线课了", res);
-					if (res.data.data.length) {
-						let strdata = res.data.data;
-						let tipStr = "";
-						for (let i = 0; i < strdata.length; i++) {
-							if (i == strdata.length - 1) {
-								tipStr += strdata[i].courseName;
-							} else {
-								tipStr += strdata[i].courseName + "/";
-							}
-						}
-						message.destroy();
-						message.warning("在线课（" + tipStr + "）重复添加");
-						state.isClick = false;
-						return;
-					} else {
-						state.addOnlineList.map((value) => {
-
-							console.log(props, props.projectTemplateId, props.projectTaskId)
-							addTempTask({
-								courseId: value.num,
-								name: value.name,
-								projectTemplateId: localStorage.getItem("projectTemplateId"),
-								projectTaskId: props.projectTaskId || 0,
-								stageId: props.chooseStageId || 0,
-								type: 1,
-							})
-								.then((res) => {
-									console.log('新增或者编辑在线课', res)
-									message.destroy();
-									message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`);
-									ctx.emit("changeData", false);
-									closeDrawer();
-									state.isClick = false;
-								})
-								.catch(() => {
-									message.destroy();
-									message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`);
-									state.isClick = false;
-								});
-						})
-					}
-				});
-
-			}
-			//if(state.addOnlineList.Target==undefined){
-			// closeDrawer();
-			//}
-		};
-		//搜索在线列表
-		const searchList = () => {
-			if (state.inputV1 || state.selectV) {
-				getAllOnlineText();
-			} else {
-				resetOnline();
-			}
-		};
-		//重置在线信息
-		const resetOnline = () => {
-			state.inputV1 = null;
-			state.selectV = null;
-			state.selectedRowKeys = [];
-			state.addOnlineList = [];
-			state.currentPage = 1;
-			getAllOnlineText();
-		};
-		onMounted(() => {
-
-		});
-		return {
-			...toRefs(state),
-			afterVisibleChange,
-			closeDrawer,
-			tableDataFunc,
-			onSelectChange,
-			clearLine,
-			handelChangePage,
-			getAllOnlineText,
-			getTableDate,
-			updateTask,
-			searchList,
-			resetOnline,
-			isExistence,
-			IsExistenceProjects,
-			ChoiceCourse,
-		};
-	},
+  name: "AddOnline",
+  props: {
+    addonlineVisible: {
+      type: Boolean,
+      default: false,
+    },
+    EditOnlineId: {
+      type: Number,
+      default: null,
+    },
+    edit: {
+      //  是否为编辑
+      type: Boolean,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: {
+      // 是否是关卡页面触发
+      type: Number,
+      default: null,
+    },
+    projectTaskId: {
+      // 要编辑的projectId
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    },
+    projectTemplateId: {
+      type: Number,
+      default: null,
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      inputV1: null,
+      options1: [
+        {
+          value: "微课",
+          label: "微课",
+        },
+        {
+          value: "录播课",
+          label: "录播课",
+        },
+      ],
+      time: undefined,
+      onlineClassesId: null,
+      onlineName: "",
+      selectV: null,
+      selectedRowKeys: [],
+      tableData: [],
+      addOnlineList: [],
+      currentPage: 1,
+      tableDataTotal: 0,
+      pageSize: 10,
+      choicecourse: true,
+      ddLoading: false,
+      isClick: false,
+    });
+    const ChoiceCourse = () => {
+      state.choicecourse = false;
+    };
+    const closeDrawer = () => {
+      state.choicecourse = true;
+      ctx.emit("update:addonlineVisible", false);
+      ctx.emit("update:edit", false);
+      state.inputV1 = null;
+      state.selectV = null;
+      state.selectedRowKeys = [];
+      state.addOnlineList = [];
+      state.currentPage = 1;
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
+    };
+    const afterVisibleChange = (bol) => {
+      if (bol == true) {
+        getAllOnlineText();
+        getOnlineById();
+      }
+    };
+    //TODO 根据id 获取在线课信息
+    const getOnlineById = () => {};
+    const tableDataFunc = () => {
+      const columns = [
+        // {
+        //   title: "课程编号",
+        //  dataIndex: "num",
+        //   key: "num",
+        //  width: "80px",
+        //  align: "center",
+        //  },
+        {
+          title: "名称",
+          dataIndex: "name",
+          key: "name",
+          width: "30%",
+          ellipsis: true,
+        },
+        {
+          title: "课程分类",
+          dataIndex: "contenttype",
+          key: "contenttype",
+          width: "15%",
+          align: "center",
+          ellipsis: true,
+        },
+        //   {
+        //    title: "授课教师",
+        //    dataIndex: "teacher",
+        //    key: "teacher",
+        //   width: "15%",
+        //   align: "center",
+        //  },
+        {
+          title: "创建人",
+          dataIndex: "sysCreateBy",
+          key: "sysCreateBy",
+          width: "15%x",
+          align: "center",
+          ellipsis: true,
+        },
+        //   {
+        //    title: "创建时间",
+        //   dataIndex: "createTime",
+        //    key: "createTime",
+        //   width: "15%",
+        //   align: "center",
+        // },
+        {
+          title: "发布时间",
+          dataIndex: "publishTime",
+          key: "publishTime",
+          width: "25%",
+          align: "center",
+          ellipsis: true,
+        },
+      ];
+      return columns;
+    };
+    const onSelectChange = (selectedRowKeys, selectedRows) => {
+      console.log("selectedRows", selectedRows);
+      state.selectedRowKeys = selectedRowKeys;
+      state.addOnlineList = selectedRows;
+      console.log(selectedRowKeys, selectedRows);
+      if (props.edit && selectedRows.length > 0) {
+        selectedRows.map((value) => {
+          console.log(props, value);
+          if (value.courseId == props.EditOnlineId) {
+            message.destroy();
+            message.error("选项相同，请重新选择");
+            state.selectedRowKeys = [];
+            state.addOnlineList = [];
+          }
+        });
+      }
+    };
+    //清空所选
+    const clearLine = () => {
+      state.selectedRowKeys = [];
+      state.addOnlineList = [];
+    };
+    const handelChangePage = (page) => {
+      state.currentPage = page;
+      state.selectedRowKeys = [];
+      getAllOnlineText();
+    };
+    const getTableDate = (tableData) => {
+      let data = tableData;
+      let array = [];
+      data.map((value, index) => {
+        {
+          let obj = {
+            key: index + 1,
+            num: value.onlineClassesId,
+            name: value.name,
+            contenttype: value.contentType == 10 ? "微课" : "录播课",
+            teacher: value.teacher,
+            sysCreateBy: value.sysCreateBy,
+            createTime: value.sysCreateTime,
+            publishTime: value.publishTime,
+            courseId: Number(value.onlineClassesId),
+            studyTime: value.studyTime,
+          };
+          // console.log("objobjobjobj", obj, value);
+          array.push(obj);
+        }
+      });
+      state.tableData = array;
+    };
+    //获取全部在线信息接口
+    const getAllOnlineText = () => {
+      api
+        .queryOnlinelList({
+          createUser: "",
+          keyword: state.inputV1,
+          orderAsc: true,
+          orderField: "",
+          pageIndex: state.currentPage,
+          pageSize: state.pageSize,
+          publish: true,
+          status: 0,
+          sysType1: "",
+          sysType2: "",
+          sysType3: "",
+        })
+        .then((res) => {
+          let arr = res.data.data.list;
+          state.tableDataTotal = res.data.data.count;
+          if (res.status === 200) {
+            console.log("获取在线课列表数据", res);
+            for (let i = 0; i < res.data.data.list.length; i++) {
+              if (
+                Number(res.data.data.list[i].onlineClassesId) ==
+                props.EditOnlineId
+              ) {
+                state.selectedRowKeys = [i + 1];
+              }
+            }
+            getTableDate(arr);
+          }
+        })
+        .catch((err) => {
+          console.log(err, "请求失败在线");
+        });
+    };
+    // 校验当前在线课是否已经添加进来了
+    const isExistence = (id) => {
+      console.log({
+        chapterId: Number(props.isactive),
+        courseTaskId: Number(id),
+        routerId: props.routerId,
+        type: 1,
+      });
+      IsExistence({
+        chapterId: Number(props.isactive),
+        courseTaskId: Number(id),
+        routerId: props.routerId,
+        type: 1,
+      })
+        .then((res) => {
+          console.log("我是不是已经添加了", res);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
+    // 判断项目中是否添加当前在线课
+    const IsExistenceProjects = (id) => {
+      console.log("参数传递", {
+        courseTaskId: id,
+        projectId: props.projectId,
+        stageId: props.chooseStageId || 0,
+        type: 1,
+      });
+      IsExistenceProject({
+        courseTaskId: id,
+        projectId: Number(props.projectId),
+        stageId: props.chooseStageId || 0,
+        type: 1,
+      })
+        .then((res) => {
+          console.log("项目中是否包含此在线课了", res);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
+    const updateTask = () => {
+      state.addLoading = true;
+      if (props.isLevel == 1) {
+        if (!props.isactive) {
+          state.addLoading = false;
+          message.destroy();
+          return message.warning("请先选中关卡");
+        }
+        console.log("我是要便利的数据2", state.addOnlineList);
+        let l_data = state.addOnlineList;
+        let l_data_id = [];
+        l_data.map((item) => {
+          l_data_id.push(item["courseId"]);
+        });
+        console.log("需要查询的在线课ID", l_data_id);
+        if (state.isClick) {
+          message.destroy();
+          message.error("请勿频繁点击");
+          return;
+        }
+        state.isClick = true;
+        IsExistence({
+          chapterId: Number(props.isactive),
+          courseTaskId: l_data_id,
+          routerId: props.routerId,
+          type: 1,
+        })
+          .then((res) => {
+            console.log("路径图中是否包含此在线课了", res);
+            if (res.data.data.length) {
+              let strdata = res.data.data;
+              let tipStr = "";
+              for (let i = 0; i < strdata.length; i++) {
+                if (i == strdata.length - 1) {
+                  tipStr += strdata[i].courseName;
+                } else {
+                  tipStr += strdata[i].courseName + "/";
+                }
+              }
+              message.destroy();
+              message.warning("在线课（" + tipStr + "）重复添加");
+              state.isClick = false;
+              state.addLoading = false;
+              return;
+            } else {
+              state.addOnlineList.map((value) => {
+                console.log("要添加的在线课任务", value);
+                RouterEditTask({
+                  chapterId: Number(props.isactive),
+                  courseId: value.num,
+                  name: value.name,
+                  routerId: props.routerId,
+                  routerTaskId: props.routerTaskId || 0,
+                  type: 1,
+                  duration: value.studyTime,
+                })
+                  .then((res) => {
+                    if (res.data.code == 200) {
+                      message.destroy();
+                      message.success(
+                        `${props.edit ? "编辑" : "新增"}关卡任务成功`
+                      );
+                    }
+                    ctx.emit("changeData", false);
+                    closeDrawer();
+                    state.addLoading = false;
+                    state.isClick = false;
+                  })
+                  .catch(() => {
+                    state.addLoading = false;
+                    message.destroy();
+                    message.error(
+                      `${props.edit ? "编辑" : "新增"}关卡任务失败`
+                    );
+                    state.isClick = false;
+                  });
+              });
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            state.isClick = false;
+          });
+      } else if (props.isLevel == 2) {
+        console.log("我是要便利的数据2", state.addOnlineList);
+        let p_data = state.addOnlineList;
+        let p_data_id = [];
+        p_data.map((item) => {
+          p_data_id.push(item["courseId"]);
+        });
+        console.log("需要查询的在线课ID", p_data_id);
+        if (state.isClick) {
+          message.destroy();
+          message.error("请勿频繁点击");
+          return;
+        }
+        state.isClick = true;
+        IsExistenceProject({
+          courseTaskId: p_data_id,
+          projectId: Number(props.projectId),
+          stageId: props.chooseStageId || 0,
+          type: 1,
+        })
+          .then((res) => {
+            console.log("项目中是否包含此在线课了", res);
+            if (res.data.data.length) {
+              let strdata = res.data.data;
+              let tipStr = "";
+              for (let i = 0; i < strdata.length; i++) {
+                if (i == strdata.length - 1) {
+                  tipStr += strdata[i].courseName;
+                } else {
+                  tipStr += strdata[i].courseName + "/";
+                }
+              }
+              message.destroy();
+              message.warning("在线课（" + tipStr + "）重复添加");
+              state.isClick = false;
+              return;
+            } else {
+              state.addOnlineList.map((value) => {
+                apiTask
+                  .addTask({
+                    courseId: value.num,
+                    name: value.name,
+                    projectId: props.projectId,
+                    projectTaskId: props.projectTaskId || 0,
+                    stageId: props.chooseStageId || 0,
+                    type: 1,
+                    duration: value.studyTime,
+                  })
+                  .then(() => {
+                    message.destroy();
+                    message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
+                    ctx.emit("changeData", false);
+                    closeDrawer();
+                    state.isClick = false;
+                  })
+                  .catch(() => {
+                    message.destroy();
+                    message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
+                    state.isClick = false;
+                  });
+              });
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      } else if (props.isLevel == 3) {
+        let p_data = state.addOnlineList;
+        let p_data_id = [];
+        p_data.map((item) => {
+          p_data_id.push(item["courseId"]);
+        });
+        console.log("需要查询的在线课ID", p_data_id);
+        if (state.isClick) {
+          message.destroy();
+          message.error("请勿频繁点击");
+          return;
+        }
+        state.isClick = true;
+        IsExistenceProjectTemplate({
+          courseTaskId: p_data_id,
+          projectTemplateId: props.projectTemplateId,
+          templateStageId: props.chooseStageId || 0,
+          type: 1,
+        }).then((res) => {
+          console.log("项目中是否包含此在线课了", res);
+          if (res.data.data.length) {
+            let strdata = res.data.data;
+            let tipStr = "";
+            for (let i = 0; i < strdata.length; i++) {
+              if (i == strdata.length - 1) {
+                tipStr += strdata[i].courseName;
+              } else {
+                tipStr += strdata[i].courseName + "/";
+              }
+            }
+            message.destroy();
+            message.warning("在线课（" + tipStr + "）重复添加");
+            state.isClick = false;
+            return;
+          } else {
+            state.addOnlineList.map((value) => {
+              console.log(props, props.projectTemplateId, props.projectTaskId);
+              addTempTask({
+                courseId: value.num,
+                name: value.name,
+                projectTemplateId: localStorage.getItem("projectTemplateId"),
+                projectTaskId: props.projectTaskId || 0,
+                stageId: props.chooseStageId || 0,
+                type: 1,
+                duration: value.studyTime,
+              })
+                .then((res) => {
+                  console.log("新增或者编辑在线课", res);
+                  message.destroy();
+                  message.success(
+                    `${props.edit ? "编辑" : "新增"}模板库任务成功`
+                  );
+                  ctx.emit("changeData", false);
+                  closeDrawer();
+                  state.isClick = false;
+                })
+                .catch(() => {
+                  message.destroy();
+                  message.error(
+                    `${props.edit ? "编辑" : "新增"}模板库任务失败`
+                  );
+                  state.isClick = false;
+                });
+            });
+          }
+        });
+      }
+      //if(state.addOnlineList.Target==undefined){
+      // closeDrawer();
+      //}
+    };
+    //搜索在线列表
+    const searchList = () => {
+      if (state.inputV1 || state.selectV) {
+        getAllOnlineText();
+      } else {
+        resetOnline();
+      }
+    };
+    //重置在线信息
+    const resetOnline = () => {
+      state.inputV1 = null;
+      state.selectV = null;
+      state.selectedRowKeys = [];
+      state.addOnlineList = [];
+      state.currentPage = 1;
+      getAllOnlineText();
+    };
+    onMounted(() => {});
+    return {
+      ...toRefs(state),
+      afterVisibleChange,
+      closeDrawer,
+      tableDataFunc,
+      onSelectChange,
+      clearLine,
+      handelChangePage,
+      getAllOnlineText,
+      getTableDate,
+      updateTask,
+      searchList,
+      resetOnline,
+      isExistence,
+      IsExistenceProjects,
+      ChoiceCourse,
+    };
+  },
 };
 </script>
 <style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
-	background-color: #fafafa !important;
+  background-color: #fafafa !important;
 }
 
 .addonlineDrawer {
-	.drawerMain {
-		.header {
-			height: 73px;
-			border-bottom: 1px solid #e8e8e8;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			flex-shrink: 0;
+  .drawerMain {
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      flex-shrink: 0;
 
-			.headerTitle {
-				font-size: 18px;
-				font-weight: 600;
-				color: #333333;
-				line-height: 25px;
-				margin-left: 24px;
-			}
-		}
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        margin-left: 24px;
+      }
+    }
 
-		.contentMain {
-			padding-right: 12px;
+    .contentMain {
+      padding-right: 12px;
 
-			.main_items {
-				display: flex;
+      .main_items {
+        display: flex;
 
-				margin-top: 32px;
-				margin-bottom: 12px;
-				flex-wrap: wrap;
+        margin-top: 32px;
+        margin-bottom: 12px;
+        flex-wrap: wrap;
 
-				.mi_ipts {
-					display: flex;
-					margin-bottom: 20px;
+        .mi_ipts {
+          display: flex;
+          margin-bottom: 20px;
 
-					.mii_ipt {
-						display: flex;
-						align-items: center;
-						margin-right: 24px;
+          .mii_ipt {
+            display: flex;
+            align-items: center;
+            margin-right: 24px;
 
-						.ipt_name {
-							white-space: nowrap;
-						}
-					}
-				}
+            .ipt_name {
+              white-space: nowrap;
+            }
+          }
+        }
 
-				.mi_btns {
-					display: flex;
-					margin-left: 38px;
-					margin-bottom: 20px;
-					cursor: pointer;
+        .mi_btns {
+          display: flex;
+          margin-left: 38px;
+          margin-bottom: 20px;
+          cursor: pointer;
 
-					.btn {
-						padding: 0px 26px 0px 26px;
-						height: 38px;
-						border-radius: 8px;
-						border: 1px solid rgba(64, 158, 255, 1);
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						margin-left: 14px;
-						flex-shrink: 0;
+          .btn {
+            padding: 0px 26px 0px 26px;
+            height: 38px;
+            border-radius: 8px;
+            border: 1px solid rgba(64, 158, 255, 1);
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-left: 14px;
+            flex-shrink: 0;
 
-						.search {
-							background-size: 100%;
-						}
+            .search {
+              background-size: 100%;
+            }
 
-						.btnText {
-							font-size: 14px;
-							font-weight: 400;
-							line-height: 36px;
-							margin-left: 5px;
-						}
-					}
+            .btnText {
+              font-size: 14px;
+              font-weight: 400;
+              line-height: 36px;
+              margin-left: 5px;
+            }
+          }
 
-					.btn1 {
-						background: rgb(64, 158, 255);
+          .btn1 {
+            background: rgb(64, 158, 255);
 
-						.search {
-							width: 15px;
-							height: 17px;
-							background-image: url("@/assets/images/coursewareManage/search0.png");
-						}
+            .search {
+              width: 15px;
+              height: 17px;
+              background-image: url("@/assets/images/coursewareManage/search0.png");
+            }
 
-						.btnText {
-							color: rgb(255, 255, 255);
-						}
-					}
+            .btnText {
+              color: rgb(255, 255, 255);
+            }
+          }
 
-					.btn2 {
-						background: rgb(255, 255, 255);
+          .btn2 {
+            background: rgb(255, 255, 255);
 
-						.search {
-							width: 15px;
-							height: 17px;
-							background-image: url("@/assets/images/coursewareManage/reset1.png");
-						}
+            .search {
+              width: 15px;
+              height: 17px;
+              background-image: url("@/assets/images/coursewareManage/reset1.png");
+            }
 
-						.btnText {
-							color: rgb(64, 158, 255);
-						}
-					}
+            .btnText {
+              color: rgb(64, 158, 255);
+            }
+          }
 
-					.btn1:hover {
-						background: rgb(255, 255, 255);
+          .btn1:hover {
+            background: rgb(255, 255, 255);
 
-						.search {
-							background-image: url("@/assets/images/courseManage/search1.png");
-						}
+            .search {
+              background-image: url("@/assets/images/courseManage/search1.png");
+            }
 
-						.btnText {
-							color: #4ea6ff;
-						}
-					}
+            .btnText {
+              color: #4ea6ff;
+            }
+          }
 
-					.btn2:hover {
-						background: rgba(64, 158, 255, 1);
+          .btn2:hover {
+            background: rgba(64, 158, 255, 1);
 
-						.search {
-							background-image: url("@/assets/images/courseManage/reset0.png");
-						}
+            .search {
+              background-image: url("@/assets/images/courseManage/reset0.png");
+            }
 
-						.btnText {
-							color: #ffffff;
-						}
-					}
-				}
-			}
+            .btnText {
+              color: #ffffff;
+            }
+          }
+        }
+      }
 
-			.main_notice {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin-bottom: 3px;
-				height: 40px;
-				background-color: #e9f6fe;
+      .main_notice {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 3px;
+        height: 40px;
+        background-color: #e9f6fe;
 
-				.mntc_left {
-					display: flex;
-					align-items: center;
+        .mntc_left {
+          display: flex;
+          align-items: center;
 
-					.notice_icon {
-						width: 14px;
-						height: 14px;
-						margin-right: 9px;
-						margin-left: 9px;
-						background-image: url(@/assets/images/coursewareManage/gan.png);
-						background-size: 100% 100%;
-					}
-				}
+          .notice_icon {
+            width: 14px;
+            height: 14px;
+            margin-right: 9px;
+            margin-left: 9px;
+            background-image: url(@/assets/images/coursewareManage/gan.png);
+            background-size: 100% 100%;
+          }
+        }
 
-				.mntc_right {
-					cursor: pointer;
-				}
-			}
+        .mntc_right {
+          cursor: pointer;
+        }
+      }
 
-			.main_table {
-				position: relative;
-				padding-bottom: 80px;
+      .main_table {
+        position: relative;
+        padding-bottom: 80px;
 
-				.ant-checkbox-wrapper {
-					align-items: center;
-					margin-top: -2px;
-				}
+        .ant-checkbox-wrapper {
+          align-items: center;
+          margin-top: -2px;
+        }
 
-				.ant-table-selection-column {
-					padding: 0px !important;
-					padding-left: 5px !important;
-				}
+        .ant-table-selection-column {
+          padding: 0px !important;
+          padding-left: 5px !important;
+        }
 
-				.ant-table-thead>tr>th {
-					background-color: rgba(239, 244, 252, 1);
-				}
+        .ant-table-thead > tr > th {
+          background-color: rgba(239, 244, 252, 1);
+        }
 
-				th.h {
-					background-color: #eff4fc !important;
-				}
+        th.h {
+          background-color: #eff4fc !important;
+        }
 
-				.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
-					background: #f6f9fd;
-				}
+        .ant-table-tbody
+          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+          > td {
+          background: #f6f9fd;
+        }
 
-				.pa {
-					left: 0;
-					width: 100%;
-					display: flex;
-					justify-content: center;
-					position: absolute;
-					bottom: 20px;
-				}
-			}
-		}
+        .pa {
+          left: 0;
+          width: 100%;
+          display: flex;
+          justify-content: center;
+          position: absolute;
+          bottom: 20px;
+        }
+      }
+    }
 
-		.main_btns {
-			height: 72px;
-			width: 100%;
-			bottom: 0;
-			left: 0;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+    .main_btns {
+      height: 72px;
+      width: 100%;
+      bottom: 0;
+      left: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
 
-			.btn1 {
-				width: 100px;
-				height: 40px;
-				border: 1px solid #4ea6ff;
-				border-radius: 8px;
-				color: #4ea6ff;
-				background-color: #fff;
-				cursor: pointer;
-			}
+      .btn1 {
+        width: 100px;
+        height: 40px;
+        border: 1px solid #4ea6ff;
+        border-radius: 8px;
+        color: #4ea6ff;
+        background-color: #fff;
+        cursor: pointer;
+      }
 
-			.btn2 {
-				cursor: pointer;
-				width: 100px;
-				height: 40px;
-				background: #4ea6ff;
-				border-radius: 8px;
-				border: 0;
-				margin-left: 15px;
-				color: #fff;
-			}
-		}
-	}
+      .btn2 {
+        cursor: pointer;
+        width: 100px;
+        height: 40px;
+        background: #4ea6ff;
+        border-radius: 8px;
+        border: 0;
+        margin-left: 15px;
+        color: #fff;
+      }
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index f62a8e6c..9c0df01c 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -24,7 +24,7 @@
               <div class="fi_input">
                 <a-input
                   v-model:value="inputV1"
-                  style="width:424px; height: 40px; border-radius: 8px"
+                  style="width: 424px; height: 40px; border-radius: 8px"
                   placeholder="请输入项目名称"
                 />
               </div>
@@ -54,20 +54,21 @@
               onChange: onSelectChange,
             }"
           />
-          <div class="tableBox" style="margin-top:85px;">
-          <div class="pa">
-            <a-pagination
-              v-if="tableDataTotal > 10"
-              :showSizeChanger="false"
-              showQuickJumper="true"
-              hideOnSinglePage="true"
-              :pageSize="pageSize"
-              :current="currentPage"
-              :total="tableDataTotal"
-              class="pagination"
-              @change="changePagination"
-            />
-          </div></div>
+          <div class="tableBox" style="margin-top: 85px">
+            <div class="pa">
+              <a-pagination
+                v-if="tableDataTotal > 10"
+                :showSizeChanger="false"
+                showQuickJumper="true"
+                hideOnSinglePage="true"
+                :pageSize="pageSize"
+                :current="currentPage"
+                :total="tableDataTotal"
+                class="pagination"
+                @change="changePagination"
+              />
+            </div>
+          </div>
         </div>
       </div>
       <div class="main_btns">
@@ -131,20 +132,20 @@ export default {
           align: "center",
           ellipsis: true,
         },
-      //   {
+        //   {
         //   title: "状态",
-       //    width: "13%",
-       //    dataIndex: "status",
-       //    key: "status",
-       //    align: "center",
-      //   },
-       // {
+        //    width: "13%",
+        //    dataIndex: "status",
+        //    key: "status",
+        //    align: "center",
+        //   },
+        // {
         //  title: "价格",
         //  width: "13%",
         //  dataIndex: "quiz_price",
-         // key: "price",
-         // align: "center",
-       // },
+        // key: "price",
+        // align: "center",
+        // },
         {
           title: "可答题人数",
           width: "20%",
@@ -161,7 +162,7 @@ export default {
       }
       state.selectedRowKeys = selectedRowKeys;
       state.evListData = selectedRows[0] ? selectedRows[0] : {};
-      console.log("state.evListData",state.evListData);
+      console.log("state.evListData", state.evListData);
     };
     const closeDrawer = () => {
       state.selectedRowKeys = [];
@@ -229,13 +230,13 @@ export default {
     //获取测评列表
     const getAllEvalText = () => {
       let objael = {
-        keyword:state.inputV1,
-       
+        keyword: state.inputV1,
       };
       api
         .choiceEvaluation(objael)
         .then((res) => {
-          state.tableDataTotal=9;
+          state.tableDataTotal = 9;
+          console.log("测评列表", res.data.data);
           getTableDataList(res.data.data);
         })
         .catch(() => {});
@@ -311,7 +312,7 @@ export default {
         }
         .mi_btns {
           display: flex;
-       
+
           cursor: pointer;
           .btn {
             padding: 0px 26px 0px 26px;
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index ea31729e..e1788227 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -4,7 +4,7 @@
       <div class="left clearfix">
         <div class="leftmain">
           <div class="tit" style="margin-left: 18px">关卡</div>
-          <div class="btn btn3"  @click="showModal()" style="margin-left: 19px">
+          <div class="btn btn3" @click="showModal()" style="margin-left: 19px">
             <div class="search"></div>
             <div class="btnText">添加关卡</div>
           </div>
@@ -206,7 +206,8 @@
               <router-link to="/leveladd">
                 <div style="display: flex">
                   <img
-                    class="img2" style="margin-right:22px;"
+                    class="img2"
+                    style="margin-right: 22px"
                     src="../../assets/images/leveladd/back.png"
                   />
                   <div class="return">返回</div>
@@ -688,7 +689,7 @@
                       </div>
                     </div>
                     <div style="width: 87px; text-align: center">
-                      {{ element.cretime }}分钟
+                      {{ element.cretime ? element.cretime + "分钟" : "-" }}
                     </div>
                     <div
                       style="
@@ -1309,22 +1310,21 @@ export default {
       api
         .deleteChapter(obj)
         .then((res) => {
-          if(res.data.code==200){
+          if (res.data.code == 200) {
             console.log("删除关卡成功", res);
             message.destroy();
             message.success("删除关卡成功");
-            let chapter = localStorage.getItem("chapterId")
-            if(state.deleteChapterId == chapter){
-              localStorage.removeItem("chapterId")
+            let chapter = localStorage.getItem("chapterId");
+            if (state.deleteChapterId == chapter) {
+              localStorage.removeItem("chapterId");
             }
             closeDeleteChapter();
             getDetail();
-          }else if(res.data.code==-1){
+          } else if (res.data.code == -1) {
             message.destroy();
             message.success("至少保留一个关卡");
             closeDeleteChapter();
           }
-          
         })
         .catch((err) => {
           console.log("删除关卡失败", err);
@@ -1418,13 +1418,16 @@ export default {
           state.chooseProjectList = JSON.stringify(state.level[i].taskList);
           console.log("state.level[i].taskList", state.level[i].taskList);
           state.level[i].taskList.forEach((element) => {
-            // console.log("element", element);
+            console.log("element", element);
             let obj = {
               id: element.routerTaskId,
               key: element.routerTaskId,
               lei: checkType(element.type),
               creater: element.name,
-              cretime: element.duration,
+              cretime:
+                element.duration || element.duration == 0
+                  ? element.duration
+                  : "-",
               checked1: element.flag,
               routerTaskId: element.routerTaskId,
               courseId: element.courseId,
@@ -1466,7 +1469,7 @@ export default {
               ? JSON.parse(localStorage.getItem("chapterId"))
               : null;
             console.log("chapter", chapter);
-            if (chapter >0) {
+            if (chapter > 0) {
               dataAssignment(chapter); //用哪个的任务表
               state.isactive = chapter; //哪个亮
             } else {
@@ -1535,13 +1538,13 @@ export default {
           align: "center",
           className: "h",
         },
-       //   {
-         //   title: "岗位",
-         //   dataIndex: "gang",
-         //   key: "gang",
-          //  width: 110,
-          //  align: "center",
-          //  className: "h",
+        //   {
+        //   title: "岗位",
+        //   dataIndex: "gang",
+        //   key: "gang",
+        //  width: 110,
+        //  align: "center",
+        //  className: "h",
         //  },
         {
           title: "当前关卡",
@@ -1551,14 +1554,14 @@ export default {
           align: "center",
           className: "h",
         },
-          {
-            title: "进度",
-            dataIndex: "jin",
-            key: "jin",
-            width: 110,
-            align: "center",
-            className: "h",
-          },
+        {
+          title: "进度",
+          dataIndex: "jin",
+          key: "jin",
+          width: 110,
+          align: "center",
+          className: "h",
+        },
         {
           title: "开始时间",
           dataIndex: "time",
@@ -1853,7 +1856,7 @@ export default {
       let obj = {
         chapterId: ele.chapterId,
         courseId: ele.courseId,
-        duration: ele.cretime,
+        duration: ele.cretime == "-" ? 0 : ele.cretime,
         flag: ele.checked1,
         name: ele.creater,
         routerId: ele.routerId,
@@ -2667,7 +2670,7 @@ export default {
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
       display: flex;
       justify-content: center;
-      min-height:512px;
+      min-height: 512px;
       .boomcen {
         width: 95%;
         // height: 100%;
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 9dd953d3..6fcb65e9 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -316,7 +316,7 @@
             <!-- 添加外链侧弹窗 -->
             <div class="lin"></div>
           </div>
-            <!--TODO1216
+          <!--TODO1216
           <div class="item" @click="showDrawerAddDiscuss">
             <div class="itcon">
               <div class="img">
@@ -407,9 +407,9 @@
                 v-model:EditInvistId="EditInvistId"
               />
             </div>
-          
+
             <div class="lin"></div>
-          </div>  
+          </div>
 
           <!--TODO1216
           <div class="item" @click="showDrawerAddVote">
@@ -437,9 +437,7 @@
             
             </div>
           </div>
-        -->
-
-        </div>  
+        --></div>
         <div class="boom">
           <div class="boomcen">
             <div class="onerow">
@@ -632,7 +630,11 @@
                         </div>
                       </div>
                       <div style="width: 87px; text-align: center">
-                        {{ element.cretime }}分钟
+                        {{
+                          element.cretime 
+                            ? element.cretime + "分钟"
+                            : "-"
+                        }}
                       </div>
                       <div
                         style="
@@ -1026,7 +1028,19 @@
             <div class="close_exit" @click="closeDeleteStage"></div>
           </div>
           <div class="body">
-            <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前阶段为第一阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span>
+            <span
+              style="
+                width: 320px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+              "
+              >{{
+                level.length == 1
+                  ? "当前阶段为第一阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?"
+                  : "您确定要删除此阶段"
+              }}</span
+            >
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeDeleteStage">
@@ -1082,7 +1096,7 @@ export default {
     AddTest,
     AddLive,
     AddRef,
-   // AddDiscuss,
+    // AddDiscuss,
     AddActive,
     AddEval,
     AddInvist,
@@ -1222,7 +1236,8 @@ export default {
               ? "投票"
               : "-",
           creater: value.name,
-          cretime: value.duration ? value.duration : "-",
+          cretime:
+            value.duration || value.duration == 0 ? value.duration : "-",
           checked1: value.flag ? true : false,
           checked: false, //是否选中类型
           courseId: value.courseId,
@@ -1396,7 +1411,6 @@ export default {
         state.stageList = res.data.data.stageList;
         getStageData(res.data.data.stageList);
         updateStageChoosd();
- 
       });
     };
 
@@ -1620,7 +1634,7 @@ export default {
     const showDeleteStage = (id) => {
       state.deleteStageId = id;
       state.deleteStageModal = true;
-      console.log(state.level)
+      console.log(state.level);
     };
     //关闭删除阶段弹窗
     const closeDeleteStage = () => {
@@ -1759,35 +1773,35 @@ export default {
     // 删除所有阶段
     const removeAllLevel = () => {
       // state.cancelModal = false;
-      console.log(state.level)
+      console.log(state.level);
       let removeArr = state.level;
-      for(let i=0;i<removeArr.length;i++){
+      for (let i = 0; i < removeArr.length; i++) {
         let obj = {
-          stageId: removeArr[i].id
-        }
+          stageId: removeArr[i].id,
+        };
         apistage
-        .deleteStage(obj)
-        .then((res) => {
-          console.log("删除阶段成功", res);
-          if(removeArr.length-1==i){
-            message.destroy();
-            message.success("删除全部阶段成功");
-            closeDeleteStage();
-            localStorage.setItem("stageId", "");
-            getTask();
-            state.cancelModal = false;
-          }
-        })
-        .catch((err) => {
-          if(removeArr.length-1==i){
-            console.log("删除阶段失败", err);
-            message.destroy();
-            message.success("删除全部阶段失败");
-            state.cancelModal = false;
-          }
-        });
+          .deleteStage(obj)
+          .then((res) => {
+            console.log("删除阶段成功", res);
+            if (removeArr.length - 1 == i) {
+              message.destroy();
+              message.success("删除全部阶段成功");
+              closeDeleteStage();
+              localStorage.setItem("stageId", "");
+              getTask();
+              state.cancelModal = false;
+            }
+          })
+          .catch((err) => {
+            if (removeArr.length - 1 == i) {
+              console.log("删除阶段失败", err);
+              message.destroy();
+              message.success("删除全部阶段失败");
+              state.cancelModal = false;
+            }
+          });
       }
-    }
+    };
 
     //选择单个任务
     const changeRow = (e) => {
@@ -1993,7 +2007,7 @@ export default {
       temporaryStorage,
       submitStorage,
       cancelStorage,
-      removeAllLevel
+      removeAllLevel,
     };
   },
 };
diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
index d6abd7e7..d2a2d504 100644
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -329,7 +329,7 @@
             <!-- 添加外链侧弹窗 -->
             <div class="lin"></div>
           </div>
-            <!--TODO1216
+          <!--TODO1216
           <div class="item" @click="showDrawerAddDiscuss">
             <div class="itcon">
               <div class="img">
@@ -427,7 +427,7 @@
             <div class="lin"></div>
           </div>
 
-            <!--TODO1216
+          <!--TODO1216
           <div class="item" @click="showDrawerAddVote">
             <div class="itcon">
               <div class="img">
@@ -455,7 +455,6 @@
             </div>
           </div>
 -->
-
         </div>
         <div class="boom">
           <div class="boomcen">
@@ -649,7 +648,7 @@
                         </div>
                       </div>
                       <div style="width: 87px; text-align: center">
-                        {{ element.cretime }}分钟
+                        {{ element.cretime ? element.cretime + "分钟" : "-" }}
                       </div>
                       <div
                         style="
@@ -1389,7 +1388,7 @@ export default {
               ? "投票"
               : "-",
           creater: value.name,
-          cretime: Number(value.duration) > 0 ? value.duration : "-",
+          cretime: value.duration || value.duration == 0 ? value.duration : "-",
           checked1: value.flag ? true : false,
           checked: false, //是否选中类型
           courseId: value.courseId,
@@ -1402,12 +1401,16 @@ export default {
       state.tableData = array;
       console.log("state.tableData", state.tableData);
     };
-   //把阶段放到level里
-   const getStageData = (tableData) => {
+    //把阶段放到level里
+    const getStageData = (tableData) => {
       let data = tableData;
       let array = [];
       data.map((value) => {
-        console.log("dd",Number(value.templateStageId) ,Number(value.templateStageId) > 0);
+        console.log(
+          "dd",
+          Number(value.templateStageId),
+          Number(value.templateStageId) > 0
+        );
         if (Number(value.templateStageId) > 0) {
           let obj = {
             id: value.templateStageId,
@@ -1624,19 +1627,18 @@ export default {
         });
     };*/
 
-       //获取任务列表
-       const getTask = async () => {
-       
-      await  api
-        .templateDetail(localStorage.getItem("projectTemplateId")).then((res) => {
-        console.log("22222", res.data.data.stageList);
-        state.projectTitle = res.data.data.projectTemplateInfo.name;
-        state.picUrl = res.data.data.projectTemplateInfo.picUrl;
-        state.stageList = res.data.data.stageList;
-        getStageData(res.data.data.stageList);
-        updateStageChoosd();
- 
-      });
+    //获取任务列表
+    const getTask = async () => {
+      await api
+        .templateDetail(localStorage.getItem("projectTemplateId"))
+        .then((res) => {
+          console.log("22222", res.data.data.stageList);
+          state.projectTitle = res.data.data.projectTemplateInfo.name;
+          state.picUrl = res.data.data.projectTemplateInfo.picUrl;
+          state.stageList = res.data.data.stageList;
+          getStageData(res.data.data.stageList);
+          updateStageChoosd();
+        });
     };
 
     function updateStageChoosd() {
@@ -1659,9 +1661,15 @@ export default {
         getTableData(state.stageList[0].taskList);
         return;
       }
-      console.log(state.chooseStageId,state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList,state.stageList);
+      console.log(
+        state.chooseStageId,
+        state.stageList.find((e) => e.templateStageId == state.chooseStageId)
+          ?.taskList,
+        state.stageList
+      );
       getTableData(
-        state.stageList.find((e) => e.templateStageId == state.chooseStageId)?.taskList
+        state.stageList.find((e) => e.templateStageId == state.chooseStageId)
+          ?.taskList
       );
     }
 
@@ -1956,10 +1964,9 @@ export default {
       console.log("state.level", id, state.level);
       state.chooseStageId = id;
       let final = state.level.find((item) => item.id === id);
-      if(final !=null){
+      if (final != null) {
         getTableData(final.taskList);
       }
-     
     };
 
     //选择单个任务

From f5c58602c4ae09fd359b25dc42ae2801323fab2c Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 21 Dec 2022 15:24:46 +0800
Subject: [PATCH 06/11] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddTest.vue | 1541 +++++++++++++++-------------
 src/components/drawers/EvList.vue  |    2 +-
 2 files changed, 824 insertions(+), 719 deletions(-)

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 3315950c..6c1440d0 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -1,15 +1,23 @@
 <template>
-	<a-drawer :visible="addtestVisible" class="drawerStyle addtestDrawer" width="80%" placement="right"
-		@after-visible-change="afterVisibleChange">
-		<div class="drawerMain">
-			<div class="header">
-				<div class="headerTitle">{{ edit ? "编辑" : "添加" }}考试</div>
-				<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
-					@click="closeDrawer2" />
-			</div>
-			<!-- 2022-11-30注释 后面放开 修改div的padding-topL:32 -->
-			<div style="display: flex; flex-direction: row; padding-top: 0px">
-				<!-- <button
+  <a-drawer
+    :visible="addtestVisible"
+    class="drawerStyle addtestDrawer"
+    width="80%"
+    placement="right"
+    @after-visible-change="afterVisibleChange"
+  >
+    <div class="drawerMain">
+      <div class="header">
+        <div class="headerTitle">{{ edit ? "编辑" : "添加" }}考试</div>
+        <img
+          style="width: 29px; height: 29px; cursor: pointer"
+          src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer2"
+        />
+      </div>
+      <!-- 2022-11-30注释 后面放开 修改div的padding-topL:32 -->
+      <div style="display: flex; flex-direction: row; padding-top: 0px">
+        <!-- <button
           style="width: 100px"
           @click="changeOuter(1)"
           :class="[isOuter == 1 ? 'outer' : 'notOuter']"
@@ -17,203 +25,289 @@
           系统考试
         </button> -->
 
-				<!-- <button
+        <!-- <button
           style="width: 100px"
           @click="changeOuter(2)"
           :class="[isOuter == 2 ? 'outer' : 'notOuter']"
         >
           外部考试
         </button> -->
-			</div>
+      </div>
 
-			<div class="contentMain">
-				<div class="main_left">
-					<div class="main_item">
-						<div class="signbox">
-							<div class="sign">
-								<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-							</div>
-							<span style="margin-right: 3px">考试名称：</span>
-						</div>
-						<div class="btnbox">
-							<a-input v-model:value="test.examinationName" style="width: 400px; height: 40px; border-radius: 8px"
-								placeholder="请输入考试名称" :maxlength="20" />
-						</div>
-					</div>
+      <div class="contentMain">
+        <div class="main_left">
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">考试名称：</span>
+            </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="test.examinationName"
+                style="width: 400px; height: 40px; border-radius: 8px"
+                placeholder="请输入考试名称"
+                :maxlength="20"
+              />
+            </div>
+          </div>
 
-					<div class="main_item">
-						<div class="signbox">
-							<div class="sign">
-								<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-							</div>
-							<span style="margin-right: 3px">选择试卷：</span>
-						</div>
-						<div class="btnbox">
-							<button class="xkbtn" @click="selectTest">
-								{{ chooseCourse ? "重选" : "选择" }}试卷
-							</button>
-							<div v-if="paperName != ''">
-								<a-tag closable color="processing" @close="delTag">
-									<span style="font-size: 14px; line-height: 33px">{{
-											paperName
-									}}</span>
-								</a-tag>
-							</div>
-						</div>
-						<!-- 选择面授侧弹窗 -->
-						<div>
-							<sel-facet v-model:selfacetVisible="selfacetvisible" v-model:chooseCourse="chooseCourse"
-								v-model:chooseCourseName="chooseCourseName" />
-						</div>
-						<!-- 选择面授侧弹窗 -->
-					</div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">选择试卷：</span>
+            </div>
+            <div class="btnbox">
+              <button class="xkbtn" @click="selectTest">
+                {{ chooseCourse ? "重选" : "选择" }}试卷
+              </button>
+              <div v-if="paperName != ''">
+                <a-tag closable color="processing" @close="delTag">
+                  <span style="font-size: 14px; line-height: 33px">{{
+                    paperName
+                  }}</span>
+                </a-tag>
+              </div>
+            </div>
+            <!-- 选择面授侧弹窗 -->
+            <div>
+              <sel-facet
+                v-model:selfacetVisible="selfacetvisible"
+                v-model:chooseCourse="chooseCourse"
+                v-model:chooseCourseName="chooseCourseName"
+              />
+            </div>
+            <!-- 选择面授侧弹窗 -->
+          </div>
 
-					<div class="main_item">
-						<div class="signbox">
-							<div class="sign">
-								<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-							</div>
-							<span style="margin-right: 3px">考试时间：</span>
-						</div>
-						<div class="btnbox">
-							<a-range-picker style="width: 400px; height: 40px; border-radius: 8px" show-time format="YYYY/MM/DD HH:mm"
-								v-model:value="test.chooseTime" :placeholder="['      开始时间', '        结束时间']" />
-						</div>
-					</div>
-					<div class="main_item">
-						<div class="signbox">
-							<div class="sign">
-								<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-							</div>
-							<span style="margin-right: 3px">考试时长：</span>
-						</div>
-						<div class="select">
-							<a-input-number :min="0" :max="300" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
-								v-model:value="test.examinationDuration"></a-input-number>
-							<span style="color: #999999; margin-left: 8px">分钟</span>
-						</div>
-					</div>
-					<div class="main_item2">
-						<div class="signbox">
-							<span style="margin-right: 3px">考试说明：</span>
-						</div>
-						<div class="textarea">
-							<a-textarea v-model:value="test.examinationExplain" placeholder="请输入考试说明" allow-clear show-count
-								:maxlength="200" :rows="6" />
-						</div>
-					</div>
-					<div class="main_item2">
-						<div class="signbox">
-							<span style="margin-right: 3px">考试限制：</span>
-						</div>
-						<div class="kqszbox">
-							<div class="setbox">
-								<div class="timerbox">
-									<span>允许重复考试：</span>
-									<a-input-number :min="-1" :max="300" :precision="0" style="
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">考试时间：</span>
+            </div>
+            <div class="btnbox">
+              <a-range-picker
+                style="width: 400px; height: 40px; border-radius: 8px"
+                show-time
+                format="YYYY/MM/DD HH:mm"
+                v-model:value="test.chooseTime"
+                :placeholder="['      开始时间', '        结束时间']"
+              />
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">考试时长：</span>
+            </div>
+            <div class="select">
+              <a-input-number
+                :min="0"
+                :max="300"
+                :precision="0"
+                style="width: 400px; height: 40px; border-radius: 8px"
+                v-model:value="test.examinationDuration"
+              ></a-input-number>
+              <span style="color: #999999; margin-left: 8px">分钟</span>
+            </div>
+          </div>
+          <div class="main_item2">
+            <div class="signbox">
+              <span style="margin-right: 3px">考试说明：</span>
+            </div>
+            <div class="textarea">
+              <a-textarea
+                v-model:value="test.examinationExplain"
+                placeholder="请输入考试说明"
+                allow-clear
+                show-count
+                :maxlength="200"
+                :rows="6"
+              />
+            </div>
+          </div>
+          <div class="main_item2">
+            <div class="signbox">
+              <span style="margin-right: 3px">考试限制：</span>
+            </div>
+            <div class="kqszbox">
+              <div class="setbox">
+                <div class="timerbox">
+                  <span>允许重复考试：</span>
+                  <a-input-number
+                    :min="-1"
+                    :max="300"
+                    :precision="0"
+                    style="
                       width: 100px;
                       height: 32px;
                       border-radius: 8px;
                       overflow: hidden;
-                    " v-model:value="test.examinationLimit"></a-input-number>
-									<span style="color: #999999; margin-left: 8px">次,-1表示无限制</span>
-								</div>
-							</div>
-						</div>
-					</div>
+                    "
+                    v-model:value="test.examinationLimit"
+                  ></a-input-number>
+                  <span style="color: #999999; margin-left: 8px"
+                    >次,-1表示无限制</span
+                  >
+                </div>
+              </div>
+            </div>
+          </div>
 
-					<div class="main_item">
-						<div class="signbox">
-							<span style="margin-right: 3px">显示答案：</span>
-						</div>
-						<div class="btnbox">
-							<a-radio-group style="margin-right: 12px" v-model:value="test.showAnswers">
-								<a-radio v-model:checked="checked" :value="1" @click="cloradio1">允许查看
-								</a-radio>
-								<a-radio v-model:checked="checked" :value="2" @click="cloradio1">不允许查看
-								</a-radio>
-							</a-radio-group>
-						</div>
-					</div>
-					<div class="main_item">
-						<div class="signbox">
-							<span style="margin-right: 3px">显示解析：</span>
-						</div>
-						<div class="btnbox">
-							<a-radio-group style="margin-right: 12px" v-model:value="test.showAnalysis">
-								<a-radio v-model:checked="checked" :value="1" @click="cloradio2">允许查看
-								</a-radio>
-								<a-radio v-model:checked="checked" :value="2" @click="cloradio2">不允许查看
-								</a-radio>
-							</a-radio-group>
-						</div>
-					</div>
-					<div class="main_item">
-						<div class="signbox">
-							<span style="margin-right: 3px">评分模式：</span>
-						</div>
-						<div class="btnbox">
-							<a-radio-group style="margin-right: 12px" v-model:value="test.scoringModel">
-								<a-radio v-model:checked="checked" :value="1" @click="cloradio3">最高一次
-								</a-radio>
-								<a-radio v-model:checked="checked" :value="2" @click="cloradio3">最后一次
-								</a-radio>
-							</a-radio-group>
-						</div>
-					</div>
-					<div class="main_item">
-						<div class="signbox">
-							<span style="margin-right: 3px">及格线：</span>
-						</div>
-						<div class="btnbox">
-							<a-input v-model:value="test.passLine" type="number"
-								style="width: 400px; height: 40px; border-radius: 8px" />
+          <div class="main_item">
+            <div class="signbox">
+              <span style="margin-right: 3px">显示答案：</span>
+            </div>
+            <div class="btnbox">
+              <a-radio-group
+                style="margin-right: 12px"
+                v-model:value="test.showAnswers"
+              >
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
+                  >允许查看
+                </a-radio>
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
+                  >不允许查看
+                </a-radio>
+              </a-radio-group>
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <span style="margin-right: 3px">显示解析：</span>
+            </div>
+            <div class="btnbox">
+              <a-radio-group
+                style="margin-right: 12px"
+                v-model:value="test.showAnalysis"
+              >
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio2"
+                  >允许查看
+                </a-radio>
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio2"
+                  >不允许查看
+                </a-radio>
+              </a-radio-group>
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <span style="margin-right: 3px">评分模式：</span>
+            </div>
+            <div class="btnbox">
+              <a-radio-group
+                style="margin-right: 12px"
+                v-model:value="test.scoringModel"
+              >
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio3"
+                  >最高一次
+                </a-radio>
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio3"
+                  >最后一次
+                </a-radio>
+              </a-radio-group>
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">及格线：</span>
+            </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="test.passLine"
+                type="number"
+                style="width: 400px; height: 40px; border-radius: 8px"
+              />
 
-							<span style="color: #999999; margin-left: 8px">分</span>
-						</div>
-					</div>
-					<div class="main_item">
-						<div class="main_item">
-							<div class="signbox">
-								<span style="margin-right: 3px">试题排列：</span>
-							</div>
-							<div class="btnbox">
-								<a-radio-group style="margin-right: 12px" v-model:value="test.questionArrangement">
-									<a-radio v-model:checked="checked" :value="1" @click="cloradio4">试题乱序
-									</a-radio>
-									<a-radio v-model:checked="checked" :value="2" @click="cloradio4">选项乱序
-									</a-radio>
-									<a-radio v-model:checked="checked" :value="3" @click="cloradio4">全部乱序
-									</a-radio>
-									<a-radio v-model:checked="checked" :value="4" @click="cloradio4">不乱序
-									</a-radio>
-								</a-radio-group>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="main_btns">
-				<a-button class="btn1" @click="closeDrawer2">取消</a-button>
-				<a-button class="btn2" @click="updateTest">确定</a-button>
-			</div>
-			<!--  加载动画 -->
-			<div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-				<a-spin :spinning="addLoading" tip="" />
-			</div>
+              <span style="color: #999999; margin-left: 8px">分</span>
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="main_item">
+              <div class="signbox">
+                <span style="margin-right: 3px">试题排列：</span>
+              </div>
+              <div class="btnbox">
+                <a-radio-group
+                  style="margin-right: 12px"
+                  v-model:value="test.questionArrangement"
+                >
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="1"
+                    @click="cloradio4"
+                    >试题乱序
+                  </a-radio>
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="2"
+                    @click="cloradio4"
+                    >选项乱序
+                  </a-radio>
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="3"
+                    @click="cloradio4"
+                    >全部乱序
+                  </a-radio>
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="4"
+                    @click="cloradio4"
+                    >不乱序
+                  </a-radio>
+                </a-radio-group>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="main_btns">
+        <a-button class="btn1" @click="closeDrawer2">取消</a-button>
+        <a-button class="btn2" @click="updateTest">确定</a-button>
+      </div>
+      <!--  加载动画 -->
+      <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+        <a-spin :spinning="addLoading" tip="" />
+      </div>
 
-			<!-- 选择考试抽屉 -->
-			<s-test v-model:STvisible="STvisible" @getSTData="getData" />
-		</div>
-	</a-drawer>
+      <!-- 选择考试抽屉 -->
+      <s-test v-model:STvisible="STvisible" @getSTData="getData" />
+    </div>
+  </a-drawer>
 </template>
 <script>
 import { reactive, toRefs } from "vue";
 import { message } from "ant-design-vue";
 import {
-	createExamination,
-	queryExaminationDetailById,
-	updateExamination,
+  createExamination,
+  queryExaminationDetailById,
+  updateExamination,
 } from "@/api/indexExam";
 import STest from "./SelectTest.vue";
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
@@ -222,594 +316,605 @@ import dayjs from "dayjs";
 //import { toDate } from "@/api/method";
 
 export default {
-	name: "AddTest",
-	components: {
-		STest,
-	},
-	props: {
-		addtestVisible: {
-			type: Boolean,
-			default: false,
-		},
-		EditTestId: {
-			// 要编辑的考试id
-			type: Number,
-			default: null,
-		},
-		isactive: {
-			type: Number,
-			default: null,
-		},
-		routerId: {
-			type: Number,
-			default: null,
-		},
-		projectId: {
-			type: Number,
-			default: null,
-		},
-		routerTaskId: {
-			type: Number,
-			default: null,
-		},
-		chooseStageId: {
-			type: Number,
-			default: null,
-		},
-		isLevel: {
-			// 是否是关卡页面触发
-			type: Number,
-			default: null,
-		},
-		projectTaskId: {
-			// 要编辑的projectId
-			type: Number,
-			default: null,
-		},
-		edit: {
-			//
-			type: Boolean,
-			default: null,
-		},
-		faceLevel: {
-			type: Boolean,
-			default: false,
-		},
-		projectTemplateId: {
-			type: Number,
-			default: null,
-		},
-		testName: {
-			type: String,
-			default: null,
-		},
-	},
-	setup(props, ctx) {
-		const state = reactive({
-			test: {},
+  name: "AddTest",
+  components: {
+    STest,
+  },
+  props: {
+    addtestVisible: {
+      type: Boolean,
+      default: false,
+    },
+    EditTestId: {
+      // 要编辑的考试id
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    routerTaskId: {
+      type: Number,
+      default: null,
+    },
+    chooseStageId: {
+      type: Number,
+      default: null,
+    },
+    isLevel: {
+      // 是否是关卡页面触发
+      type: Number,
+      default: null,
+    },
+    projectTaskId: {
+      // 要编辑的projectId
+      type: Number,
+      default: null,
+    },
+    edit: {
+      //
+      type: Boolean,
+      default: null,
+    },
+    faceLevel: {
+      type: Boolean,
+      default: false,
+    },
+    projectTemplateId: {
+      type: Number,
+      default: null,
+    },
+    testName: {
+      type: String,
+      default: null,
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      test: {},
 
-			addLoading: false,
-			isOuter: 1, // 是否为外部考试
-			STvisible: false, //选择试卷抽屉
-			paperId: null, //试卷id 子组件传过来给考试抽屉创建考试信息需要
-			paperName: "", //试卷名称 子组件传过来给考试抽屉选择试卷后框框用
-			id: "",
-			testName: "",
-			TestName: "",
-			testObj: {
-				name: "",
-				paperId: "",
-				choosedTime: "",
-				duration: "",
-			},
-			choosedTestList: [
-				{
-					value: "提高核心竞争力",
-					key: 1,
-				},
-			],
-		});
+      addLoading: false,
+      isOuter: 1, // 是否为外部考试
+      STvisible: false, //选择试卷抽屉
+      paperId: null, //试卷id 子组件传过来给考试抽屉创建考试信息需要
+      paperName: "", //试卷名称 子组件传过来给考试抽屉选择试卷后框框用
+      id: "",
+      testName: "",
+      TestName: "",
+      testObj: {
+        name: "",
+        paperId: "",
+        choosedTime: "",
+        duration: "",
+      },
+      choosedTestList: [
+        {
+          value: "提高核心竞争力",
+          key: 1,
+        },
+      ],
+    });
+    state.test.showAnswers = 1;
+    state.test.showAnalysis = 1;
+    state.test.scoringModel = 2;
+    const clearAll = () => {
+      state.test = {};
+    };
 
-		const clearAll = () => {
-			state.test = {};
-		};
+    const closeDrawer = () => {
+      state.statechoosedTime = "";
+      ctx.emit("update:addtestVisible", false);
+      ctx.emit("update:edit", false);
+      ctx.emit("update:EditTestId", state.EditTestId);
+      ctx.emit("update:testName", state.testName);
+      console.log("statetestName", state.testName);
+      localStorage.setItem("stageId", props.chooseStageId);
+      localStorage.setItem("chapterId", props.isactive);
+      state.addLoading = false;
+      clearAll();
+    };
+    const closeDrawer2 = () => {
+      state.paperName = "";
+      state.statechoosedTime = "";
+      ctx.emit("update:edit", false);
+      ctx.emit("update:addtestVisible", false);
+      clearAll();
+      state.addLoading = false;
+    };
+    const afterVisibleChange = () => {
+      console.log("props", props);
+      if (props.addtestVisible && props.edit) {
+        // 该页面显示同时 edit为true 时，发送查询请求,
+        queryTest();
+      }
+    };
+    const selectTest = () => {
+      state.STvisible = true;
+    };
+    const delTag = () => {
+      state.paperId = 0;
+      state.paperName = "";
+    };
+    const queryTest = () => {
+      queryExaminationDetailById({ examinationId: props.EditTestId })
+        .then((res) => {
+          state.test = res.data.data;
+          state.test.showAnswers = Number(state.test.showAnswers);
+          state.test.showAnalysis = Number(state.test.showAnalysis);
+          state.test.scoringModel = Number(state.test.scoringModel);
+          state.test.questionArrangement = Number(
+            state.test.questionArrangement
+          );
+          state.test.chooseTime = [
+            dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm"),
+            dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm"),
+          ];
+          state.paperName = state.test.examinationTestName;
+          // state.paperId=dayjs
+          state.paperId = state.test.examinationTestId;
 
-		const closeDrawer = () => {
-			state.statechoosedTime = "";
-			ctx.emit("update:addtestVisible", false);
-			ctx.emit("update:edit", false);
-			ctx.emit("update:EditTestId", state.EditTestId);
-			ctx.emit("update:testName", state.testName);
-			console.log("statetestName", state.testName);
-			localStorage.setItem("stageId", props.chooseStageId);
-			localStorage.setItem("chapterId", props.isactive);
-			state.addLoading = false;
-			clearAll();
-		};
-		const closeDrawer2 = () => {
-			state.paperName = "";
-			state.statechoosedTime = "";
-			ctx.emit("update:edit", false);
-			ctx.emit("update:addtestVisible", false);
-			clearAll();
-			state.addLoading = false;
-		};
-		const afterVisibleChange = () => {
-			console.log("props", props);
-			if (props.addtestVisible && props.edit) {
-				// 该页面显示同时 edit为true 时，发送查询请求,
-				queryTest();
-			}
-		};
-		const selectTest = () => {
-			state.STvisible = true;
-		};
-		const delTag = () => {
-			state.paperId = 0;
-			state.paperName = "";
-		};
-		const queryTest = () => {
-			queryExaminationDetailById({ examinationId: props.EditTestId })
-				.then((res) => {
-					state.test = res.data.data;
-					state.test.showAnswers = Number(state.test.showAnswers);
-					state.test.showAnalysis = Number(state.test.showAnalysis);
-					state.test.scoringModel = Number(state.test.scoringModel);
-					state.test.questionArrangement = Number(
-						state.test.questionArrangement
-					);
-					state.test.chooseTime = [
-						dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm"),
-						dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm"),
-					];
-					state.paperName = state.test.examinationTestName;
-					// state.paperId=dayjs
-					state.paperId = state.test.examinationTestId;
+          console.log("querytest", state.test);
+        })
+        .catch(() => {
+          //message.error(`查询失败`);
+        });
+    };
+    const updateTest = () => {
+      if (!state.test.examinationName) {
+        message.destroy();
+        return message.warning("请输入考试名称");
+      }
+      if (!state.paperId) {
+        message.destroy();
+        return message.warning("请输入选择试卷");
+      }
+      if (!state.test.chooseTime) {
+        message.destroy();
+        return message.warning("请输入开始结束时间");
+      }
+      if (!state.test.examinationDuration) {
+        message.destroy();
+        return message.warning("请输入考试时长");
+      }
+      if (!state.test.passLine) {
+        message.destroy();
+        return message.warning("请输入及格线");
+      }
 
-					console.log("querytest", state.test);
-				})
-				.catch(() => {
-					//message.error(`查询失败`);
-				});
-		};
-		const updateTest = () => {
-			if (!state.test.examinationName) {
-				message.destroy();
-				return message.warning("请输入考试名称");
-			}
-			if (!state.paperId) {
-				message.destroy();
-				return message.warning("请输入选择试卷");
-			}
-			if (!state.test.chooseTime) {
-				message.destroy();
-				return message.warning("请输入开始结束时间");
-			}
-			if (!state.test.examinationDuration) {
-				message.destroy();
-				return message.warning("请输入考试时长");
-			}
+      state.addLoading = true;
+      console.log("test", state.test);
+      // state.test.examinationStartTime = toDate(
+      //  new Date(state.test.chooseTime[0].$d).getTime() / 1000,
+      // "Y-M-D h:m"
+      // );
+      // state.test.examinationEndTime =toDate(
+      //   new Date(state.test.$slotschooseTime[1].$d).getTime() / 1000,
+      //   "Y-M-D h:m"
+      // );
+      (state.test.examinationStartTime = dayjs(state.test.chooseTime[0]).format(
+        "YYYY-MM-DD HH:mm"
+      )),
+        (state.test.examinationEndTime = dayjs(state.test.chooseTime[1]).format(
+          "YYYY-MM-DD HH:mm"
+        )),
+        (state.test.examinationPaperId = state.paperId);
+      //TODO缺少paperName字段
+      state.test.examinationTestName = state.paperName;
 
-			state.addLoading = true;
-			console.log("test", state.test);
-			// state.test.examinationStartTime = toDate(
-			//  new Date(state.test.chooseTime[0].$d).getTime() / 1000,
-			// "Y-M-D h:m"
-			// );
-			// state.test.examinationEndTime =toDate(
-			//   new Date(state.test.$slotschooseTime[1].$d).getTime() / 1000,
-			//   "Y-M-D h:m"
-			// );
-			state.test.examinationStartTime = dayjs(state.test.chooseTime[0]).format("YYYY-MM-DD HH:mm"),
+      if (props.EditTestId > 0) {
+        // 编辑任务
+        updateExamination(state.test)
+          .then(async (res) => {
+            await updateTask(res);
+            // closeDrawer();
+          })
+          .catch(() => {
+            message.destroy();
+            message.error(`编辑失败`);
+          });
+      } else {
+        // 创建任务
+        createExamination(state.test)
+          .then(async (res) => {
+            await updateTask(res);
+            // closeDrawer();
+          })
+          .catch(() => {
+            message.destroy();
+            message.error(`创建失败`);
+          });
+      }
+    };
+    const updateTask = (res) => {
+      state.EditTestId = res.data.data.examinationId;
+      if (props.faceLevel) {
+        state.EditTestId = res.data.data.examinationId;
+        state.paperName = "";
+        closeDrawer();
+      } else {
+        if (props.isLevel == 1) {
+          if (!props.isactive) {
+            message.destroy();
+            return message.warning("请先选中关卡");
+          }
+          let editObj1 = {
+            chapterId: props.isactive,
+            duration: res.data.data.examinationDuration,
+            courseId: res.data.data.examinationId,
+            name: res.data.data.examinationName,
+            routerId: props.routerId,
+            routerTaskId: props.routerTaskId || 0,
+            type: 5,
+          };
+          RouterEditTask(editObj1)
+            .then(() => {
+              console.log("props.edit", props.edit);
+              message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
+              ctx.emit("changeData", false);
+              state.paperName = "";
+              closeDrawer();
+            })
+            .catch(() => {
+              //message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
+            });
+        } else if (props.isLevel == 2) {
+          let editObj = {
+            courseId: res.data.data.examinationId,
+            duration: res.data.data.examinationDuration,
+            name: res.data.data.examinationName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId || 0,
+            type: 5,
+          };
+          // 新增编辑或新增项目
+          ProjectEditTask(editObj)
+            .then(() => {
+              message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
+              ctx.emit("changeData", false);
+              state.paperName = "";
+              closeDrawer();
+            })
+            .catch(() => {
+              //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
+            });
+        } else if (props.isLevel == 3) {
+          addTempTask({
+            courseId: res.data.data.examinationId,
+            duration: res.data.data.examinationDuration,
+            name: res.data.data.examinationName,
+            projectTemplateId: props.projectTemplateId,
+            projectTaskId: props.projectTaskId || 0,
+            stageId: props.chooseStageId || 0,
+            type: 5,
+          })
+            .then(() => {
+              message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
+              ctx.emit("changeData", false);
+              state.paperName = "";
+              closeDrawer();
+            })
+            .catch(() => {
+              //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
+            });
+        }
+      }
+    };
+    const cloradio1 = (value) => {
+      if (value != "") {
+        state.showAnswers = "";
+      }
+    };
+    const cloradio2 = (value) => {
+      if (value != "") {
+        state.showAnalysis = "";
+      }
+    };
+    const cloradio3 = (value) => {
+      if (value != "") {
+        state.scoringModel = "";
+      }
+    };
+    const cloradio4 = (value) => {
+      if (value != "") {
+        state.questionArrangement = "";
+      }
+    };
+    const changeOuter = (value) => {
+      state.isOuter = value;
+    };
+    const chooseTest = () => {};
+    const closeTag = (removedTag) => {
+      const tags = state.choosedTestList.filter(
+        (item) => item.key != removedTag
+      );
+      state.choosedTestList = tags;
+    };
+    const getData = (value) => {
+      state.paperId = value.paperId;
+      state.paperName = value.testName;
+      state.id = value.id;
+      state.testName = value.testName;
+    };
 
-				state.test.examinationEndTime = dayjs(state.test.chooseTime[1]).format("YYYY-MM-DD HH:mm"),
-				state.test.examinationPaperId = state.paperId;
-			//TODO缺少paperName字段
-			state.test.examinationTestName = state.paperName;
+    return {
+      afterVisibleChange,
+      closeDrawer,
+      closeDrawer2,
+      selectTest,
+      cloradio1,
+      cloradio2,
+      cloradio3,
+      cloradio4,
 
-			if (props.EditTestId > 0) {
-				// 编辑任务
-				updateExamination(state.test)
-					.then(async (res) => {
-						await updateTask(res);
-						// closeDrawer();
-					})
-					.catch(() => {
-						message.destroy();
-						message.error(`编辑失败`);
-					});
-			} else {
-				// 创建任务
-				createExamination(state.test)
-					.then(async (res) => {
-						await updateTask(res);
-						// closeDrawer();
-					})
-					.catch(() => {
-						message.destroy();
-						message.error(`创建失败`);
-					});
-			}
-		};
-		const updateTask = (res) => {
-			state.EditTestId = res.data.data.examinationId;
-			if (props.faceLevel) {
-				state.EditTestId = res.data.data.examinationId;
-				state.paperName = "";
-				closeDrawer();
-			} else {
-				if (props.isLevel == 1) {
-					if (!props.isactive) {
-						message.destroy();
-						return message.warning("请先选中关卡");
-					}
-					let editObj1 = {
-						chapterId: props.isactive,
-						duration: res.data.data.examinationDuration,
-						courseId: res.data.data.examinationId,
-						name: res.data.data.examinationName,
-						routerId: props.routerId,
-						routerTaskId: props.routerTaskId || 0,
-						type: 5,
-					};
-					RouterEditTask(editObj1)
-						.then(() => {
-							console.log("props.edit", props.edit);
-							message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
-							ctx.emit("changeData", false);
-							state.paperName = "";
-							closeDrawer();
-						})
-						.catch(() => {
-							//message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
-						});
-				} else if (props.isLevel == 2) {
-					let editObj = {
-						courseId: res.data.data.examinationId,
-						duration: res.data.data.examinationDuration,
-						name: res.data.data.examinationName,
-						projectId: props.projectId,
-						projectTaskId: props.projectTaskId || 0,
-						stageId: props.chooseStageId || 0,
-						type: 5,
-					};
-					// 新增编辑或新增项目
-					ProjectEditTask(editObj)
-						.then(() => {
-							message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
-							ctx.emit("changeData", false);
-							state.paperName = "";
-							closeDrawer();
-						})
-						.catch(() => {
-							//message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
-						});
-				} else if (props.isLevel == 3) {
-					addTempTask({
-						courseId: res.data.data.examinationId,
-						duration: res.data.data.examinationDuration,
-						name: res.data.data.examinationName,
-						projectTemplateId: props.projectTemplateId,
-						projectTaskId: props.projectTaskId || 0,
-						stageId: props.chooseStageId || 0,
-						type: 5,
-					})
-						.then(() => {
-							message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
-							ctx.emit("changeData", false);
-							state.paperName = "";
-							closeDrawer();
-						})
-						.catch(() => {
-							//message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
-						});
-				}
-			}
-		};
-		const cloradio1 = (value) => {
-			if (value != "") {
-				state.showAnswers = "";
-			}
-		};
-		const cloradio2 = (value) => {
-			if (value != "") {
-				state.showAnalysis = "";
-			}
-		};
-		const cloradio3 = (value) => {
-			if (value != "") {
-				state.scoringModel = "";
-			}
-		};
-		const cloradio4 = (value) => {
-			if (value != "") {
-				state.questionArrangement = "";
-			}
-		};
-		const changeOuter = (value) => {
-			state.isOuter = value;
-		};
-		const chooseTest = () => { };
-		const closeTag = (removedTag) => {
-			const tags = state.choosedTestList.filter(
-				(item) => item.key != removedTag
-			);
-			state.choosedTestList = tags;
-		};
-		const getData = (value) => {
-			state.paperId = value.paperId;
-			state.paperName = value.testName;
-			state.id = value.id;
-			state.testName = value.testName;
-		};
+      clearAll,
 
-		return {
-			afterVisibleChange,
-			closeDrawer,
-			closeDrawer2,
-			selectTest,
-			cloradio1,
-			cloradio2,
-			cloradio3,
-			cloradio4,
+      delTag,
+      // layout,
 
-			clearAll,
+      updateTest,
+      queryTest,
+      changeOuter,
+      chooseTest,
+      closeTag,
+      getData,
 
-			delTag,
-			// layout,
-
-			updateTest,
-			queryTest,
-			changeOuter,
-			chooseTest,
-			closeTag,
-			getData,
-
-			...toRefs(state),
-		};
-	},
+      ...toRefs(state),
+    };
+  },
 };
 </script>
 <style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
-	background-color: #fafafa !important;
+  background-color: #fafafa !important;
 }
 
 .outer {
-	background-color: #4ea6ff;
-	color: #fff;
-	border-radius: 5px;
-	border: 1px solid #a09292;
-	height: 36px;
-	margin-right: 10px;
+  background-color: #4ea6ff;
+  color: #fff;
+  border-radius: 5px;
+  border: 1px solid #a09292;
+  height: 36px;
+  margin-right: 10px;
 }
 
 .notOuter {
-	color: #000;
-	border-radius: 5px;
-	border: 1px solid #a09292;
-	background: #fff;
-	margin-right: 10px;
-	padding: 3px;
+  color: #000;
+  border-radius: 5px;
+  border: 1px solid #a09292;
+  background: #fff;
+  margin-right: 10px;
+  padding: 3px;
 }
 
 .tag-style {
-	color: rgb(113, 113, 237);
-	background-color: #d7d1f7;
+  color: rgb(113, 113, 237);
+  background-color: #d7d1f7;
 }
 
 .addtestDrawer {
-	.drawerMain {
-		.header {
-			height: 73px;
-			border-bottom: 1px solid #e8e8e8;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			flex-shrink: 0;
+  .drawerMain {
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      flex-shrink: 0;
 
-			.headerTitle {
-				font-size: 18px;
-				font-weight: 600;
-				color: #333333;
-				line-height: 25px;
-				margin-left: 24px;
-			}
-		}
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        margin-left: 24px;
+      }
+    }
 
-		.contentMain {
-			display: flex;
-			justify-content: space-between;
+    .contentMain {
+      display: flex;
+      justify-content: space-between;
 
-			.main_left {
-				padding-right: 30px;
-				flex: 1;
-				border-right: 1px solid #e8e8e8;
+      .main_left {
+        padding-right: 30px;
+        flex: 1;
+        border-right: 1px solid #e8e8e8;
 
-				.main_item {
-					display: flex;
-					align-items: center;
-					margin-top: 32px;
-					margin-bottom: 32px;
+        .main_item {
+          display: flex;
+          align-items: center;
+          margin-top: 32px;
+          margin-bottom: 32px;
 
-					.signbox {
-						width: 120px;
-						display: flex;
-						justify-content: end;
-						align-items: center;
+          .signbox {
+            width: 120px;
+            display: flex;
+            justify-content: end;
+            align-items: center;
 
-						.sign {
-							margin-right: 5px;
-						}
-					}
+            .sign {
+              margin-right: 5px;
+            }
+          }
 
-					.btnbox {
-						display: flex;
-						flex: 1;
-						align-items: center;
+          .btnbox {
+            display: flex;
+            flex: 1;
+            align-items: center;
 
-						.xkbtn {
-							cursor: pointer;
-							width: 130px;
-							height: 40px;
-							background: #4ea6ff;
-							border-radius: 8px;
-							border: 0;
-							margin-right: 8px;
-							color: #fff;
-						}
-					}
-				}
+            .xkbtn {
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              background: #4ea6ff;
+              border-radius: 8px;
+              border: 0;
+              margin-right: 8px;
+              color: #fff;
+            }
+          }
+        }
 
-				.main_item2 {
-					display: flex;
-					align-items: flex-start;
-					margin-bottom: 32px;
+        .main_item2 {
+          display: flex;
+          align-items: flex-start;
+          margin-bottom: 32px;
 
-					.textarea {
-						width: 400px;
+          .textarea {
+            width: 400px;
 
-						.ant-input {
-							width: 100%;
-						}
+            .ant-input {
+              width: 100%;
+            }
 
-						.ant-input-textarea-show-count {
-							position: relative;
-						}
+            .ant-input-textarea-show-count {
+              position: relative;
+            }
 
-						.ant-input-textarea-show-count::after {
-							position: absolute;
-							right: 10px;
-							bottom: 0px;
-						}
+            .ant-input-textarea-show-count::after {
+              position: absolute;
+              right: 10px;
+              bottom: 0px;
+            }
 
-						.ant-input {
-							border-radius: 8px;
-						}
-					}
+            .ant-input {
+              border-radius: 8px;
+            }
+          }
 
-					.signbox {
-						width: 120px;
-						display: flex;
-						justify-content: end;
-						align-items: center;
+          .signbox {
+            width: 120px;
+            display: flex;
+            justify-content: end;
+            align-items: center;
 
-						.sign {
-							margin-right: 5px;
-						}
-					}
+            .sign {
+              margin-right: 5px;
+            }
+          }
 
-					.kqszbox {
-						.qdqtbox {
-							margin-left: 56px;
-						}
+          .kqszbox {
+            .qdqtbox {
+              margin-left: 56px;
+            }
 
-						.setbox {
-							display: flex;
-							flex-wrap: wrap;
-							margin-top: 10px;
-							margin-bottom: 24px;
+            .setbox {
+              display: flex;
+              flex-wrap: wrap;
+              margin-top: 10px;
+              margin-bottom: 24px;
 
-							.timerbox {
-								margin-top: 6px;
-								margin-right: 32px;
-								display: flex;
-								align-items: center;
-								flex-wrap: nowrap;
-							}
-						}
-					}
+              .timerbox {
+                margin-top: 6px;
+                margin-right: 32px;
+                display: flex;
+                align-items: center;
+                flex-wrap: nowrap;
+              }
+            }
+          }
 
-					.btnbox2 {
-						display: flex;
-						flex-direction: column;
-						justify-content: flex-start;
+          .btnbox2 {
+            display: flex;
+            flex-direction: column;
+            justify-content: flex-start;
 
-						.xkbtn {
-							cursor: pointer;
-							width: 130px;
-							height: 40px;
-							background: #4ea6ff;
-							border-radius: 8px;
-							border: 0;
-							margin-right: 16px 8px 32px 0;
-							color: #fff;
-							margin-top: 16px;
-							margin-bottom: 60px;
-						}
-					}
-				}
-			}
-		}
+            .xkbtn {
+              cursor: pointer;
+              width: 130px;
+              height: 40px;
+              background: #4ea6ff;
+              border-radius: 8px;
+              border: 0;
+              margin-right: 16px 8px 32px 0;
+              color: #fff;
+              margin-top: 16px;
+              margin-bottom: 60px;
+            }
+          }
+        }
+      }
+    }
 
-		.main_table {
-			position: relative;
-			padding-bottom: 80px;
+    .main_table {
+      position: relative;
+      padding-bottom: 80px;
 
-			.ant-checkbox-wrapper {
-				align-items: center;
-				margin-top: -2px;
-			}
+      .ant-checkbox-wrapper {
+        align-items: center;
+        margin-top: -2px;
+      }
 
-			.ant-table-selection-column {
-				padding: 0px !important;
-				padding-left: 5px !important;
-			}
+      .ant-table-selection-column {
+        padding: 0px !important;
+        padding-left: 5px !important;
+      }
 
-			.ant-table-thead>tr>th {
-				background-color: rgba(239, 244, 252, 1);
-			}
+      .ant-table-thead > tr > th {
+        background-color: rgba(239, 244, 252, 1);
+      }
 
-			th.h {
-				background-color: #eff4fc !important;
-			}
+      th.h {
+        background-color: #eff4fc !important;
+      }
 
-			.ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td {
-				background: #f6f9fd;
-			}
+      .ant-table-tbody
+        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+        > td {
+        background: #f6f9fd;
+      }
 
-			.pa {
-				left: 0;
-				width: 100%;
-				display: flex;
-				justify-content: center;
-				position: absolute;
-				bottom: 20px;
-			}
-		}
+      .pa {
+        left: 0;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        position: absolute;
+        bottom: 20px;
+      }
+    }
 
-		.main_btns {
-			height: 72px;
-			width: 100%;
-			bottom: 0;
-			left: 0;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+    .main_btns {
+      height: 72px;
+      width: 100%;
+      bottom: 0;
+      left: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
 
-			.btn1 {
-				width: 100px;
-				height: 40px;
-				border: 1px solid #4ea6ff;
-				border-radius: 8px;
-				color: #4ea6ff;
-				background-color: #fff;
-				cursor: pointer;
-			}
+      .btn1 {
+        width: 100px;
+        height: 40px;
+        border: 1px solid #4ea6ff;
+        border-radius: 8px;
+        color: #4ea6ff;
+        background-color: #fff;
+        cursor: pointer;
+      }
 
-			.btn2 {
-				cursor: pointer;
-				width: 100px;
-				height: 40px;
-				background: #4ea6ff;
-				border-radius: 8px;
-				border: 0;
-				margin-left: 15px;
-				color: #fff;
-			}
-		}
-	}
+      .btn2 {
+        cursor: pointer;
+        width: 100px;
+        height: 40px;
+        background: #4ea6ff;
+        border-radius: 8px;
+        border: 0;
+        margin-left: 15px;
+        color: #fff;
+      }
+    }
+  }
 }
 </style>
   
\ No newline at end of file
diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue
index 9c0df01c..1054c356 100644
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -236,7 +236,7 @@ export default {
         .choiceEvaluation(objael)
         .then((res) => {
           state.tableDataTotal = 9;
-          console.log("测评列表", res.data.data);
+          // console.log("测评列表", res.data.data);
           getTableDataList(res.data.data);
         })
         .catch(() => {});

From a200f7b8f28615aff68e60edeefa24d9c5dddded Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 21 Dec 2022 15:30:09 +0800
Subject: [PATCH 07/11] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 6c1440d0..3bcce3ed 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -406,6 +406,7 @@ export default {
     state.test.showAnswers = 1;
     state.test.showAnalysis = 1;
     state.test.scoringModel = 2;
+    state.test.questionArrangement = 4;
     const clearAll = () => {
       state.test = {};
     };

From 7c0aa7e7476c8a108770a311ff7649c45955650a Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Wed, 21 Dec 2022 15:36:09 +0800
Subject: [PATCH 08/11] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=88=A0=E9=99=A4/=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F/=E5=88=9D=E5=A7=8B=E5=8C=96=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskAdd.vue | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 9dd953d3..ded2236c 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1026,7 +1026,7 @@
             <div class="close_exit" @click="closeDeleteStage"></div>
           </div>
           <div class="body">
-            <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前阶段为第一阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span>
+            <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span>
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeDeleteStage">
@@ -1094,8 +1094,9 @@ export default {
     const route = useRoute();
     const state = reactive({
       projectId: route.query.projectId,
-      chooseStageId: null,
+      chooseStageId: null, 
       removeStageId: null,
+      onceChoice: true,
       edit: false,
       isLevel: 2, //学习路径1项目2模板库3
       // isRefEdit: 1, //外链编辑
@@ -1253,7 +1254,8 @@ export default {
           array.push(obj);
         }
       });
-      state.level = array;
+      console.log(array)
+      state.level = array.sort((a,b)=>{ return a.id - b.id });
     };
 
     const tableDataFunc = () => {
@@ -1391,12 +1393,26 @@ export default {
       };
       await api.getTask(obj).then((res) => {
         console.log("22222", res.data.data.stageList);
+
+        if(state.onceChoice){
+          let data = res.data.data.stageList;
+          state.onceChoice = false;
+          let arraynew = []
+          for(let i=0;i<data.length;i++){
+            if(data[i].stageId!=='0'){
+              arraynew.push(data[i])
+            }
+          }
+          console.log(arraynew)
+          state.chooseStageId = Number(arraynew[arraynew.length-1].stageId);
+        }
+
         state.projectTitle = res.data.data.projectInfo.name;
         state.picUrl = res.data.data.projectInfo.picUrl;
         state.stageList = res.data.data.stageList;
         getStageData(res.data.data.stageList);
         updateStageChoosd();
- 
+        
       });
     };
 

From a068f4d53045fa41da66504b22cbc69e048aa643 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Wed, 21 Dec 2022 15:38:00 +0800
Subject: [PATCH 09/11] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=88=A0=E9=99=A4/=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F/=E5=88=9D=E5=A7=8B=E5=8C=96=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskAdd.vue | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 8ac0ed9b..6caa1c9a 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1028,23 +1028,7 @@
             <div class="close_exit" @click="closeDeleteStage"></div>
           </div>
           <div class="body">
-<<<<<<< HEAD
             <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{level.length==1?"当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?":"您确定要删除此阶段"}}</span>
-=======
-            <span
-              style="
-                width: 320px;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-              "
-              >{{
-                level.length == 1
-                  ? "当前阶段为第一阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?"
-                  : "您确定要删除此阶段"
-              }}</span
-            >
->>>>>>> a200f7b8f28615aff68e60edeefa24d9c5dddded
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closeDeleteStage">

From 76160bfd30ef97328421002a1fcd07a09ee3b4c7 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 21 Dec 2022 16:31:28 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix:=E9=9A=90=E8=97=8F=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE=E6=96=B0=E5=BB=BA=E7=9A=84=E5=9C=A8=E7=BA=BF=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 631f72f6..fcd2d774 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -143,7 +143,6 @@
                   placeholder="请输入课程名称"
                   v-model:value="xzinputV1"
                   v-model:validate="validate"
-               
                   :maxlength="20"
                   show-count
                   :type="2"
@@ -226,7 +225,7 @@
               </div>
               <a-radio-group v-model:value="valueE1">
                 <div class="bc_box">
-                  <div class="bc_boxl">
+                  <!-- <div class="bc_boxl">
                     <div class="ol_checkbox" @click="expectOnline">
                       <a-radio
                         v-model:checked="checked"
@@ -237,7 +236,7 @@
                         线上
                       </a-radio>
                     </div>
-                  </div>
+                  </div> -->
                   <div class="bc_boxr">
                     <div class="ol_checkbox">
                       <a-radio
@@ -364,7 +363,6 @@
                         placeholder="请输入课程名称"
                         v-model:value="qdms_inputV1"
                         v-model:validate="validate"
-                     
                         :maxlength="20"
                         show-count
                         :type="2"
@@ -2278,7 +2276,11 @@
                 <span>{{ currentPlanItem.teacher }}</span>
               </div>
               <div class="stmm_i5">
-                <TableStudent :type="3" :id="offcoursePlanId" :columns="stuColumns">
+                <TableStudent
+                  :type="3"
+                  :id="offcoursePlanId"
+                  :columns="stuColumns"
+                >
                   <!--                  <template #extension = "data">-->
                   <!--                    <div style="display: flex">-->
                   <!--                      <button @click="handlJoinStu(data)">成绩录入</button>-->
@@ -3732,7 +3734,7 @@ export default defineComponent({
       codevisible: false, //二维码弹窗
       codeInfo: null, //二维码内容
       codeUrl: codeUrl,
-     
+
       // 课程三级分类
       options2222: [
         {
@@ -4658,7 +4660,6 @@ export default defineComponent({
       }
 
       console.log("state.validate", state.validate);
-    
 
       if (!state.validate) {
         message.destroy();

From cb0ffbf3634c098b11df2d5d4ad6fb851c6d2e76 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 21 Dec 2022 16:55:27 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E5=AD=A6=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AssessmentAll.vue  |  8 ++++----
 src/components/drawers/AssessmentList.vue |  4 ++--
 src/components/student/TableStudent.vue   | 14 +++++++++++---
 src/views/projectcenter/LibraryAdd.vue    |  4 +++-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue
index 74fab40c..5549b39c 100644
--- a/src/components/drawers/AssessmentAll.vue
+++ b/src/components/drawers/AssessmentAll.vue
@@ -185,8 +185,8 @@ export default {
               assessmentId: info.assessmentId,
               name: info.assessmentName,
               num: num,
-              creator: info.createUser ? info.createUser : "-",
-              time: dayjs(info.createTime).format("YYYY-MM-DD"),
+              creator: info.createUserName ? info.createUserName : "-",
+              time: dayjs(info.createTime).format("YYYY-MM-DD HH:mm"),
             };
             //更新讨论信息
             state.assessment = obj;
@@ -277,8 +277,8 @@ export default {
           assessmentId: value.assessmentId,
           num: num,
           name: value.assessmentName ? value.assessmentName : "-",
-          creator: value.createUser ? value.createUser : "-",
-          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+          creator: value.createUserName ? value.createUserName : "-",
+          time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
         };
         array.push(obj);
       });
diff --git a/src/components/drawers/AssessmentList.vue b/src/components/drawers/AssessmentList.vue
index 5ee947cf..0566d5a6 100644
--- a/src/components/drawers/AssessmentList.vue
+++ b/src/components/drawers/AssessmentList.vue
@@ -202,8 +202,8 @@ export default {
           assessmentId: value.assessmentId,
           num: num,
           name: value.assessmentName ? value.assessmentName : "-",
-          creator: value.createUser ? value.createUser : "-",
-          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+          creator: value.createUserName ? value.createUserName : "-",
+          time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
         };
         array.push(obj);
       });
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 3bbe3583..96b19294 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -6,7 +6,7 @@
       style="padding-left: 20px; margin-right: 0px"
     >
       <a-col>
-        <a-form-item title="姓名：" @click="getStuList">
+        <a-form-item title="姓名：" >
           <a-input
             class="cus-input"
             v-model:value="tableParam.studentName"
@@ -15,7 +15,7 @@
         </a-form-item>
       </a-col>
       <a-col>
-        <a-button class="cus-btn" style="width: 100px">
+        <a-button class="cus-btn" style="width: 100px"  @click="getStuList">
           <template #icon>
             <img
               style="margin-right: 10px"
@@ -117,6 +117,7 @@ import { computed, defineProps, onMounted, ref, watch } from "vue";
 import { delStudentList, getStuPage } from "@/api/index1";
 import CommonStudent from "@/components/student/CommonStudent";
 import ChangeLevelModal from "./ChangeLevelModal.vue";
+import { message } from "ant-design-vue";
 const props = defineProps({
   type: Number,
   id: String,
@@ -232,9 +233,16 @@ function getStuList() {
   });
 }
 
-function reset() {}
+function reset() {
+  tableParam.value.studentName="";
+}
 
 function bathDel() {
+  if( stuSelectKeys.value &&
+    stuSelectKeys.value.length == 0){
+      message.destroy();
+    return message.warning("请先选中学员");
+  }
   stuSelectKeys.value &&
     stuSelectKeys.value.length &&
     delStudentList({
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index f3da9068..5c99aa3c 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -332,7 +332,7 @@
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
-
+<!--
         <a-tab-pane key="3" tab="项目积分">
           <div class="split"></div>
           <div class="projectscore">
@@ -478,6 +478,8 @@
             </div>
           </div>
         </a-tab-pane>
+-->
+
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
           <a-tabs>