Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

src/App.vue

@@ -155,8 +155,8 @@ const getDictList = (param) => api1.getDictTree({code: param,}).then((res) => re
   }
 
   .white {
-    background: #fff;
+    // background: #fff;
-    color: #4ea6ff;
+    // color: #4ea6ff;
   }
 
   .cus-input {

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 USER_LIST = "/userbasic/user/searchList post";
-export const ORG_LIST = '/userbasic/org/list post'
+export const ORG_LIST = "/userbasic/org/list post";
-export const ORG_CHILD_LIST = '/userbasic/org/info 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 AUDIENCE_LIST = "/userbasic/audience/userAudiencesFilter post";
-export const USER_PERMISSION = '/userbasic/permission/listByUser post'
+export const USER_PERMISSION = "/userbasic/permission/listByUser post";
-export const CASE_PAGE = '/systemapi/xboe/m/boe/cases/pagelist post formData'
+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 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 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_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`;

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';

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'

src/components/common/CommonAlert.vue

@@ -1,13 +1,13 @@
 <template>
   <a-modal
-      :visible="true"
+    :visible="true"
-      :footer="null"
+    :footer="null"
-      :title="null"
+    :title="null"
-      :centere="true"
+    :centere="true"
-      :closable="false"
+    :closable="false"
-      style="margin-top: 400px"
+    style="margin-top: 400px"
-      :zIndex="9999"
+    :zIndex="9999"
-      @cancel="close"
+    @cancel="close"
   >
     <div class="delete">
       <div class="del_header"></div>
@@ -22,7 +22,7 @@
           <div><span>{{ content }}</span></div>
         </div>
         <div class="del_btnbox">
-          <div class="del_btn 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 notide from "@/assets/images/coursewareManage/notice.png";
-import infoPng from '@/assets/images/coursewareManage/QR.png'
+import infoPng from "@/assets/images/coursewareManage/QR.png";
-import {defineProps, ref} from "vue";
+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.ok();
-  props.close()
+  props.close();
 }
 </script>
 <style lang="scss" scoped>
@@ -84,8 +96,8 @@ function handleConfirm() {
     width: calc(100%);
     height: 40px;
     background: linear-gradient(
-            rgba(78, 166, 255, 0.2) 0%,
+        rgba(78, 166, 255, 0.2) 0%,
-            rgba(78, 166, 255, 0) 100%
+        rgba(78, 166, 255, 0) 100%
     );
   }
 

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()

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 ? "重选" : "选择" }}试卷

src/components/drawers/CheckVote.vue

@@ -19,7 +19,7 @@
             <div class="main">
                 <div class="basetext"><span>投票题目</span></div>
                 <div v-if="voteResource" class="basequestion">
-                    <div class="ques" v-for=" item,index  in voteResource.ballotVo.voteStemVoList" :key="index">
+                    <div class="ques" v-for=" item,index  in voteResource.voteStemDtoList" :key="index">
                         <div class="quename">{{ index+1 +"."+ item.voteStemName }}</div>
                         <div class="queanswer">
                             <a-radio-group v-model:value="currentChoice[index]">
@@ -50,7 +50,8 @@
 import { toRefs,reactive } from '@vue/reactivity';
 import {computed} from "vue";
 import { useStore } from "vuex";
-import * as api from "../../api/indexTaskManage";
+// import * as api from "../../api/indexTaskManage";
+import {queryStemByStemId} from '@/api/indexVote';
 
 export default {
     name:"CheckWork",
@@ -126,19 +127,15 @@ export default {
         function getData() {
             console.log('我是请求的参数', {
                 "courseId": props.courseID,
-                "studentId": userInfo.value.id,
+                "userInfo": userInfo.value,
-                "voteSubmitId": props.voteID
+                "voteId": props.voteID
             })
-            api.QueryVoteTaskDetailById({
+            queryStemByStemId(props.courseID).then(res=>{
-                "courseId": props.courseID,
-                "studentId": userInfo.value.id,
-                "voteSubmitId": props.voteID
-            }).then(res=>{
                 console.log(res)
                 state.voteResource = res.data.data
-
                 let choiceArr = []
-                let dataQuestion = state.voteResource.ballotVo.voteStemVoList
+                //2023-02-28
+                let dataQuestion = state.voteResource.voteStemDtoList
                 for(let i=0;i<dataQuestion.length;i++){
                     for(let j=0;j<dataQuestion[i].optionDetailList.length;j++){
                         if(dataQuestion[i].optionDetailList[j].isAnswer){

src/components/drawers/CommonTest.vue

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

src/components/drawers/CreateOnline.vue

@@ -3,38 +3,44 @@
     <slot></slot>
   </div>
   <a-modal
-      :visible="visible"
+    :visible="visible"
-      :footer="null"
+    :footer="null"
-      :centered="true"
+    :centered="true"
-      :maskClosable="false"
+    :maskClosable="false"
-      width="80%"
+    width="80%"
-      height="80%"
+    height="80%"
-      @cancel="closeModal"
+    @cancel="closeModal"
   >
     <iframe
-        id="iframe"
+      id="iframe"
-        style="width: 100%; height: 600px"
+      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"
+      name="myframe"
-        security="restricted"
+      security="restricted"
-        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+      sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
     ></iframe>
   </a-modal>
 </template>
 <script setup>
-import {ref} from "vue";
+import {defineProps, ref} from "vue";
 import {iframeUrl} from "@/api/method";
 
-const visible = ref(false)
+const visible = ref(false);
+
+const props = defineProps({
+  type: Number,
+  id: Number,
+});
 
 function openModal() {
-  visible.value = true
+  visible.value = true;
 }
 
 function closeModal() {
-  visible.value = false
+  visible.value = false;
 }
-defineExpose({closeModal})
+
+defineExpose({ closeModal });
 
 </script>
 <style lang="scss">
@@ -302,8 +308,8 @@ defineExpose({closeModal})
             justify-content: center;
 
             background: linear-gradient(
-                    rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0.2) 0%,
-                    rgba(78, 166, 255, 0) 100%
+                rgba(78, 166, 255, 0) 100%
             );
 
             .inhe {

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>

src/components/drawers/project/ProjectExamManage.vue

@@ -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={()=>{
+                  <a onClick={()=>{
                     state.studentKid = text.record.studentKid;
                     state.datasource = text.record;
                     state.CAvisible = true;
-                  }}>  查看答卷 </a>
+                  }}>查看答卷 </a> : 
+                  <span style="color:rgba(0, 0, 0, 0.25);cursor:not-allowed;">  查看答卷 </span>
                 }
-                
               </div>
             );
           },

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),

src/components/student/OnlineClassModelStudent.vue

@@ -1,45 +1,45 @@
 <template>
   <a-modal
-      :visible="visiable"
+    :visible="visiable"
-      :centered="true"
+    :centered="true"
-      width="70%"
+    width="70%"
-      title="学员管理"
+    title="学员管理"
-      @cancel="closeDrawer"
+    @cancel="closeDrawer"
   >
     <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">
       <a-row
-          type="flex"
+        type="flex"
-          gutter="12"
+        gutter="12"
-          style="padding-left: 20px; margin-right: 0px"
+        style="padding-left: 20px; margin-right: 0px"
       >
         <a-col>
           <a-form-item title="学员名称：">
             <a-input
-                class="cus-input"
+              class="cus-input"
-                v-model:value="searchParams.studentName"
+              v-model:value="searchParams.studentName"
-                placeholder="请输入学员名称"
+              placeholder="请输入学员名称"
             />
           </a-form-item>
         </a-col>
         <a-col>
           <a-button
-              class="cus-btn"
+            class="cus-btn"
-              style="background: #4ea6ff; color: #fff; width: 100px"
+            style="background: #4ea6ff; color: #fff; width: 100px"
-              @click="searchStu"
+            @click="searchStu"
           >
             <template #icon><img style="margin-right: 10px" src="../../assets/images/courseManage/search0.png"/>
             </template>
@@ -55,16 +55,17 @@
       </a-row>
 
       <a-row
-          type="flex"
+        type="flex"
-          gutter="12"
+        gutter="12"
-          style="padding-left: 20px; margin-right: 0px"
+        style="padding-left: 20px; margin-right: 0px"
       >
         <a-col :span="1.5">
           <CommonStudent
-              :type="type"
+            :type="type"
-              :id="id"
+            title="添加在线课学员"
-              @finash="submitCall"
+            :id="formData.id"
-              :stage="stage"
+            @finash="submitCall"
+            :stage="stage"
           >
             <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
               <template #icon><img style="margin-right: 10px" src="../../assets/images/courseManage/add0.png"/>
@@ -76,17 +77,16 @@
       </a-row>
       <div style="margin-top: 20px">
         <a-table
-            :columns="columns"
+          :columns="columns"
-            :data-source="studentList"
+          :data-source="studentList"
-            :pagination="stuPagination"
+          :pagination="stuPagination"
-            :loading="loading"
+          :loading="loading"
-            row-key="id"
+          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 {computed, defineExpose, defineProps, ref, watch} from "vue";
-import {usePage} from "@/api/request";
+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 searchParams = ref(initParams);
-const searchName = ref('')
+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(() => ({
+const openDrawer = (raw) => {
-  columnWidth: 20,
+  console.log(raw);
-  selectedRowKeys: stuSelectKeys.value,
+  searchParams.value.pid = raw.id;
-  onChange: onStuSelectChange,
+  formData.value = raw;
-  preserveSelectedRowKeys: true,
-}));
-
-function onStuSelectChange(e) {
-  stuSelectKeys.value = e;
-}
-
-const openDrawer = () => {
   visiable.value = true;
+  searchStu();
 };
 
 const changePagination = (page) => {
@@ -202,20 +264,17 @@ const changePagination = (page) => {
 };
 
 function del(id) {
-  Modal.confirm({
+  dialog({ content: "确定删除?", ok: async () => {
-    title: () => '确定删除?',
-    icon: () => createVNode(ExclamationCircleOutlined),
-    content: () => '数据删除后不可恢复！',
-    okText: () => '确定',
-    okType: 'danger',
-    cancelText: () => '取消',
-    onOk() {
       if (id) {
-        loading.value = true
+        loading.value = true;
-        delStudentList({ids: [id]}).then(() => searchStu())
+        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
+  searchParams.value = initParams;
-  searchName.value = ''
+  searchName.value = "";
 }
 
 watch(visiable, () => {
-  visiable.value && searchStu()
+  visiable.value && searchStu();
-  searchParams.value = initParams
+  searchParams.value = initParams;
 });
 
 defineExpose({
@@ -237,7 +296,7 @@ defineExpose({
   loading,
   closeDrawer,
   openDrawer
-})
+});
 </script>
 <style lang="scss">
 .header-content {

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 {useAsyncStu} from "@/utils/useCommon";
-// import { Modal } from "ant-design-vue";
 
 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, () => {

src/components/student/TableStudent.vue

@@ -42,9 +42,7 @@
               style="width: 260px; height: 40px"
               placeholder="是否为优秀学员"
               :options="topFlagList"
-              @change="selectProjectName"
               allowClear
-              showSearch
             ></a-select>
           </div>
         </a-form-item>
@@ -54,12 +52,13 @@
           class="cus-btn"
           style="background: #4ea6ff; color: #fff; width: 100px"
           @click="getStuList"
+          :loading="stuAsyncLoading"
         >
           <template #icon>
             <img
               style="margin-right: 10px"
               src="../../assets/images/courseManage/search0.png"
-          /></template>
+            /></template>
           搜索
         </a-button>
       </a-col>
@@ -68,8 +67,8 @@
           <template #icon>
             <img
               style="margin-right: 10px"
-              src="../../assets/images/leveladd/reset.png"
+              src="../../assets/images/courseManage/reset0.png"
-          /></template>
+            /></template>
           重置
         </a-button>
       </a-col>
@@ -90,9 +89,9 @@
         >
           <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
             <template #icon
-              ><img
+            ><img
-                style="margin-right: 10px"
+              style="margin-right: 10px"
-                src="../../assets/images/courseManage/add0.png"
+              src="../../assets/images/courseManage/add0.png"
             /></template>
             添加学员
           </a-button>
@@ -102,9 +101,9 @@
       <a-col :span="1.5" v-if="type === 1 || type === 2">
         <a-button class="cus-btn white" @click="showImpStu">
           <template #icon
-            ><img
+          ><img
-              style="margin-right: 10px"
+            style="margin-right: 10px"
-              src="../../assets/images/basicinfo/in2.png"
+            src="../../assets/images/basicinfo/in.png"
           /></template>
           导入学员
         </a-button>
@@ -129,9 +128,9 @@
       <a-col :span="1.5">
         <a-button class="cus-btn white" @click="bathDel">
           <template #icon
-            ><img
+          ><img
-              style="margin-right: 10px"
+            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 {computed, defineProps, onMounted, ref, watch} from "vue";
-import { delStudentList, getStuPage, batchUpdateStatus } from "@/api/index1";
+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 {message} from "ant-design-vue";
-// import { topStudent } from "../../api/indexProjStu";
 import SeeStu from "../../components/drawers/SeeStu";
 import EScore from "../drawers/ExportScore.vue";
 import OrgClass from "@/components/project/OrgClass";
 import ExportHomeWork from "../Modals/ExportHomeWork.vue";
 import * as api from "../../api/index1";
 import ImpStu from "../drawers/AddLevelImportStu";
-// import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
+import {checkPer} from "@/utils/utils";
-import { checkPer } from "@/utils/utils";
+import {useAsyncStu} from "@/utils/useCommon";
 
 const props = defineProps({
   type: Number,
@@ -435,6 +436,9 @@ const props = defineProps({
     default: () => [],
   },
 });
+
+const { loading: stuAsyncLoading, start } = useAsyncStu(props.id, props.type, getStuList);
+
 const topFlagList = ref([
   {
     id: 0,
@@ -541,8 +545,8 @@ function allDepartShow(a, b) {
     a == "" || a == null || a == undefined
       ? (a = "")
       : a.slice(0, 1) == "/"
-      ? a.slice(1, a.length)
+        ? a.slice(1, a.length)
-      : a;
+        : a;
   let depart = b == "" || b == null || b == undefined ? (b = "") : b;
   let allname = org == "" && depart == "" ? "-" : org + depart;
   return allname;
@@ -680,11 +684,12 @@ function bathDel() {
     );
   }
   tableData.value.loading = true;
-  delStudentList({ ids: stuSelectKeys.value,type:props.type,targetId:props.id }).then(() => getStuList());
+  delStudentList({ ids: stuSelectKeys.value, type: props.type, targetId: props.id }).then(() => getStuList());
 }
 
 const deleteModalVisible = ref(false);
 const deleteId = ref(null);
+
 function del(id, row) {
   if (row.isLeader === "1") {
     return message.warning("" + row.name + "是小组长，请勿删除!");
@@ -707,6 +712,7 @@ function del(id, row) {
   //   },
   // });
 }
+
 //确定删除
 const sureSameModal = () => {
   if (deleteId.value) {
@@ -724,6 +730,7 @@ const closeSameModal = () => {
 function submitCall(flag) {
   tableData.value.loading = true;
   flag && getStuList();
+  flag && start();
 }
 
 // 调整关卡;
@@ -885,9 +892,11 @@ const AddImpStuvisibleClose = (isget) => {
     getStuList();
   }
 };
+
 function startLoading() {
   tableData.value.loading = true;
 }
+
 defineExpose({ getStuList, startLoading });
 </script>
 <style lang="scss">
@@ -967,8 +976,8 @@ defineExpose({ getStuList, startLoading });
   width: calc(100%);
   height: 40px;
   background: linear-gradient(
-    rgba(78, 166, 255, 0.2) 0%,
+      rgba(78, 166, 255, 0.2) 0%,
-    rgba(78, 166, 255, 0) 100%
+      rgba(78, 166, 255, 0) 100%
   );
 }
 
@@ -1101,8 +1110,8 @@ defineExpose({ getStuList, startLoading });
             width: calc(100%);
             height: 68px;
             background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
+                rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -1194,11 +1203,13 @@ defineExpose({ getStuList, startLoading });
         }
       }
     }
+
     .ant-modal-close-x {
       display: none;
     }
   }
 }
+
 /*.delete {
   z-index: 9999;
   width: 424px;

src/utils/useCommon.js

@@ -1,45 +1,79 @@
-import {ref} from "vue";
+import {onMounted, ref, watch} from "vue";
 import {message} from "ant-design-vue";
+import {ASYNC_STUDENT_STATUS} from "@/api/apis";
+import {request} from "@/api/request";
+import dialog from "@/utils/dialog";
 
 export function useInterval(fun, time) {
-    const timer = ref();
+  const timer = ref();
 
-    function start(d) {
+  function start(d) {
-        clearInterval(timer.value)
+    clearInterval(timer.value);
-        timer.value = setInterval(async () => {
+    timer.value = setInterval(async () => {
-            if (await fun(d)) {
+      if (await fun(d)) {
-                clearInterval(timer.value)
+        clearInterval(timer.value);
-            }
+      }
-        }, time);
+    }, time);
-    }
+  }
 
-    return {start}
+  return { start };
 }
 
 export function useTimeout(asyncFun, time) {
-    const timer = ref();
+  const timer = ref();
-    const maxCount = ref(0);
+  const maxCount = ref(0);
 
-    function start(d) {
+  function start(d) {
-        clearTimeout(timer.value)
+    clearTimeout(timer.value);
-        maxCount.value = 0
+    maxCount.value = 0;
-        execute(d)
+    execute(d);
+  }
+
+  async function execute(d) {
+    if (maxCount.value > 300) {
+      message.error("等待超时，请联系管理员！");
+      throw Error("等待超时 查询任务结束");
     }
-
+    try {
-    async function execute(d) {
+      await asyncFun(d);
-        if (maxCount.value > 300) {
+      maxCount.value = maxCount.value + 1;
-            message.error("等待超时，请联系管理员！")
+      timer.value = setTimeout(() => execute(d), time);
-            throw Error("等待超时 查询任务结束")
+    } catch (e) {
-        }
+      clearTimeout(timer.value);
-        try {
+      console.log(e);
-            await asyncFun(d)
-            maxCount.value = maxCount.value + 1
-            timer.value = setTimeout(() => execute(d), time);
-        } catch (e) {
-            clearTimeout(timer.value)
-            console.log(e)
-        }
     }
+  }
 
-    return {start}
+  return { start };
 }
+
+export function useAsyncStu(id, type, func) {
+  const loading = ref(false);
+
+  const { start } = useTimeout(async () => {
+    const { data } = await request(ASYNC_STUDENT_STATUS, { id, type });
+    if (!data) {
+      loading.value = false;
+      throw Error("查询任务结束");
+    }
+    loading.value = true;
+  }, 10000);
+
+  watch(loading, () => {
+    loading.value && dialog({
+      duration: 3500,
+      cancel: false,
+      content: "您选择的学员正在添加中，请耐心等待，进行其他操作不影响此次添加"
+    });
+    loading.value || (func && func());
+  });
+
+  onMounted(() => {
+    console.log(22222222);
+    console.log(id);
+    console.log(type);
+    id && type && start();
+  });
+  return { loading, start };
+}
+

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 {
+      // .btn1:hover {
-        background: rgba(64, 158, 255, 0.76);
+      //   background: rgba(64, 158, 255, 0.76);
 
-        .search {
+      //   .search {
-          background-image: url("../assets/images/courseManage/search0.png");
+      //     background-image: url("../assets/images/courseManage/search0.png");
-        }
+      //   }
 
-        .btnText {
+      //   .btnText {
-          color: #ffffff;
+      //     color: #ffffff;
-        }
+      //   }
-      }
+      // }
       .btn1:active {
         background: #0982ff;
       }
 
-      .btn2:hover {
+      // .btn2:hover {
-        background: rgba(64, 158, 255, 0.1);
+      //   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;
         }

src/views/courselibrary/CoursewareManage.vue

@@ -5140,7 +5140,7 @@ export default defineComponent({
       .btnn {
         padding: 0px 26px 0px 26px;
         height: 38px;
-        background: #ffffff;
+        background: #4ea6ff;
         border-radius: 8px;
         border: 1px solid rgba(64, 158, 255, 1);
         display: flex;
@@ -5157,7 +5157,7 @@ export default defineComponent({
         .btnText {
           font-size: 14px;
           font-weight: 400;
-          color: #4ea6ff;
+          color: #fff;
           line-height: 36px;
           margin-left: 5px;
         }
@@ -5170,18 +5170,23 @@ export default defineComponent({
           background-image: url("../../assets/images/courseManage/search0.png");
         }
       }
-
+      .btn1:active {
+        background: #0982ff;
+      }
+      .btn2:active {
+        background: #0982ff;
+      }
       .btn2 {
         .search {
           width: 16px;
           height: 18px;
-          background-image: url("../../assets/images/courseManage/reset1.png");
+          background-image: url("../../assets/images/courseManage/reset0.png");
         }
 
         .daochu {
           width: 16px;
           height: 18px;
-          background-image: url("../../assets/images/coursewareManage/export.png");
+          background-image: url("../../assets/images/coursewareManage/export1.png");
         }
       }
 
@@ -5238,7 +5243,9 @@ export default defineComponent({
           margin-left: 5px;
         }
       }
-
+      .btn3:active {
+					background: #0982ff;
+			}
       .btn3 {
         .search {
           width: 17px;
@@ -6243,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;
@@ -6259,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;
                     }
@@ -6290,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");
                     }
                   }
                 }
@@ -6865,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;
@@ -6882,7 +6891,7 @@ export default defineComponent({
                 .btnText {
                   font-size: 14px;
                   font-weight: 400;
-                  color: #4ea6ff;
+                  color: #fff;
                   line-height: 36px;
                   margin-left: 5px;
                 }
@@ -6900,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");
                 }
               }
 

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 {

src/views/learningpath/LevelAdd.vue

@@ -2786,17 +2786,13 @@ export default {
 
     // 共享文档文件下载
     const downloadFile = (url) => {
-      console.log(url);
+      console.log("url", url);
-      let urlNew = url.slice(1);
+      window.open(
-      console.log(urlNew);
+        window.location.protocol +
-      if (urlNew) {
+          process.env.VUE_APP_BOE_API_URL +
-        window.open(
+          process.env.VUE_APP_FILE_PATH +
-          window.location.protocol +
+          url
-            process.env.VUE_APP_BOE_API_URL +
+      );
-            process.env.VUE_APP_FILE_PATH +
-            urlNew
-        );
-      }
       // if(url){
       //   const filename = '操作指南'
       //   const x = new XMLHttpRequest()

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;
 };

src/views/projectcenter/LibraryAdd.vue

@@ -550,9 +550,7 @@
                   <div class="set_content">
                     <div class="setc_name"><span>同步学习记录：</span></div>
                     <div class="setc_main">
-                      <a-radio
+                      <a-radio v-model:checked="projectInfo.courseSyncFlag"
-                        v-model:checked="projectInfo.courseSyncFlag"
-                        :disabled="true"
                         ><span style="color: #333333"
                           >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                         ></a-radio
@@ -1437,15 +1435,13 @@ export default defineComponent({
     // 共享文档文件下载
     const downloadFile = (url) => {
       console.log(url);
-      let urlNew = url.slice(1);
+      window.open(
-      if (urlNew) {
+        window.location.protocol +
-        window.open(
+          process.env.VUE_APP_BOE_API_URL +
-          window.location.protocol +
+          process.env.VUE_APP_FILE_PATH +
-            process.env.VUE_APP_BOE_API_URL +
+          url
-            process.env.VUE_APP_FILE_PATH +
+      );
-            urlNew
+
-        );
-      }
       // if (url) {
       //   window.open(url)
       // }

src/views/projectcenter/ProjectAdd.vue

@@ -150,21 +150,8 @@
           <div class="namebox">
             <div class="inname">同步学习记录</div>
           </div>
-          <div class="in ggysxz" v-if="courseSyncFlag">
+          <div class="in ggysxz">
-            <!-- :disabled="viewDetail ? true : false" -->
+            <a-checkbox v-model:checked="courseSyncFlag">
-            <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>
               <span style="
                     width: 100%;
                     color: rgba(109, 117, 132, 1);

src/views/projectcenter/ProjectManage.vue

@@ -1352,8 +1352,11 @@ export default {
           projectId: state.copyProjectId,
           type: 2
         })
-        .then(() => getTableDate());
+        .then(() => {
-      message.success("复制成功");
+          state.tableLoading = false;
+          message.success("复制成功");
+          getTableDate()
+        });
     };
     //打开提交审核弹窗
     const showReviewModal = (projectId) => {

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
 };

src/views/projectcenter/TaskPage.vue

@@ -4679,15 +4679,13 @@ export default {
     // 共享文档文件下载
     const downloadFile = (url) => {
       console.log(url);
-      let urlNew = url.slice(1);
+      window.open(
-      if (urlNew) {
+        window.location.protocol +
-        window.open(
+          process.env.VUE_APP_BOE_API_URL +
-          window.location.protocol +
+          process.env.VUE_APP_FILE_PATH +
-            process.env.VUE_APP_BOE_API_URL +
+          url
-            process.env.VUE_APP_FILE_PATH +
+      );
-            urlNew
+
-        );
-      }
       // url && window.open(url);
     };
     function stageChange(item, index) {

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">

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%;

src/views/research/ManagePage.vue

@@ -31,7 +31,7 @@
           </div>
           <div style="width: 103px; margin-right: 126px; float: left">
             <span class="name">创建人:</span>
-            <span class="descript">{{ basicInfo.createName }}</span>
+            <span class="descript">{{ createName }}</span>
           </div>
           <div style="width: 88px; margin-right: 126px; float: left">
             <span class="name">状态:</span>
@@ -40,7 +40,7 @@
           </div>
           <div style="width: 192px; margin-right: 126px; float: left">
             <span class="name">创建时间:</span>
-            <span class="descript">{{ basicInfo.createTime }}</span>
+            <span class="descript">{{ createTime }}</span>
           </div>
           <div style="width: 192px; margin-right: 126px; float: left">
             <span class="name">发布时间:</span>
@@ -82,7 +82,7 @@
 import ViewAssess from "../../components/drawers/ViewAssess";
 import { reactive, toRefs } from "vue";
 import { queryAssessmentDetailList } from "@/api/indexResearch";
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 import * as api from "@/api/indexTaskManage";
 
 export default {
@@ -90,6 +90,7 @@ export default {
   components: { ViewAssess },
   setup() {
     const router = useRouter();
+    const { query: { createName, createTime }} = useRoute();
     const state = reactive({
       Assessvisible: false,
       basicInfo: "",
@@ -104,7 +105,7 @@ export default {
       evalStuListDataTotal: 0,
       evalCurrentPage: 1
     });
-
+    
     const getInfoDate = async () => {
       state.tableDataTotalLoading = true;
       await queryAssessmentDetailList({
@@ -322,7 +323,9 @@ export default {
       ],
       showassess,
       changePaginationStu,
-      exportStudentInfo
+      exportStudentInfo,
+      createName, 
+      createTime
     };
   },
 };
@@ -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>

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;

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) {
+function toManage(id, record) {
-  router.push("/managepage/" + id);
+  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 {
+      // .btn1:hover {
-        background: rgba(64, 158, 255, 0.76);
+      //   background: rgba(64, 158, 255, 0.76);
 
-        .search {
+      //   .search {
-          background-image: url("../../assets/images/courseManage/search0.png");
+      //     background-image: url("../../assets/images/courseManage/search0.png");
-        }
+      //   }
 
-        .btnText {
+      //   .btnText {
-          color: #ffffff;
+      //     color: #ffffff;
-        }
+      //   }
-      }
+      // }
 
       .btn1:active {
         background: #0982ff;
       }
 
-      .btn2:hover {
+      // .btn2:hover {
-        background: rgba(64, 158, 255, 0.1);
+      //   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 {
+      // .btn3:hover {
-        background: rgba(64, 158, 255, 0.76);
+      //   background: rgba(64, 158, 255, 0.76);
 
-        .search {
+      //   .search {
-          background-image: url("../../assets/images/courseManage/add0.png");
+      //     background-image: url("../../assets/images/courseManage/add0.png");
-        }
+      //   }
 
-        .btnText {
+      //   .btnText {
-          color: #ffffff;
+      //     color: #ffffff;
-        }
+      //   }
-      }
+      // }
 
       .btn3:active {
         background: #0982ff;