合并冲突

2025-12-12 12:26:47 +08:00 · 2023-03-04 14:20:16 +08:00
parent 11086021f9 62a0600a8a
commit 142c1d8977
43 changed files with 1126 additions and 899 deletions
--- 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 {
--- 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'
+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`;
--- 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';
--- 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'
--- 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" 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>
--- 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()
--- 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 ? "重选" : "选择" }}试卷
@@ -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">
@@ -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 = []
 };
--- 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){
--- 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>
@@ -287,7 +287,7 @@
                  v-model:value="formData.source"
                  style="width: 400px; height: 40px; border-radius: 8px"
                  placeholder="请输入数据来源"
-                  :maxlength="20"
+                  :maxlength="120"
              />
            </div>
          </div>
@@ -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 = '';
 }

--- 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;
--- a/src/components/drawers/CreateOnline.vue
+++ b/src/components/drawers/CreateOnline.vue
@@ -14,7 +14,7 @@
    <iframe
      id="iframe"
      style="width: 100%; height: 600px"
-        :src="iframeUrl + '/course/manages?f=choose'"
+      :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"
@@ -22,19 +22,25 @@
  </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">
--- 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>
--- 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>
@@ -318,14 +318,14 @@ export default {
          customRender: (text) => {
            return (
              <div class="racona">
-                {text.record.status == '0' ? "查看答卷" : 
+                {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>
+                  }}>查看答卷 </a> : 
+                  <span style="color:rgba(0, 0, 0, 0.25);cursor:not-allowed;">  查看答卷 </span>
                }
-                
              </div>
            );
          },
@@ -334,7 +334,7 @@ export default {
      loadingData: true,
      studentKid: '',
      CAvisible: false,
-      datasource: ''
+      datasource1: ''
    });

    const closeDrawer = () => {
--- 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}`)
      }
--- 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}`)
      }
--- 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),
--- 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 = () => {
--- 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();
  }
 };

--- 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,7 +62,8 @@
        <a-col :span="1.5">
          <CommonStudent
            :type="type"
-              :id="id"
+            title="添加在线课学员"
+            :id="formData.id"
            @finash="submitCall"
            :stage="stage"
          >
@@ -81,12 +82,11 @@
          :pagination="stuPagination"
          :loading="loading"
          row-key="id"
-            :row-selection="stuRowSelection"
        >
          <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>
@@ -95,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: () => [],
@@ -127,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,
  },
@@ -160,17 +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 {data: studentList, fetch: searchStu, total, loading} = usePage(STUDENT_LIST, searchParams)
+const formData = ref({});
+
+const { data: studentList, fetch: searchStu, total, loading } = usePage(STUDENT_LIST, searchParams, false);

 const stuPagination = computed(() => ({
  total: total.value,
@@ -180,21 +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 = () => {
+const openDrawer = (raw) => {
+  console.log(raw);
+  searchParams.value.pid = raw.id;
+  formData.value = raw;
  visiable.value = true;
+  searchStu();
 };

 const changePagination = (page) => {
@@ -202,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 = () => {
@@ -223,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({
@@ -237,7 +296,7 @@ defineExpose({
  loading,
  closeDrawer,
  openDrawer
-})
+});
 </script>
 <style lang="scss">
 .header-content {
--- 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, () => {
--- 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,6 +52,7 @@
          class="cus-btn"
          style="background: #4ea6ff; color: #fff; width: 100px"
          @click="getStuList"
+          :loading="stuAsyncLoading"
        >
          <template #icon>
            <img
@@ -68,7 +67,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 +103,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 +130,7 @@
          <template #icon
          ><img
            style="margin-right: 10px"
-              src="../../assets/images/projectadd/delete.png"
+            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,
@@ -680,11 +684,12 @@ 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);
 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">
@@ -1194,11 +1203,13 @@ defineExpose({ getStuList, startLoading });
        }
      }
    }
+
    .ant-modal-close-x {
      display: none;
    }
  }
 }
+
 /*.delete {
  z-index: 9999;
  width: 424px;
--- a/src/utils/useCommon.js
+++ b/src/utils/useCommon.js
@@ -1,19 +1,22 @@
-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();

  function start(d) {
-        clearInterval(timer.value)
+    clearInterval(timer.value);
    timer.value = setInterval(async () => {
      if (await fun(d)) {
-                clearInterval(timer.value)
+        clearInterval(timer.value);
      }
    }, time);
  }

-    return {start}
+  return { start };
 }

 export function useTimeout(asyncFun, time) {
@@ -21,25 +24,56 @@ export function useTimeout(asyncFun, time) {
  const maxCount = ref(0);

  function start(d) {
-        clearTimeout(timer.value)
-        maxCount.value = 0
-        execute(d)
+    clearTimeout(timer.value);
+    maxCount.value = 0;
+    execute(d);
  }

  async function execute(d) {
    if (maxCount.value > 300) {
-            message.error("等待超时，请联系管理员！")
-            throw Error("等待超时 查询任务结束")
+      message.error("等待超时，请联系管理员！");
+      throw Error("等待超时 查询任务结束");
    }
    try {
-            await asyncFun(d)
-            maxCount.value = maxCount.value + 1
+      await asyncFun(d);
+      maxCount.value = maxCount.value + 1;
      timer.value = setTimeout(() => execute(d), time);
    } catch (e) {
-            clearTimeout(timer.value)
-            console.log(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 };
+}
+
--- 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;
        }
--- 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; //考勤 开始后
@@ -4655,7 +4657,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;
@@ -5138,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;
@@ -5155,7 +5157,7 @@ export default defineComponent({
        .btnText {
          font-size: 14px;
          font-weight: 400;
-          color: #4ea6ff;
+          color: #fff;
          line-height: 36px;
          margin-left: 5px;
        }
@@ -5168,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");
        }
      }

@@ -5236,7 +5243,9 @@ export default defineComponent({
          margin-left: 5px;
        }
      }
-
+      .btn3:active {
+					background: #0982ff;
+			}
      .btn3 {
        .search {
          width: 17px;
@@ -6241,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;
@@ -6257,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;
                    }
@@ -6288,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");
                    }
                  }
                }
@@ -6863,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;
@@ -6880,7 +6891,7 @@ export default defineComponent({
                .btnText {
                  font-size: 14px;
                  font-weight: 400;
-                  color: #4ea6ff;
+                  color: #fff;
                  line-height: 36px;
                  margin-left: 5px;
                }
@@ -6898,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");
                }
              }

--- 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>
@@ -32,6 +32,7 @@ const stuRef = ref()
 onMounted(() => {
  window.openSelectStu = stuRef.value.openDrawer
 })
+
 </script>
 <style lang="scss">
 .courseManage {
--- 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;
--- 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;
--- 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>
@@ -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;
--- 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;
--- 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;
      }
--- 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;
@@ -2786,12 +2786,14 @@ export default {

    // 共享文档文件下载
    const downloadFile = (url) => {
-      debugger
-      const urlNew = url.slice(1);
-      console.log(urlNew);
-      if (urlNew) {
-        window.open(process.env.VUE_APP_FILE_PATH + urlNew);
-      }
+      url && window.open(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){
      //   const filename = '操作指南'
      //   const x = new XMLHttpRequest()
--- 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"  :courseSyncFlag="routerInfo.routerInfo?.courseSyncFlag"
                       v-model:task-list="routerInfo.chapterList[activeIndex].draftTaskList">
              <div class="itcon">
                <div class="img">
@@ -564,6 +564,7 @@ const submitStorage = async () => {
  }
  confirmLoading.value = true;
  await request(ROUTER_DETAIL_MODIFY, routerInfo.value);
+  await getDetail();
  message.success("关卡和任务数据已保存");
  confirmLoading.value = false;
 };
--- 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,14 +34,12 @@
          </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>
@@ -60,7 +58,10 @@
              <!-- <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"
@@ -260,13 +261,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)">
                  创建任务
@@ -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>
@@ -422,84 +423,51 @@
                  ><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>
@@ -556,26 +524,33 @@
                    <div class="setc_name"><span>资源归属：</span></div>
                    <div class="setc_main">
                      <span style="color: #999999">{{
-                          (projectInfo.sourceBelongFullName || '') + projectInfo.sourceBelongName
+                        (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"
+                      <a-radio v-model:checked="projectInfo.courseSyncFlag"
                        ><span style="color: #333333"
                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                        ></a-radio
@@ -585,12 +560,14 @@
                  <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"
+                      <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">{{
@@ -633,7 +610,13 @@
                        >
                        <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>
@@ -649,7 +632,7 @@
                      <div
                        v-for="item in fileList"
                        :key="item.uid"
-                          style="margin-bottom: 30px;"
+                        style="margin-bottom: 30px"
                        class="docListStyle"
                      >
                        <!-- <img
@@ -662,35 +645,74 @@
                          "
                          alt=""
                        /> -->
-                        <img v-if="
+                        <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"/>
+                          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,13 +720,26 @@
                        </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)"
@@ -716,8 +751,6 @@
                </div>
              </div>
            </a-tab-pane>
-
-
          </a-tabs>
        </a-tab-pane>
      </a-tabs>
@@ -756,8 +789,7 @@
            </div>
          </div>
        </div>
-      </a-modal
-      >
+      </a-modal>
    </div>
  </div>
 </template>
@@ -771,10 +803,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 +818,7 @@ export default defineComponent({
  },
  setup() {
    const state = reactive({
-      templateInfo:{},
+      templateInfo: {},
      //任务大纲列表
      taskSyllabus: [
        // {
@@ -869,26 +901,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,7 +976,9 @@ 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
@@ -1017,7 +1051,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;
@@ -1027,13 +1061,12 @@ 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) {
@@ -1060,7 +1093,7 @@ export default defineComponent({
            });
          }
        }
-          })
+      });
    };

    // 发布公告
@@ -1148,7 +1181,7 @@ export default defineComponent({
        projectTaskId: 0,
        projectTemplateId: localStorage.getItem("projectTemplateId"),
        stageId: 0,
-        type: 0
+        type: 0,
      };
      api
        .editTask(obj)
@@ -1165,6 +1198,7 @@ export default defineComponent({
      scoreRule({
        projectId: projectTemplateId,
      })
+<<<<<<< HEAD
          .then((res) => {
            let result = res.data.data;
           //Write operation failed: computed value is readonly 总积分
@@ -1196,8 +1230,53 @@ export default defineComponent({
          .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.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);
+        });
+>>>>>>> 62a0600a8a44904ec64b4bb4c14a4eb3e3dc7d74
    };
-    const handleChange2 = ({file, fileList}) => {
+    const handleChange2 = ({ file, fileList }) => {
      console.log(fileList);
      let list = [];
      if (file.status !== "uploading") {
@@ -1276,16 +1355,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;
        });
    };

@@ -1293,7 +1372,9 @@ 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;

      // 更新开关状态
@@ -1315,56 +1396,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)
@@ -1387,10 +1468,17 @@ export default defineComponent({

    // 共享文档文件下载
    const downloadFile = (url) => {
-      console.log(url)
-      if (url) {
-        window.open(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)
+      // }
      // if(url){
      //   const filename = '操作指南'
      //   const x = new XMLHttpRequest()
@@ -1406,7 +1494,7 @@ export default defineComponent({
      //   }
      //   x.send()
      // }
-    }
+    };

    return {
      ...toRefs(state),
@@ -1431,7 +1519,7 @@ export default defineComponent({
      checkedClose,
      editNotice,
      deFile,
-      downloadFile
+      downloadFile,
    };
  },
 });
--- 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);
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1352,8 +1352,11 @@ export default {
          projectId: state.copyProjectId,
          type: 2
        })
-        .then(() => getTableDate());
+        .then(() => {
+          state.tableLoading = false;
          message.success("复制成功");
+          getTableDate()
+        });
    };
    //打开提交审核弹窗
    const showReviewModal = (projectId) => {
@@ -1829,7 +1832,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 +1849,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 +1893,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 +1961,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;
--- 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>
@@ -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" :courseSyncFlag="projectInfo.projectInfo?.courseSyncFlag"
                         v-model:task-list="projectInfo.stageList[activeIndex].taskDraftDtoList">
                <div class="itcon">
                  <div class="img">
@@ -613,6 +613,7 @@ const submitStorage = async () => {
  }
  confirmLoading.value = true
  await request(PROJECT_DETAIL_MODIFY, projectInfo.value)
+  await getTask()
  message.success("阶段和任务数据已保存")
  confirmLoading.value = false
 };
--- 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>
@@ -465,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>
@@ -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") {
@@ -3925,7 +3929,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 +4517,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 +4544,7 @@ export default {
          codeUrl =
            window.location.protocol +
            process.env.VUE_APP_H5 +
-            "/externalexam?courseId=" +
+            "/externalexam?type=1&courseId=" +
            item.courseId;
        } else {
          codeUrl =
@@ -4607,7 +4611,7 @@ export default {
          process.env.VUE_APP_H5 +
          "/evaluation?courseId=" +
          item.courseId +
-          "&evaType=" +
+          "&type=1&evaType=" +
          item.evaType +
          "&targetId=" +
          item.targetId;
@@ -4638,7 +4642,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 +4667,7 @@ export default {
        url:
          window.location.protocol +
          process.env.VUE_APP_H5 +
-          "/projectdetails?projectId=" +
+          "/projectdetails?type=1&projectId=" +
          state.projectId,
      };
      state.codeInfo = obj;
@@ -4678,8 +4682,14 @@ export default {
    }
    // 共享文档文件下载
    const downloadFile = (url) => {
-        debugger
      url && window.open(url);
+      console.log(url);
+      window.open(
+        window.location.protocol +
+          process.env.VUE_APP_BOE_API_URL +
+          process.env.VUE_APP_FILE_PATH +
+          url
+      );
    };
    function stageChange(item, index) {
      state.choosedStageName = item.name;
@@ -5955,12 +5965,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;
@@ -5974,15 +5985,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 {
--- 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;
-          }
        }
      }
    }
--- 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">
--- 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%;
--- 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: "",
@@ -322,7 +323,9 @@ export default {
      ],
      showassess,
      changePaginationStu,
-      exportStudentInfo
+      exportStudentInfo,
+      createName, 
+      createTime
    };
  },
 };
@@ -482,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;
    }
@@ -495,9 +498,13 @@ export default {
  }

  .btn2 {
-    background: #ffffff;
+    background: #4ea6ff;

-    color: #4ea6ff;
+    color: #fff;
    border: 1px solid #4ea6ff;
  }
+
+  .btn2:active {
+    background: #0982ff;
+  }
 }</style>
--- 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"
        >
@@ -665,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;
--- 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>
@@ -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>
@@ -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());
@@ -588,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;
@@ -605,7 +606,7 @@ const handleNext = async () => {
        .btnText {
          font-size: 14px;
          font-weight: 400;
-          color: #4ea6ff;
+          color: #fff;
          line-height: 36px;
          margin-left: 5px;
        }
@@ -623,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);
@@ -691,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;