From 351626701c8f894b113f0ddd3751ffaf9c95d815 Mon Sep 17 00:00:00 2001
From: caozc <zcz963852@qq.com>
Date: Wed, 1 Mar 2023 00:23:29 +0800
Subject: [PATCH 01/54] =?UTF-8?q?fix:=E6=8A=95=E7=A5=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8A=95=E7=A5=A8=E6=97=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=20=20=20=20=20=E9=A1=B9=E7=9B=AE=E5=A4=8D=E5=88=B6=20=E4=B8=80?=
 =?UTF-8?q?=E7=9B=B4=E8=BD=AC=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/CheckVote.vue      | 19 ++++++++-----------
 src/views/projectcenter/ProjectManage.vue |  7 +++++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/drawers/CheckVote.vue b/src/components/drawers/CheckVote.vue
index f68db461..cfbde7df 100644
--- a/src/components/drawers/CheckVote.vue
+++ b/src/components/drawers/CheckVote.vue
@@ -19,7 +19,7 @@
             <div class="main">
                 <div class="basetext"><span>投票题目</span></div>
                 <div v-if="voteResource" class="basequestion">
-                    <div class="ques" v-for=" item,index  in voteResource.ballotVo.voteStemVoList" :key="index">
+                    <div class="ques" v-for=" item,index  in voteResource.voteStemDtoList" :key="index">
                         <div class="quename">{{ index+1 +"."+ item.voteStemName }}</div>
                         <div class="queanswer">
                             <a-radio-group v-model:value="currentChoice[index]">
@@ -50,7 +50,8 @@
 import { toRefs,reactive } from '@vue/reactivity';
 import {computed} from "vue";
 import { useStore } from "vuex";
-import * as api from "../../api/indexTaskManage";
+// import * as api from "../../api/indexTaskManage";
+import {queryStemByStemId} from '@/api/indexVote';
 
 export default {
     name:"CheckWork",
@@ -126,19 +127,15 @@ export default {
         function getData() {
             console.log('我是请求的参数', {
                 "courseId": props.courseID,
-                "studentId": userInfo.value.id,
-                "voteSubmitId": props.voteID
+                "userInfo": userInfo.value,
+                "voteId": props.voteID
             })
-            api.QueryVoteTaskDetailById({
-                "courseId": props.courseID,
-                "studentId": userInfo.value.id,
-                "voteSubmitId": props.voteID
-            }).then(res=>{
+            queryStemByStemId(props.courseID).then(res=>{
                 console.log(res)
                 state.voteResource = res.data.data
-
                 let choiceArr = []
-                let dataQuestion = state.voteResource.ballotVo.voteStemVoList
+                //2023-02-28
+                let dataQuestion = state.voteResource.voteStemDtoList
                 for(let i=0;i<dataQuestion.length;i++){
                     for(let j=0;j<dataQuestion[i].optionDetailList.length;j++){
                         if(dataQuestion[i].optionDetailList[j].isAnswer){
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 8cc62e43..b845e8c2 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1346,8 +1346,11 @@ export default {
           projectId: state.copyProjectId,
           type: 2
         })
-        .then(() => getTableDate());
-      message.success("复制成功");
+        .then(() => {
+          state.tableLoading = false;
+          message.success("复制成功");
+          getTableDate()
+        });
     };
     //打开提交审核弹窗
     const showReviewModal = (projectId) => {

From 5f1157c028fe484b7f4725a77650e2afd4d9ab2f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 2 Mar 2023 11:48:11 +0800
Subject: [PATCH 02/54] -- fix bug

---
 src/components/NavLeft.vue                |  21 +++
 src/views/learningpath/LevelAddDetail.vue | 169 +++++++++++-----------
 2 files changed, 107 insertions(+), 83 deletions(-)

diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index 277ef48a..de2108a1 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -240,6 +240,27 @@
           </a-menu-item>
         </a-sub-menu>
 
+        <a-sub-menu key="sub7">
+          <template #icon>
+            <div class="imgBox">
+              <img
+                style="width: 22px; height: 22px"
+                src="../assets/images/navleft/review.png"
+              />
+            </div>
+          </template>
+          <template #title>受众管理</template>
+          <a-menu-item key="sub7-1">
+            <span
+              :class="{
+                circleActive: selectedKeys[0] === 'sub6-7',
+                circle: selectedKeys[0]!=='sub6-7',
+              }"
+            ></span>
+            <router-link to="/AudienceManage">受众管理</router-link>
+          </a-menu-item>
+        </a-sub-menu>
+
         <a-menu-item key="sub5" v-if="checkMenu('systemManage')">
           <div class="imgBox">
             <img style="width: 16px; height: 16px" src="../assets/images/navleft/system.png"/>
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 56d32975..db151e35 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -82,8 +82,8 @@
             </div>
             <div class="name">
               <div
-                  class="d"
-                  style="width: 10px;
+                class="d"
+                style="width: 10px;
                   height: 10px;
                   margin-top: 2px;
                   margin-right: 2px;"></div>
@@ -118,9 +118,9 @@
               <div class="select" style="margin-right:90px;">
                 <span>学习模式：</span>
                 <span
-                    style="border: 1px solid rgba(0, 0, 0, 0.25);width: 120px;height: 38px; border-radius: 10px;text-align: center;line-height: 38px;">
+                  style="border: 1px solid rgba(0, 0, 0, 0.25);width: 120px;height: 38px; border-radius: 10px;text-align: center;line-height: 38px;">
                   {{
-                    routerInfo.routerInfo.unlockMode == 1 ? '自由学习模式' : routerInfo.routerInfo.unlockMode == 2 || routerInfo.routerInfo.unlockMode == 3 ? '闯关模式' : ''
+                    routerInfo.routerInfo.unlockMode == 1 ? "自由学习模式" : routerInfo.routerInfo.unlockMode == 2 || routerInfo.routerInfo.unlockMode == 3 ? "闯关模式" : ""
                   }}
                 </span>
                 <unlock-mode :routerInfo="routerInfo.routerInfo" :types="types">
@@ -216,8 +216,8 @@
                          animation="500">
                 <template #item="{ element,index }">
                   <div
-                      v-if="!element.deleted"
-                      style="
+                    v-if="!element.deleted"
+                    style="
                       height: 50px;
                       display: flex;
                       justify-content: space-between;
@@ -241,7 +241,7 @@
                             left: -25px;"></div>
                         <a-checkbox :id="element.id" v-model:checked="element.checked"></a-checkbox>
                         <div style="margin-top: 2px; margin-left: 8px">
-                          {{ TASK_TYPE[element.type]?.name || '' }}
+                          {{ TASK_TYPE[element.type]?.name || "" }}
                         </div>
                       </div>
                     </div>
@@ -280,10 +280,10 @@
                       <div class="opa">
                         <div class="opacation">
                           <span
-                              style="color: #4ea6ff;
+                            style="color: #4ea6ff;
                               margin-right: 25px;
                               cursor: pointer;"
-                              @click="editTaskForType(element,index)">
+                            @click="editTaskForType(element,index)">
                             编辑
                           </span>
                           <span style="color: #4ea6ff; cursor: pointer" @click="deleteTask(element,index)">
@@ -374,48 +374,47 @@ import {ROUTER_DETAIL_MODIFY} from "@/api/apis";
 import {request} from "@/api/request";
 import dialog from "@/utils/dialog";
 
-const {query: {routerId}} = useRoute();
-const modal = ref(false)
-const ischapterEdit = ref(false)
-const visiblene = ref(false)
-const cancleLoading = ref(false)
-const confirmLoading = ref(false)
-const moveChapterIndex = ref('')
-const activeIndex = ref(0)
-const types = 1 // 1 路径图 2 项目
-
-const courseRef = ref({})
-const formValue = ref({draftTaskList: []})
-const routerInfo = ref({chapterList: [{name: '关卡一', draftTaskList: []}], routerInfo: {}})
+const { query: { routerId } } = useRoute();
+const modal = ref(false);
+const ischapterEdit = ref(false);
+const visiblene = ref(false);
+const cancleLoading = ref(false);
+const confirmLoading = ref(false);
+const moveChapterIndex = ref("");
+const activeIndex = ref(0);
+const types = 1; // 1 路径图 2 项目
 
+const courseRef = ref({});
+const formValue = ref({ draftTaskList: [] });
+const routerInfo = ref({ chapterList: [{ name: "关卡一", draftTaskList: [] }], routerInfo: {} });
 
 const selectAll = computed(() => {
-  const selectedNum = routerInfo.value.chapterList[activeIndex.value].draftTaskList.filter(t => t.checked).length
+  const selectedNum = routerInfo.value.chapterList[activeIndex.value].draftTaskList.filter(t => t.checked).length;
   if (!selectedNum) {
-    return 0
+    return 0;
   }
   if (selectedNum === routerInfo.value.chapterList[activeIndex.value].draftTaskList.length) {
-    return 1
+    return 1;
   }
-  return 2
-})
+  return 2;
+});
 
 watch(() => routerInfo.value.chapterList, () => {
   routerInfo.value.chapterList.forEach((t, i) => {
     t.sort = i;
     t.draftTaskList?.forEach((s, j) => {
-      s.sort = j
-    })
-  })
-}, {deep: true})
+      s.sort = j;
+    });
+  });
+}, { deep: true });
 
-const showModal = (e,type) => {
+const showModal = (e, type) => {
   ischapterEdit.value = (type === "edit");
-  console.log(ischapterEdit.value)
-  if(type == 'edit'){
+  console.log(ischapterEdit.value);
+  if (type == "edit") {
     console.log("关卡信息：" + e.name);
     formValue.value = e;//回传修改的信息
-  }else{
+  } else {
     //关卡信息初始化
     formValue.value = {};
   }
@@ -430,26 +429,30 @@ const editChapter = () => {
   if (!formValue.value.name) {
     return message.warning("请输入关卡名称");
   }
-  if(ischapterEdit.value){
-    routerInfo.value.chapterList = [{...formValue.value, draftTaskList: []}];
+  if (ischapterEdit.value) {
+    routerInfo.value.chapterList = [{ ...formValue.value, draftTaskList: [] }];
+  } else {
+    routerInfo.value.chapterList.push({ ...formValue.value, draftTaskList: [] });
   }
-  else{
-    routerInfo.value.chapterList.push({...formValue.value, draftTaskList: []})
-  }
-  formValue.value = {draftTaskList: []}
-  closeModal()
+  formValue.value = { draftTaskList: [] };
+  closeModal();
 };
 
 //删除关卡
 const deleteChapter = () => {
   dialog({
-    content: '确定要删除关卡吗?',
+    content: "确定要删除关卡吗?",
     ok: () => {
       if (routerInfo.value.chapterList.length === 1) {
         message.warning("至少保留一个关卡");
-        return
+        return;
+      }
+      if (routerInfo.value.chapterList[activeIndex.value].id) {
+        routerInfo.value.chapterList[activeIndex.value].deleted = true;
+        routerInfo.value.chapterList[activeIndex.value].draftTaskList?.forEach((t, i) => t.id ? (t.deleted = true) : routerInfo.value.chapterList[activeIndex.value].draftTaskList.splice(i, 1));
+      } else {
+        routerInfo.value.chapterList.splice(activeIndex.value, 1);
       }
-      routerInfo.value.chapterList[activeIndex.value].id ? (routerInfo.value.chapterList[activeIndex.value].deleted = true) : routerInfo.value.chapterList.splice(activeIndex.value, 1);
       activeIndex.value && (activeIndex.value = activeIndex.value - 1);
       message.info("删除关卡成功");
     },
@@ -458,8 +461,8 @@ const deleteChapter = () => {
 
 const getDetail = async () => {
   await GetRouterDraftDetail(routerId).then((res) => {
-    routerInfo.value = res.data.data
-  })
+    routerInfo.value = res.data.data;
+  });
 };
 
 onMounted(() => {
@@ -467,19 +470,19 @@ onMounted(() => {
 });
 
 const changebgc = (index) => {
-  activeIndex.value = index
+  activeIndex.value = index;
 };
 
 const subdeleteAll = () => {
   if (!routerInfo.value?.chapterList[activeIndex.value]?.draftTaskList?.filter(t => t.checked)?.length) {
     message.warning("请选择要删除的任务！");
-    return
+    return;
   }
   dialog({
-    content: '确定要删除所选任务吗?',
+    content: "确定要删除所选任务吗?",
     ok: () => {
       for (let i = 0; i < routerInfo.value.chapterList[activeIndex.value].draftTaskList.length; i++) {
-        const t = routerInfo.value.chapterList[activeIndex.value].draftTaskList[i]
+        const t = routerInfo.value.chapterList[activeIndex.value].draftTaskList[i];
         if (t.checked) {
           if (t.id) {
             t.checked = false;
@@ -497,10 +500,10 @@ const subdeleteAll = () => {
 //全选任务或全不选任务
 const selectRowAll = () => {
   if (selectAll.value === 1) {
-    routerInfo.value.chapterList[activeIndex.value].draftTaskList.forEach(t => t.checked = false)
-    return
+    routerInfo.value.chapterList[activeIndex.value].draftTaskList.forEach(t => t.checked = false);
+    return;
   }
-  routerInfo.value.chapterList[activeIndex.value].draftTaskList.forEach(t => t.checked = true)
+  routerInfo.value.chapterList[activeIndex.value].draftTaskList.forEach(t => t.checked = true);
 };
 //移动任务到关卡
 const moveTask = () => {
@@ -513,15 +516,15 @@ const moveTask = () => {
 };
 //编辑的按钮
 const editTaskForType = (ele, index) => {
-  courseRef.value['el' + ele.type].openDrawer(index, ele)
+  courseRef.value["el" + ele.type].openDrawer(index, ele);
 };
 
 function deleteTask(element, index) {
   dialog({
-    content: '确定要删除此任务吗?',
+    content: "确定要删除此任务吗?",
     ok: () => {
       message.success("删除成功");
-      routerInfo.value.chapterList[activeIndex.value].draftTaskList[index].id ? (element.deleted = true) : routerInfo.value.chapterList[activeIndex.value].draftTaskList.splice(index, 1)
+      routerInfo.value.chapterList[activeIndex.value].draftTaskList[index].id ? (element.deleted = true) : routerInfo.value.chapterList[activeIndex.value].draftTaskList.splice(index, 1);
     },
   });
 }
@@ -529,51 +532,51 @@ function deleteTask(element, index) {
 const showChangeModal = () => {
   if (routerInfo.value?.chapterList?.length <= 1) {
     message.warning("请添加关卡！");
-    return
+    return;
   }
   if (!routerInfo.value?.chapterList[activeIndex.value]?.draftTaskList?.filter(t => t.checked)?.length) {
     message.warning("请选择要移动的任务！");
-    return
+    return;
   }
-  visiblene.value = true
+  visiblene.value = true;
 };
 const closeChangeModal = () => {
-  visiblene.value = false
+  visiblene.value = false;
 };
 
 //暂存
 const temporaryStorage = async () => {
-  confirmLoading.value = true
-  await request(ROUTER_DETAIL_MODIFY, routerInfo.value)
-  await getDetail()
+  confirmLoading.value = true;
+  await request(ROUTER_DETAIL_MODIFY, routerInfo.value);
+  await getDetail();
   message.success("暂存成功");
-  confirmLoading.value = false
+  confirmLoading.value = false;
 };
 
 const submitStorage = async () => {
   if (routerInfo.value.routerInfo.status === 1) {
     dialog({
-      content: '该路径图已经发布，修改后如未点击暂存当前操作未保存数据将丢失，确认保存?',
+      content: "该路径图已经发布，修改后如未点击暂存当前操作未保存数据将丢失，确认保存?",
       ok: async () => {
-        confirmLoading.value = true
-        await releaseRouter(routerId)
+        confirmLoading.value = true;
+        await releaseRouter(routerId);
         message.success("关卡和任务数据已保存");
-        confirmLoading.value = false
+        confirmLoading.value = false;
       },
-    })
-    return
+    });
+    return;
   }
-  confirmLoading.value = true
-  await request(ROUTER_DETAIL_MODIFY, routerInfo.value)
-  message.success("关卡和任务数据已保存")
-  confirmLoading.value = false
+  confirmLoading.value = true;
+  await request(ROUTER_DETAIL_MODIFY, routerInfo.value);
+  message.success("关卡和任务数据已保存");
+  confirmLoading.value = false;
 };
 //取消
 const cancelStorage = async () => {
-  cancleLoading.value = true
-  await getDetail()
+  cancleLoading.value = true;
+  await getDetail();
   message.success("取消成功");
-  cancleLoading.value = false
+  cancleLoading.value = false;
 };
 
 </script>
@@ -605,7 +608,7 @@ const cancelStorage = async () => {
             width: calc(100%);
             height: 40px;
             background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%);
+              rgba(78, 166, 255, 0) 100%);
           }
 
           .del_main {
@@ -722,7 +725,7 @@ const cancelStorage = async () => {
             position: relative;
             justify-content: center;
             background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%);
+              rgba(78, 166, 255, 0) 100%);
 
             .inhe {
               width: 80%;
@@ -835,8 +838,8 @@ const cancelStorage = async () => {
           width: 624px;
           height: 68px;
           background: linear-gradient(180deg,
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%);
+            rgba(78, 166, 255, 0.2) 0%,
+            rgba(78, 166, 255, 0) 100%);
           display: flex;
           justify-content: center;
 
@@ -2076,7 +2079,7 @@ const cancelStorage = async () => {
             width: calc(100%);
             height: 40px;
             background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
-                rgba(78, 166, 255, 0) 100%);
+              rgba(78, 166, 255, 0) 100%);
           }
 
           .del_main {

From 369fa8e26395682a88a99ab3e2a699457fba1d62 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 2 Mar 2023 11:54:50 +0800
Subject: [PATCH 03/54] -- fix bug

---
 src/components/NavLeft.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index de2108a1..a71d031b 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -220,15 +220,6 @@
             ></span>
             <router-link to="/ReadingClubManage">业务支援读书会管理</router-link>
           </a-menu-item>
-          <a-menu-item key="sub6-3">
-            <span
-                :class="{
-                circleActive: selectedKeys[0] === 'sub6-3',
-                circle: selectedKeys[0]!=='sub6-3',
-              }"
-            ></span>
-            <router-link to="/AudienceManage">受众管理</router-link>
-          </a-menu-item>
           <a-menu-item key="sub6-4">
             <span
                 :class="{

From 5888be784df9a66dadb7d1d17b108eac5e34eda5 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 2 Mar 2023 12:03:12 +0800
Subject: [PATCH 04/54] -- fix bug

---
 src/views/projectcenter/TaskAdd.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index c6af2cac..a5c779b1 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -541,7 +541,12 @@ const deleteStage = () => {
     content: projectInfo.value.stageList.length === 1 ? "当前为最后一个阶段，删除后任务将被移出，为无阶段模式，确认删除阶段吗?" : '确认删除此阶段吗?',
     ok: () => {
       message.success("删除成功");
-      projectInfo.value.stageList[activeIndex.value].id ? (projectInfo.value.stageList[activeIndex.value].deleted = true) : projectInfo.value.stageList.splice(activeIndex.value, 1)
+      if (projectInfo.value.stageList[activeIndex.value].id) {
+        projectInfo.value.stageList[activeIndex.value].deleted = true
+        projectInfo.value.stageList[activeIndex.value].taskDraftDtoList?.forEach((t, i) => t.id ? (t.deleted = true) : projectInfo.value.stageList[activeIndex.value].taskDraftDtoList.splice(i, 1));
+      } else {
+        projectInfo.value.stageList.splice(activeIndex.value, 1)
+      }
       activeIndex.value && (activeIndex.value = activeIndex.value - 1);
     },
   });

From 5691a5f4c5eeee1e69f673ecf21a72204b27226a Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 2 Mar 2023 15:57:32 +0800
Subject: [PATCH 05/54] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E8=AF=BE=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 26 +++++++++++++-------
 src/views/learningpath/LevelAdd.vue          |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index eb7d995e..d4366401 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -287,7 +287,11 @@
               <div class="btn btn5" @click="of_exit1">
                 <div class="btnText">取消</div>
               </div>
-              <a-button class="btn btn6" @click="createft" :loading="validated===1">
+              <a-button
+                class="btn btn6"
+                @click="createft"
+                :loading="validated === 1"
+              >
                 确定
               </a-button>
             </div>
@@ -846,10 +850,10 @@
                             >
                               删除
                             </a-menu-item>
-                            <!--新加 二维码
-                            <a-menu-item @click="qrcodeVisible(record, 1)">
+                            <!-- 新加 二维码 -->
+                            <!-- <a-menu-item @click="qrcodeVisible(record, 1)">
                               二维码
-                            </a-menu-item>-->
+                            </a-menu-item> -->
                           </a-menu>
                         </template>
                         <div class="fb" style="margin-left: -20px">
@@ -1169,7 +1173,11 @@
             <div class="cstm_btn btn5" @click="handleCancelStu">
               <div class="btnText">取消</div>
             </div>
-            <a-button class="cstm_btn btn6" @click="handleSureStu" :loading="validated===1">
+            <a-button
+              class="cstm_btn btn6"
+              @click="handleSureStu"
+              :loading="validated === 1"
+            >
               确定
             </a-button>
           </div>
@@ -4867,21 +4875,21 @@ export default defineComponent({
 
     //二维码
     const qrcodeVisible = (record, type) => {
+      // `${location.protocol}//${location.host}${import.meta.env.VUE_APP_BASE_API}/stu/project/redirectDetail?courseId=${record.id}`
       state.codevisible = true;
       state.codeInfo = {
         title: type == 1 ? "【课程】二维码" : "【签到】二维码",
         name: record.name ? record.name : "",
         url:
           type == 1
-            ? window.location.protocol +
-              process.env.VUE_APP_COURSE_STUDY +
-              record.offcourseId
+            ? process.env.VUE_APP_BASE_API +
+              `/stu/project/redirectDetail?courseId=${record.id}`
             : process.env.VUE_APP_BASE_API +
               `/admin/student/studentSign?taskId=${
                 record.id
               }&taskType=${2}&type=${3}`,
       };
-      console.log("codeInfo", state.codeInfo);
+      console.log("codeInfo", state.codeInfo, record);
       state.codeIndex = 0;
       state.codeType = type;
     };
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index d7dc1af8..f29c0a3d 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -2598,7 +2598,7 @@ export default {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_ONLINE_CLASS_URL +
-          item.targetId;
+          item.courseId;
       }
       if (item.type == 2) {
         let date1 = new Date(item.endTime).getTime();

From 2ebd49fa2f9c577413295436cd49dd8c4afca405 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 2 Mar 2023 16:31:30 +0800
Subject: [PATCH 06/54] -- fix bug

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

diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index add28f11..6cd6935f 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -175,7 +175,7 @@ async function confirm() {
   } else {
     const data = props.taskList[taskIndex.value]
     data.name = formData.value.evaluationName
-    data.info = formData.value
+    data.info = {...formData.value}
     data.duration = dayjs(formData.value.evaluationEndTime).diff(formData.value.evaluationStartTime,'minutes')
   }
   emit('update:taskList', [...props.taskList])

From 6dd6208747e6e7ce2dbf86265b8ccdfcaaaedcdc Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 2 Mar 2023 16:34:06 +0800
Subject: [PATCH 07/54] -- fix bug

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

diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index db32a1eb..41f726fc 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -210,7 +210,7 @@ async function confirm() {
   } else {
     const data = props.taskList[taskIndex.value];
     data.name = formData.value.evaluationName;
-    data.info = formData.value;
+    data.info = {...formData.value};
     data.duration = dayjs(formData.value.evaluationEndTime).diff(
       formData.value.evaluationStartTime,
       "minutes"
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 201ee932..bc689a0f 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -138,7 +138,7 @@ function confirm() {
   } else {
     const data = props.taskList[taskIndex.value]
     data.name = formData.value.workName
-    data.info = formData.value
+    data.info = {...formData.value}
     data.duration = dayjs(formData.value.submitEndTime).diff(formData.value.submitStartTime,'minutes')
   }
   emit('update:taskList', [...props.taskList])

From da565f0933186c0bd525d81f7baeac3038b1ddd9 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 2 Mar 2023 16:45:29 +0800
Subject: [PATCH 08/54] -- fix bug

---
 src/views/projectcenter/TaskAdd.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index a5c779b1..b64bdb60 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -35,7 +35,7 @@
                           <span style="font-size: 12px; color: #ffffff">说明</span>
                         </div>
                       </a-popover>
-                      <div class="imgIcon" @click="showModal(index)"></div>
+                      <div class="imgIcon" @click="editModal(index)"></div>
                     </div>
                     <div class="boxs_right">
                       <div class="imgIcon" @click="deleteStage(index)"></div>
@@ -513,6 +513,11 @@ const closeModal = () => {
 };
 //显示添加阶段弹窗
 const showModal = () => {
+  formValue.value = {}
+  stage.value = true
+};
+const editModal = () => {
+  formValue.value = projectInfo.value.stageList[activeIndex.value]
   stage.value = true
 };
 
@@ -522,6 +527,10 @@ function editStage() {
     message.warning("请输入阶段名称！");
     return
   }
+  if(formValue.value.id){
+    stage.value = false
+    return
+  }
   //替换 默认阶段
   if (projectInfo.value.stageList.length === 1 && projectInfo.value.stageList[0].id === '0') {
     formValue.value.taskDraftDtoList = [...projectInfo.value.stageList[0].taskDraftDtoList]

From 615d1517c4ee10397c9478b042e305abae22bf50 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 2 Mar 2023 16:51:16 +0800
Subject: [PATCH 09/54] -- fix bug

---
 src/views/learningpath/LevelAddDetail.vue | 30 ++++++++++-------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index db151e35..6fd40d65 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({},'add')" style="margin-left: 19px">
+          <div class="btn btn3" @click="showModal()" style="margin-left: 19px">
             <div class="search"></div>
             <div class="btnText">添加关卡</div>
           </div>
@@ -33,7 +33,7 @@
                           </div>
                         </div>
                       </a-popover>
-                      <div class="imgIcon" @click="showModal(element,'edit')"></div>
+                      <div class="imgIcon" @click="showEditModal(element)"></div>
                     </div>
                     <div class="boxs_right">
                       <div class="imgIcon" @click="deleteChapter"></div>
@@ -376,7 +376,6 @@ import dialog from "@/utils/dialog";
 
 const { query: { routerId } } = useRoute();
 const modal = ref(false);
-const ischapterEdit = ref(false);
 const visiblene = ref(false);
 const cancleLoading = ref(false);
 const confirmLoading = ref(false);
@@ -408,18 +407,14 @@ watch(() => routerInfo.value.chapterList, () => {
   });
 }, { deep: true });
 
-const showModal = (e, type) => {
-  ischapterEdit.value = (type === "edit");
-  console.log(ischapterEdit.value);
-  if (type == "edit") {
-    console.log("关卡信息：" + e.name);
-    formValue.value = e;//回传修改的信息
-  } else {
-    //关卡信息初始化
-    formValue.value = {};
-  }
+const showModal = () => {
+  formValue.value = {};
   modal.value = true;
 };
+function showEditModal(ele){
+  formValue.value =ele;
+  modal.value = false;
+}
 const closeModal = () => {
   modal.value = false;
 };
@@ -429,11 +424,12 @@ const editChapter = () => {
   if (!formValue.value.name) {
     return message.warning("请输入关卡名称");
   }
-  if (ischapterEdit.value) {
-    routerInfo.value.chapterList = [{ ...formValue.value, draftTaskList: [] }];
-  } else {
-    routerInfo.value.chapterList.push({ ...formValue.value, draftTaskList: [] });
+  if(formValue.value.id){
+    closeModal();
+    return
   }
+  routerInfo.value.chapterList.push({ ...formValue.value, draftTaskList: [] });
+  activeIndex.value = activeIndex.value + 1
   formValue.value = { draftTaskList: [] };
   closeModal();
 };

From 8f33a96e67e95fb2f234fd687b70f72ea590594e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 2 Mar 2023 16:53:27 +0800
Subject: [PATCH 10/54] -- fix bug

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

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 6fd40d65..0a33b76b 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -413,7 +413,7 @@ const showModal = () => {
 };
 function showEditModal(ele){
   formValue.value =ele;
-  modal.value = false;
+  modal.value = true;
 }
 const closeModal = () => {
   modal.value = false;

From a9900bc66c0155431f1948ee6e5392109f05c769 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 2 Mar 2023 16:59:23 +0800
Subject: [PATCH 11/54] -- fix bug

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

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 0a33b76b..4d15fe10 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -408,7 +408,7 @@ watch(() => routerInfo.value.chapterList, () => {
 }, { deep: true });
 
 const showModal = () => {
-  formValue.value = {};
+  formValue.value = {draftTaskList: []}
   modal.value = true;
 };
 function showEditModal(ele){
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index b64bdb60..e00e397c 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -513,7 +513,7 @@ const closeModal = () => {
 };
 //显示添加阶段弹窗
 const showModal = () => {
-  formValue.value = {}
+  formValue.value = {taskDraftDtoList: []}
   stage.value = true
 };
 const editModal = () => {

From b5bcf54a4b0aeabfc1a98f48fd120dda3165dbd9 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 2 Mar 2023 19:04:46 +0800
Subject: [PATCH 12/54] =?UTF-8?q?feat:=E6=98=BE=E7=A4=BA=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index d4366401..c07592a2 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -851,9 +851,9 @@
                               删除
                             </a-menu-item>
                             <!-- 新加 二维码 -->
-                            <!-- <a-menu-item @click="qrcodeVisible(record, 1)">
+                            <a-menu-item @click="qrcodeVisible(record, 1)">
                               二维码
-                            </a-menu-item> -->
+                            </a-menu-item>
                           </a-menu>
                         </template>
                         <div class="fb" style="margin-left: -20px">

From 893cda59216500b340be3ed552302ee8372299eb Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Thu, 2 Mar 2023 20:50:35 +0800
Subject: [PATCH 13/54] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=9D=A2=E6=8E=88?=
 =?UTF-8?q?=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue    |  1 +
 src/views/courselibrary/components/seeModal.vue |  6 +++++-
 src/views/courselibrary/courseModal.vue         | 10 +++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index c07592a2..f94077ab 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4456,6 +4456,7 @@ export default defineComponent({
       state.lookCourseModal = true;
       item.attach = item.attach == "" ? [] : item.attach.split(",");
       state.faceDetailObj = item;
+      console.log("获取查看信息", item);
     };
     // const handleTea = async () => {
     //   console.log("item22224444");
diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue
index 092b86b6..9afde740 100644
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -405,6 +405,7 @@ export default defineComponent({
         detail({
           offcourseId: Number(props.detail.id),
         }).then((res) => {
+          console.log("res", res);
           if (res.data.code === 200) {
             let item = res.data.data;
             if (item.jobTypeIds) {
@@ -428,13 +429,16 @@ export default defineComponent({
               );
               let arrObj = [];
               arrObj = orgSelectIds.map((item, index) => {
-                return { value: item, lebel: orgSelectNames[index] };
+                return { value: item, label: orgSelectNames[index] };
               });
               console.log("arrObj-------------", arrObj);
               state.orgSelect = arrObj;
             }
           }
         });
+      },
+      {
+        deep: true,
       }
     );
 
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index 4216ee9f..164ee631 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -457,7 +457,11 @@
             <div class="btn btn5" @click="noEditClose">
               <div class="btnText">取消</div>
             </div>
-            <a-button class="btn btn6" @click="handlePush" :loading="validated===1">
+            <a-button
+              class="btn btn6"
+              @click="handlePush"
+              :loading="validated === 1"
+            >
               <div class="btnText">保存</div>
             </a-button>
           </div>
@@ -847,9 +851,9 @@ export default defineComponent({
           orgSelectNames += item.label + ",";
         });
       }
+      console.log("orgSelectIds&orgSelectNames2", orgSelectIds, orgSelectNames);
       orgSelectIds = orgSelectIds.slice(0, orgSelectIds.length - 1);
       orgSelectNames = orgSelectNames.slice(0, orgSelectNames.length - 1);
-      console.log("orgSelectIds&orgSelectNames2", orgSelectIds, orgSelectNames);
 
       let selectJobId = "";
       if (state.selectJobId.length) {
@@ -1027,7 +1031,7 @@ export default defineComponent({
         );
         let arrObj = [];
         arrObj = orgSelectIds.map((item, index) => {
-          return { value: item, lebel: orgSelectNames[index] };
+          return { value: item, label: orgSelectNames[index] };
         });
         console.log("arrObj-------------", arrObj);
         state.orgSelect = arrObj;

From 4caedbff7cec8549b7f2e02556c0c8553e3266b2 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Thu, 2 Mar 2023 21:13:43 +0800
Subject: [PATCH 14/54] =?UTF-8?q?=E5=85=B1=E4=BA=AB=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index f29c0a3d..2e7b1258 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -2786,9 +2786,11 @@ export default {
 
     // 共享文档文件下载
     const downloadFile = (url) => {
-      console.log(url);
-      if (url) {
-        window.open(url);
+      debugger
+      const urlNew = url.slice(1);
+      console.log(urlNew);
+      if (urlNew) {
+        window.open(process.env.VUE_APP_FILE_PATH + urlNew);
       }
       // if(url){
       //   const filename = '操作指南'
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 4f3d7a5c..a3ee2489 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -1171,7 +1171,7 @@ export default defineComponent({
 
             state.scoresum = Number(result[0].pointsCount) + Number(result[1].pointsCount) + Number(result[2].pointsCount) + Number(result[3].pointsCount) + Number(result[4].pointsCount) + Number(result[5].pointsCount) + Number(result[6].pointsCount) + Number(result[7].pointsCount)
 
-            state.score1 = result[0].pointsCount; 
+            state.score1 = result[0].pointsCount;
 
             state.done2 = result[1].typeDescConfig;
             state.done3 = result[1].pointsCount;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 5996e071..94b9522f 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -4678,6 +4678,7 @@ export default {
     }
     // 共享文档文件下载
     const downloadFile = (url) => {
+        debugger
       url && window.open(url);
     };
     function stageChange(item, index) {

From 56b919cde6b25984011bfe84526210ac3e27076e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com>
Date: Thu, 2 Mar 2023 23:07:58 +0800
Subject: [PATCH 15/54] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index 89e0abe0..4f6ef758 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -505,7 +505,7 @@ export default {
         window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.chapterId}&type=${2}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
       }else if(props.datasource.type==11){
         {/* 评估导出 */}
-        window.open(`${process.env.VUE_APP_BASE_API}admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }else{
         window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }

From 1dc4270f8ba85535a2cfada85087f7dc1123d4cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com>
Date: Fri, 3 Mar 2023 00:03:09 +0800
Subject: [PATCH 16/54] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index ae6c97ac..e92e95e2 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -498,7 +498,7 @@ export default {
         window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.stageId}&type=${1}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}`)
       }else if(props.datasource.type==11){
         {/* 评估导出 */}
-        window.open(`${process.env.VUE_APP_BASE_API}admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }else{
         window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       }

From ffb469e80f99cbcbefc1cbc803be238d85845eb1 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 3 Mar 2023 10:49:37 +0800
Subject: [PATCH 17/54] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=92=8C=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue  |  8 ++++----
 src/views/projectcenter/TaskPage.vue | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index f29c0a3d..0044ce3a 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -2637,7 +2637,7 @@ export default {
           codeUrl =
             window.location.protocol +
             process.env.VUE_APP_H5 +
-            "/externalexam?courseId=" +
+            "/externalexam?type=2&courseId=" +
             item.courseId;
         } else {
           codeUrl =
@@ -2705,7 +2705,7 @@ export default {
           item.courseId +
           "&evaType=" +
           item.evaType +
-          "&targetId=" +
+          "&type=2&targetId=" +
           item.targetId;
       }
 
@@ -2737,7 +2737,7 @@ export default {
           item.id +
           "&chapterOrStageId=" +
           item.chapterId +
-          "&infoId=" +
+          "&type=2&infoId=" +
           state.routerId;
       }
       // 项目
@@ -2745,7 +2745,7 @@ export default {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
-          "/projectdetails?projectId=" +
+          "/projectdetails?type=2&projectId=" +
           item.courseId;
       }
       state.codevisible = true;
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 5996e071..c32d1870 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -3925,7 +3925,7 @@ export default {
     };
     //创建小组
     const createGroup = async () => {
-      debugger
+      debugger;
       console.log("state.groupPageList" + state.groupPageList);
       const id = state.groupInfo.id;
       const d = state.groupPageList
@@ -4513,7 +4513,7 @@ export default {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
-          "/faceteach?type=2&courseId=" +
+          "/faceteach?type=1&courseId=" +
           item.courseId +
           "&id=" +
           item.id;
@@ -4540,7 +4540,7 @@ export default {
           codeUrl =
             window.location.protocol +
             process.env.VUE_APP_H5 +
-            "/externalexam?courseId=" +
+            "/externalexam?type=1&courseId=" +
             item.courseId;
         } else {
           codeUrl =
@@ -4607,7 +4607,7 @@ export default {
           process.env.VUE_APP_H5 +
           "/evaluation?courseId=" +
           item.courseId +
-          "&evaType=" +
+          "&type=1&evaType=" +
           item.evaType +
           "&targetId=" +
           item.targetId;
@@ -4638,7 +4638,7 @@ export default {
           process.env.VUE_APP_H5 +
           "/ballotpage?courseId=" +
           item.courseId +
-          "&btype=2&id=" +
+          "&type=1&btype=2&id=" +
           item.id +
           "&chapterOrStageId=" +
           item.stageId +
@@ -4663,7 +4663,7 @@ export default {
         url:
           window.location.protocol +
           process.env.VUE_APP_H5 +
-          "/projectdetails?projectId=" +
+          "/projectdetails?type=1&projectId=" +
           state.projectId,
       };
       state.codeInfo = obj;

From 630752547d32c5bbdf51b83a25862f39dc73dd7d Mon Sep 17 00:00:00 2001
From: peiqingliu <1226880979@qq.com>
Date: Fri, 3 Mar 2023 11:26:24 +0800
Subject: [PATCH 18/54] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=85=B1=E4=BA=AB=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index f29c0a3d..664f68ee 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -2787,8 +2787,10 @@ export default {
     // 共享文档文件下载
     const downloadFile = (url) => {
       console.log(url);
-      if (url) {
-        window.open(url);
+      let urlNew = url.slice(1);
+      console.log(urlNew);
+      if (urlNew) {
+        window.open(process.env.VUE_APP_FILE_PATH + urlNew);
       }
       // if(url){
       //   const filename = '操作指南'

From 49fa5ae375201d93dc3eec7987447e4a79c2721c Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 3 Mar 2023 11:54:08 +0800
Subject: [PATCH 19/54] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=85=B1=E4=BA=AB?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue    |    7 +-
 src/views/projectcenter/LibraryAdd.vue | 1010 +++++++++++++-----------
 src/views/projectcenter/TaskPage.vue   |   12 +-
 3 files changed, 551 insertions(+), 478 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 9a78c17e..146e6cdb 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -2790,7 +2790,12 @@ export default {
       let urlNew = url.slice(1);
       console.log(urlNew);
       if (urlNew) {
-        window.open(process.env.VUE_APP_FILE_PATH + urlNew);
+        window.open(
+          window.location.protocol +
+            process.env.VUE_APP_BOE_API_URL +
+            process.env.VUE_APP_FILE_PATH +
+            urlNew
+        );
       }
       // if(url){
       //   const filename = '操作指南'
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 4f3d7a5c..2725efa6 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -2,7 +2,7 @@
   <div class="addwrapper">
     <div class="addhead">
       <div class="leftimg">
-        <img class="img" :src="projectInfo.picUrl"/>
+        <img class="img" :src="projectInfo.picUrl" />
       </div>
       <div class="imgfor">
         <div class="forz">{{ projectInfo.name || "-" }}</div>
@@ -34,23 +34,21 @@
           </div>
         </div>
         <div class="line"></div> -->
-        <router-link to="/templatelibrary"
-        >
+        <router-link to="/templatelibrary">
           <div style="display: flex">
-            <img class="img2" src="../../assets/images/leveladd/back.png"/>
+            <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
           </div>
-        </router-link
-        >
+        </router-link>
       </div>
     </div>
     <div class="split"></div>
     <div class="bom clearfix">
       <a-tabs
-          class="tab"
-          v-model:activeKey="activeKey"
-          size="large"
-          :tabBarStyle="{ marginLeft: '10px' }"
+        class="tab"
+        v-model:activeKey="activeKey"
+        size="large"
+        :tabBarStyle="{ marginLeft: '10px' }"
       >
         <a-tab-pane key="1" tab="任务">
           <div class="taskBox" style="flex: 1">
@@ -59,12 +57,15 @@
               <div class="taskmain">任务大纲</div>
               <!-- <button class="btn" @click="showFaceIn">批量面授报名</button> -->
               <router-link
-                  class="edit"
-                  :to="{ path: `/temTask`, query: { projectId: projectTemplateId } }"
+                class="edit"
+                :to="{
+                  path: `/temTask`,
+                  query: { projectId: projectTemplateId },
+                }"
               >
                 <img
-                    class="editimg"
-                    src="../../assets/images/projectadd/edit.png"
+                  class="editimg"
+                  src="../../assets/images/projectadd/edit.png"
                 />
                 <span class="editext">编辑</span>
               </router-link>
@@ -83,12 +84,12 @@
               <a-collapse v-model:activeKey="taskSyllabusActive" accordion>
                 <template #expandIcon="{ isActive }">
                   <img
-                      :style="{
+                    :style="{
                       width: isActive ? 9.1 : 8.1,
                       height: isActive ? 8.1 : 9.1,
                       'margin-right': isActive ? '12px' : '13px',
                     }"
-                      :src="
+                    :src="
                       isActive
                         ? require('../../assets/images/projectadd/open.png')
                         : require('../../assets/images/projectadd/close.png')
@@ -97,21 +98,21 @@
                   <div></div>
                 </template>
                 <a-collapse-panel
-                    v-for="(value, index) in taskSyllabus"
-                    :key="index"
-                    :header="value.text"
+                  v-for="(value, index) in taskSyllabus"
+                  :key="index"
+                  :header="value.text"
                 >
                   <div
-                      class="course"
-                      v-for="(item, key) in value.children"
-                      :key="key"
+                    class="course"
+                    v-for="(item, key) in value.children"
+                    :key="key"
                   >
                     <!-- :style="{width:item.course==='在线'?'28px':
                             height:item.course==='在线'?'27px':}" -->
                     <div class="first">
                       <div class="icon">
                         <div
-                            style="
+                          style="
                             width: 31px;
                             height: 28px;
                             display: flex;
@@ -120,7 +121,7 @@
                           "
                         >
                           <img
-                              :src="
+                            :src="
                               item.course === '在线'
                                 ? require('../../assets/images/leveladd/zai.png')
                                 : item.course === '面授'
@@ -175,32 +176,32 @@
                       </div>
                       <div style="display: flex">
                         <a-progress
-                            :showInfo="false"
-                            :percent="item.percent"
-                            strokeColor="#FFC067"
-                            trailColor="rgba(253, 209, 98, 0.2)"
+                          :showInfo="false"
+                          :percent="item.percent"
+                          strokeColor="#FFC067"
+                          trailColor="rgba(253, 209, 98, 0.2)"
                         />
                         <span class="progresstext" style="margin-left: 10px"
-                        >{{ item.percent }}%</span
+                          >{{ item.percent }}%</span
                         >
                       </div>
                     </div>
                     <div class="operations">
                       <div
-                          class="operation"
-                          style="cursor: pointer"
-                          :style="{
+                        class="operation"
+                        style="cursor: pointer"
+                        :style="{
                           display: item.course === '面授' ? 'flex' : 'none',
                         }"
-                          @click="showFS"
+                        @click="showFS"
                       >
                         <!-- 学员 -->
                       </div>
                       <div
-                          class="operation"
-                          style="cursor: pointer"
-                          @click="showAA"
-                          :style="{
+                        class="operation"
+                        style="cursor: pointer"
+                        @click="showAA"
+                        :style="{
                           display:
                             item.course === '直播' || item.course === '活动'
                               ? 'flex'
@@ -210,9 +211,9 @@
                         <!-- 考勤 -->
                       </div>
                       <div
-                          class="operation"
-                          style="cursor: pointer"
-                          :style="{
+                        class="operation"
+                        style="cursor: pointer"
+                        :style="{
                           display:
                             item.course === '直播' ||
                             item.course === '活动' ||
@@ -224,9 +225,9 @@
                         <!-- 二维码 -->
                       </div>
                       <div
-                          class="operation"
-                          style="cursor: pointer; margin-right: 35px"
-                          @click="
+                        class="operation"
+                        style="cursor: pointer; margin-right: 35px"
+                        @click="
                           item.course === '在线' ||
                           item.course === '案例' ||
                           item.course === '外链' ||
@@ -253,20 +254,20 @@
               </a-collapse>
               <!-- 无数据创建任务 -->
               <div
-                  class="taskbox"
-                  style="
+                class="taskbox"
+                style="
                   background: linear-gradient(180deg, #ddeaff, #f0f8fe);
                   display: none;
                 "
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left2.png"/>
+                  <img src="../../assets/images/taskpage/left2.png" />
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture8.png"/>
+                  <img src="../../assets/images/taskpage/picture8.png" />
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right2.png"/>
+                  <img src="../../assets/images/taskpage/right2.png" />
                 </div>
                 <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                   创建任务
@@ -286,9 +287,9 @@
                 <div class="ntc_body">
                   <div class="ntc_switch">
                     <a-switch
-                        size="small"
-                        v-model:checked="checked"
-                        @click="changeopclo"
+                      size="small"
+                      v-model:checked="checked"
+                      @click="changeopclo"
                     />
                     <div v-if="checked == true" class="opclo">
                       <span>关闭</span>
@@ -314,10 +315,10 @@
                       <div class="ntcc_tit">编辑公告：</div>
                       <div class="textarea">
                         <a-textarea
-                            v-model:value="projectInfo.notice"
-                            placeholder="公告信息最多输入150个字。"
-                            :maxlength="textnum"
-                            allow-clear
+                          v-model:value="projectInfo.notice"
+                          placeholder="公告信息最多输入150个字。"
+                          :maxlength="textnum"
+                          allow-clear
                         />
                         <div class="btnarea">
                           <div>&nbsp;</div>
@@ -341,13 +342,13 @@
             <div class="pjc_tit">
               <span>获取规则</span>
             </div>
-            <hr color="#E8E8E8"/>
+            <hr color="#E8E8E8" />
             <div class="pjc_body">
               <div class="groupright">
                 <div class="spandiv"><span class="spantext">规则</span></div>
                 <div v-if="edit" class="btns">
                   <div class="btn1" @click="edit = !edit">
-                    <img src="../../assets/images/projectadd/edit1.png"/>
+                    <img src="../../assets/images/projectadd/edit1.png" />
                     <span class="btn1text">编辑</span>
                   </div>
                 </div>
@@ -362,7 +363,7 @@
                 <div class="content content1">
                   <span>当前设计下，学员可以获得 </span
                   ><span class="scoretext">{{ scoresum }}</span
-                ><span>积分</span>
+                  ><span>积分</span>
                 </div>
                 <div class="content content2">
                   <span>完成【必修/选修】获得 </span
@@ -371,35 +372,35 @@
                 <div class="content">
                   <span>完成作业成绩不低于 </span
                   ><span class="scoretext">{{ done2 }}</span
-                ><span>分获得</span> <span class="scoretext">{{ done3 }}</span
-                ><span>积分</span>
+                  ><span>分获得</span> <span class="scoretext">{{ done3 }}</span
+                  ><span>积分</span>
                 </div>
                 <div class="content">
                   <span>前</span><span class="scoretext">{{ four1 }}</span
-                ><span>名学完在线课程获得</span>
+                  ><span>名学完在线课程获得</span>
                   <span class="scoretext">{{ four2 }}</span
                   ><span style="margin-right: 50px">积分</span> <span>前</span
-                ><span class="scoretext">{{ four3 }}</span
-                ><span>名提交作业且成绩不低于</span>
+                  ><span class="scoretext">{{ four3 }}</span
+                  ><span>名提交作业且成绩不低于</span>
                   <span class="scoretext">{{ four4 }}</span
                   ><span>分获得</span> <span class="scoretext">{{ four5 }}</span
-                ><span>积分</span>
+                  ><span>积分</span>
                 </div>
                 <div class="content">
                   <span>考试成绩高于</span
                   ><span class="scoretext">{{ five1 }}</span
-                ><span>分获得</span> <span class="scoretext">{{ five2 }}</span
-                ><span>积分</span>
+                  ><span>分获得</span> <span class="scoretext">{{ five2 }}</span
+                  ><span>积分</span>
                 </div>
                 <div class="content">
                   <span>考勤正常学员获得 </span
                   ><span class="scoretext">{{ six1 }}</span
-                ><span>积分</span>
+                  ><span>积分</span>
                 </div>
                 <div class="content">
                   <span>成为小组长获得</span
                   ><span class="scoretext">{{ seven1 }}</span
-                ><span style="margin-right: 50px">积分</span>
+                  ><span style="margin-right: 50px">积分</span>
                   <span>优秀学员可获得</span>
                   <span class="scoretext">{{ seven2 }}</span
                   ><span>积分</span>
@@ -409,97 +410,64 @@
                 <div class="content content1">
                   <span>当前设计下，学员可以获得 </span
                   ><span class="scoretext">{{ scoresum }}</span
-                ><span>积分</span>
+                  ><span>积分</span>
                 </div>
                 <div class="content content2">
                   <span>完成【必修/选修】获得 </span
                   ><span
-                ><a-input
-                    v-model:value="score1"
-                    :bordered="false"
-                    @change="getScore"
-                /> </span
-                ><span>积分</span>
+                    ><a-input
+                      v-model:value="score1"
+                      :bordered="false"
+                      @change="getScore"
+                    /> </span
+                  ><span>积分</span>
                 </div>
                 <div class="content">
-                  <span>完成作业成绩不低于 </span
-                  >
-                  <a-input v-model:value="done2" :bordered="false"/>
-                  <span
-                  >分获得</span
-                  >
-                  <a-input v-model:value="done3" :bordered="false"/>
-                  <span
-                  >积分</span
-                  >
+                  <span>完成作业成绩不低于 </span>
+                  <a-input v-model:value="done2" :bordered="false" />
+                  <span>分获得</span>
+                  <a-input v-model:value="done3" :bordered="false" />
+                  <span>积分</span>
                 </div>
                 <div class="content">
-                  <span>前</span
-                  >
-                  <a-input v-model:value="four1" :bordered="false"/>
-                  <span
-                  >名学完在线课程获得</span
-                  >
-                  <a-input v-model:value="four2" :bordered="false"/>
-                  <span
-                      style="margin-right: 50px"
-                  >积分</span
-                  >
-                  <span>前</span
-                  >
-                  <a-input v-model:value="four3" :bordered="false"/>
-                  <span
-                  >名提交作业且成绩不低于</span
-                  >
-                  <a-input v-model:value="four4" :bordered="false"/>
-                  <span
-                  >分获得</span
-                  >
-                  <a-input v-model:value="four5" :bordered="false"/>
-                  <span
-                  >积分</span
-                  >
+                  <span>前</span>
+                  <a-input v-model:value="four1" :bordered="false" />
+                  <span>名学完在线课程获得</span>
+                  <a-input v-model:value="four2" :bordered="false" />
+                  <span style="margin-right: 50px">积分</span>
+                  <span>前</span>
+                  <a-input v-model:value="four3" :bordered="false" />
+                  <span>名提交作业且成绩不低于</span>
+                  <a-input v-model:value="four4" :bordered="false" />
+                  <span>分获得</span>
+                  <a-input v-model:value="four5" :bordered="false" />
+                  <span>积分</span>
                 </div>
                 <div class="content">
-                  <span>考试成绩高于</span
-                  >
-                  <a-input v-model:value="five1" :bordered="false"/>
-                  <span
-                  >分获得</span
-                  >
-                  <a-input v-model:value="five2" :bordered="false"/>
-                  <span
-                  >积分</span
-                  >
+                  <span>考试成绩高于</span>
+                  <a-input v-model:value="five1" :bordered="false" />
+                  <span>分获得</span>
+                  <a-input v-model:value="five2" :bordered="false" />
+                  <span>积分</span>
                 </div>
                 <div class="content">
-                  <span>考勤正常学员获得 </span
-                  >
-                  <a-input v-model:value="six1" :bordered="false"/>
-                  <span
-                  >积分</span
-                  >
+                  <span>考勤正常学员获得 </span>
+                  <a-input v-model:value="six1" :bordered="false" />
+                  <span>积分</span>
                 </div>
                 <div class="content">
-                  <span>成为小组长获得</span
-                  >
-                  <a-input v-model:value="seven1" :bordered="false"/>
-                  <span
-                      style="margin-right: 50px"
-                  >积分</span
-                  >
+                  <span>成为小组长获得</span>
+                  <a-input v-model:value="seven1" :bordered="false" />
+                  <span style="margin-right: 50px">积分</span>
                   <span>优秀学员可获得</span>
-                  <a-input v-model:value="seven2" :bordered="false"/>
-                  <span
-                  >积分</span
-                  >
+                  <a-input v-model:value="seven2" :bordered="false" />
+                  <span>积分</span>
                 </div>
               </div>
             </div>
           </div>
         </a-tab-pane>
 
-
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
           <a-tabs>
@@ -529,9 +497,9 @@
                     <div class="setc_name"><span>封面图：</span></div>
                     <div class="setc_main">
                       <img
-                          style="width: 151px; height: 84px"
-                          :src="projectInfo.picUrl"
-                          alt=""
+                        style="width: 151px; height: 84px"
+                        :src="projectInfo.picUrl"
+                        alt=""
                       />
                     </div>
                   </div>
@@ -539,7 +507,7 @@
                     <div class="setc_name"><span>项目时间：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
-                      >{{ projectInfo.beginTime }} ～
+                        >{{ projectInfo.beginTime }} ～
                         {{ projectInfo.endTime }}</span
                       >
                     </div>
@@ -548,54 +516,65 @@
                     <div class="setc_name"><span>项目经理：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999">{{
-                          projectInfo.manager
-                        }}</span>
+                        projectInfo.manager
+                      }}</span>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>资源归属：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999">{{
-                          (projectInfo.sourceBelongFullName || '') + projectInfo.sourceBelongName
-                        }}</span>
+                        (projectInfo.sourceBelongFullName || "") +
+                        projectInfo.sourceBelongName
+                      }}</span>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
-                      <ProjectLevel :value="projectInfo.level" :tag="true"></ProjectLevel>
+                      <ProjectLevel
+                        :value="projectInfo.level"
+                        :tag="true"
+                      ></ProjectLevel>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>培训体系：</span></div>
                     <div class="setc_main">
-                      <TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass>
+                      <TrainClass
+                        :value="projectInfo.systemId"
+                        :tag="true"
+                      ></TrainClass>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>同步学习记录：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.courseSyncFlag" :disabled="true"
-                      ><span style="color: #333333"
-                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                      ></a-radio
+                      <a-radio
+                        v-model:checked="projectInfo.courseSyncFlag"
+                        :disabled="true"
+                        ><span style="color: #333333"
+                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                        ></a-radio
                       >
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.boeFlag" :disabled="true"
-                      ><span style="color: #333333">BOEU实施</span></a-radio
+                      <a-radio
+                        v-model:checked="projectInfo.boeFlag"
+                        :disabled="true"
+                        ><span style="color: #333333">BOEU实施</span></a-radio
                       >
                     </div>
                   </div>
-                  <div class="set_content" v-if="projectInfo.remark ">
+                  <div class="set_content" v-if="projectInfo.remark">
                     <div class="setc_name"><span>项目说明：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999">{{
-                          projectInfo.remark
-                        }}</span>
+                        projectInfo.remark
+                      }}</span>
                     </div>
                   </div>
                 </div>
@@ -612,45 +591,51 @@
                       <div class="onetitle">上传共享文档</div>
                       <div class="oneedi">
                         <a-switch
-                            size="small"
-                            v-model:checked="attachSwitch"
-                            @change="checkedClose"
+                          size="small"
+                          v-model:checked="attachSwitch"
+                          @change="checkedClose"
                         ></a-switch>
                       </div>
                     </div>
                     <div class="btnbox" style="margin: 20px">
                       <a-upload
-                          v-if="attachSwitch == true"
-                          v-model:file-list="fileList"
-                          name="file"
-                          action="/manageApi/file/uploadunlimit"
-                          @change="handleChange2"
+                        v-if="attachSwitch == true"
+                        v-model:file-list="fileList"
+                        name="file"
+                        action="/manageApi/file/uploadunlimit"
+                        @change="handleChange2"
                       >
                         <span
-                            class="xkbtn"
-                            style="cursor: pointer; font-size: 17px"
-                        >上传</span
+                          class="xkbtn"
+                          style="cursor: pointer; font-size: 17px"
+                          >上传</span
                         >
                         <img
-                            src="@/assets/images/basicinfo/cloud.png"
-                            style="cursor: pointer; width: 24px; height: 24px; margin-left: 8px;margin-bottom: 3px;"
-                            alt=""
+                          src="@/assets/images/basicinfo/cloud.png"
+                          style="
+                            cursor: pointer;
+                            width: 24px;
+                            height: 24px;
+                            margin-left: 8px;
+                            margin-bottom: 3px;
+                          "
+                          alt=""
                         />
                       </a-upload>
                       <div
-                          v-if="attachSwitch == true"
-                          class="btnbox"
-                          style="margin: 20px"
+                        v-if="attachSwitch == true"
+                        class="btnbox"
+                        style="margin: 20px"
                       >
                         <span style="color: #999999">
                           支持：pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip
                         </span>
                       </div>
                       <div
-                          v-for="item in fileList"
-                          :key="item.uid"
-                          style="margin-bottom: 30px;"
-                          class="docListStyle"
+                        v-for="item in fileList"
+                        :key="item.uid"
+                        style="margin-bottom: 30px"
+                        class="docListStyle"
                       >
                         <!-- <img
                           src="@/assets/images/basicinfo/download.png"
@@ -662,35 +647,74 @@
                           "
                           alt=""
                         /> -->
-                        <img v-if="
-                              item.name.indexOf('jpg') !== -1 ||
-                              item.name.indexOf('jpeg') !== -1 ||
-                              item.name.indexOf('png') !== -1
-                            "
-                             style="width: 27px;height: 32px;margin-right: 40px;"
-                             src="@/assets/images/coursewareManage/pngpic.png"/>
+                        <img
+                          v-if="
+                            item.name.indexOf('jpg') !== -1 ||
+                            item.name.indexOf('jpeg') !== -1 ||
+                            item.name.indexOf('png') !== -1
+                          "
+                          style="width: 27px; height: 32px; margin-right: 40px"
+                          src="@/assets/images/coursewareManage/pngpic.png"
+                        />
                         <div v-else>
-                          <img v-if="item.name.indexOf('doc') !== -1"
-                               style="width: 27px;height: 32px;margin-right: 40px;"
-                               src="@/assets/images/coursewareManage/docpic.png"/>
+                          <img
+                            v-if="item.name.indexOf('doc') !== -1"
+                            style="
+                              width: 27px;
+                              height: 32px;
+                              margin-right: 40px;
+                            "
+                            src="@/assets/images/coursewareManage/docpic.png"
+                          />
                           <div v-else>
-                            <img v-if="item.name.indexOf('xls') !== -1"
-                                 style="width: 27px;height: 32px;margin-right: 40px;"
-                                 src="@/assets/images/coursewareManage/xlspic.png"/>
+                            <img
+                              v-if="item.name.indexOf('xls') !== -1"
+                              style="
+                                width: 27px;
+                                height: 32px;
+                                margin-right: 40px;
+                              "
+                              src="@/assets/images/coursewareManage/xlspic.png"
+                            />
                             <div v-else>
-                              <img v-if="item.name.indexOf('ppt') !== -1"
-                                   style="width: 27px;height: 32px;margin-right: 40px;"
-                                   src="@/assets/images/coursewareManage/pptpic.png"/>
+                              <img
+                                v-if="item.name.indexOf('ppt') !== -1"
+                                style="
+                                  width: 27px;
+                                  height: 32px;
+                                  margin-right: 40px;
+                                "
+                                src="@/assets/images/coursewareManage/pptpic.png"
+                              />
                               <div v-else>
-                                <img v-if="item.name.indexOf('pdf') !== -1"
-                                     style="width: 27px;height: 32px;margin-right: 40px;"
-                                     src="@/assets/images/coursewareManage/pdfpic.png"/>
+                                <img
+                                  v-if="item.name.indexOf('pdf') !== -1"
+                                  style="
+                                    width: 27px;
+                                    height: 32px;
+                                    margin-right: 40px;
+                                  "
+                                  src="@/assets/images/coursewareManage/pdfpic.png"
+                                />
                                 <div v-else>
-                                  <img v-if="item.name.indexOf('zip') !== -1"
-                                       style="width: 27px;height: 32px;margin-right: 40px;"
-                                       src="@/assets/images/coursewareManage/zippic.png"/>
-                                  <img v-else style="width: 27px;height: 32px;margin-right: 40px;"
-                                       src="@/assets/images/coursewareManage/docpic.png"/>
+                                  <img
+                                    v-if="item.name.indexOf('zip') !== -1"
+                                    style="
+                                      width: 27px;
+                                      height: 32px;
+                                      margin-right: 40px;
+                                    "
+                                    src="@/assets/images/coursewareManage/zippic.png"
+                                  />
+                                  <img
+                                    v-else
+                                    style="
+                                      width: 27px;
+                                      height: 32px;
+                                      margin-right: 40px;
+                                    "
+                                    src="@/assets/images/coursewareManage/docpic.png"
+                                  />
                                 </div>
                               </div>
                             </div>
@@ -698,17 +722,30 @@
                         </div>
 
                         <span
-                            style="font: oblique bold 16px Sans-serif;width:300px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{
-                            item.name
-                          }}</span>
+                          style="
+                            font: oblique bold 16px Sans-serif;
+                            width: 300px;
+                            display: block;
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis;
+                          "
+                          >{{ item.name }}</span
+                        >
                         <a
-                            href="javascript:void(0);"
-                            @click="downloadFile(item.response ? item.response.data : '')"
-                            style="margin-left: 5px">下载</a>
+                          href="javascript:void(0);"
+                          @click="
+                            downloadFile(
+                              item.response ? item.response.data : ''
+                            )
+                          "
+                          style="margin-left: 5px"
+                          >下载</a
+                        >
                         <span
-                            style="color: #4ea6ff; cursor: pointer"
-                            @click="deFile(item.uid)"
-                        >删除</span
+                          style="color: #4ea6ff; cursor: pointer"
+                          @click="deFile(item.uid)"
+                          >删除</span
                         >
                       </div>
                     </div>
@@ -716,17 +753,15 @@
                 </div>
               </div>
             </a-tab-pane>
-
-
           </a-tabs>
         </a-tab-pane>
       </a-tabs>
       <a-modal
-          style="padding: 0"
-          :closable="sh"
-          v-model:visible="visible"
-          :footer="null"
-          centered="true"
+        style="padding: 0"
+        :closable="sh"
+        v-model:visible="visible"
+        :footer="null"
+        centered="true"
       >
         <div class="con">
           <div class="header">
@@ -741,12 +776,12 @@
               <div class="cur">当前关卡：</div>
               <div class="select">
                 <a-select
-                    v-model:value="projectName"
-                    style="width: 100%"
-                    placeholder="请选择关卡"
-                    :options="projectNameList4"
-                    @change="selectProjectName4"
-                    allowClear
+                  v-model:value="projectName"
+                  style="width: 100%"
+                  placeholder="请选择关卡"
+                  :options="projectNameList4"
+                  @change="selectProjectName4"
+                  allowClear
                 ></a-select>
               </div>
               <div class="btn">
@@ -756,8 +791,7 @@
             </div>
           </div>
         </div>
-      </a-modal
-      >
+      </a-modal>
     </div>
   </div>
 </template>
@@ -771,10 +805,10 @@ import {
   onMounted,
   computed,
 } from "vue";
-import {message} from "ant-design-vue";
+import { message } from "ant-design-vue";
 import * as api from "@/api/indexTemplate";
-import {useRoute, useRouter} from "vue-router";
-import {scoreRule, setScoreRule} from "@/api/indexTaskadd";
+import { useRoute, useRouter } from "vue-router";
+import { scoreRule, setScoreRule } from "@/api/indexTaskadd";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import TrainClass from "@/components/project/TrainClass";
 
@@ -786,7 +820,7 @@ export default defineComponent({
   },
   setup() {
     const state = reactive({
-      templateInfo:{},
+      templateInfo: {},
       //任务大纲列表
       taskSyllabus: [
         // {
@@ -869,26 +903,26 @@ export default defineComponent({
       ],
       // 模板编辑列表
       managerOptions: [
-        {value: "李俊国"},
-        {value: "将小米"},
-        {value: "刘孟君"},
+        { value: "李俊国" },
+        { value: "将小米" },
+        { value: "刘孟君" },
       ],
       sourceBelongOptions: [
-        {value: "项目一"},
-        {value: "项目二"},
-        {value: "项目三"},
+        { value: "项目一" },
+        { value: "项目二" },
+        { value: "项目三" },
       ],
       levelOptions: [
-        {value: "集团级"},
-        {value: "组织级"},
-        {value: "现地级"},
-        {value: "部门级"},
+        { value: "集团级" },
+        { value: "组织级" },
+        { value: "现地级" },
+        { value: "部门级" },
       ],
       systemOptions: [
-        {value: "集团级"},
-        {value: "组织级"},
-        {value: "现地级"},
-        {value: "部门级"},
+        { value: "集团级" },
+        { value: "组织级" },
+        { value: "现地级" },
+        { value: "部门级" },
       ],
       taskSyllabusActive: 0,
       //在线管理等页面传递参数
@@ -944,17 +978,19 @@ export default defineComponent({
     const value = ref("");
     const textnum = "150";
     const routered = useRouter();
-    const {query: {projectTemplateId}} = useRoute();
+    const {
+      query: { projectTemplateId },
+    } = useRoute();
     const changeopclo = () => {
       state.projectInfo.noticeFlag = state.checked ? 1 : 0;
       api
-          .templateEdit(state.projectInfo)
-          .then((res) => {
-            console.log(res);
-          })
-          .catch((err) => {
-            console.log(err);
-          });
+        .templateEdit(state.projectInfo)
+        .then((res) => {
+          console.log(res);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     };
 
     const changecheck2 = () => {
@@ -967,14 +1003,14 @@ export default defineComponent({
       //   return message.warning("请输入合法数字");
       // }
       return (
-          Number(state.score1) +
-          Number(state.done3) +
-          Number(state.four2) +
-          Number(state.four5) +
-          Number(state.five2) +
-          Number(state.six1) +
-          Number(state.seven1) +
-          Number(state.seven2)
+        Number(state.score1) +
+        Number(state.done3) +
+        Number(state.four2) +
+        Number(state.four5) +
+        Number(state.five2) +
+        Number(state.six1) +
+        Number(state.seven1) +
+        Number(state.seven2)
       );
     });
     const changecheck3 = () => {
@@ -1017,50 +1053,49 @@ export default defineComponent({
     // 获取详情
     const getDetail = () => {
       api.templateEditDetail(projectTemplateId).then((res) => {
-            state.templateInfo = res.data.data
-            state.taskSyllabus = [];
-            state.projectInfo = res.data.data.projectTemplateInfo;
-            state.noticeContent = state.projectInfo.notice;
-            state.checked = state.projectInfo.noticeFlag == 1;
-            console.log(
-                "res.data.data.projectTemplateInfo",
-                res.data.data.projectTemplateInfo
-            );
-            try {
-              state.fileList = JSON.parse(
-                  res.data.data.projectTemplateInfo.attach
-              );
-            } catch {
-              state.fileList = [];
-            }
-            state.attachSwitch = res.data.data.projectTemplateInfo.attachSwitch == 1;
-            let data = res.data.data.stageList;
-            console.log("data=====", data);
-            for (let i in data) {
-              console.log("what ------ > ", i, data);
-              // if (data[i].taskTemplateList.length !== 0) {
-              if (!data[i].name) {
-                continue;
-              }
-              state.taskSyllabus.push({
-                text: data[i].name ? data[i].name : "无阶段任务",
-                children: [],
-              });
-              //  }
+        state.templateInfo = res.data.data;
+        state.taskSyllabus = [];
+        state.projectInfo = res.data.data.projectTemplateInfo;
+        state.noticeContent = state.projectInfo.notice;
+        state.checked = state.projectInfo.noticeFlag == 1;
+        console.log(
+          "res.data.data.projectTemplateInfo",
+          res.data.data.projectTemplateInfo
+        );
+        try {
+          state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach);
+        } catch {
+          state.fileList = [];
+        }
+        state.attachSwitch =
+          res.data.data.projectTemplateInfo.attachSwitch == 1;
+        let data = res.data.data.stageList;
+        console.log("data=====", data);
+        for (let i in data) {
+          console.log("what ------ > ", i, data);
+          // if (data[i].taskTemplateList.length !== 0) {
+          if (!data[i].name) {
+            continue;
+          }
+          state.taskSyllabus.push({
+            text: data[i].name ? data[i].name : "无阶段任务",
+            children: [],
+          });
+          //  }
 
-              for (let j in data[i].taskTemplateList) {
-                state.taskSyllabus[i].children.push({
-                  course: checkType(data[i].taskTemplateList[j].type),
-                  name: data[i].taskTemplateList[j].name,
-                  classify: data[i].taskTemplateList[j].flag,
-                  beginTime: "",
-                  total: 0, //总人数
-                  complete: 0, //完成人数
-                  percent: 0,
-                });
-              }
-            }
-          })
+          for (let j in data[i].taskTemplateList) {
+            state.taskSyllabus[i].children.push({
+              course: checkType(data[i].taskTemplateList[j].type),
+              name: data[i].taskTemplateList[j].name,
+              classify: data[i].taskTemplateList[j].flag,
+              beginTime: "",
+              total: 0, //总人数
+              complete: 0, //完成人数
+              percent: 0,
+            });
+          }
+        }
+      });
     };
 
     // 发布公告
@@ -1070,45 +1105,45 @@ export default defineComponent({
         return message.warning("请输入公告内容");
       }
       api
-          .templateEdit(state.projectInfo)
-          .then((res) => {
-            state.noticeContent = state.projectInfo.notice;
-            message.success("公告发布成功");
-            console.log(res);
-          })
-          .catch((err) => {
-            message.error("公告发布失败" + err);
-            console.log(err);
-          });
+        .templateEdit(state.projectInfo)
+        .then((res) => {
+          state.noticeContent = state.projectInfo.notice;
+          message.success("公告发布成功");
+          console.log(res);
+        })
+        .catch((err) => {
+          message.error("公告发布失败" + err);
+          console.log(err);
+        });
       state.editFlag = false;
     };
 
     // 删除阶段
     const stateDel = (id) => {
       api
-          .deleteStage(id)
-          .then((res) => {
-            message.success("删除阶段成功");
-            console.log(res);
-          })
-          .catch((err) => {
-            message.error("删除阶段失败" + err);
-            console.log(err);
-          });
+        .deleteStage(id)
+        .then((res) => {
+          message.success("删除阶段成功");
+          console.log(res);
+        })
+        .catch((err) => {
+          message.error("删除阶段失败" + err);
+          console.log(err);
+        });
     };
 
     // 删除任务
     const taskDel = (id) => {
       api
-          .deleteTask(id)
-          .then((res) => {
-            message.success("删除任务成功");
-            console.log(res);
-          })
-          .catch((err) => {
-            message.error("删除任务失败" + err);
-            console.log(err);
-          });
+        .deleteTask(id)
+        .then((res) => {
+          message.success("删除任务成功");
+          console.log(res);
+        })
+        .catch((err) => {
+          message.error("删除任务失败" + err);
+          console.log(err);
+        });
     };
     const toEdit = () => {
       routered.push({
@@ -1128,15 +1163,15 @@ export default defineComponent({
         stageId: 0,
       };
       api
-          .editStagek(obj)
-          .then((res) => {
-            message.success("编辑阶段成功");
-            console.log(res);
-          })
-          .catch((err) => {
-            message.error("编辑阶段失败" + err);
-            console.log(err);
-          });
+        .editStagek(obj)
+        .then((res) => {
+          message.success("编辑阶段成功");
+          console.log(res);
+        })
+        .catch((err) => {
+          message.error("编辑阶段失败" + err);
+          console.log(err);
+        });
     };
     //新建或编辑阶段任务
     const taskEdit = () => {
@@ -1148,56 +1183,68 @@ export default defineComponent({
         projectTaskId: 0,
         projectTemplateId: localStorage.getItem("projectTemplateId"),
         stageId: 0,
-        type: 0
+        type: 0,
       };
       api
-          .editTask(obj)
-          .then((res) => {
-            message.success("编辑任务成功");
-            console.log(res);
-          })
-          .catch((err) => {
-            message.error("编辑任务失败" + err);
-            console.log(err);
-          });
+        .editTask(obj)
+        .then((res) => {
+          message.success("编辑任务成功");
+          console.log(res);
+        })
+        .catch((err) => {
+          message.error("编辑任务失败" + err);
+          console.log(err);
+        });
     };
     const getScoreRule = () => {
       scoreRule({
         projectId: projectTemplateId,
       })
-          .then((res) => {
-            let result = res.data.data;
-           //Write operation failed: computed value is readonly 总积分
+        .then((res) => {
+          let result = res.data.data;
+          //Write operation failed: computed value is readonly 总积分
 
-            state.scoresum = Number(result[0].pointsCount) + Number(result[1].pointsCount) + Number(result[2].pointsCount) + Number(result[3].pointsCount) + Number(result[4].pointsCount) + Number(result[5].pointsCount) + Number(result[6].pointsCount) + Number(result[7].pointsCount)
+          state.scoresum =
+            Number(result[0].pointsCount) +
+            Number(result[1].pointsCount) +
+            Number(result[2].pointsCount) +
+            Number(result[3].pointsCount) +
+            Number(result[4].pointsCount) +
+            Number(result[5].pointsCount) +
+            Number(result[6].pointsCount) +
+            Number(result[7].pointsCount);
 
-            state.score1 = result[0].pointsCount; 
+          state.score1 = result[0].pointsCount;
 
-            state.done2 = result[1].typeDescConfig;
-            state.done3 = result[1].pointsCount;
+          state.done2 = result[1].typeDescConfig;
+          state.done3 = result[1].pointsCount;
 
-            state.four1 = result[2].typeDescConfig;
-            state.four2 = result[2].pointsCount;
+          state.four1 = result[2].typeDescConfig;
+          state.four2 = result[2].pointsCount;
 
-            state.four3 = result[3].typeDescConfig.slice(0,result[3].typeDescConfig.indexOf(';'));
-            state.four4 = result[3].typeDescConfig.slice(result[3].typeDescConfig.indexOf(';')+1);
-            state.four5 = result[3].pointsCount;
+          state.four3 = result[3].typeDescConfig.slice(
+            0,
+            result[3].typeDescConfig.indexOf(";")
+          );
+          state.four4 = result[3].typeDescConfig.slice(
+            result[3].typeDescConfig.indexOf(";") + 1
+          );
+          state.four5 = result[3].pointsCount;
 
-            state.five1 = result[4].typeDescConfig;
-            state.five2 = result[4].pointsCount;
+          state.five1 = result[4].typeDescConfig;
+          state.five2 = result[4].pointsCount;
 
-            state.six1 = result[5].pointsCount;
+          state.six1 = result[5].pointsCount;
 
-            state.seven1 = result[6].pointsCount;
+          state.seven1 = result[6].pointsCount;
 
-            state.seven2 = result[7].pointsCount;
-
-          })
-          .catch((err) => {
-            console.log("获取项目积分规则失败了", err);
-          });
+          state.seven2 = result[7].pointsCount;
+        })
+        .catch((err) => {
+          console.log("获取项目积分规则失败了", err);
+        });
     };
-    const handleChange2 = ({file, fileList}) => {
+    const handleChange2 = ({ file, fileList }) => {
       console.log(fileList);
       let list = [];
       if (file.status !== "uploading") {
@@ -1227,30 +1274,30 @@ export default defineComponent({
         });
         //要编辑项目
         api
-            .templateEdit({
-              name: state.projectInfo.name,
-              category: state.projectInfo.category,
-              picUrl: state.projectInfo.picUrl,
-              manager: state.projectInfo.manager,
-              managerId: state.projectInfo.managerId || 0,
-              sourceBelongId: state.projectInfo.sourceBelongId,
-              level: state.projectInfo.level,
-              systemId: state.projectInfo.systemId,
-              boeFlag: state.projectInfo.boeFlag ? 1 : 0,
-              courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
-              notice: state.projectInfo.notice,
-              noticeFlag: state.projectInfo.noticeFlag,
-              projectTemplateId: localStorage.getItem("projectTemplateId"),
-              remark: state.projectInfo.remark,
-              status: state.projectInfo.status,
-              attach: str,
-            })
-            .then((res) => {
-              console.log("上传成功", res);
-            })
-            .catch((err) => {
-              console.log("上传失败了", err);
-            });
+          .templateEdit({
+            name: state.projectInfo.name,
+            category: state.projectInfo.category,
+            picUrl: state.projectInfo.picUrl,
+            manager: state.projectInfo.manager,
+            managerId: state.projectInfo.managerId || 0,
+            sourceBelongId: state.projectInfo.sourceBelongId,
+            level: state.projectInfo.level,
+            systemId: state.projectInfo.systemId,
+            boeFlag: state.projectInfo.boeFlag ? 1 : 0,
+            courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0,
+            notice: state.projectInfo.notice,
+            noticeFlag: state.projectInfo.noticeFlag,
+            projectTemplateId: localStorage.getItem("projectTemplateId"),
+            remark: state.projectInfo.remark,
+            status: state.projectInfo.status,
+            attach: str,
+          })
+          .then((res) => {
+            console.log("上传成功", res);
+          })
+          .catch((err) => {
+            console.log("上传失败了", err);
+          });
       }
 
       if (file.status === "done") {
@@ -1270,114 +1317,116 @@ export default defineComponent({
       let str = JSON.stringify(state.fileList);
 
       api
-          .templateEdit({
-            sourceBelongId: state.projectInfo.sourceBelongId,
-            projectTemplateId: localStorage.getItem("projectTemplateId"),
-            attach: str,
-          })
-          .then((res) => {
-            console.log(res)
-            message.destroy();
-            message.success("删除成功");
-            return
-          })
-          .catch((err) => {
-            console.log(err)
-            message.destroy();
-            message.warning("删除失败");
-            return
-          });
+        .templateEdit({
+          sourceBelongId: state.projectInfo.sourceBelongId,
+          projectTemplateId: localStorage.getItem("projectTemplateId"),
+          attach: str,
+        })
+        .then((res) => {
+          console.log(res);
+          message.destroy();
+          message.success("删除成功");
+          return;
+        })
+        .catch((err) => {
+          console.log(err);
+          message.destroy();
+          message.warning("删除失败");
+          return;
+        });
     };
 
     // 设置上传图片开关
     const checkedClose = (data, a) => {
       console.log(data, a);
       console.log("模板id：" + projectTemplateId);
-      console.log("开关数据：" + JSON.stringify(data) + "====" + JSON.stringify(a))
+      console.log(
+        "开关数据：" + JSON.stringify(data) + "====" + JSON.stringify(a)
+      );
       state.attachSwitch = data;
 
       // 更新开关状态
       api
-          .templateEdit({
-            sourceBelongId: state.projectInfo.sourceBelongId,
-            projectTemplateId: projectTemplateId,
-            attachSwitch: state.attachSwitch ? 1 : -1,
-          })
-          .then((res) => {
-            console.log("开关更新成功", res);
-          })
-          .catch((err) => {
-            console.log("开关更新失败", err);
-          });
+        .templateEdit({
+          sourceBelongId: state.projectInfo.sourceBelongId,
+          projectTemplateId: projectTemplateId,
+          attachSwitch: state.attachSwitch ? 1 : -1,
+        })
+        .then((res) => {
+          console.log("开关更新成功", res);
+        })
+        .catch((err) => {
+          console.log("开关更新失败", err);
+        });
     };
 
     //设置积分规则
     const editRule = () => {
       let obj = {
         projectId: projectTemplateId,
-        datas:[
+        datas: [
           {
-              "type": 1,
-              "pointsCount": Number(state.score1),
-              "typeDesc": "完成【必修/选修】获得%p积分",
-              "typeDescConfig": ""
+            type: 1,
+            pointsCount: Number(state.score1),
+            typeDesc: "完成【必修/选修】获得%p积分",
+            typeDescConfig: "",
           },
           {
-              "type": 2,
-              "pointsCount": Number(state.done3),
-              "typeDesc": "完成作业成绩不低于%d分获得%p积分",
-              "typeDescConfig": state.done2
+            type: 2,
+            pointsCount: Number(state.done3),
+            typeDesc: "完成作业成绩不低于%d分获得%p积分",
+            typeDescConfig: state.done2,
           },
           {
-              "type": 3,
-              "pointsCount": Number(state.four2),
-              "typeDesc": "前%d名学完在线课程获得%p积分",
-              "typeDescConfig": state.four1
+            type: 3,
+            pointsCount: Number(state.four2),
+            typeDesc: "前%d名学完在线课程获得%p积分",
+            typeDescConfig: state.four1,
           },
           {
-              "type": 4,
-              "pointsCount": Number(state.four5),
-              "typeDesc": "前%d名提交作业且成绩不低于%d分获得%p积分",
-              "typeDescConfig":  state.four3 + ';' + state.four4
+            type: 4,
+            pointsCount: Number(state.four5),
+            typeDesc: "前%d名提交作业且成绩不低于%d分获得%p积分",
+            typeDescConfig: state.four3 + ";" + state.four4,
           },
           {
-              "type": 5,
-              "pointsCount": Number(state.five2),
-              "typeDesc": "考试成绩高于%d分获得%p积分",
-              "typeDescConfig": state.five1
+            type: 5,
+            pointsCount: Number(state.five2),
+            typeDesc: "考试成绩高于%d分获得%p积分",
+            typeDescConfig: state.five1,
           },
           {
-              "type": 6,
-              "pointsCount": Number(state.six1),
-              "typeDesc": "考勤正常学员获得%p积分",
-              "typeDescConfig": ""
+            type: 6,
+            pointsCount: Number(state.six1),
+            typeDesc: "考勤正常学员获得%p积分",
+            typeDescConfig: "",
           },
           {
-              "type": 7,
-              "pointsCount": Number(state.seven1),
-              "typeDesc": "成为小组长获得%p积分",
-              "typeDescConfig": ""
+            type: 7,
+            pointsCount: Number(state.seven1),
+            typeDesc: "成为小组长获得%p积分",
+            typeDescConfig: "",
           },
           {
-              "type": 8,
-              "pointsCount": Number(state.seven2),
-              "typeDesc": "优秀学员可获得%p积分",
-              "typeDescConfig": ""
-          }
-        ]
+            type: 8,
+            pointsCount: Number(state.seven2),
+            typeDesc: "优秀学员可获得%p积分",
+            typeDescConfig: "",
+          },
+        ],
       };
       console.log(obj);
       setScoreRule(obj)
-          .then((res) => {
-            console.log(res.data, "修改成功");
-            message.destroy();
-            return message.success("修改积分规则成功");
-          })
-          .catch((err) => {
-            console.log(err.data);
-            message.destroy();
-            return message.warning("修改积分规则失败");
-          });
+        .then((res) => {
+          console.log(res.data, "修改成功");
+          message.destroy();
+          return message.success("修改积分规则成功");
+        })
+        .catch((err) => {
+          console.log(err.data);
+          message.destroy();
+          return message.warning("修改积分规则失败");
+        });
       // scoreRule({
       //   projectId: props.projectId,
       // });
@@ -1387,10 +1436,19 @@ export default defineComponent({
 
     // 共享文档文件下载
     const downloadFile = (url) => {
-      console.log(url)
-      if (url) {
-        window.open(url)
+      console.log(url);
+      let urlNew = url.slice(1);
+      if (urlNew) {
+        window.open(
+          window.location.protocol +
+            process.env.VUE_APP_BOE_API_URL +
+            process.env.VUE_APP_FILE_PATH +
+            urlNew
+        );
       }
+      // if (url) {
+      //   window.open(url)
+      // }
       // if(url){
       //   const filename = '操作指南'
       //   const x = new XMLHttpRequest()
@@ -1406,7 +1464,7 @@ export default defineComponent({
       //   }
       //   x.send()
       // }
-    }
+    };
 
     return {
       ...toRefs(state),
@@ -1431,7 +1489,7 @@ export default defineComponent({
       checkedClose,
       editNotice,
       deFile,
-      downloadFile
+      downloadFile,
     };
   },
 });
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index c32d1870..0d079455 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -4678,7 +4678,17 @@ export default {
     }
     // 共享文档文件下载
     const downloadFile = (url) => {
-      url && window.open(url);
+      console.log(url);
+      let urlNew = url.slice(1);
+      if (urlNew) {
+        window.open(
+          window.location.protocol +
+            process.env.VUE_APP_BOE_API_URL +
+            process.env.VUE_APP_FILE_PATH +
+            urlNew
+        );
+      }
+      // url && window.open(url);
     };
     function stageChange(item, index) {
       state.choosedStageName = item.name;

From 3e703c6c5a545020f46b0a3b81789ac04a5fb0b3 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 3 Mar 2023 12:41:39 +0800
Subject: [PATCH 20/54] -- fix bug

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

diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 76ee2af2..109c4a77 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -680,7 +680,7 @@ function bathDel() {
     );
   }
   tableData.value.loading = true;
-  delStudentList({ ids: stuSelectKeys.value }).then(() => getStuList());
+  delStudentList({ ids: stuSelectKeys.value,type:props.type,targetId:props.id }).then(() => getStuList());
 }
 
 const deleteModalVisible = ref(false);

From 90fdbd9234688721e443a417e68b1967ae985a71 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 3 Mar 2023 13:53:52 +0800
Subject: [PATCH 21/54] -- fix bug

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

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index f94077ab..679ac4ea 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -4655,7 +4655,7 @@ export default defineComponent({
       state.manageStuLoading = true;
       console.log(787666, item);
       state.faceClassification = item.contentTxt;
-      state.faceStatus = item.kkty;
+      state.faceStatus = item.status;
       state.currentFaceId = item.id;
       getCourseStudentList();
       state.newCourseName = item.name;

From e0c95dc063a9de8e71b2d623701a547b47c14f51 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 14:03:56 +0800
Subject: [PATCH 22/54] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E5=80=BC=E6=9C=AA=E6=B8=85=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddTest.vue    | 4 +++-
 src/views/examine/ProjectReviewed.vue | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 79707622..1b11c0ac 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -116,7 +116,7 @@
             <div class="textarea">
               <a-textarea :disabled="taskIndex >= 0" v-model:value="formData.examinationExplain" placeholder="请输入考试说明"
                 allow-clear show-count :maxlength="200" :rows="6" />
-            </div>
+            </div> 
           </div>
           <div class="main_item2">
             <div class="signbox">
@@ -327,6 +327,8 @@ watch(() => formData.value.examType, () => {
 const closeDrawer = () => {
   visible.value = false
   taskIndex.value = -1
+  formData.value.examinationLimit = ''
+  formData.value.examinationExplain = ''
   resetFields()
   dateTime.value = []
 };
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index fda6a627..98956358 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -89,10 +89,10 @@
               @expand="expandTable" :pagination="false" />
           </div>
           <div class="del_btnbox">
-            <div class="del_btn btn22" @click="closeProjAuditModal" style="margin-right: 32px;">
+            <div class="del_btn btn22" @click="closeProjAuditModal" style="margin-right: 32px;color: #fff;background: #4ea6ff;">
               <div class="btnText">取消</div>
             </div>
-            <div class="del_btn btn22" @click="closeProjAuditModal">
+            <div class="del_btn btn22" @click="closeProjAuditModal" style="margin-right: 32px;color: #fff;background: #4ea6ff;">
               <div class="btnText">确定</div>
             </div>
           </div>

From f284dff0ec1d35440d04452f1c87d3796f9caea8 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 3 Mar 2023 14:22:46 +0800
Subject: [PATCH 23/54] -- fix bug

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

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index bd096ee8..afd1beed 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -780,7 +780,7 @@ const submitAuth = () => {
   if (props.type === 2) {
     stageVisible.value = true;
   } else {
-    handleStageOk();
+    handleDialogOk();
   }
 };
 

From 99647d6c98c4d790ea47d4d4c254a74de51d2a5f Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 14:27:00 +0800
Subject: [PATCH 24/54] =?UTF-8?q?style:=E5=AE=A1=E6=A0=B8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/examine/CourseReviewed.vue    |  7 +++-
 src/views/examine/CourseReviewedN.vue   |  7 +++-
 src/views/examine/ProjectReviewed.vue   |  7 +++-
 src/views/examine/ProjectReviewedN.vue  |  7 +++-
 src/views/learningpath/LearningPath.vue | 44 +++++++++----------------
 5 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 02f8b97a..e109a6d1 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -678,7 +678,12 @@ export default {
 						background-image: url("../../assets/images/courseManage/search0.png");
 					}
 				}
-
+				.btn2:active {
+					background: #0982ff;
+				}
+				.btn1:active {
+					background: #0982ff;
+				}
 				.btn2 {
 					background: #4ea6ff;
 					border: 1px solid #4ea6ff;
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 2ac34b36..0efa77fc 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -1613,7 +1613,12 @@ export default {
 						background-image: url("../../assets/images/courseManage/search0.png");
 					}
 				}
-
+				.btn2:active {
+					background: #0982ff;
+				}
+				.btn1:active {
+					background: #0982ff;
+				}
 				.btn2 {
 					background: #4ea6ff;
 					border: 1px solid #4ea6ff;
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index 98956358..0ae5a659 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -599,7 +599,12 @@ export default {
             background-image: url("../../assets/images/courseManage/search0.png");
           }
         }
-
+        .btn22:active {
+					background: #0982ff;
+				}
+				.btn11:active {
+					background: #0982ff;
+				}
         .btn22 {
           background: #4ea6ff;
           border: 1px solid #4ea6ff;
diff --git a/src/views/examine/ProjectReviewedN.vue b/src/views/examine/ProjectReviewedN.vue
index cccf8fd8..d122c9b9 100644
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -383,7 +383,12 @@ export default {
             background-image: url("../../assets/images/courseManage/search0.png");
           }
         }
-
+        .btn2:active {
+					background: #0982ff;
+				}
+				.btn1:active {
+					background: #0982ff;
+				}
         .btn2 {
           background: #4ea6ff;
           border: 1px solid #4ea6ff;
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index e1074981..9604ac94 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -2359,7 +2359,7 @@ export default {
       .btnn {
         padding: 0px 26px 0px 26px;
         height: 38px;
-        background: #ffffff;
+        background: rgba(64, 158, 255, 1);
         border-radius: 8px;
         border: 1px solid rgba(64, 158, 255, 1);
         display: flex;
@@ -2376,7 +2376,7 @@ export default {
         .btnText {
           font-size: 14px;
           font-weight: 400;
-          color: #4ea6ff;
+          color: #fff;
           line-height: 36px;
           margin-left: 5px;
         }
@@ -2394,32 +2394,32 @@ export default {
         .search {
           width: 16px;
           height: 18px;
-          background-image: url("../../assets/images/courseManage/reset1.png");
+          background-image: url("../../assets/images/courseManage/reset0.png");
         }
       }
 
-      .btn1:hover {
-        background: rgba(64, 158, 255, 0.76);
+      // .btn1:hover {
+      //   background: rgba(64, 158, 255, 0.76);
 
-        .search {
-          background-image: url("../../assets/images/courseManage/search0.png");
-        }
+      //   .search {
+      //     background-image: url("../../assets/images/courseManage/search0.png");
+      //   }
 
-        .btnText {
-          color: #ffffff;
-        }
-      }
+      //   .btnText {
+      //     color: #ffffff;
+      //   }
+      // }
 
       .btn1:active {
         background: #0982ff;
       }
 
-      .btn2:hover {
-        background: rgba(64, 158, 255, 0.1);
-      }
+      // .btn2:hover {
+      //   background: rgba(64, 158, 255, 0.1);
+      // }
 
       .btn2:active {
-        background: rgba(64, 158, 255, 0.2);
+        background: #0982ff;
       }
     }
 
@@ -2462,18 +2462,6 @@ export default {
         }
       }
 
-      .btn3:hover {
-        background: rgba(64, 158, 255, 0.76);
-
-        .search {
-          background-image: url("../../assets/images/courseManage/add0.png");
-        }
-
-        .btnText {
-          color: #ffffff;
-        }
-      }
-
       .btn3:active {
         background: #0982ff;
       }

From d415b71f65ac6a78dc09e7025ac84da95baaccf2 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 3 Mar 2023 14:50:27 +0800
Subject: [PATCH 25/54] -- fix bug

---
 src/views/courselibrary/CoursewareManage.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 679ac4ea..6e5f4565 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3623,6 +3623,8 @@ export default defineComponent({
       state.EditTestId = 0;
       state.assessmentId = null;
       state.assessmentName = "";
+      state.workInfo = {};
+      state.examInfo = {};
       state.EditWorkId = null;
       state.beforeValue = null; //考勤 开始前
       state.afterStartValue = null; //考勤 开始后

From 43866dd142479534ea4c50f6e13ad3da452817df Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 14:52:03 +0800
Subject: [PATCH 26/54] style

---
 src/views/projectcenter/ProjectManage.vue | 38 +++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index ad1f355d..71acdef2 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1829,7 +1829,7 @@ export default {
       .btn {
         padding: 0px 26px 0px 26px;
         height: 38px;
-        background: rgba(64, 158, 255, 0);
+        background: #4ea6ff;
         border-radius: 8px;
         border: 1px solid rgba(64, 158, 255, 1);
         display: flex;
@@ -1846,7 +1846,7 @@ export default {
         .btnText {
           font-size: 14px;
           font-weight: 400;
-          color: rgba(64, 158, 255, 1);
+          color: #fff;
           line-height: 36px;
           margin-left: 5px;
         }
@@ -1890,32 +1890,32 @@ export default {
         .search {
           width: 16px;
           height: 18px;
-          background-image: url("../../assets/images/courseManage/reset1.png");
+          background-image: url("../../assets/images/courseManage/reset0.png");
         }
       }
 
-      .btn1:hover {
-        background: rgba(64, 158, 255, 0.76);
+      // .btn1:hover {
+      //   background: rgba(64, 158, 255, 0.76);
 
-        .search {
-          background-image: url("../../assets/images/courseManage/search0.png");
-        }
+      //   .search {
+      //     background-image: url("../../assets/images/courseManage/search0.png");
+      //   }
 
-        .btnText {
-          color: #ffffff;
-        }
-      }
+      //   .btnText {
+      //     color: #ffffff;
+      //   }
+      // }
 
       .btn1:active {
         background: #0982ff;
       }
 
-      .btn2:hover {
-        background: rgba(64, 158, 255, 0.1);
-      }
+      // .btn2:hover {
+      //   background: rgba(64, 158, 255, 0.1);
+      // }
 
       .btn2:active {
-        background: rgba(64, 158, 255, 0.2);
+        background: #0982ff;
       }
     }
 
@@ -1958,9 +1958,9 @@ export default {
         }
       }
 
-      .btn3:hover {
-        background: rgba(64, 158, 255, 0.76);
-      }
+      // .btn3:hover {
+      //   background: rgba(64, 158, 255, 0.76);
+      // }
 
       .btn3:active {
         background: #0982ff;

From 87a9b25339c5f91323c74cfa0069b3698a8d426c Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 14:57:09 +0800
Subject: [PATCH 27/54] style

---
 src/views/projectcenter/TemplateLibrary.vue | 36 +++++----------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue
index b4a78532..ad7c00d5 100644
--- a/src/views/projectcenter/TemplateLibrary.vue
+++ b/src/views/projectcenter/TemplateLibrary.vue
@@ -368,10 +368,15 @@ export default defineComponent({
           }
 
           .btnText2 {
-            color: rgba(64, 158, 255, 1);
+            color: rgb(255, 255, 255);
           }
         }
-
+        .btn1:active {
+          background: #0982ff;
+        }
+        .btn2:active {
+          background: #0982ff;
+        }
         .btn1 {
           background: #4ea6ff;
 
@@ -383,39 +388,14 @@ export default defineComponent({
         }
 
         .btn2 {
-          background: #ffffff;
+          background: #4ea6ff;
           border: 1px solid #4ea6ff;
 
           .search {
             width: 16px;
             height: 18px;
-            background-image: url("../../assets/images/courseManage/reset1.png");
-          }
-        }
-
-        .btn1:hover {
-          background: rgb(255, 255, 255);
-          border: 1px solid #4ea6ff;
-
-          .search {
-            background-image: url("../../assets/images/courseManage/search1.png");
-          }
-
-          .btnText {
-            color: rgba(64, 158, 255, 1);
-          }
-        }
-
-        .btn2:hover {
-          background: rgba(64, 158, 255, 1);
-
-          .search {
             background-image: url("../../assets/images/courseManage/reset0.png");
           }
-
-          .btnText {
-            color: #ffffff;
-          }
         }
       }
     }

From ff4f1a9d8c92eec721d2893e1d378e7ccce590c8 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 3 Mar 2023 15:50:41 +0800
Subject: [PATCH 28/54] -- fix bug

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

diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue
index cc6e5b4e..1ac78573 100644
--- a/src/components/student/OnlineClassModelStudent.vue
+++ b/src/components/student/OnlineClassModelStudent.vue
@@ -193,7 +193,8 @@ function onStuSelectChange(e) {
   stuSelectKeys.value = e;
 }
 
-const openDrawer = () => {
+const openDrawer = (raw) => {
+  console.log(raw);
   visiable.value = true;
 };
 

From 43435b0b4197ca1e08c03dbc0ab9b374b3701995 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 3 Mar 2023 16:50:07 +0800
Subject: [PATCH 29/54] -- fix bug

---
 src/components/student/OnlineClassModelStudent.vue | 10 +++++++---
 src/views/courselibrary/OnlineManage.vue           |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue
index 1ac78573..bc4f5d62 100644
--- a/src/components/student/OnlineClassModelStudent.vue
+++ b/src/components/student/OnlineClassModelStudent.vue
@@ -8,16 +8,16 @@
   >
     <div class="header-content">
       <div style="font-size: 16px">
-        xxxxxxxx  课程
+        {{formData.name}}  课程
       </div>
       <div>
         <span style="color:#999">内容分类</span>：12312
       </div>
       <div>
-        <span style="color:#999">授课教师</span>：12312
+        <span style="color:#999">授课教师</span>：{{ formData.sysType1 }}/{{ formData.sysType2 }}/{{ formData.sysType3 }}
       </div>
       <div>
-        <span style="color:#999">审核状态</span>：12312
+        <span style="color:#999">审核状态</span>：{{ formData.status }}
       </div>
     </div>
     <div class="TableStudent">
@@ -62,6 +62,7 @@
         <a-col :span="1.5">
           <CommonStudent
               :type="type"
+              title="添加在线课学员"
               :id="id"
               @finash="submitCall"
               :stage="stage"
@@ -170,6 +171,8 @@ const columns = ref([
   },
 ])
 
+const formData = ref({})
+
 const {data: studentList, fetch: searchStu, total, loading} = usePage(STUDENT_LIST, searchParams)
 
 const stuPagination = computed(() => ({
@@ -195,6 +198,7 @@ function onStuSelectChange(e) {
 
 const openDrawer = (raw) => {
   console.log(raw);
+  formData.value = raw
   visiable.value = true;
 };
 
diff --git a/src/views/courselibrary/OnlineManage.vue b/src/views/courselibrary/OnlineManage.vue
index 647efc00..9b6778c2 100644
--- a/src/views/courselibrary/OnlineManage.vue
+++ b/src/views/courselibrary/OnlineManage.vue
@@ -19,7 +19,7 @@
         security="restricted"
         sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
     ></iframe>
-    <OnlineClassModelStudent ref="stuRef"></OnlineClassModelStudent>
+    <OnlineClassModelStudent ref="stuRef" :type="13"></OnlineClassModelStudent>
   </div>
 </template>
 <script setup>

From 3ef7a3ec4c153916d0d52f9e3d2caae03e34fb18 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 16:51:58 +0800
Subject: [PATCH 30/54] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=AD=94=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index 739ba505..e0ea9a36 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -318,14 +318,14 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                {text.record.status == '0' ? "查看答卷" : 
-                <a onClick={()=>{
+                {text.record.status === 1 || text.record.status === 9 ? 
+                  <a onClick={()=>{
                     state.studentKid = text.record.studentKid;
                     state.datasource = text.record;
                     state.CAvisible = true;
-                  }}>  查看答卷 </a>
+                  }}>查看答卷 </a> : 
+                  <span style="color:rgba(0, 0, 0, 0.25);cursor:not-allowed;">  查看答卷 </span>
                 }
-                
               </div>
             );
           },

From 78fd3a87b03e1cdc8fb3c6be10036a1b6bb1f2f2 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 3 Mar 2023 17:27:42 +0800
Subject: [PATCH 31/54] -- fix bug

---
 src/components/drawers/AddOnline.vue      | 10 ++++-
 src/components/drawers/CreateOnline.vue   | 46 +++++++++++++----------
 src/views/learningpath/LevelAddDetail.vue |  2 +-
 src/views/projectcenter/LibraryAdd.vue    |  1 -
 src/views/projectcenter/ProjectAdd.vue    | 17 +--------
 src/views/projectcenter/TaskAdd.vue       |  2 +-
 src/views/projectcenter/TaskPage.vue      |  2 +-
 src/views/projectcenter/temTask.vue       |  2 +-
 src/views/projectcenter/templateAdd.vue   |  4 +-
 9 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 46e0c03b..19b489f3 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -17,7 +17,7 @@
       </div>
       <div>
         <div class="contentMain" style="padding:20px">
-          <CreateOnline ref="onlineRef">
+          <CreateOnline ref="onlineRef" :id="props.id" :type="props.infoType">
             <a-button type="primary" style="border-radius: 4px">{{
                 taskIndex === -1 ? '选择/新建课程' : '重新选择'
               }}
@@ -46,7 +46,9 @@ import {message} from "ant-design-vue";
 import CreateOnline from "@/components/drawers/CreateOnline.vue";
 
 const props = defineProps({
-  type: Number,
+  infoType: Number,
+  courseSyncFlag: Number,
+  id: Number,
   taskList: []
 })
 const visible = ref(false)
@@ -133,6 +135,10 @@ function confirm() {
 
 function selectCourse(row) {
   console.log(row)
+  if(!props.courseSyncFlag && !row.refId){
+    message.warning("请新建本项目在线课！");
+    return
+  }
   rowSelectKeys.value = [row.id]
   selectsData.value = [row]
   onlineRef.value.closeModal()
diff --git a/src/components/drawers/CreateOnline.vue b/src/components/drawers/CreateOnline.vue
index ebf178d1..7b9ad6a2 100644
--- a/src/components/drawers/CreateOnline.vue
+++ b/src/components/drawers/CreateOnline.vue
@@ -3,38 +3,44 @@
     <slot></slot>
   </div>
   <a-modal
-      :visible="visible"
-      :footer="null"
-      :centered="true"
-      :maskClosable="false"
-      width="80%"
-      height="80%"
-      @cancel="closeModal"
+    :visible="visible"
+    :footer="null"
+    :centered="true"
+    :maskClosable="false"
+    width="80%"
+    height="80%"
+    @cancel="closeModal"
   >
     <iframe
-        id="iframe"
-        style="width: 100%; height: 600px"
-        :src="iframeUrl + '/course/manages?f=choose'"
-        name="myframe"
-        security="restricted"
-        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+      id="iframe"
+      style="width: 100%; height: 600px"
+      :src="`${iframeUrl}/course/manages?f=choose?ref_id=${props.id}&ref_type=${props.type}`"
+      name="myframe"
+      security="restricted"
+      sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </a-modal>
 </template>
 <script setup>
-import {ref} from "vue";
+import {defineProps, ref} from "vue";
 import {iframeUrl} from "@/api/method";
 
-const visible = ref(false)
+const visible = ref(false);
+
+const props = defineProps({
+  type: Number,
+  id: Number,
+});
 
 function openModal() {
-  visible.value = true
+  visible.value = true;
 }
 
 function closeModal() {
-  visible.value = false
+  visible.value = false;
 }
-defineExpose({closeModal})
+
+defineExpose({ closeModal });
 
 </script>
 <style lang="scss">
@@ -302,8 +308,8 @@ defineExpose({closeModal})
             justify-content: center;
 
             background: linear-gradient(
-                    rgba(78, 166, 255, 0.2) 0%,
-                    rgba(78, 166, 255, 0) 100%
+                rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%
             );
 
             .inhe {
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 4d15fe10..8d65cd49 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -140,7 +140,7 @@
         </div>
         <div class="mid">
           <div class="item" v-for="(value,key) in TASK_TYPE" :key="key">
-            <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key"
+            <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="2" :id="routerInfo.routerInfo?.id"
                        v-model:task-list="routerInfo.chapterList[activeIndex].draftTaskList">
               <div class="itcon">
                 <div class="img">
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 2725efa6..003fbd5b 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -552,7 +552,6 @@
                     <div class="setc_main">
                       <a-radio
                         v-model:checked="projectInfo.courseSyncFlag"
-                        :disabled="true"
                         ><span style="color: #333333"
                           >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                         ></a-radio
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index a2a87d26..75fdec9b 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -150,21 +150,8 @@
           <div class="namebox">
             <div class="inname">同步学习记录</div>
           </div>
-          <div class="in ggysxz" v-if="courseSyncFlag">
-            <!-- :disabled="viewDetail ? true : false" -->
-            <a-checkbox v-model:checked="courseSyncFlag" disabled>
-              <span style="
-                    width: 100%;
-                    color: rgba(109, 117, 132, 1);
-                    font-size: 14px;
-                  ">
-                同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
-              </span>
-            </a-checkbox>
-          </div>
-          <div class="in" v-else>
-            <!-- :disabled="viewDetail ? true : false" -->
-            <a-checkbox v-model:checked="courseSyncFlag" disabled>
+          <div class="in ggysxz">
+            <a-checkbox v-model:checked="courseSyncFlag">
               <span style="
                     width: 100%;
                     color: rgba(109, 117, 132, 1);
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index e00e397c..3b687fae 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -100,7 +100,7 @@
         <div class="mid">
           <div class="item" v-for="(value,key) in TASK_TYPE" :key="key">
             <div v-if="key!=13">
-              <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key"
+              <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="1" :id="projectInfo.projectInfo?.id"
                          v-model:task-list="projectInfo.stageList[activeIndex].taskDraftDtoList">
                 <div class="itcon">
                   <div class="img">
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 0d079455..8885b9d4 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1247,7 +1247,7 @@
                   <div class="set_content">
                     <div class="setc_name"><span>同步学习记录：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="checkedSty" :disabled="true"
+                      <a-radio v-model:checked="checkedSty"
                         ><span style="color: #333333"
                           >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                         ></a-radio
diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
index e1d422c3..d11e9edb 100644
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -98,7 +98,7 @@
         <div class="mid">
           <div class="item" v-for="(value, key) in TASK_TYPE" :key="key">
             <div v-if="key != 13">
-              <component :is="value.component" :ref="el => courseRef['el' + key] = el" :type="key"
+              <component :is="value.component" :ref="el => courseRef['el' + key] = el" :type="key" :infoType="1" :id="projectInfo.projectTemplateInfo?.id"
                 v-model:task-list="projectInfo.stageList[activeIndex].taskTemplateList">
                 <div class="itcon">
                   <div class="img">
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 21574111..7f28a41d 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -197,7 +197,7 @@
           </div>
           <div class="in ggysxz" v-if="courseSyncFlag">
             <!-- :disabled="viewDetail ? true : false" -->
-            <a-checkbox disabled v-model:checked="courseSyncFlag"
+            <a-checkbox v-model:checked="courseSyncFlag"
               ><span
                 style="
                   width: 100%;
@@ -210,7 +210,7 @@
           </div>
           <div class="in" v-else>
             <!-- :disabled="viewDetail ? true : false" -->
-            <a-checkbox disabled v-model:checked="courseSyncFlag"
+            <a-checkbox v-model:checked="courseSyncFlag"
               ><span
                 style="
                   width: 100%;

From 55b0c887b419c71e905e27107749288f1907c10f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 3 Mar 2023 17:32:32 +0800
Subject: [PATCH 32/54] -- fix bug

---
 src/views/learningpath/LevelAddDetail.vue | 2 +-
 src/views/projectcenter/TaskAdd.vue       | 2 +-
 src/views/projectcenter/TaskPage.vue      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 8d65cd49..603a0613 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -140,7 +140,7 @@
         </div>
         <div class="mid">
           <div class="item" v-for="(value,key) in TASK_TYPE" :key="key">
-            <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="2" :id="routerInfo.routerInfo?.id"
+            <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="2" :id="routerInfo.routerInfo?.id"  :courseSyncFlag="routerInfo.routerInfo?.courseSyncFlag"
                        v-model:task-list="routerInfo.chapterList[activeIndex].draftTaskList">
               <div class="itcon">
                 <div class="img">
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 3b687fae..222dbe12 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -100,7 +100,7 @@
         <div class="mid">
           <div class="item" v-for="(value,key) in TASK_TYPE" :key="key">
             <div v-if="key!=13">
-              <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="1" :id="projectInfo.projectInfo?.id"
+              <component :is="value.component" :ref="el=>courseRef['el'+key]=el" :type="key" :infoType="1" :id="projectInfo.projectInfo?.id" :courseSyncFlag="projectInfo.projectInfo?.courseSyncFlag"
                          v-model:task-list="projectInfo.stageList[activeIndex].taskDraftDtoList">
                 <div class="itcon">
                   <div class="img">
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 8885b9d4..0d079455 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -1247,7 +1247,7 @@
                   <div class="set_content">
                     <div class="setc_name"><span>同步学习记录：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="checkedSty"
+                      <a-radio v-model:checked="checkedSty" :disabled="true"
                         ><span style="color: #333333"
                           >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                         ></a-radio

From 31129433b2153a19ce17cc8763de30f9a661e832 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 17:48:38 +0800
Subject: [PATCH 33/54] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=8E=BB?=
 =?UTF-8?q?=E8=80=83=E8=AF=95=E7=99=BD=E5=B1=8F=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=95=E5=8D=B7id=E5=AD=97=E6=AE=B5=E4=BC=A0=E9=80=92?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/CommonTest.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/drawers/CommonTest.vue b/src/components/drawers/CommonTest.vue
index 8bb43ba0..9c63c00f 100644
--- a/src/components/drawers/CommonTest.vue
+++ b/src/components/drawers/CommonTest.vue
@@ -68,14 +68,14 @@
               </div>
               <span style="margin-right: 3px">选择试卷：</span>
             </div>
-            <s-test v-model:id="formData.examinationTestId" v-model:name="formData.examinationTestName">
+            <s-test v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
               <div class="btnbox">
                 <button class="xkbtn" style="margin:0">
-                  {{ formData.examinationTestId ? "重选" : "选择" }}试卷
+                  {{ formData.examinationPaperId ? "重选" : "选择" }}试卷
                 </button>
               </div>
             </s-test>
-            <div v-if="formData.examinationTestId">
+            <div v-if="formData.examinationPaperId">
               <a-tag closable color="processing" @close="delTag" :closeIcon="true">
                 <span style="font-size: 14px; line-height: 33px">{{ formData.examinationTestName }}</span>
               </a-tag>
@@ -327,7 +327,7 @@ const props = defineProps({
 const visible = ref(false)
 const initValue = {
   examinationName: '',
-  examinationTestId: '',
+  examinationPaperId: '',
   examinationStartTime: '',
   examinationEndTime: '',
   examinationDuration: '',
@@ -349,7 +349,7 @@ const innerRule = {
       message: '请输入考试名称',
     },
   ],
-  examinationTestId: [
+  examinationPaperId: [
     {
       required: true,
       message: '请输入选择试卷',
@@ -440,7 +440,7 @@ function openDrawer() {
 }
 
 const delTag = () => {
-  formData.value.examinationTestId = '';
+  formData.value.examinationPaperId = '';
   formData.value.examinationTestName = '';
 }
 

From 9f5fee0473731d9cb42b8d54d091b2fe2cc7cb94 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 18:04:45 +0800
Subject: [PATCH 34/54] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=88=9B=E5=BB=BA=E4=BA=BA=20=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/ManagePage.vue     | 13 ++++++++-----
 src/views/research/ResearchManage.vue |  7 ++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue
index 9437fd6e..754e329d 100644
--- a/src/views/research/ManagePage.vue
+++ b/src/views/research/ManagePage.vue
@@ -31,7 +31,7 @@
           </div>
           <div style="width: 103px; margin-right: 126px; float: left">
             <span class="name">创建人:</span>
-            <span class="descript">{{ basicInfo.createName }}</span>
+            <span class="descript">{{ createName }}</span>
           </div>
           <div style="width: 88px; margin-right: 126px; float: left">
             <span class="name">状态:</span>
@@ -40,7 +40,7 @@
           </div>
           <div style="width: 192px; margin-right: 126px; float: left">
             <span class="name">创建时间:</span>
-            <span class="descript">{{ basicInfo.createTime }}</span>
+            <span class="descript">{{ createTime }}</span>
           </div>
           <div style="width: 192px; margin-right: 126px; float: left">
             <span class="name">发布时间:</span>
@@ -82,7 +82,7 @@
 import ViewAssess from "../../components/drawers/ViewAssess";
 import { reactive, toRefs } from "vue";
 import { queryAssessmentDetailList } from "@/api/indexResearch";
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 import * as api from "@/api/indexTaskManage";
 
 export default {
@@ -90,6 +90,7 @@ export default {
   components: { ViewAssess },
   setup() {
     const router = useRouter();
+    const { query: { createName, createTime }} = useRoute();
     const state = reactive({
       Assessvisible: false,
       basicInfo: "",
@@ -104,7 +105,7 @@ export default {
       evalStuListDataTotal: 0,
       evalCurrentPage: 1
     });
-
+    
     const getInfoDate = async () => {
       state.tableDataTotalLoading = true;
       await queryAssessmentDetailList({
@@ -322,7 +323,9 @@ export default {
       ],
       showassess,
       changePaginationStu,
-      exportStudentInfo
+      exportStudentInfo,
+      createName, 
+      createTime
     };
   },
 };
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 997e46e1..275eb8b7 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -76,7 +76,7 @@
                       @click=" handleEditPage(record.id)" type="link">基础信息
             </a-button>
             <a-button v-if="record.releaseStatus === '2' && checkPer(record.permissions)"
-                      @click=" toManage(record.id)" type="link">管理
+                      @click=" toManage(record.id, record)" type="link">管理
             </a-button>
             <a-button v-if="checkPer(record.permissions)" @click=" handleOper(record,'copy')" type="link">复制
             </a-button>
@@ -369,9 +369,10 @@ function handleEditPage(id) {
   router.push("/researchadd/" + id);
 }
 
-function toManage(id) {
-  router.push("/managepage/" + id);
+function toManage(id, record) {
+  router.push({ path: `/managepage/${id}`, query: { createName:record.createName, createTime:record.createTime } });
 }
+
 const handleNext = async () => {
   await validate().catch(({ errorFields }) => {
     message.warning(errorFields[0].errors.join());

From c0d872b78d12eadeeb365085fcec732ebd452362 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 18:20:23 +0800
Subject: [PATCH 35/54] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=87=8D=E9=80=89=E8=AF=95=E5=8D=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 1b11c0ac..68a6f37f 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -59,7 +59,7 @@
                 <span style="font-size: 14px; line-height: 33px">{{ formData.examinationTestName }}</span>
               </a-tag>
             </div>
-            <s-test v-else v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
+            <s-test v-if="taskIndex < 0" v-model:id="formData.examinationPaperId" v-model:name="formData.examinationTestName">
               <div class="btnbox">
                 <button class="xkbtn" style="margin:0" >
                   {{ formData.examinationPaperId ? "重选" : "选择" }}试卷

From d6cf2ee0894cc1dafb48c983ea944649baa97de0 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 18:28:29 +0800
Subject: [PATCH 36/54] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 222dbe12..0c05ce0e 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -25,7 +25,7 @@
                       <a-popover placement="topLeft" trigger="click">
                         <template #content>
                           <div style="width: 130px">
-                            {{ element.name || "暂无说明" }}
+                            {{ element.remark || "暂无说明" }}
                           </div>
                         </template>
                         <template #title>

From 8b6e5201ce2a7cb5337f9f9b329f8ee8bf539a22 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 3 Mar 2023 19:23:23 +0800
Subject: [PATCH 37/54] -- fix bug

---
 src/api/ThirdApi.js                           |  21 +-
 src/api/request.js                            |   2 +-
 .../student/OnlineClassModelStudent.vue       | 208 +++++++++++-------
 src/views/courselibrary/OnlineManage.vue      |   1 +
 4 files changed, 144 insertions(+), 88 deletions(-)

diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js
index ca3f8f34..88a85ba3 100644
--- a/src/api/ThirdApi.js
+++ b/src/api/ThirdApi.js
@@ -1,14 +1,15 @@
 //学员列表带分页
-export const USER_LIST_PAGE = '/userbasic/user/list post'
+export const USER_LIST_PAGE = "/userbasic/user/list post";
 //学员列表 没有分页数据 只能通过名称检索 速度较快
-export const USER_LIST = '/userbasic/user/searchList post'
-export const ORG_LIST = '/userbasic/org/list post'
-export const ORG_CHILD_LIST = '/userbasic/org/info post'
+export const USER_LIST = "/userbasic/user/searchList post";
+export const ORG_LIST = "/userbasic/org/list post";
+export const ORG_CHILD_LIST = "/userbasic/org/info post";
 // export const AUDIENCE_LIST = '/userbasic/audience/list post'
 //当前用户可以查看的受众接口
-export const AUDIENCE_LIST = '/userbasic/audience/userAudiencesFilter post'
-export const USER_PERMISSION = '/userbasic/permission/listByUser post'
-export const CASE_PAGE = '/systemapi/xboe/m/boe/cases/pagelist post formData'
-export const EXAM_PAPER_PAGE = '/systemapi/xboe/m/exam/paper/querylist post formData'
-export const TEST_PAGE = '/api/b1/system/quiz/quiz-list post formData'
-export const ONLINE_PAGE = '/systemapi/xboe/m/course/manage/pagelist post formData'
\ No newline at end of file
+export const AUDIENCE_LIST = "/userbasic/audience/userAudiencesFilter post";
+export const USER_PERMISSION = "/userbasic/permission/listByUser post";
+export const CASE_PAGE = "/systemapi/xboe/m/boe/cases/pagelist post formData";
+export const EXAM_PAPER_PAGE = "/systemapi/xboe/m/exam/paper/querylist post formData";
+export const TEST_PAGE = "/api/b1/system/quiz/quiz-list post formData";
+export const ONLINE_PAGE = "/systemapi/xboe/m/course/manage/pagelist post formData";
+export const ONLINE_COURSE_DEL = (id, courseId) => `/systemapi/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId} post`;
\ No newline at end of file
diff --git a/src/api/request.js b/src/api/request.js
index 945daf79..18d527f0 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -237,7 +237,7 @@ export function useRequest(_url, params = {}, init = true) {
     };
 }
 
-export async function boeRequest(_url, params) {
+export async function boeRequest(_url, params = {}) {
     const s = _url.split(' ')
     let url = s[0]
     const method = s[1]?.toLowerCase() || 'get'
diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue
index bc4f5d62..526c203f 100644
--- a/src/components/student/OnlineClassModelStudent.vue
+++ b/src/components/student/OnlineClassModelStudent.vue
@@ -1,14 +1,14 @@
 <template>
   <a-modal
-      :visible="visiable"
-      :centered="true"
-      width="70%"
-      title="学员管理"
-      @cancel="closeDrawer"
+    :visible="visiable"
+    :centered="true"
+    width="70%"
+    title="学员管理"
+    @cancel="closeDrawer"
   >
     <div class="header-content">
       <div style="font-size: 16px">
-        {{formData.name}}  课程
+        {{ formData.name }} 课程
       </div>
       <div>
         <span style="color:#999">内容分类</span>：12312
@@ -22,24 +22,24 @@
     </div>
     <div class="TableStudent">
       <a-row
-          type="flex"
-          gutter="12"
-          style="padding-left: 20px; margin-right: 0px"
+        type="flex"
+        gutter="12"
+        style="padding-left: 20px; margin-right: 0px"
       >
         <a-col>
           <a-form-item title="学员名称：">
             <a-input
-                class="cus-input"
-                v-model:value="searchParams.studentName"
-                placeholder="请输入学员名称"
+              class="cus-input"
+              v-model:value="searchParams.studentName"
+              placeholder="请输入学员名称"
             />
           </a-form-item>
         </a-col>
         <a-col>
           <a-button
-              class="cus-btn"
-              style="background: #4ea6ff; color: #fff; width: 100px"
-              @click="searchStu"
+            class="cus-btn"
+            style="background: #4ea6ff; color: #fff; width: 100px"
+            @click="searchStu"
           >
             <template #icon><img style="margin-right: 10px" src="../../assets/images/courseManage/search0.png"/>
             </template>
@@ -55,17 +55,17 @@
       </a-row>
 
       <a-row
-          type="flex"
-          gutter="12"
-          style="padding-left: 20px; margin-right: 0px"
+        type="flex"
+        gutter="12"
+        style="padding-left: 20px; margin-right: 0px"
       >
         <a-col :span="1.5">
           <CommonStudent
-              :type="type"
-              title="添加在线课学员"
-              :id="id"
-              @finash="submitCall"
-              :stage="stage"
+            :type="type"
+            title="添加在线课学员"
+            :id="formData.id"
+            @finash="submitCall"
+            :stage="stage"
           >
             <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
               <template #icon><img style="margin-right: 10px" src="../../assets/images/courseManage/add0.png"/>
@@ -77,17 +77,16 @@
       </a-row>
       <div style="margin-top: 20px">
         <a-table
-            :columns="columns"
-            :data-source="studentList"
-            :pagination="stuPagination"
-            :loading="loading"
-            row-key="id"
-            :row-selection="stuRowSelection"
+          :columns="columns"
+          :data-source="studentList"
+          :pagination="stuPagination"
+          :loading="loading"
+          row-key="id"
         >
           <template #action="{ record }">
             <a-space :size="2">
               <slot name="extension" v-bind:data="{ record }"></slot>
-              <a-button v-if="checkPer(permissions)" @click="del(record.id)" type="link" danger>删除</a-button>
+              <a-button v-if="checkPer(permissions)" @click="del(record.courseStuId)" type="link" danger>删除</a-button>
             </a-space>
           </template>
         </a-table>
@@ -96,22 +95,20 @@
   </a-modal>
 </template>
 <script setup>
-import {computed, createVNode, defineExpose, defineProps, ref, watch} from "vue";
-import {usePage} from "@/api/request";
+import {computed, defineExpose, defineProps, ref, watch} from "vue";
+import {boeRequest, usePage} from "@/api/request";
 import {STUDENT_LIST} from "@/api/apis";
-import {delStudentList} from "@/api/index1";
-import {ExclamationCircleOutlined} from "@ant-design/icons-vue";
-import {Modal} from "ant-design-vue";
 import CommonStudent from "@/components/student/CommonStudent";
 import {checkPer} from "@/utils/utils";
+import dialog from "@/utils/dialog";
+import {ONLINE_COURSE_DEL} from "@/api/ThirdApi";
 
 const props = defineProps({
   permissions: {
     type: String,
-    default: ''
+    default: ""
   },
   type: Number,
-  id: String,
   stage: {
     type: Array,
     default: () => [],
@@ -128,20 +125,20 @@ const initParams = {
   studentName: "",
   pageNo: 1,
   pageSize: 10,
-  type: props.type || '',
+  type: props.type || "",
   types: props.types,
-  pid: props.id || '',
-}
+  pid: props.id || "",
+};
 
-const searchParams = ref(initParams)
-const searchName = ref('')
+const searchParams = ref(initParams);
+const searchName = ref("");
 
 const columns = ref([
   {
     title: "姓名",
     dataIndex: "studentName",
     key: "studentName",
-    width: 30,
+    width: 50,
     align: "center",
     ellipsis: true,
   },
@@ -161,19 +158,89 @@ const columns = ref([
     align: "center",
     ellipsis: true,
   },
+  {
+    title: "岗位",
+    dataIndex: "studentJobName",
+    key: "studentJobName",
+    width: 80,
+    align: "center",
+    ellipsis: true,
+  },
+  {
+    title: "Band",
+    dataIndex: "studentBandDesc",
+    key: "studentBandDesc",
+    width: 80,
+    align: "center",
+    ellipsis: true,
+  },
+  {
+    title: "报名状态",
+    dataIndex: "studentDepartName",
+    key: "studentDepartName",
+    width: 80,
+    align: "center",
+    ellipsis: true,
+    customRender: () => "已报名",
+  },
+  {
+    title: "加入方式",
+    dataIndex: "studentDepartName",
+    key: "studentDepartName",
+    width: 80,
+    align: "center",
+    ellipsis: true,
+    customRender: () => "手动加入",
+  },
+  {
+    title: "数据来源",
+    dataIndex: "id",
+    key: "id",
+    width: 80,
+    align: "center",
+    ellipsis: true,
+    customRender: () => "-",
+  },
+  {
+    title: "评估状态",
+    dataIndex: "status",
+    key: "status",
+    width: 80,
+    align: "center",
+    ellipsis: true,
+    customRender: () => "-",
+  },
+  {
+    title: "考试成绩",
+    dataIndex: "score",
+    key: "score",
+    width: 80,
+    align: "center",
+    ellipsis: true,
+    customRender: ({ record: { score } }) => score || "-",
+  },
+  {
+    title: "状态",
+    dataIndex: "status",
+    key: "status",
+    width: 80,
+    align: "center",
+    ellipsis: true,
+    customRender: ({ record: { status } }) => status ? "已完成" : "未开始",
+  },
   {
     title: "操作",
     dataIndex: "operation",
     key: "operation",
     width: 50,
     align: "center",
-    slots: {customRender: "action"},
+    slots: { customRender: "action" },
   },
-])
+]);
 
-const formData = ref({})
+const formData = ref({});
 
-const {data: studentList, fetch: searchStu, total, loading} = usePage(STUDENT_LIST, searchParams)
+const { data: studentList, fetch: searchStu, total, loading } = usePage(STUDENT_LIST, searchParams, false);
 
 const stuPagination = computed(() => ({
   total: total.value,
@@ -183,23 +250,13 @@ const stuPagination = computed(() => ({
   onChange: changePagination
 }));
 
-const stuSelectKeys = ref([]);
-
-const stuRowSelection = computed(() => ({
-  columnWidth: 20,
-  selectedRowKeys: stuSelectKeys.value,
-  onChange: onStuSelectChange,
-  preserveSelectedRowKeys: true,
-}));
-
-function onStuSelectChange(e) {
-  stuSelectKeys.value = e;
-}
 
 const openDrawer = (raw) => {
   console.log(raw);
-  formData.value = raw
+  searchParams.value.pid = raw.id;
+  formData.value = raw;
   visiable.value = true;
+  searchStu();
 };
 
 const changePagination = (page) => {
@@ -207,20 +264,17 @@ const changePagination = (page) => {
 };
 
 function del(id) {
-  Modal.confirm({
-    title: () => '确定删除?',
-    icon: () => createVNode(ExclamationCircleOutlined),
-    content: () => '数据删除后不可恢复！',
-    okText: () => '确定',
-    okType: 'danger',
-    cancelText: () => '取消',
-    onOk() {
+  dialog({ content: "确定删除?", ok: async () => {
       if (id) {
-        loading.value = true
-        delStudentList({ids: [id]}).then(() => searchStu())
+        loading.value = true;
+        await boeRequest(ONLINE_COURSE_DEL(id, formData.value.id))
+        searchStu()
       }
-    },
-  });
+    }});
+}
+
+function submitCall(flag) {
+  flag && searchStu();
 }
 
 const closeDrawer = () => {
@@ -228,13 +282,13 @@ const closeDrawer = () => {
 };
 
 function reset() {
-  searchParams.value = initParams
-  searchName.value = ''
+  searchParams.value = initParams;
+  searchName.value = "";
 }
 
 watch(visiable, () => {
-  visiable.value && searchStu()
-  searchParams.value = initParams
+  visiable.value && searchStu();
+  searchParams.value = initParams;
 });
 
 defineExpose({
@@ -242,7 +296,7 @@ defineExpose({
   loading,
   closeDrawer,
   openDrawer
-})
+});
 </script>
 <style lang="scss">
 .header-content {
diff --git a/src/views/courselibrary/OnlineManage.vue b/src/views/courselibrary/OnlineManage.vue
index 9b6778c2..dd333a7a 100644
--- a/src/views/courselibrary/OnlineManage.vue
+++ b/src/views/courselibrary/OnlineManage.vue
@@ -32,6 +32,7 @@ const stuRef = ref()
 onMounted(() => {
   window.openSelectStu = stuRef.value.openDrawer
 })
+
 </script>
 <style lang="scss">
 .courseManage {

From 5e5b280d95c8a0baf625fb087b64db8c9e2058a2 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Fri, 3 Mar 2023 20:14:40 +0800
Subject: [PATCH 38/54] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=85=B1=E4=BA=AB?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAdd.vue    | 18 +++++++-----------
 src/views/projectcenter/LibraryAdd.vue | 19 ++++++++-----------
 src/views/projectcenter/TaskPage.vue   | 16 +++++++---------
 3 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 146e6cdb..687b4675 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -2786,17 +2786,13 @@ export default {
 
     // 共享文档文件下载
     const downloadFile = (url) => {
-      console.log(url);
-      let urlNew = url.slice(1);
-      console.log(urlNew);
-      if (urlNew) {
-        window.open(
-          window.location.protocol +
-            process.env.VUE_APP_BOE_API_URL +
-            process.env.VUE_APP_FILE_PATH +
-            urlNew
-        );
-      }
+      console.log("url", url);
+      window.open(
+        window.location.protocol +
+          process.env.VUE_APP_BOE_API_URL +
+          process.env.VUE_APP_FILE_PATH +
+          url
+      );
       // if(url){
       //   const filename = '操作指南'
       //   const x = new XMLHttpRequest()
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 003fbd5b..e7c7649d 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -550,8 +550,7 @@
                   <div class="set_content">
                     <div class="setc_name"><span>同步学习记录：</span></div>
                     <div class="setc_main">
-                      <a-radio
-                        v-model:checked="projectInfo.courseSyncFlag"
+                      <a-radio v-model:checked="projectInfo.courseSyncFlag"
                         ><span style="color: #333333"
                           >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                         ></a-radio
@@ -1436,15 +1435,13 @@ export default defineComponent({
     // 共享文档文件下载
     const downloadFile = (url) => {
       console.log(url);
-      let urlNew = url.slice(1);
-      if (urlNew) {
-        window.open(
-          window.location.protocol +
-            process.env.VUE_APP_BOE_API_URL +
-            process.env.VUE_APP_FILE_PATH +
-            urlNew
-        );
-      }
+      window.open(
+        window.location.protocol +
+          process.env.VUE_APP_BOE_API_URL +
+          process.env.VUE_APP_FILE_PATH +
+          url
+      );
+
       // if (url) {
       //   window.open(url)
       // }
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 0d079455..17fed061 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -4679,15 +4679,13 @@ export default {
     // 共享文档文件下载
     const downloadFile = (url) => {
       console.log(url);
-      let urlNew = url.slice(1);
-      if (urlNew) {
-        window.open(
-          window.location.protocol +
-            process.env.VUE_APP_BOE_API_URL +
-            process.env.VUE_APP_FILE_PATH +
-            urlNew
-        );
-      }
+      window.open(
+        window.location.protocol +
+          process.env.VUE_APP_BOE_API_URL +
+          process.env.VUE_APP_FILE_PATH +
+          url
+      );
+
       // url && window.open(url);
     };
     function stageChange(item, index) {

From fb11f951d90c0027f354d2f5df6245486e0ec58e Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 20:57:49 +0800
Subject: [PATCH 39/54] =?UTF-8?q?style:=E9=9D=A2=E6=8E=88=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 6e5f4565..ddfc4893 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -5140,7 +5140,7 @@ export default defineComponent({
       .btnn {
         padding: 0px 26px 0px 26px;
         height: 38px;
-        background: #ffffff;
+        background: #4ea6ff;
         border-radius: 8px;
         border: 1px solid rgba(64, 158, 255, 1);
         display: flex;
@@ -5157,7 +5157,7 @@ export default defineComponent({
         .btnText {
           font-size: 14px;
           font-weight: 400;
-          color: #4ea6ff;
+          color: #fff;
           line-height: 36px;
           margin-left: 5px;
         }
@@ -5170,18 +5170,23 @@ export default defineComponent({
           background-image: url("../../assets/images/courseManage/search0.png");
         }
       }
-
+      .btn1:active {
+        background: #0982ff;
+      }
+      .btn2:active {
+        background: #0982ff;
+      }
       .btn2 {
         .search {
           width: 16px;
           height: 18px;
-          background-image: url("../../assets/images/courseManage/reset1.png");
+          background-image: url("../../assets/images/courseManage/reset0.png");
         }
 
         .daochu {
           width: 16px;
           height: 18px;
-          background-image: url("../../assets/images/coursewareManage/export.png");
+          background-image: url("../../assets/images/coursewareManage/export1.png");
         }
       }
 
@@ -5238,7 +5243,9 @@ export default defineComponent({
           margin-left: 5px;
         }
       }
-
+      .btn3:active {
+					background: #0982ff;
+			}
       .btn3 {
         .search {
           width: 17px;

From bbfe70a89546ae8cf9960bcfa5e249c956ec6116 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 21:10:15 +0800
Subject: [PATCH 40/54] =?UTF-8?q?style:=E8=AF=84=E4=BC=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ViewAssess.vue |  2 +-
 src/views/research/ManagePage.vue     | 10 ++++--
 src/views/research/ResearchAdd.vue    |  2 ++
 src/views/research/ResearchManage.vue | 50 +++++++++++++--------------
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/components/drawers/ViewAssess.vue b/src/components/drawers/ViewAssess.vue
index c79e86c3..d60c4054 100644
--- a/src/components/drawers/ViewAssess.vue
+++ b/src/components/drawers/ViewAssess.vue
@@ -130,7 +130,7 @@
         
       </div>
       <div class="btnn">
-        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="closeDrawer">确定</button>
       </div>
     </div>
diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue
index 754e329d..764cbcbe 100644
--- a/src/views/research/ManagePage.vue
+++ b/src/views/research/ManagePage.vue
@@ -485,7 +485,7 @@ export default {
     .img2 {
       width: 16px;
       height: 18px;
-      background-image: url(../../assets/images/coursewareManage/export.png);
+      background-image: url(../../assets/images/coursewareManage/export1.png);
       background-size: 100% 100%;
       margin-right: 7px;
     }
@@ -498,9 +498,13 @@ export default {
   }
 
   .btn2 {
-    background: #ffffff;
+    background: #4ea6ff;
 
-    color: #4ea6ff;
+    color: #fff;
     border: 1px solid #4ea6ff;
   }
+
+  .btn2:active {
+    background: #0982ff;
+  }
 }</style>
\ No newline at end of file
diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index 8b5fbbaf..a41405a2 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -82,6 +82,8 @@
             height: 40px;
             margin-left: 14px;
             border-radius: 8px;
+            color:#fff;
+            background-color: #4ea6ff;
           "
           @click="handleAllCancel"
         >
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 275eb8b7..21eab1d3 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -144,7 +144,7 @@
             </div>
           </div>
           <div class="btn">
-            <button class="samtn btn1" @click="handleCancel">取消</button>
+            <button class="samtn btn2" @click="handleCancel">取消</button>
             <a-button class="samtn btn2" @click="handleNext" :loading="formData.validated===1">
               {{ !formData.id ? "下一步" : "确定" }}
             </a-button>
@@ -589,7 +589,7 @@ const handleNext = async () => {
       .btnn {
         padding: 0px 26px 0px 26px;
         height: 38px;
-        background: #ffffff;
+        background: #4ea6ff;
         border-radius: 8px;
         border: 1px solid rgba(64, 158, 255, 1);
         display: flex;
@@ -606,7 +606,7 @@ const handleNext = async () => {
         .btnText {
           font-size: 14px;
           font-weight: 400;
-          color: #4ea6ff;
+          color: #fff;
           line-height: 36px;
           margin-left: 5px;
         }
@@ -624,29 +624,29 @@ const handleNext = async () => {
         .search {
           width: 16px;
           height: 18px;
-          background-image: url("../../assets/images/courseManage/reset1.png");
+          background-image: url("../../assets/images/courseManage/reset0.png");
         }
       }
 
-      .btn1:hover {
-        background: rgba(64, 158, 255, 0.76);
+      // .btn1:hover {
+      //   background: rgba(64, 158, 255, 0.76);
 
-        .search {
-          background-image: url("../../assets/images/courseManage/search0.png");
-        }
+      //   .search {
+      //     background-image: url("../../assets/images/courseManage/search0.png");
+      //   }
 
-        .btnText {
-          color: #ffffff;
-        }
-      }
+      //   .btnText {
+      //     color: #ffffff;
+      //   }
+      // }
 
       .btn1:active {
         background: #0982ff;
       }
 
-      .btn2:hover {
-        background: rgba(64, 158, 255, 0.1);
-      }
+      // .btn2:hover {
+      //   background: rgba(64, 158, 255, 0.1);
+      // }
 
       .btn2:active {
         background: rgba(64, 158, 255, 0.2);
@@ -692,17 +692,17 @@ const handleNext = async () => {
         }
       }
 
-      .btn3:hover {
-        background: rgba(64, 158, 255, 0.76);
+      // .btn3:hover {
+      //   background: rgba(64, 158, 255, 0.76);
 
-        .search {
-          background-image: url("../../assets/images/courseManage/add0.png");
-        }
+      //   .search {
+      //     background-image: url("../../assets/images/courseManage/add0.png");
+      //   }
 
-        .btnText {
-          color: #ffffff;
-        }
-      }
+      //   .btnText {
+      //     color: #ffffff;
+      //   }
+      // }
 
       .btn3:active {
         background: #0982ff;

From ef7fddd6e098c21a3eba2d6165d1c5fb092a3f8f Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 21:17:15 +0800
Subject: [PATCH 41/54] =?UTF-8?q?style=EF=BC=9A=E4=B8=8B=E8=BD=BD=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/DownLoad.vue | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/views/DownLoad.vue b/src/views/DownLoad.vue
index 9903a356..b1461e4b 100644
--- a/src/views/DownLoad.vue
+++ b/src/views/DownLoad.vue
@@ -34,7 +34,7 @@
           </div>
           <div class="btn2" @click="reseatDownloadList">
             <div class="img2">
-              <img src="../assets/images/courseManage/reset1.png" />
+              <img src="../assets/images/courseManage/reset0.png" />
             </div>
             <div class="wz">重置</div>
           </div>
@@ -290,24 +290,24 @@ export default {
           margin-left: 10px;
         }
       }
-      .btn1:hover {
-        background: rgba(64, 158, 255, 0.76);
+      // .btn1:hover {
+      //   background: rgba(64, 158, 255, 0.76);
 
-        .search {
-          background-image: url("../assets/images/courseManage/search0.png");
-        }
+      //   .search {
+      //     background-image: url("../assets/images/courseManage/search0.png");
+      //   }
 
-        .btnText {
-          color: #ffffff;
-        }
-      }
+      //   .btnText {
+      //     color: #ffffff;
+      //   }
+      // }
       .btn1:active {
         background: #0982ff;
       }
 
-      .btn2:hover {
-        background: rgba(64, 158, 255, 0.1);
-      }
+      // .btn2:hover {
+      //   background: rgba(64, 158, 255, 0.1);
+      // }
       .btn2:active {
         background: rgba(64, 158, 255, 0.2);
       }
@@ -317,12 +317,11 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
-        color: #4ea6ff;
+        color: #fff;
         font-size: 14px;
-        background: #ffffff;
+        background: #4ea6ff;
         border-radius: 8px;
         cursor: pointer;
-        border: 1px solid #4ea6ff;
         .wz {
           margin-left: 10px;
         }

From 733ec7b646e204dc5263ad29c95b7260457b6586 Mon Sep 17 00:00:00 2001
From: caozc <zcz963852@qq.com>
Date: Fri, 3 Mar 2023 22:09:55 +0800
Subject: [PATCH 42/54] =?UTF-8?q?fix=EF=BC=9A=E3=80=90=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE-=E5=A4=96=E9=83=A8=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E3=80=91=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=AF=BC=E5=87=BA=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawers/router/RouterExaminationExternalManage.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue
index 830e49af..943992bf 100644
--- a/src/components/drawers/router/RouterExaminationExternalManage.vue
+++ b/src/components/drawers/router/RouterExaminationExternalManage.vue
@@ -437,7 +437,7 @@
   
       {/* 导出数据 */}
       function  exportData() {
-        window.open(`${process.env.VUE_APP_BASE_API}/admin/external/exam/manage/exportExternalExam?chapterId=${props.datasource.chapterId}&type=${1}&targetId=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}`)
+        window.open(`${process.env.VUE_APP_BASE_API}/admin/external/exam/manage/exportExternalExam?chapterId=${props.datasource.chapterId}&type=${1}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}`)
       }
       return {
         ...toRefs(state),

From 80778b87d99568d6583b2f828d43ba211dc32fbc Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Fri, 3 Mar 2023 22:28:45 +0800
Subject: [PATCH 43/54] style

---
 src/App.vue                                  |  4 ++--
 src/components/common/CommonAlert.vue        |  2 +-
 src/components/student/TableStudent.vue      |  6 +++---
 src/views/courselibrary/CoursewareManage.vue | 14 ++++++++------
 src/views/research/ResearchAdd.vue           |  3 ++-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 24fde76b..bc766a13 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -155,8 +155,8 @@ const getDictList = (param) => api1.getDictTree({code: param,}).then((res) => re
   }
 
   .white {
-    background: #fff;
-    color: #4ea6ff;
+    // background: #fff;
+    // color: #4ea6ff;
   }
 
   .cus-input {
diff --git a/src/components/common/CommonAlert.vue b/src/components/common/CommonAlert.vue
index f2847e0b..ba1f3d55 100644
--- a/src/components/common/CommonAlert.vue
+++ b/src/components/common/CommonAlert.vue
@@ -22,7 +22,7 @@
           <div><span>{{ content }}</span></div>
         </div>
         <div class="del_btnbox">
-          <div class="del_btn btn1" @click="close">
+          <div class="del_btn btn2" @click="close">
             <div class="btnText">取消</div>
           </div>
           <div class="del_btn btn2" @click="handleConfirm">
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 109c4a77..6a081afa 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -68,7 +68,7 @@
           <template #icon>
             <img
               style="margin-right: 10px"
-              src="../../assets/images/leveladd/reset.png"
+              src="../../assets/images/courseManage/reset0.png"
           /></template>
           重置
         </a-button>
@@ -104,7 +104,7 @@
           <template #icon
             ><img
               style="margin-right: 10px"
-              src="../../assets/images/basicinfo/in2.png"
+              src="../../assets/images/basicinfo/in.png"
           /></template>
           导入学员
         </a-button>
@@ -131,7 +131,7 @@
           <template #icon
             ><img
               style="margin-right: 10px"
-              src="../../assets/images/projectadd/delete.png"
+              src="../../assets/images/projectadd/delete1.png"
           /></template>
           批量删除
         </a-button>
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index ddfc4893..a52c1421 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -6250,9 +6250,10 @@ export default defineComponent({
                   .btn {
                     padding: 0px 26px 0px 26px;
                     height: 40px;
-                    background: rgba(64, 158, 255, 0);
+                    background: rgba(64, 158, 255, 1);
                     border-radius: 8px;
                     border: 1px solid rgba(64, 158, 255, 1);
+                    color: #fff;
                     display: flex;
                     align-items: center;
                     justify-content: center;
@@ -6266,7 +6267,7 @@ export default defineComponent({
                     .btnText {
                       font-size: 14px;
                       font-weight: 400;
-                      color: rgba(64, 158, 255, 1);
+                      color: #fff;
                       line-height: 36px;
                       margin-left: 5px;
                     }
@@ -6297,7 +6298,7 @@ export default defineComponent({
                       width: 16px;
                       height: 18px;
                       margin-right: 6px;
-                      background-image: url("../../assets/images/courseManage/reset1.png");
+                      background-image: url("../../assets/images/courseManage/reset0.png");
                     }
                   }
                 }
@@ -6872,9 +6873,10 @@ export default defineComponent({
               .btnn {
                 padding: 0px 26px 0px 26px;
                 height: 38px;
-                background: #ffffff;
+                background: #4ea6ff;
                 border-radius: 8px;
                 border: 1px solid rgba(64, 158, 255, 1);
+                color:#fff;
                 display: flex;
                 align-items: center;
                 justify-content: center;
@@ -6889,7 +6891,7 @@ export default defineComponent({
                 .btnText {
                   font-size: 14px;
                   font-weight: 400;
-                  color: #4ea6ff;
+                  color: #fff;
                   line-height: 36px;
                   margin-left: 5px;
                 }
@@ -6907,7 +6909,7 @@ export default defineComponent({
                 .search {
                   width: 16px;
                   height: 18px;
-                  background-image: url("../../assets/images/courseManage/reset1.png");
+                  background-image: url("../../assets/images/courseManage/reset0.png");
                 }
               }
 
diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index a41405a2..40f92151 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -667,7 +667,8 @@ export default {
       cursor: pointer;
       width: 80px;
       height: 40px;
-      color: #4ea6ff;
+      color: #fff;
+      background: #4ea6ff;
       border: 1px solid #4ea6ff;
       border-radius: 4px;
       display: flex;

From e69d0d442e420ff5a8a0e7d774fb3c2605af8b90 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Fri, 3 Mar 2023 23:05:46 +0800
Subject: [PATCH 44/54] -- fix bug

---
 src/views/learningpath/LevelAddDetail.vue | 1 +
 src/views/projectcenter/TaskAdd.vue       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 603a0613..cbfdf832 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -564,6 +564,7 @@ const submitStorage = async () => {
   }
   confirmLoading.value = true;
   await request(ROUTER_DETAIL_MODIFY, routerInfo.value);
+  await getDetail();
   message.success("关卡和任务数据已保存");
   confirmLoading.value = false;
 };
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 0c05ce0e..104d0b5e 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -613,6 +613,7 @@ const submitStorage = async () => {
   }
   confirmLoading.value = true
   await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
+  await getTask()
   message.success("阶段和任务数据已保存")
   confirmLoading.value = false
 };

From 77aac9cdcf423f69d4bcce571b6633dc5361550f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 4 Mar 2023 02:53:02 +0800
Subject: [PATCH 45/54] -- fix bug

---
 src/api/apis.js                              |  1 +
 src/components/common/CommonAlert.vue        | 52 +++++++----
 src/components/student/TableModelStudent.vue | 25 ++---
 src/components/student/TableStudent.vue      | 69 ++++++++------
 src/utils/useCommon.js                       | 98 +++++++++++++-------
 5 files changed, 147 insertions(+), 98 deletions(-)

diff --git a/src/api/apis.js b/src/api/apis.js
index fb053205..a136ade9 100644
--- a/src/api/apis.js
+++ b/src/api/apis.js
@@ -6,3 +6,4 @@ export const ROUTER_DETAIL_MODIFY = '/admin/router/routerInfoTemp post';
 export const PROJECT_DETAIL_MODIFY = '/admin/project/projectInfoTemp post';
 export const PROJECT_TEMPLATE_DETAIL_MODIFY = '/admin/project/template/editStageAndTask post';
 export const PROJECT_RELEASE = '/admin/project/realease';
+export const ASYNC_STUDENT_STATUS = '/admin/cache/getStudentAsyncStatus';
diff --git a/src/components/common/CommonAlert.vue b/src/components/common/CommonAlert.vue
index ba1f3d55..0a8aee89 100644
--- a/src/components/common/CommonAlert.vue
+++ b/src/components/common/CommonAlert.vue
@@ -1,13 +1,13 @@
 <template>
   <a-modal
-      :visible="true"
-      :footer="null"
-      :title="null"
-      :centere="true"
-      :closable="false"
-      style="margin-top: 400px"
-      :zIndex="9999"
-      @cancel="close"
+    :visible="true"
+    :footer="null"
+    :title="null"
+    :centere="true"
+    :closable="false"
+    style="margin-top: 400px"
+    :zIndex="9999"
+    @cancel="close"
   >
     <div class="delete">
       <div class="del_header"></div>
@@ -22,7 +22,7 @@
           <div><span>{{ content }}</span></div>
         </div>
         <div class="del_btnbox">
-          <div class="del_btn btn2" @click="close">
+          <div class="del_btn btn2" @click="close" v-if="cancel">
             <div class="btnText">取消</div>
           </div>
           <div class="del_btn btn2" @click="handleConfirm">
@@ -34,9 +34,9 @@
   </a-modal>
 </template>
 <script setup>
-import notide from '@/assets/images/coursewareManage/notice.png'
-import infoPng from '@/assets/images/coursewareManage/QR.png'
-import {defineProps, ref} from "vue";
+import notide from "@/assets/images/coursewareManage/notice.png";
+import infoPng from "@/assets/images/coursewareManage/QR.png";
+import {defineProps, onMounted, ref} from "vue";
 
 const props = defineProps({
   close: {
@@ -50,22 +50,34 @@ const props = defineProps({
   content: String,
   title: {
     type: String,
-    default: '提示'
+    default: "提示"
+  },
+  cancel: {
+    type: Boolean,
+    default: true
+  },
+  duration: {
+    type: Number,
+    default: 0
   },
   type: {
     type: Number,
     default: 1
   }
-})
+});
 const types = {
   1: infoPng,
   2: notide
-}
-const type = ref(1)
+};
+const type = ref(1);
+
+onMounted(() => {
+ props.duration && setTimeout(() => props.close(), props.duration)
+});
 
 function handleConfirm() {
-  props.ok()
-  props.close()
+  props.ok();
+  props.close();
 }
 </script>
 <style lang="scss" scoped>
@@ -84,8 +96,8 @@ function handleConfirm() {
     width: calc(100%);
     height: 40px;
     background: linear-gradient(
-            rgba(78, 166, 255, 0.2) 0%,
-            rgba(78, 166, 255, 0) 100%
+        rgba(78, 166, 255, 0.2) 0%,
+        rgba(78, 166, 255, 0) 100%
     );
   }
 
diff --git a/src/components/student/TableModelStudent.vue b/src/components/student/TableModelStudent.vue
index 5eccfd9a..f2c14ad1 100644
--- a/src/components/student/TableModelStudent.vue
+++ b/src/components/student/TableModelStudent.vue
@@ -35,6 +35,7 @@
                 class="cus-btn"
                 style="background: #4ea6ff; color: #fff; width: 100px"
                 @click="search"
+                :loading="stuAsyncLoading"
               >
                 <template #icon
                   ><img
@@ -131,7 +132,6 @@
 <script setup>
 import {
   computed,
-  // createVNode,
   defineProps,
   defineExpose,
   ref,
@@ -140,8 +140,7 @@ import {
 import { usePage } from "@/api/request";
 import { STUDENT_LIST } from "@/api/apis";
 import { delStudentList } from "@/api/index1";
-// import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
-// import { Modal } from "ant-design-vue";
+import {useAsyncStu} from "@/utils/useCommon";
 
 const props = defineProps({
   type: Number,
@@ -231,6 +230,9 @@ const {
   loading,
 } = usePage(STUDENT_LIST, searchParams);
 
+const { loading: stuAsyncLoading } = useAsyncStu(props.id, props.types.join(","), searchStu);
+
+
 const stuPagination = computed(() => ({
   total: total.value,
   showSizeChanger: false,
@@ -250,6 +252,7 @@ const changePagination = (page) => {
 function search() {
   searchParams.value.studentName = searchName.value;
   searchParams.value.pageNo = 1;
+  searchStu()
 }
 
 const deleteModalVisible = ref(false);
@@ -257,20 +260,6 @@ const deleteId = ref(null);
 function del(id) {
   deleteModalVisible.value = true;
   deleteId.value = id;
-  // Modal.confirm({
-  //   title: () => "确定删除?",
-  //   icon: () => createVNode(ExclamationCircleOutlined),
-  //   content: () => "数据删除后不可恢复！",
-  //   okText: () => "确定",
-  //   okType: "danger",
-  //   cancelText: () => "取消",
-  //   onOk() {
-  //     if (id) {
-  //       loading.value = true;
-  //       delStudentList({ ids: [id] }).then(() => searchStu());
-  //     }
-  //   },
-  // });
 }
 
 //确定删除
@@ -294,6 +283,8 @@ const closeDrawer = () => {
 function reset() {
   searchParams.value = initParams;
   searchName.value = "";
+  searchParams.value.pageNo = 1;
+  searchStu()
 }
 
 watch(visiable, () => {
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 6a081afa..91099234 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -42,9 +42,7 @@
               style="width: 260px; height: 40px"
               placeholder="是否为优秀学员"
               :options="topFlagList"
-              @change="selectProjectName"
               allowClear
-              showSearch
             ></a-select>
           </div>
         </a-form-item>
@@ -54,12 +52,13 @@
           class="cus-btn"
           style="background: #4ea6ff; color: #fff; width: 100px"
           @click="getStuList"
+          :loading="stuAsyncLoading"
         >
           <template #icon>
             <img
               style="margin-right: 10px"
               src="../../assets/images/courseManage/search0.png"
-          /></template>
+            /></template>
           搜索
         </a-button>
       </a-col>
@@ -69,7 +68,7 @@
             <img
               style="margin-right: 10px"
               src="../../assets/images/courseManage/reset0.png"
-          /></template>
+            /></template>
           重置
         </a-button>
       </a-col>
@@ -90,9 +89,9 @@
         >
           <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
             <template #icon
-              ><img
-                style="margin-right: 10px"
-                src="../../assets/images/courseManage/add0.png"
+            ><img
+              style="margin-right: 10px"
+              src="../../assets/images/courseManage/add0.png"
             /></template>
             添加学员
           </a-button>
@@ -102,9 +101,9 @@
       <a-col :span="1.5" v-if="type === 1 || type === 2">
         <a-button class="cus-btn white" @click="showImpStu">
           <template #icon
-            ><img
-              style="margin-right: 10px"
-              src="../../assets/images/basicinfo/in.png"
+          ><img
+            style="margin-right: 10px"
+            src="../../assets/images/basicinfo/in.png"
           /></template>
           导入学员
         </a-button>
@@ -129,9 +128,9 @@
       <a-col :span="1.5">
         <a-button class="cus-btn white" @click="bathDel">
           <template #icon
-            ><img
-              style="margin-right: 10px"
-              src="../../assets/images/projectadd/delete1.png"
+          ><img
+            style="margin-right: 10px"
+            src="../../assets/images/projectadd/delete1.png"
           /></template>
           批量删除
         </a-button>
@@ -223,13 +222,15 @@
               v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
               @click="updateStatus(0, record.id)"
               type="link"
-              >通过</a-button
+            >通过
+            </a-button
             >
             <a-button
               v-if="type === 3 && record.status !== 0 && checkPer(permissions)"
               @click="updateStatus(2, record.id)"
               type="link"
-              >拒绝</a-button
+            >拒绝
+            </a-button
             >
             <a-button
               v-if="checkPer(permissions)"
@@ -237,7 +238,8 @@
               @click="del(record.id, record)"
               type="link"
               danger
-              >删除</a-button
+            >删除
+            </a-button
             >
           </a-space>
         </template>
@@ -387,21 +389,20 @@
   </a-modal>
 </template>
 <script setup>
-import { computed, defineProps, onMounted, ref, watch } from "vue";
-import { delStudentList, getStuPage, batchUpdateStatus } from "@/api/index1";
+import {computed, defineProps, onMounted, ref, watch} from "vue";
+import {delStudentList, getStuPage, batchUpdateStatus} from "@/api/index1";
 import ChangeGroupModal from "@/components/student/ChangeGroupModal.vue";
 import CommonStudent from "@/components/student/CommonStudent";
 import ChangeLevelModal from "./ChangeLevelModal.vue";
-import { message } from "ant-design-vue";
-// import { topStudent } from "../../api/indexProjStu";
+import {message} from "ant-design-vue";
 import SeeStu from "../../components/drawers/SeeStu";
 import EScore from "../drawers/ExportScore.vue";
 import OrgClass from "@/components/project/OrgClass";
 import ExportHomeWork from "../Modals/ExportHomeWork.vue";
 import * as api from "../../api/index1";
 import ImpStu from "../drawers/AddLevelImportStu";
-// import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
-import { checkPer } from "@/utils/utils";
+import {checkPer} from "@/utils/utils";
+import {useAsyncStu} from "@/utils/useCommon";
 
 const props = defineProps({
   type: Number,
@@ -435,6 +436,9 @@ const props = defineProps({
     default: () => [],
   },
 });
+
+const { loading: stuAsyncLoading, start } = useAsyncStu(props.id, props.type, getStuList);
+
 const topFlagList = ref([
   {
     id: 0,
@@ -541,8 +545,8 @@ function allDepartShow(a, b) {
     a == "" || a == null || a == undefined
       ? (a = "")
       : a.slice(0, 1) == "/"
-      ? a.slice(1, a.length)
-      : a;
+        ? a.slice(1, a.length)
+        : a;
   let depart = b == "" || b == null || b == undefined ? (b = "") : b;
   let allname = org == "" && depart == "" ? "-" : org + depart;
   return allname;
@@ -680,11 +684,12 @@ function bathDel() {
     );
   }
   tableData.value.loading = true;
-  delStudentList({ ids: stuSelectKeys.value,type:props.type,targetId:props.id }).then(() => getStuList());
+  delStudentList({ ids: stuSelectKeys.value, type: props.type, targetId: props.id }).then(() => getStuList());
 }
 
 const deleteModalVisible = ref(false);
 const deleteId = ref(null);
+
 function del(id, row) {
   if (row.isLeader === "1") {
     return message.warning("" + row.name + "是小组长，请勿删除!");
@@ -707,6 +712,7 @@ function del(id, row) {
   //   },
   // });
 }
+
 //确定删除
 const sureSameModal = () => {
   if (deleteId.value) {
@@ -724,6 +730,7 @@ const closeSameModal = () => {
 function submitCall(flag) {
   tableData.value.loading = true;
   flag && getStuList();
+  flag && start();
 }
 
 // 调整关卡;
@@ -885,9 +892,11 @@ const AddImpStuvisibleClose = (isget) => {
     getStuList();
   }
 };
+
 function startLoading() {
   tableData.value.loading = true;
 }
+
 defineExpose({ getStuList, startLoading });
 </script>
 <style lang="scss">
@@ -967,8 +976,8 @@ defineExpose({ getStuList, startLoading });
   width: calc(100%);
   height: 40px;
   background: linear-gradient(
-    rgba(78, 166, 255, 0.2) 0%,
-    rgba(78, 166, 255, 0) 100%
+      rgba(78, 166, 255, 0.2) 0%,
+      rgba(78, 166, 255, 0) 100%
   );
 }
 
@@ -1101,8 +1110,8 @@ defineExpose({ getStuList, startLoading });
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
+                rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -1194,11 +1203,13 @@ defineExpose({ getStuList, startLoading });
         }
       }
     }
+
     .ant-modal-close-x {
       display: none;
     }
   }
 }
+
 /*.delete {
   z-index: 9999;
   width: 424px;
diff --git a/src/utils/useCommon.js b/src/utils/useCommon.js
index d55a0cc5..4773b3f3 100644
--- a/src/utils/useCommon.js
+++ b/src/utils/useCommon.js
@@ -1,45 +1,79 @@
-import {ref} from "vue";
+import {onMounted, ref, watch} from "vue";
 import {message} from "ant-design-vue";
+import {ASYNC_STUDENT_STATUS} from "@/api/apis";
+import {request} from "@/api/request";
+import dialog from "@/utils/dialog";
 
 export function useInterval(fun, time) {
-    const timer = ref();
+  const timer = ref();
 
-    function start(d) {
-        clearInterval(timer.value)
-        timer.value = setInterval(async () => {
-            if (await fun(d)) {
-                clearInterval(timer.value)
-            }
-        }, time);
-    }
+  function start(d) {
+    clearInterval(timer.value);
+    timer.value = setInterval(async () => {
+      if (await fun(d)) {
+        clearInterval(timer.value);
+      }
+    }, time);
+  }
 
-    return {start}
+  return { start };
 }
 
 export function useTimeout(asyncFun, time) {
-    const timer = ref();
-    const maxCount = ref(0);
+  const timer = ref();
+  const maxCount = ref(0);
 
-    function start(d) {
-        clearTimeout(timer.value)
-        maxCount.value = 0
-        execute(d)
+  function start(d) {
+    clearTimeout(timer.value);
+    maxCount.value = 0;
+    execute(d);
+  }
+
+  async function execute(d) {
+    if (maxCount.value > 300) {
+      message.error("等待超时，请联系管理员！");
+      throw Error("等待超时 查询任务结束");
     }
-
-    async function execute(d) {
-        if (maxCount.value > 300) {
-            message.error("等待超时，请联系管理员！")
-            throw Error("等待超时 查询任务结束")
-        }
-        try {
-            await asyncFun(d)
-            maxCount.value = maxCount.value + 1
-            timer.value = setTimeout(() => execute(d), time);
-        } catch (e) {
-            clearTimeout(timer.value)
-            console.log(e)
-        }
+    try {
+      await asyncFun(d);
+      maxCount.value = maxCount.value + 1;
+      timer.value = setTimeout(() => execute(d), time);
+    } catch (e) {
+      clearTimeout(timer.value);
+      console.log(e);
     }
+  }
 
-    return {start}
+  return { start };
 }
+
+export function useAsyncStu(id, type, func) {
+  const loading = ref(false);
+
+  const { start } = useTimeout(async () => {
+    const { data } = await request(ASYNC_STUDENT_STATUS, { id, type });
+    if (!data) {
+      loading.value = false;
+      throw Error("查询任务结束");
+    }
+    loading.value = true;
+  }, 10000);
+
+  watch(loading, () => {
+    loading.value && dialog({
+      duration: 3500,
+      cancel: false,
+      content: "您选择的学员正在添加中，请耐心等待，进行其他操作不影响此次添加"
+    });
+    loading.value || (func && func());
+  });
+
+  onMounted(() => {
+    console.log(22222222);
+    console.log(id);
+    console.log(type);
+    id && type && start();
+  });
+  return { loading, start };
+}
+

From a09396ccf6f39556f30b9278d79d50798f1ae596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com>
Date: Sat, 4 Mar 2023 09:51:05 +0800
Subject: [PATCH 46/54] =?UTF-8?q?969=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 68a6f37f..4db19344 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -212,7 +212,7 @@
             </div>
             <div class="btnbox">
               <a-input v-model:value="formData.source" style="width: 400px; height: 40px; border-radius: 8px" :disabled="taskIndex >= 0"
-                placeholder="请输入数据来源" :maxlength="20" />
+                placeholder="请输入数据来源" :maxlength="120" />
             </div>
           </div>
           <div class="main_item2">
diff --git a/src/components/drawers/CommonTest.vue b/src/components/drawers/CommonTest.vue
index 9c63c00f..11c41043 100644
--- a/src/components/drawers/CommonTest.vue
+++ b/src/components/drawers/CommonTest.vue
@@ -287,7 +287,7 @@
                   v-model:value="formData.source"
                   style="width: 400px; height: 40px; border-radius: 8px"
                   placeholder="请输入数据来源"
-                  :maxlength="20"
+                  :maxlength="120"
               />
             </div>
           </div>

From 8a2159d1beaad0f23ed5b929842e0afc29a463e2 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sat, 4 Mar 2023 11:45:49 +0800
Subject: [PATCH 47/54] =?UTF-8?q?fix:=E6=9F=A5=E7=9C=8B=E6=8A=95=E7=A5=A8?=
 =?UTF-8?q?=E3=80=81=E6=9F=A5=E7=9C=8B=E8=AF=95=E5=8D=B7=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/CheckVote.vue          | 19 +++++++++++--------
 .../drawers/project/ProjectExamManage.vue     |  6 +++---
 .../router/RouterExaminationManage.vue        |  8 ++++----
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/components/drawers/CheckVote.vue b/src/components/drawers/CheckVote.vue
index cfbde7df..f68db461 100644
--- a/src/components/drawers/CheckVote.vue
+++ b/src/components/drawers/CheckVote.vue
@@ -19,7 +19,7 @@
             <div class="main">
                 <div class="basetext"><span>投票题目</span></div>
                 <div v-if="voteResource" class="basequestion">
-                    <div class="ques" v-for=" item,index  in voteResource.voteStemDtoList" :key="index">
+                    <div class="ques" v-for=" item,index  in voteResource.ballotVo.voteStemVoList" :key="index">
                         <div class="quename">{{ index+1 +"."+ item.voteStemName }}</div>
                         <div class="queanswer">
                             <a-radio-group v-model:value="currentChoice[index]">
@@ -50,8 +50,7 @@
 import { toRefs,reactive } from '@vue/reactivity';
 import {computed} from "vue";
 import { useStore } from "vuex";
-// import * as api from "../../api/indexTaskManage";
-import {queryStemByStemId} from '@/api/indexVote';
+import * as api from "../../api/indexTaskManage";
 
 export default {
     name:"CheckWork",
@@ -127,15 +126,19 @@ export default {
         function getData() {
             console.log('我是请求的参数', {
                 "courseId": props.courseID,
-                "userInfo": userInfo.value,
-                "voteId": props.voteID
+                "studentId": userInfo.value.id,
+                "voteSubmitId": props.voteID
             })
-            queryStemByStemId(props.courseID).then(res=>{
+            api.QueryVoteTaskDetailById({
+                "courseId": props.courseID,
+                "studentId": userInfo.value.id,
+                "voteSubmitId": props.voteID
+            }).then(res=>{
                 console.log(res)
                 state.voteResource = res.data.data
+
                 let choiceArr = []
-                //2023-02-28
-                let dataQuestion = state.voteResource.voteStemDtoList
+                let dataQuestion = state.voteResource.ballotVo.voteStemVoList
                 for(let i=0;i<dataQuestion.length;i++){
                     for(let j=0;j<dataQuestion[i].optionDetailList.length;j++){
                         if(dataQuestion[i].optionDetailList[j].isAnswer){
diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index e0ea9a36..d856d88a 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -117,7 +117,7 @@
     <EScore v-model:eScorevisible="eScorevisible" />
   </a-drawer>
   <!-- 查看答卷抽屉 -->
-  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource"/>
+  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource1"/>
 </template>
 
 <script>
@@ -321,7 +321,7 @@ export default {
                 {text.record.status === 1 || text.record.status === 9 ? 
                   <a onClick={()=>{
                     state.studentKid = text.record.studentKid;
-                    state.datasource = text.record;
+                    state.datasource1 = text.record;
                     state.CAvisible = true;
                   }}>查看答卷 </a> : 
                   <span style="color:rgba(0, 0, 0, 0.25);cursor:not-allowed;">  查看答卷 </span>
@@ -334,7 +334,7 @@ export default {
       loadingData: true,
       studentKid: '',
       CAvisible: false,
-      datasource: ''
+      datasource1: ''
     });
 
     const closeDrawer = () => {
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index 1563c4af..bbbbab61 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -79,7 +79,7 @@
     <EScore v-model:eScorevisible="eScorevisible" />
   </a-drawer>
   <!-- 查看答卷抽屉 -->
-  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource" />
+  <CheckAnsware v-model:CAvisible="CAvisible" :datasource="datasource1" />
 </template>
 
 <script>
@@ -306,7 +306,7 @@ export default {
                     type="link"
                     onClick={() => {
                       state.studentKid = text.record.studentKid;
-                      state.datasource = text.record;
+                      state.datasource1 = text.record;
                       state.CAvisible = true;
                     }}>
                     查看答卷
@@ -321,7 +321,7 @@ export default {
                     disabled
                     onClick={() => {
                       state.studentKid = text.record.studentKid;
-                      state.datasource = text.record;
+                      state.datasource1 = text.record;
                       state.CAvisible = true;
                     }}>
                     查看答卷
@@ -336,7 +336,7 @@ export default {
       loadingData: true,
       studentKid: '',
       CAvisible: false,
-      datasource: ''
+      datasource1: ''
     });
 
     const closeDrawer = () => {

From 733c47ea646ffe9a37b342be6e5f8cb0453e68a0 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Sat, 4 Mar 2023 11:46:22 +0800
Subject: [PATCH 48/54] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 17fed061..981bd5aa 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -366,12 +366,13 @@
                 :key="item.stageId"
                 @click="stageChange(item, index)"
               >
-                {{ item.name || "无阶段" }}
+                <div v-if="item.id === '0'">无阶段</div>
+                <div v-else>{{ "阶段" + (index + 1) }}</div>
               </div>
               <!-- <div class="stage1">阶段1</div>
                     <div class="stage2">阶段2</div> -->
             </div>
-            <div class="stagesecond">
+            <div class="stagesecond" v-if="choosedStageName">
               <div class="staname">阶段名称：</div>
               <div class="stamess">{{ choosedStageName }}</div>
             </div>
@@ -2918,13 +2919,16 @@ export default {
           }
         }
         levelList.stageList = res.data.data.stageList;
-        if (levelList.stageList.length === 1) {
+        if (
+          levelList.stageList.length === 1 &&
+          levelList.stageList[0].id === "0"
+        ) {
           // 无解段任务
           state.rankjieduan = [{ value: 0, label: "无阶段" }];
           state.valuestu2 = 0;
         } else {
           // 有阶段任务
-          console.log(levelList.stageList);
+          console.log("有阶段任务", levelList.stageList);
           let arrStage = [];
           for (let i = 0; i < levelList.stageList.length; i++) {
             if (levelList.stageList[i].id !== "0") {

From fe576763187b0e65e52deff42ef6effe6e4733b8 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sat, 4 Mar 2023 13:15:16 +0800
Subject: [PATCH 49/54] =?UTF-8?q?fix:=E6=9F=A5=E7=9C=8B=E5=A4=B4=E7=89=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/CheckVote.vue |  8 ++++----
 src/views/projectcenter/TaskPage.vue | 23 ++++++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/components/drawers/CheckVote.vue b/src/components/drawers/CheckVote.vue
index f68db461..28c93747 100644
--- a/src/components/drawers/CheckVote.vue
+++ b/src/components/drawers/CheckVote.vue
@@ -19,7 +19,7 @@
             <div class="main">
                 <div class="basetext"><span>投票题目</span></div>
                 <div v-if="voteResource" class="basequestion">
-                    <div class="ques" v-for=" item,index  in voteResource.ballotVo.voteStemVoList" :key="index">
+                    <div class="ques" v-for=" item,index  in voteResource.voteStemDtoList" :key="index">
                         <div class="quename">{{ index+1 +"."+ item.voteStemName }}</div>
                         <div class="queanswer">
                             <a-radio-group v-model:value="currentChoice[index]">
@@ -27,7 +27,7 @@
                                     <div class="queabox" v-for="items,index in item.optionDetailList" :key="index">
                                         <a-radio
                                             v-model:checked="checked"
-                                            :value="items.optionId"
+                                            :value="items.id"
                                         >
                                             {{items.optionName}}
                                         </a-radio>
@@ -138,11 +138,11 @@ export default {
                 state.voteResource = res.data.data
 
                 let choiceArr = []
-                let dataQuestion = state.voteResource.ballotVo.voteStemVoList
+                let dataQuestion = state.voteResource.voteStemDtoList
                 for(let i=0;i<dataQuestion.length;i++){
                     for(let j=0;j<dataQuestion[i].optionDetailList.length;j++){
                         if(dataQuestion[i].optionDetailList[j].isAnswer){
-                            choiceArr.push(dataQuestion[i].optionDetailList[j].optionId)
+                            choiceArr.push(dataQuestion[i].optionDetailList[j].id)
                             break
                         }
                         if(j==dataQuestion[i].optionDetailList.length - 1 && dataQuestion[i].optionDetailList[j].isAnswer == false){
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index 981bd5aa..eb7e2270 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -466,7 +466,7 @@
                 <button class="edit">
                   <img
                     class="editimg"
-                    src="../../assets/images/projectadd/edit.png"
+                    src="../../assets/images/projectadd/edit1.png"
                   />
                   <span class="editext">编辑</span>
                 </button>
@@ -5966,12 +5966,13 @@ export default {
         position: absolute;
         right: 38px;
         top: 0;
-        color: #4ea6ff;
-        background: #ffffff;
+        color: #fff;
+        background: #4ea6ff;
         width: 100px;
         height: 40px;
         border: 1px solid #4ea6ff;
         border-radius: 8px;
+        cursor: pointer;
 
         .editimg {
           width: 15px;
@@ -5985,15 +5986,15 @@ export default {
         }
       }
 
-      .edit:hover {
-        color: #ffffff;
-        background-color: #4ea6ff;
-        cursor: pointer;
+      // .edit:hover {
+      //   color: #ffffff;
+      //   background-color: #4ea6ff;
+      //   cursor: pointer;
 
-        .editimg {
-          background-image: url("../../assets/images/projectadd/edit1.png");
-        }
-      }
+      //   .editimg {
+      //     background-image: url("../../assets/images/projectadd/edit1.png");
+      //   }
+      // }
     }
 
     .second {

From 62a0600a8a44904ec64b4bb4c14a4eb3e3dc7d74 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Sat, 4 Mar 2023 13:31:31 +0800
Subject: [PATCH 50/54] =?UTF-8?q?style:=E6=9F=A5=E7=9C=8B=E6=8A=95?=
 =?UTF-8?q?=E7=A5=A8=E5=BC=B9=E6=A1=86=E5=B1=82=E7=BA=A7=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index b5818b69..20a0a035 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -375,6 +375,7 @@ export default {
   background-color: #fafafa !important;
 }
 .crevoteDrawer {
+  z-index: 9999;
   .drawerMain {
     .header {
       height: 73px;

From 96f837a1d8d3d6b4061982535196b854c8fdf05f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 4 Mar 2023 14:17:48 +0800
Subject: [PATCH 51/54] -- fix bug

---
 src/views/courselibrary/CoursewareManage.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index a52c1421..dc7a8757 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3465,6 +3465,7 @@ export default defineComponent({
     const options4CurId = ref("");
     const options4CurName = ref("张");
     const of_hShow = () => {
+      state.offcourseId = '';
       getTea();
       if (state.of_hs == false) {
         state.of_hs = true;

From 2c9bf37df4fbeb7e9d61a14f86d397c98277f7be Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 4 Mar 2023 14:24:40 +0800
Subject: [PATCH 52/54] -- fix bug

---
 src/components/NavLeft.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue
index a71d031b..21964c12 100644
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -192,7 +192,7 @@
           <router-link to="/researchmanage">评估管理</router-link>
         </a-menu-item>
 
-        <a-sub-menu key="sub6">
+        <a-sub-menu key="sub6" v-if="checkMenu('OldSystemManage','ReadingClubManage','dictmanage')">
           <template #icon>
             <div class="imgBox">
               <img
@@ -202,7 +202,7 @@
             </div>
           </template>
           <template #title>系统管理</template>
-          <a-menu-item key="sub6-1">
+          <a-menu-item key="sub6-1" v-if="checkMenu('OldSystemManage')">
             <span
                 :class="{
                 circleActive: selectedKeys[0] === 'sub6-1',
@@ -211,7 +211,7 @@
             ></span>
             <router-link to="/OldSystemManage">旧版管理员界面</router-link>
           </a-menu-item>
-          <a-menu-item key="sub6-2">
+          <a-menu-item key="sub6-2" v-if="checkMenu('ReadingClubManage')">
             <span
                 :class="{
                 circleActive: selectedKeys[0] === 'sub6-2',
@@ -220,7 +220,7 @@
             ></span>
             <router-link to="/ReadingClubManage">业务支援读书会管理</router-link>
           </a-menu-item>
-          <a-menu-item key="sub6-4">
+          <a-menu-item key="sub6-4" v-if="checkMenu('dictmanage')">
             <span
                 :class="{
                 circleActive: selectedKeys[0] === 'sub6-4',
@@ -231,7 +231,7 @@
           </a-menu-item>
         </a-sub-menu>
 
-        <a-sub-menu key="sub7">
+        <a-sub-menu key="sub7"  v-if="checkMenu('AudienceManage')">
           <template #icon>
             <div class="imgBox">
               <img
@@ -241,7 +241,7 @@
             </div>
           </template>
           <template #title>受众管理</template>
-          <a-menu-item key="sub7-1">
+          <a-menu-item key="sub7-1" v-if="checkMenu('AudienceManage')">
             <span
               :class="{
                 circleActive: selectedKeys[0] === 'sub6-7',
@@ -252,7 +252,7 @@
           </a-menu-item>
         </a-sub-menu>
 
-        <a-menu-item key="sub5" v-if="checkMenu('systemManage')">
+        <a-menu-item key="sub5" v-if="checkMenu('researchmanage')">
           <div class="imgBox">
             <img style="width: 16px; height: 16px" src="../assets/images/navleft/system.png"/>
           </div>

From 69e84fbbc3965a659981905585fc32e09da8c1d4 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 4 Mar 2023 14:47:28 +0800
Subject: [PATCH 53/54] -- fix bug

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

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index dc7a8757..93159872 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3511,7 +3511,7 @@ export default defineComponent({
         return message.warning("请输入必填项");
       }
 
-      if (!state.validated == 2) {
+      if (state.validated !== 2) {
         message.destroy();
         return message.warning("该课程名称已存在");
       }
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index 164ee631..64ef66cb 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -560,7 +560,7 @@ export default defineComponent({
       hideshow: true,
       ft_eidt: false,
       attach: "",
-      validated: 0,
+      validated: 2,
       ft_hs: false,
       addLoading: false,
       statusJuJue: 0,

From 88bbc99c9748c69fbac3ffe07412ce362baa64db Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Sat, 4 Mar 2023 14:48:36 +0800
Subject: [PATCH 54/54] -- fix bug

---
 src/views/projectcenter/LibraryAdd.vue | 536 +++++++++++--------------
 1 file changed, 224 insertions(+), 312 deletions(-)

diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index 3c4bffaf..f4db79eb 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -2,7 +2,7 @@
   <div class="addwrapper">
     <div class="addhead">
       <div class="leftimg">
-        <img class="img" :src="projectInfo.picUrl" />
+        <img class="img" :src="projectInfo.picUrl"/>
       </div>
       <div class="imgfor">
         <div class="forz">{{ projectInfo.name || "-" }}</div>
@@ -34,12 +34,14 @@
           </div>
         </div>
         <div class="line"></div> -->
-        <router-link to="/templatelibrary">
+        <router-link to="/templatelibrary"
+        >
           <div style="display: flex">
-            <img class="img2" src="../../assets/images/leveladd/back.png" />
+            <img class="img2" src="../../assets/images/leveladd/back.png"/>
             <div class="return">返回</div>
           </div>
-        </router-link>
+        </router-link
+        >
       </div>
     </div>
     <div class="split"></div>
@@ -58,10 +60,7 @@
               <!-- <button class="btn" @click="showFaceIn">批量面授报名</button> -->
               <router-link
                 class="edit"
-                :to="{
-                  path: `/temTask`,
-                  query: { projectId: projectTemplateId },
-                }"
+                :to="{ path: `/temTask`, query: { projectId: projectTemplateId } }"
               >
                 <img
                   class="editimg"
@@ -182,7 +181,7 @@
                           trailColor="rgba(253, 209, 98, 0.2)"
                         />
                         <span class="progresstext" style="margin-left: 10px"
-                          >{{ item.percent }}%</span
+                        >{{ item.percent }}%</span
                         >
                       </div>
                     </div>
@@ -261,13 +260,13 @@
                 "
               >
                 <div class="leftt">
-                  <img src="../../assets/images/taskpage/left2.png" />
+                  <img src="../../assets/images/taskpage/left2.png"/>
                 </div>
                 <div class="photo">
-                  <img src="../../assets/images/taskpage/picture8.png" />
+                  <img src="../../assets/images/taskpage/picture8.png"/>
                 </div>
                 <div class="rightt">
-                  <img src="../../assets/images/taskpage/right2.png" />
+                  <img src="../../assets/images/taskpage/right2.png"/>
                 </div>
                 <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                   创建任务
@@ -342,13 +341,13 @@
             <div class="pjc_tit">
               <span>获取规则</span>
             </div>
-            <hr color="#E8E8E8" />
+            <hr color="#E8E8E8"/>
             <div class="pjc_body">
               <div class="groupright">
                 <div class="spandiv"><span class="spantext">规则</span></div>
                 <div v-if="edit" class="btns">
                   <div class="btn1" @click="edit = !edit">
-                    <img src="../../assets/images/projectadd/edit1.png" />
+                    <img src="../../assets/images/projectadd/edit1.png"/>
                     <span class="btn1text">编辑</span>
                   </div>
                 </div>
@@ -363,7 +362,7 @@
                 <div class="content content1">
                   <span>当前设计下，学员可以获得 </span
                   ><span class="scoretext">{{ scoresum }}</span
-                  ><span>积分</span>
+                ><span>积分</span>
                 </div>
                 <div class="content content2">
                   <span>完成【必修/选修】获得 </span
@@ -372,35 +371,35 @@
                 <div class="content">
                   <span>完成作业成绩不低于 </span
                   ><span class="scoretext">{{ done2 }}</span
-                  ><span>分获得</span> <span class="scoretext">{{ done3 }}</span
-                  ><span>积分</span>
+                ><span>分获得</span> <span class="scoretext">{{ done3 }}</span
+                ><span>积分</span>
                 </div>
                 <div class="content">
                   <span>前</span><span class="scoretext">{{ four1 }}</span
-                  ><span>名学完在线课程获得</span>
+                ><span>名学完在线课程获得</span>
                   <span class="scoretext">{{ four2 }}</span
                   ><span style="margin-right: 50px">积分</span> <span>前</span
-                  ><span class="scoretext">{{ four3 }}</span
-                  ><span>名提交作业且成绩不低于</span>
+                ><span class="scoretext">{{ four3 }}</span
+                ><span>名提交作业且成绩不低于</span>
                   <span class="scoretext">{{ four4 }}</span
                   ><span>分获得</span> <span class="scoretext">{{ four5 }}</span
-                  ><span>积分</span>
+                ><span>积分</span>
                 </div>
                 <div class="content">
                   <span>考试成绩高于</span
                   ><span class="scoretext">{{ five1 }}</span
-                  ><span>分获得</span> <span class="scoretext">{{ five2 }}</span
-                  ><span>积分</span>
+                ><span>分获得</span> <span class="scoretext">{{ five2 }}</span
+                ><span>积分</span>
                 </div>
                 <div class="content">
                   <span>考勤正常学员获得 </span
                   ><span class="scoretext">{{ six1 }}</span
-                  ><span>积分</span>
+                ><span>积分</span>
                 </div>
                 <div class="content">
                   <span>成为小组长获得</span
                   ><span class="scoretext">{{ seven1 }}</span
-                  ><span style="margin-right: 50px">积分</span>
+                ><span style="margin-right: 50px">积分</span>
                   <span>优秀学员可获得</span>
                   <span class="scoretext">{{ seven2 }}</span
                   ><span>积分</span>
@@ -410,64 +409,97 @@
                 <div class="content content1">
                   <span>当前设计下，学员可以获得 </span
                   ><span class="scoretext">{{ scoresum }}</span
-                  ><span>积分</span>
+                ><span>积分</span>
                 </div>
                 <div class="content content2">
                   <span>完成【必修/选修】获得 </span
                   ><span
-                    ><a-input
-                      v-model:value="score1"
-                      :bordered="false"
-                      @change="getScore"
-                    /> </span
-                  ><span>积分</span>
+                ><a-input
+                  v-model:value="score1"
+                  :bordered="false"
+                  @change="getScore"
+                /> </span
+                ><span>积分</span>
                 </div>
                 <div class="content">
-                  <span>完成作业成绩不低于 </span>
-                  <a-input v-model:value="done2" :bordered="false" />
-                  <span>分获得</span>
-                  <a-input v-model:value="done3" :bordered="false" />
-                  <span>积分</span>
+                  <span>完成作业成绩不低于 </span
+                  >
+                  <a-input v-model:value="done2" :bordered="false"/>
+                  <span
+                  >分获得</span
+                  >
+                  <a-input v-model:value="done3" :bordered="false"/>
+                  <span
+                  >积分</span
+                  >
                 </div>
                 <div class="content">
-                  <span>前</span>
-                  <a-input v-model:value="four1" :bordered="false" />
-                  <span>名学完在线课程获得</span>
-                  <a-input v-model:value="four2" :bordered="false" />
-                  <span style="margin-right: 50px">积分</span>
-                  <span>前</span>
-                  <a-input v-model:value="four3" :bordered="false" />
-                  <span>名提交作业且成绩不低于</span>
-                  <a-input v-model:value="four4" :bordered="false" />
-                  <span>分获得</span>
-                  <a-input v-model:value="four5" :bordered="false" />
-                  <span>积分</span>
+                  <span>前</span
+                  >
+                  <a-input v-model:value="four1" :bordered="false"/>
+                  <span
+                  >名学完在线课程获得</span
+                  >
+                  <a-input v-model:value="four2" :bordered="false"/>
+                  <span
+                    style="margin-right: 50px"
+                  >积分</span
+                  >
+                  <span>前</span
+                  >
+                  <a-input v-model:value="four3" :bordered="false"/>
+                  <span
+                  >名提交作业且成绩不低于</span
+                  >
+                  <a-input v-model:value="four4" :bordered="false"/>
+                  <span
+                  >分获得</span
+                  >
+                  <a-input v-model:value="four5" :bordered="false"/>
+                  <span
+                  >积分</span
+                  >
                 </div>
                 <div class="content">
-                  <span>考试成绩高于</span>
-                  <a-input v-model:value="five1" :bordered="false" />
-                  <span>分获得</span>
-                  <a-input v-model:value="five2" :bordered="false" />
-                  <span>积分</span>
+                  <span>考试成绩高于</span
+                  >
+                  <a-input v-model:value="five1" :bordered="false"/>
+                  <span
+                  >分获得</span
+                  >
+                  <a-input v-model:value="five2" :bordered="false"/>
+                  <span
+                  >积分</span
+                  >
                 </div>
                 <div class="content">
-                  <span>考勤正常学员获得 </span>
-                  <a-input v-model:value="six1" :bordered="false" />
-                  <span>积分</span>
+                  <span>考勤正常学员获得 </span
+                  >
+                  <a-input v-model:value="six1" :bordered="false"/>
+                  <span
+                  >积分</span
+                  >
                 </div>
                 <div class="content">
-                  <span>成为小组长获得</span>
-                  <a-input v-model:value="seven1" :bordered="false" />
-                  <span style="margin-right: 50px">积分</span>
+                  <span>成为小组长获得</span
+                  >
+                  <a-input v-model:value="seven1" :bordered="false"/>
+                  <span
+                    style="margin-right: 50px"
+                  >积分</span
+                  >
                   <span>优秀学员可获得</span>
-                  <a-input v-model:value="seven2" :bordered="false" />
-                  <span>积分</span>
+                  <a-input v-model:value="seven2" :bordered="false"/>
+                  <span
+                  >积分</span
+                  >
                 </div>
               </div>
             </div>
           </div>
         </a-tab-pane>
 
+
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
           <a-tabs>
@@ -507,7 +539,7 @@
                     <div class="setc_name"><span>项目时间：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
-                        >{{ projectInfo.beginTime }} ～
+                      >{{ projectInfo.beginTime }} ～
                         {{ projectInfo.endTime }}</span
                       >
                     </div>
@@ -516,63 +548,54 @@
                     <div class="setc_name"><span>项目经理：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999">{{
-                        projectInfo.manager
-                      }}</span>
+                          projectInfo.manager
+                        }}</span>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>资源归属：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999">{{
-                        (projectInfo.sourceBelongFullName || "") +
-                        projectInfo.sourceBelongName
-                      }}</span>
+                          (projectInfo.sourceBelongFullName || '') + projectInfo.sourceBelongName
+                        }}</span>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
-                      <ProjectLevel
-                        :value="projectInfo.level"
-                        :tag="true"
-                      ></ProjectLevel>
+                      <ProjectLevel :value="projectInfo.level" :tag="true"></ProjectLevel>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>培训体系：</span></div>
                     <div class="setc_main">
-                      <TrainClass
-                        :value="projectInfo.systemId"
-                        :tag="true"
-                      ></TrainClass>
+                      <TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>同步学习记录：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.courseSyncFlag"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
+                      <a-radio v-model:checked="projectInfo.courseSyncFlag" :disabled="true"
+                      ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
                       >
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
-                      <a-radio
-                        v-model:checked="projectInfo.boeFlag"
-                        :disabled="true"
-                        ><span style="color: #333333">BOEU实施</span></a-radio
+                      <a-radio v-model:checked="projectInfo.boeFlag" :disabled="true"
+                      ><span style="color: #333333">BOEU实施</span></a-radio
                       >
                     </div>
                   </div>
-                  <div class="set_content" v-if="projectInfo.remark">
+                  <div class="set_content" v-if="projectInfo.remark ">
                     <div class="setc_name"><span>项目说明：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999">{{
-                        projectInfo.remark
-                      }}</span>
+                          projectInfo.remark
+                        }}</span>
                     </div>
                   </div>
                 </div>
@@ -606,17 +629,11 @@
                         <span
                           class="xkbtn"
                           style="cursor: pointer; font-size: 17px"
-                          >上传</span
+                        >上传</span
                         >
                         <img
                           src="@/assets/images/basicinfo/cloud.png"
-                          style="
-                            cursor: pointer;
-                            width: 24px;
-                            height: 24px;
-                            margin-left: 8px;
-                            margin-bottom: 3px;
-                          "
+                          style="cursor: pointer; width: 24px; height: 24px; margin-left: 8px;margin-bottom: 3px;"
                           alt=""
                         />
                       </a-upload>
@@ -632,7 +649,7 @@
                       <div
                         v-for="item in fileList"
                         :key="item.uid"
-                        style="margin-bottom: 30px"
+                        style="margin-bottom: 30px;"
                         class="docListStyle"
                       >
                         <!-- <img
@@ -645,74 +662,35 @@
                           "
                           alt=""
                         /> -->
-                        <img
-                          v-if="
-                            item.name.indexOf('jpg') !== -1 ||
-                            item.name.indexOf('jpeg') !== -1 ||
-                            item.name.indexOf('png') !== -1
-                          "
-                          style="width: 27px; height: 32px; margin-right: 40px"
-                          src="@/assets/images/coursewareManage/pngpic.png"
-                        />
-                        <div v-else>
-                          <img
-                            v-if="item.name.indexOf('doc') !== -1"
-                            style="
-                              width: 27px;
-                              height: 32px;
-                              margin-right: 40px;
+                        <img v-if="
+                              item.name.indexOf('jpg') !== -1 ||
+                              item.name.indexOf('jpeg') !== -1 ||
+                              item.name.indexOf('png') !== -1
                             "
-                            src="@/assets/images/coursewareManage/docpic.png"
-                          />
+                             style="width: 27px;height: 32px;margin-right: 40px;"
+                             src="@/assets/images/coursewareManage/pngpic.png"/>
+                        <div v-else>
+                          <img v-if="item.name.indexOf('doc') !== -1"
+                               style="width: 27px;height: 32px;margin-right: 40px;"
+                               src="@/assets/images/coursewareManage/docpic.png"/>
                           <div v-else>
-                            <img
-                              v-if="item.name.indexOf('xls') !== -1"
-                              style="
-                                width: 27px;
-                                height: 32px;
-                                margin-right: 40px;
-                              "
-                              src="@/assets/images/coursewareManage/xlspic.png"
-                            />
+                            <img v-if="item.name.indexOf('xls') !== -1"
+                                 style="width: 27px;height: 32px;margin-right: 40px;"
+                                 src="@/assets/images/coursewareManage/xlspic.png"/>
                             <div v-else>
-                              <img
-                                v-if="item.name.indexOf('ppt') !== -1"
-                                style="
-                                  width: 27px;
-                                  height: 32px;
-                                  margin-right: 40px;
-                                "
-                                src="@/assets/images/coursewareManage/pptpic.png"
-                              />
+                              <img v-if="item.name.indexOf('ppt') !== -1"
+                                   style="width: 27px;height: 32px;margin-right: 40px;"
+                                   src="@/assets/images/coursewareManage/pptpic.png"/>
                               <div v-else>
-                                <img
-                                  v-if="item.name.indexOf('pdf') !== -1"
-                                  style="
-                                    width: 27px;
-                                    height: 32px;
-                                    margin-right: 40px;
-                                  "
-                                  src="@/assets/images/coursewareManage/pdfpic.png"
-                                />
+                                <img v-if="item.name.indexOf('pdf') !== -1"
+                                     style="width: 27px;height: 32px;margin-right: 40px;"
+                                     src="@/assets/images/coursewareManage/pdfpic.png"/>
                                 <div v-else>
-                                  <img
-                                    v-if="item.name.indexOf('zip') !== -1"
-                                    style="
-                                      width: 27px;
-                                      height: 32px;
-                                      margin-right: 40px;
-                                    "
-                                    src="@/assets/images/coursewareManage/zippic.png"
-                                  />
-                                  <img
-                                    v-else
-                                    style="
-                                      width: 27px;
-                                      height: 32px;
-                                      margin-right: 40px;
-                                    "
-                                    src="@/assets/images/coursewareManage/docpic.png"
-                                  />
+                                  <img v-if="item.name.indexOf('zip') !== -1"
+                                       style="width: 27px;height: 32px;margin-right: 40px;"
+                                       src="@/assets/images/coursewareManage/zippic.png"/>
+                                  <img v-else style="width: 27px;height: 32px;margin-right: 40px;"
+                                       src="@/assets/images/coursewareManage/docpic.png"/>
                                 </div>
                               </div>
                             </div>
@@ -720,30 +698,17 @@
                         </div>
 
                         <span
-                          style="
-                            font: oblique bold 16px Sans-serif;
-                            width: 300px;
-                            display: block;
-                            overflow: hidden;
-                            white-space: nowrap;
-                            text-overflow: ellipsis;
-                          "
-                          >{{ item.name }}</span
-                        >
+                          style="font: oblique bold 16px Sans-serif;width:300px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{
+                            item.name
+                          }}</span>
                         <a
                           href="javascript:void(0);"
-                          @click="
-                            downloadFile(
-                              item.response ? item.response.data : ''
-                            )
-                          "
-                          style="margin-left: 5px"
-                          >下载</a
-                        >
+                          @click="downloadFile(item.response ? item.response.data : '')"
+                          style="margin-left: 5px">下载</a>
                         <span
                           style="color: #4ea6ff; cursor: pointer"
                           @click="deFile(item.uid)"
-                          >删除</span
+                        >删除</span
                         >
                       </div>
                     </div>
@@ -751,6 +716,8 @@
                 </div>
               </div>
             </a-tab-pane>
+
+
           </a-tabs>
         </a-tab-pane>
       </a-tabs>
@@ -789,7 +756,8 @@
             </div>
           </div>
         </div>
-      </a-modal>
+      </a-modal
+      >
     </div>
   </div>
 </template>
@@ -803,10 +771,10 @@ import {
   onMounted,
   computed,
 } from "vue";
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
 import * as api from "@/api/indexTemplate";
-import { useRoute, useRouter } from "vue-router";
-import { scoreRule, setScoreRule } from "@/api/indexTaskadd";
+import {useRoute, useRouter} from "vue-router";
+import {scoreRule, setScoreRule} from "@/api/indexTaskadd";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import TrainClass from "@/components/project/TrainClass";
 
@@ -818,7 +786,7 @@ export default defineComponent({
   },
   setup() {
     const state = reactive({
-      templateInfo: {},
+      templateInfo:{},
       //任务大纲列表
       taskSyllabus: [
         // {
@@ -901,26 +869,26 @@ export default defineComponent({
       ],
       // 模板编辑列表
       managerOptions: [
-        { value: "李俊国" },
-        { value: "将小米" },
-        { value: "刘孟君" },
+        {value: "李俊国"},
+        {value: "将小米"},
+        {value: "刘孟君"},
       ],
       sourceBelongOptions: [
-        { value: "项目一" },
-        { value: "项目二" },
-        { value: "项目三" },
+        {value: "项目一"},
+        {value: "项目二"},
+        {value: "项目三"},
       ],
       levelOptions: [
-        { value: "集团级" },
-        { value: "组织级" },
-        { value: "现地级" },
-        { value: "部门级" },
+        {value: "集团级"},
+        {value: "组织级"},
+        {value: "现地级"},
+        {value: "部门级"},
       ],
       systemOptions: [
-        { value: "集团级" },
-        { value: "组织级" },
-        { value: "现地级" },
-        { value: "部门级" },
+        {value: "集团级"},
+        {value: "组织级"},
+        {value: "现地级"},
+        {value: "部门级"},
       ],
       taskSyllabusActive: 0,
       //在线管理等页面传递参数
@@ -976,9 +944,7 @@ export default defineComponent({
     const value = ref("");
     const textnum = "150";
     const routered = useRouter();
-    const {
-      query: { projectTemplateId },
-    } = useRoute();
+    const {query: {projectTemplateId}} = useRoute();
     const changeopclo = () => {
       state.projectInfo.noticeFlag = state.checked ? 1 : 0;
       api
@@ -1051,7 +1017,7 @@ export default defineComponent({
     // 获取详情
     const getDetail = () => {
       api.templateEditDetail(projectTemplateId).then((res) => {
-        state.templateInfo = res.data.data;
+        state.templateInfo = res.data.data
         state.taskSyllabus = [];
         state.projectInfo = res.data.data.projectTemplateInfo;
         state.noticeContent = state.projectInfo.notice;
@@ -1061,12 +1027,13 @@ export default defineComponent({
           res.data.data.projectTemplateInfo
         );
         try {
-          state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach);
+          state.fileList = JSON.parse(
+            res.data.data.projectTemplateInfo.attach
+          );
         } catch {
           state.fileList = [];
         }
-        state.attachSwitch =
-          res.data.data.projectTemplateInfo.attachSwitch == 1;
+        state.attachSwitch = res.data.data.projectTemplateInfo.attachSwitch == 1;
         let data = res.data.data.stageList;
         console.log("data=====", data);
         for (let i in data) {
@@ -1093,7 +1060,7 @@ export default defineComponent({
             });
           }
         }
-      });
+      })
     };
 
     // 发布公告
@@ -1181,7 +1148,7 @@ export default defineComponent({
         projectTaskId: 0,
         projectTemplateId: localStorage.getItem("projectTemplateId"),
         stageId: 0,
-        type: 0,
+        type: 0
       };
       api
         .editTask(obj)
@@ -1198,52 +1165,11 @@ export default defineComponent({
       scoreRule({
         projectId: projectTemplateId,
       })
-<<<<<<< HEAD
-          .then((res) => {
-            let result = res.data.data;
-           //Write operation failed: computed value is readonly 总积分
-
-            state.scoresum = Number(result[0].pointsCount) + Number(result[1].pointsCount) + Number(result[2].pointsCount) + Number(result[3].pointsCount) + Number(result[4].pointsCount) + Number(result[5].pointsCount) + Number(result[6].pointsCount) + Number(result[7].pointsCount)
-
-            state.score1 = result[0].pointsCount;
-
-            state.done2 = result[1].typeDescConfig;
-            state.done3 = result[1].pointsCount;
-
-            state.four1 = result[2].typeDescConfig;
-            state.four2 = result[2].pointsCount;
-
-            state.four3 = result[3].typeDescConfig.slice(0,result[3].typeDescConfig.indexOf(';'));
-            state.four4 = result[3].typeDescConfig.slice(result[3].typeDescConfig.indexOf(';')+1);
-            state.four5 = result[3].pointsCount;
-
-            state.five1 = result[4].typeDescConfig;
-            state.five2 = result[4].pointsCount;
-
-            state.six1 = result[5].pointsCount;
-
-            state.seven1 = result[6].pointsCount;
-
-            state.seven2 = result[7].pointsCount;
-
-          })
-          .catch((err) => {
-            console.log("获取项目积分规则失败了", err);
-          });
-=======
         .then((res) => {
           let result = res.data.data;
           //Write operation failed: computed value is readonly 总积分
 
-          state.scoresum =
-            Number(result[0].pointsCount) +
-            Number(result[1].pointsCount) +
-            Number(result[2].pointsCount) +
-            Number(result[3].pointsCount) +
-            Number(result[4].pointsCount) +
-            Number(result[5].pointsCount) +
-            Number(result[6].pointsCount) +
-            Number(result[7].pointsCount);
+          state.scoresum = Number(result[0].pointsCount) + Number(result[1].pointsCount) + Number(result[2].pointsCount) + Number(result[3].pointsCount) + Number(result[4].pointsCount) + Number(result[5].pointsCount) + Number(result[6].pointsCount) + Number(result[7].pointsCount)
 
           state.score1 = result[0].pointsCount;
 
@@ -1253,13 +1179,8 @@ export default defineComponent({
           state.four1 = result[2].typeDescConfig;
           state.four2 = result[2].pointsCount;
 
-          state.four3 = result[3].typeDescConfig.slice(
-            0,
-            result[3].typeDescConfig.indexOf(";")
-          );
-          state.four4 = result[3].typeDescConfig.slice(
-            result[3].typeDescConfig.indexOf(";") + 1
-          );
+          state.four3 = result[3].typeDescConfig.slice(0,result[3].typeDescConfig.indexOf(';'));
+          state.four4 = result[3].typeDescConfig.slice(result[3].typeDescConfig.indexOf(';')+1);
           state.four5 = result[3].pointsCount;
 
           state.five1 = result[4].typeDescConfig;
@@ -1270,13 +1191,13 @@ export default defineComponent({
           state.seven1 = result[6].pointsCount;
 
           state.seven2 = result[7].pointsCount;
+
         })
         .catch((err) => {
           console.log("获取项目积分规则失败了", err);
         });
->>>>>>> 62a0600a8a44904ec64b4bb4c14a4eb3e3dc7d74
     };
-    const handleChange2 = ({ file, fileList }) => {
+    const handleChange2 = ({file, fileList}) => {
       console.log(fileList);
       let list = [];
       if (file.status !== "uploading") {
@@ -1355,16 +1276,16 @@ export default defineComponent({
           attach: str,
         })
         .then((res) => {
-          console.log(res);
+          console.log(res)
           message.destroy();
           message.success("删除成功");
-          return;
+          return
         })
         .catch((err) => {
-          console.log(err);
+          console.log(err)
           message.destroy();
           message.warning("删除失败");
-          return;
+          return
         });
     };
 
@@ -1372,9 +1293,7 @@ export default defineComponent({
     const checkedClose = (data, a) => {
       console.log(data, a);
       console.log("模板id：" + projectTemplateId);
-      console.log(
-        "开关数据：" + JSON.stringify(data) + "====" + JSON.stringify(a)
-      );
+      console.log("开关数据：" + JSON.stringify(data) + "====" + JSON.stringify(a))
       state.attachSwitch = data;
 
       // 更新开关状态
@@ -1396,56 +1315,56 @@ export default defineComponent({
     const editRule = () => {
       let obj = {
         projectId: projectTemplateId,
-        datas: [
+        datas:[
           {
-            type: 1,
-            pointsCount: Number(state.score1),
-            typeDesc: "完成【必修/选修】获得%p积分",
-            typeDescConfig: "",
+            "type": 1,
+            "pointsCount": Number(state.score1),
+            "typeDesc": "完成【必修/选修】获得%p积分",
+            "typeDescConfig": ""
           },
           {
-            type: 2,
-            pointsCount: Number(state.done3),
-            typeDesc: "完成作业成绩不低于%d分获得%p积分",
-            typeDescConfig: state.done2,
+            "type": 2,
+            "pointsCount": Number(state.done3),
+            "typeDesc": "完成作业成绩不低于%d分获得%p积分",
+            "typeDescConfig": state.done2
           },
           {
-            type: 3,
-            pointsCount: Number(state.four2),
-            typeDesc: "前%d名学完在线课程获得%p积分",
-            typeDescConfig: state.four1,
+            "type": 3,
+            "pointsCount": Number(state.four2),
+            "typeDesc": "前%d名学完在线课程获得%p积分",
+            "typeDescConfig": state.four1
           },
           {
-            type: 4,
-            pointsCount: Number(state.four5),
-            typeDesc: "前%d名提交作业且成绩不低于%d分获得%p积分",
-            typeDescConfig: state.four3 + ";" + state.four4,
+            "type": 4,
+            "pointsCount": Number(state.four5),
+            "typeDesc": "前%d名提交作业且成绩不低于%d分获得%p积分",
+            "typeDescConfig":  state.four3 + ';' + state.four4
           },
           {
-            type: 5,
-            pointsCount: Number(state.five2),
-            typeDesc: "考试成绩高于%d分获得%p积分",
-            typeDescConfig: state.five1,
+            "type": 5,
+            "pointsCount": Number(state.five2),
+            "typeDesc": "考试成绩高于%d分获得%p积分",
+            "typeDescConfig": state.five1
           },
           {
-            type: 6,
-            pointsCount: Number(state.six1),
-            typeDesc: "考勤正常学员获得%p积分",
-            typeDescConfig: "",
+            "type": 6,
+            "pointsCount": Number(state.six1),
+            "typeDesc": "考勤正常学员获得%p积分",
+            "typeDescConfig": ""
           },
           {
-            type: 7,
-            pointsCount: Number(state.seven1),
-            typeDesc: "成为小组长获得%p积分",
-            typeDescConfig: "",
+            "type": 7,
+            "pointsCount": Number(state.seven1),
+            "typeDesc": "成为小组长获得%p积分",
+            "typeDescConfig": ""
           },
           {
-            type: 8,
-            pointsCount: Number(state.seven2),
-            typeDesc: "优秀学员可获得%p积分",
-            typeDescConfig: "",
-          },
-        ],
+            "type": 8,
+            "pointsCount": Number(state.seven2),
+            "typeDesc": "优秀学员可获得%p积分",
+            "typeDescConfig": ""
+          }
+        ]
       };
       console.log(obj);
       setScoreRule(obj)
@@ -1468,17 +1387,10 @@ export default defineComponent({
 
     // 共享文档文件下载
     const downloadFile = (url) => {
-      console.log(url);
-      window.open(
-        window.location.protocol +
-          process.env.VUE_APP_BOE_API_URL +
-          process.env.VUE_APP_FILE_PATH +
-          url
-      );
-
-      // if (url) {
-      //   window.open(url)
-      // }
+      console.log(url)
+      if (url) {
+        window.open(url)
+      }
       // if(url){
       //   const filename = '操作指南'
       //   const x = new XMLHttpRequest()
@@ -1494,7 +1406,7 @@ export default defineComponent({
       //   }
       //   x.send()
       // }
-    };
+    }
 
     return {
       ...toRefs(state),
@@ -1519,7 +1431,7 @@ export default defineComponent({
       checkedClose,
       editNotice,
       deFile,
-      downloadFile,
+      downloadFile
     };
   },
 });