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

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/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/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 ? "重选" : "选择" }}试卷
@@ -116,7 +116,7 @@
             <div class="textarea">
               <a-textarea :disabled="taskIndex >= 0" v-model:value="formData.examinationExplain" placeholder="请输入考试说明"
                 allow-clear show-count :maxlength="200" :rows="6" />
-            </div>
+            </div> 
           </div>
           <div class="main_item2">
             <div class="signbox">
@@ -327,6 +327,8 @@ watch(() => formData.value.examType, () => {
 const closeDrawer = () => {
   visible.value = false
   taskIndex.value = -1
+  formData.value.examinationLimit = ''
+  formData.value.examinationExplain = ''
   resetFields()
   dateTime.value = []
 };

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/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/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}`)
       }

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}`)
       }

src/components/student/CommonStudent.vue

@@ -780,7 +780,7 @@ const submitAuth = () => {
   if (props.type === 2) {
     stageVisible.value = true;
   } else {
-    handleStageOk();
+    handleDialogOk();
   }
 };
 

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/TableStudent.vue

@@ -680,7 +680,7 @@ function bathDel() {
     );
   }
   tableData.value.loading = true;
-  delStudentList({ ids: stuSelectKeys.value }).then(() => getStuList());
+  delStudentList({ ids: stuSelectKeys.value,type:props.type,targetId:props.id }).then(() => getStuList());
 }
 
 const deleteModalVisible = ref(false);

src/views/courselibrary/CoursewareManage.vue

@@ -851,9 +851,9 @@
                               删除
                             </a-menu-item>
                             <!-- 新加 二维码 -->
-                            <!-- <a-menu-item @click="qrcodeVisible(record, 1)">
+                            <a-menu-item @click="qrcodeVisible(record, 1)">
                               二维码
-                            </a-menu-item> -->
+                            </a-menu-item>
                           </a-menu>
                         </template>
                         <div class="fb" style="margin-left: -20px">
@@ -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; //考勤 开始后
@@ -4456,6 +4458,7 @@ export default defineComponent({
       state.lookCourseModal = true;
       item.attach = item.attach == "" ? [] : item.attach.split(",");
       state.faceDetailObj = item;
+      console.log("获取查看信息", item);
     };
     // const handleTea = async () => {
     //   console.log("item22224444");
@@ -4654,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;

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/courselibrary/components/seeModal.vue

@@ -405,6 +405,7 @@ export default defineComponent({
         detail({
           offcourseId: Number(props.detail.id),
         }).then((res) => {
+          console.log("res", res);
           if (res.data.code === 200) {
             let item = res.data.data;
             if (item.jobTypeIds) {
@@ -428,13 +429,16 @@ export default defineComponent({
               );
               let arrObj = [];
               arrObj = orgSelectIds.map((item, index) => {
-                return { value: item, lebel: orgSelectNames[index] };
+                return { value: item, label: orgSelectNames[index] };
               });
               console.log("arrObj-------------", arrObj);
               state.orgSelect = arrObj;
             }
           }
         });
+      },
+      {
+        deep: true,
       }
     );
 

src/views/courselibrary/courseModal.vue

@@ -457,7 +457,11 @@
             <div class="btn btn5" @click="noEditClose">
               <div class="btnText">取消</div>
             </div>
-            <a-button class="btn btn6" @click="handlePush" :loading="validated===1">
+            <a-button
+              class="btn btn6"
+              @click="handlePush"
+              :loading="validated === 1"
+            >
               <div class="btnText">保存</div>
             </a-button>
           </div>
@@ -847,9 +851,9 @@ export default defineComponent({
           orgSelectNames += item.label + ",";
         });
       }
+      console.log("orgSelectIds&orgSelectNames2", orgSelectIds, orgSelectNames);
       orgSelectIds = orgSelectIds.slice(0, orgSelectIds.length - 1);
       orgSelectNames = orgSelectNames.slice(0, orgSelectNames.length - 1);
-      console.log("orgSelectIds&orgSelectNames2", orgSelectIds, orgSelectNames);
 
       let selectJobId = "";
       if (state.selectJobId.length) {
@@ -1027,7 +1031,7 @@ export default defineComponent({
         );
         let arrObj = [];
         arrObj = orgSelectIds.map((item, index) => {
-          return { value: item, lebel: orgSelectNames[index] };
+          return { value: item, label: orgSelectNames[index] };
         });
         console.log("arrObj-------------", arrObj);
         state.orgSelect = arrObj;

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;

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;

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;

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;

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 {
+      // .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);
+        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;
       }

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;
@@ -2787,8 +2787,15 @@ export default {
     // 共享文档文件下载
     const downloadFile = (url) => {
       console.log(url);
-      if (url) {
+      let urlNew = url.slice(1);
-        window.open(url);
+      console.log(urlNew);
+      if (urlNew) {
+        window.open(
+          window.location.protocol +
+            process.env.VUE_APP_BOE_API_URL +
+            process.env.VUE_APP_FILE_PATH +
+            urlNew
+        );
       }
       // if(url){
       //   const filename = '操作指南'

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

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

@@ -1832,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;
@@ -1849,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;
         }
@@ -1893,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 {
+      // .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);
+        background: #0982ff;
       }
     }
 
@@ -1961,9 +1961,9 @@ export default {
         }
       }
 
-      .btn3:hover {
+      // .btn3:hover {
-        background: rgba(64, 158, 255, 0.76);
+      //   background: rgba(64, 158, 255, 0.76);
-      }
+      // }
 
       .btn3:active {
         background: #0982ff;

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

src/views/projectcenter/TaskPage.vue

@@ -3925,7 +3925,7 @@ export default {
     };
     //创建小组
     const createGroup = async () => {
-      debugger
+      debugger;
       console.log("state.groupPageList" + state.groupPageList);
       const id = state.groupInfo.id;
       const d = state.groupPageList
@@ -4513,7 +4513,7 @@ export default {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
-          "/faceteach?type=2&courseId=" +
+          "/faceteach?type=1&courseId=" +
           item.courseId +
           "&id=" +
           item.id;
@@ -4540,7 +4540,7 @@ export default {
           codeUrl =
             window.location.protocol +
             process.env.VUE_APP_H5 +
-            "/externalexam?courseId=" +
+            "/externalexam?type=1&courseId=" +
             item.courseId;
         } else {
           codeUrl =
@@ -4607,7 +4607,7 @@ export default {
           process.env.VUE_APP_H5 +
           "/evaluation?courseId=" +
           item.courseId +
-          "&evaType=" +
+          "&type=1&evaType=" +
           item.evaType +
           "&targetId=" +
           item.targetId;
@@ -4638,7 +4638,7 @@ export default {
           process.env.VUE_APP_H5 +
           "/ballotpage?courseId=" +
           item.courseId +
-          "&btype=2&id=" +
+          "&type=1&btype=2&id=" +
           item.id +
           "&chapterOrStageId=" +
           item.stageId +
@@ -4663,7 +4663,7 @@ export default {
         url:
           window.location.protocol +
           process.env.VUE_APP_H5 +
-          "/projectdetails?projectId=" +
+          "/projectdetails?type=1&projectId=" +
           state.projectId,
       };
       state.codeInfo = obj;
@@ -4678,7 +4678,17 @@ export default {
     }
     // 共享文档文件下载
     const downloadFile = (url) => {
-      url && window.open(url);
+      console.log(url);
+      let urlNew = url.slice(1);
+      if (urlNew) {
+        window.open(
+          window.location.protocol +
+            process.env.VUE_APP_BOE_API_URL +
+            process.env.VUE_APP_FILE_PATH +
+            urlNew
+        );
+      }
+      // url && window.open(url);
     };
     function stageChange(item, index) {
       state.choosedStageName = item.name;

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

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

src/views/research/ResearchManage.vue

@@ -76,7 +76,7 @@
                       @click=" handleEditPage(record.id)" type="link">基础信息
             </a-button>
             <a-button v-if="record.releaseStatus === '2' && checkPer(record.permissions)"
-                      @click=" toManage(record.id)" type="link">管理
+                      @click=" toManage(record.id, record)" type="link">管理
             </a-button>
             <a-button v-if="checkPer(record.permissions)" @click=" handleOper(record,'copy')" type="link">复制
             </a-button>
@@ -369,9 +369,10 @@ function handleEditPage(id) {
   router.push("/researchadd/" + id);
 }
 
-function toManage(id) {
+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());