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

@@ -14,7 +14,7 @@
     <iframe
       id="iframe"
       style="width: 100%; height: 600px"
-        :src="iframeUrl + '/course/manages?f=choose'"
+      :src="`${iframeUrl}/course/manages?f=choose?ref_id=${props.id}&ref_type=${props.type}`"
       name="myframe"
       security="restricted"
       sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
@@ -22,19 +22,25 @@
   </a-modal>
 </template>
 <script setup>
-import {ref} from "vue";
+import {defineProps, ref} from "vue";
 import {iframeUrl} from "@/api/method";
 
-const visible = ref(false)
+const visible = ref(false);
+
+const props = defineProps({
+  type: Number,
+  id: Number,
+});
 
 function openModal() {
-  visible.value = true
+  visible.value = true;
 }
 
 function closeModal() {
-  visible.value = false
+  visible.value = false;
 }
-defineExpose({closeModal})
+
+defineExpose({ closeModal });
 
 </script>
 <style lang="scss">

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

@@ -8,16 +8,16 @@
   >
     <div class="header-content">
       <div style="font-size: 16px">
-        xxxxxxxx  课程
+        {{ formData.name }} 课程
       </div>
       <div>
         <span style="color:#999">内容分类</span>：12312
       </div>
       <div>
-        <span style="color:#999">授课教师</span>：12312
+        <span style="color:#999">授课教师</span>：{{ formData.sysType1 }}/{{ formData.sysType2 }}/{{ formData.sysType3 }}
       </div>
       <div>
-        <span style="color:#999">审核状态</span>：12312
+        <span style="color:#999">审核状态</span>：{{ formData.status }}
       </div>
     </div>
     <div class="TableStudent">
@@ -62,7 +62,8 @@
         <a-col :span="1.5">
           <CommonStudent
             :type="type"
-              :id="id"
+            title="添加在线课学员"
+            :id="formData.id"
             @finash="submitCall"
             :stage="stage"
           >
@@ -81,12 +82,11 @@
           :pagination="stuPagination"
           :loading="loading"
           row-key="id"
-            :row-selection="stuRowSelection"
         >
           <template #action="{ record }">
             <a-space :size="2">
               <slot name="extension" v-bind:data="{ record }"></slot>
-              <a-button v-if="checkPer(permissions)" @click="del(record.id)" type="link" danger>删除</a-button>
+              <a-button v-if="checkPer(permissions)" @click="del(record.courseStuId)" type="link" danger>删除</a-button>
             </a-space>
           </template>
         </a-table>
@@ -95,22 +95,20 @@
   </a-modal>
 </template>
 <script setup>
-import {computed, createVNode, defineExpose, defineProps, ref, watch} from "vue";
+import {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,6 +158,76 @@ 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",
@@ -168,9 +236,11 @@ const columns = ref([
     align: "center",
     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/LibraryAdd.vue

@@ -34,14 +34,12 @@
           </div>
         </div>
         <div class="line"></div> -->
-        <router-link to="/templatelibrary"
+        <router-link to="/templatelibrary">
-        >
           <div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
           </div>
-        </router-link
+        </router-link>
-        >
       </div>
     </div>
     <div class="split"></div>
@@ -60,7 +58,10 @@
               <!-- <button class="btn" @click="showFaceIn">批量面授报名</button> -->
               <router-link
                 class="edit"
-                  :to="{ path: `/temTask`, query: { projectId: projectTemplateId } }"
+                :to="{
+                  path: `/temTask`,
+                  query: { projectId: projectTemplateId },
+                }"
               >
                 <img
                   class="editimg"
@@ -422,84 +423,51 @@
                   ><span>积分</span>
                 </div>
                 <div class="content">
-                  <span>完成作业成绩不低于 </span
+                  <span>完成作业成绩不低于 </span>
-                  >
                   <a-input v-model:value="done2" :bordered="false" />
-                  <span
+                  <span>分获得</span>
-                  >分获得</span
-                  >
                   <a-input v-model:value="done3" :bordered="false" />
-                  <span
+                  <span>积分</span>
-                  >积分</span
-                  >
                 </div>
                 <div class="content">
-                  <span>前</span
+                  <span>前</span>
-                  >
                   <a-input v-model:value="four1" :bordered="false" />
-                  <span
+                  <span>名学完在线课程获得</span>
-                  >名学完在线课程获得</span
-                  >
                   <a-input v-model:value="four2" :bordered="false" />
-                  <span
+                  <span style="margin-right: 50px">积分</span>
-                      style="margin-right: 50px"
+                  <span>前</span>
-                  >积分</span
-                  >
-                  <span>前</span
-                  >
                   <a-input v-model:value="four3" :bordered="false" />
-                  <span
+                  <span>名提交作业且成绩不低于</span>
-                  >名提交作业且成绩不低于</span
-                  >
                   <a-input v-model:value="four4" :bordered="false" />
-                  <span
+                  <span>分获得</span>
-                  >分获得</span
-                  >
                   <a-input v-model:value="four5" :bordered="false" />
-                  <span
+                  <span>积分</span>
-                  >积分</span
-                  >
                 </div>
                 <div class="content">
-                  <span>考试成绩高于</span
+                  <span>考试成绩高于</span>
-                  >
                   <a-input v-model:value="five1" :bordered="false" />
-                  <span
+                  <span>分获得</span>
-                  >分获得</span
-                  >
                   <a-input v-model:value="five2" :bordered="false" />
-                  <span
+                  <span>积分</span>
-                  >积分</span
-                  >
                 </div>
                 <div class="content">
-                  <span>考勤正常学员获得 </span
+                  <span>考勤正常学员获得 </span>
-                  >
                   <a-input v-model:value="six1" :bordered="false" />
-                  <span
+                  <span>积分</span>
-                  >积分</span
-                  >
                 </div>
                 <div class="content">
-                  <span>成为小组长获得</span
+                  <span>成为小组长获得</span>
-                  >
                   <a-input v-model:value="seven1" :bordered="false" />
-                  <span
+                  <span style="margin-right: 50px">积分</span>
-                      style="margin-right: 50px"
-                  >积分</span
-                  >
                   <span>优秀学员可获得</span>
                   <a-input v-model:value="seven2" :bordered="false" />
-                  <span
+                  <span>积分</span>
-                  >积分</span
-                  >
                 </div>
               </div>
             </div>
           </div>
         </a-tab-pane>
 
-
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
           <a-tabs>
@@ -556,26 +524,34 @@
                     <div class="setc_name"><span>资源归属：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999">{{
-                          (projectInfo.sourceBelongFullName || '') + projectInfo.sourceBelongName
+                        (projectInfo.sourceBelongFullName || "") +
+                        projectInfo.sourceBelongName
                       }}</span>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
-                      <ProjectLevel :value="projectInfo.level" :tag="true"></ProjectLevel>
+                      <ProjectLevel
+                        :value="projectInfo.level"
+                        :tag="true"
+                      ></ProjectLevel>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>培训体系：</span></div>
                     <div class="setc_main">
-                      <TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass>
+                      <TrainClass
+                        :value="projectInfo.systemId"
+                        :tag="true"
+                      ></TrainClass>
                     </div>
                   </div>
                   <div class="set_content">
                     <div class="setc_name"><span>同步学习记录：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.courseSyncFlag" :disabled="true"
+                      <a-radio
+                        v-model:checked="projectInfo.courseSyncFlag"
                         ><span style="color: #333333"
                           >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                         ></a-radio
@@ -585,7 +561,9 @@
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.boeFlag" :disabled="true"
+                      <a-radio
+                        v-model:checked="projectInfo.boeFlag"
+                        :disabled="true"
                         ><span style="color: #333333">BOEU实施</span></a-radio
                       >
                     </div>
@@ -633,7 +611,13 @@
                         >
                         <img
                           src="@/assets/images/basicinfo/cloud.png"
-                            style="cursor: pointer; width: 24px; height: 24px; margin-left: 8px;margin-bottom: 3px;"
+                          style="
+                            cursor: pointer;
+                            width: 24px;
+                            height: 24px;
+                            margin-left: 8px;
+                            margin-bottom: 3px;
+                          "
                           alt=""
                         />
                       </a-upload>
@@ -649,7 +633,7 @@
                       <div
                         v-for="item in fileList"
                         :key="item.uid"
-                          style="margin-bottom: 30px;"
+                        style="margin-bottom: 30px"
                         class="docListStyle"
                       >
                         <!-- <img
@@ -662,35 +646,74 @@
                           "
                           alt=""
                         /> -->
-                        <img v-if="
+                        <img
+                          v-if="
                             item.name.indexOf('jpg') !== -1 ||
                             item.name.indexOf('jpeg') !== -1 ||
                             item.name.indexOf('png') !== -1
                           "
-                             style="width: 27px;height: 32px;margin-right: 40px;"
+                          style="width: 27px; height: 32px; margin-right: 40px"
-                             src="@/assets/images/coursewareManage/pngpic.png"/>
+                          src="@/assets/images/coursewareManage/pngpic.png"
+                        />
                         <div v-else>
-                          <img v-if="item.name.indexOf('doc') !== -1"
+                          <img
-                               style="width: 27px;height: 32px;margin-right: 40px;"
+                            v-if="item.name.indexOf('doc') !== -1"
-                               src="@/assets/images/coursewareManage/docpic.png"/>
+                            style="
+                              width: 27px;
+                              height: 32px;
+                              margin-right: 40px;
+                            "
+                            src="@/assets/images/coursewareManage/docpic.png"
+                          />
                           <div v-else>
-                            <img v-if="item.name.indexOf('xls') !== -1"
+                            <img
-                                 style="width: 27px;height: 32px;margin-right: 40px;"
+                              v-if="item.name.indexOf('xls') !== -1"
-                                 src="@/assets/images/coursewareManage/xlspic.png"/>
+                              style="
+                                width: 27px;
+                                height: 32px;
+                                margin-right: 40px;
+                              "
+                              src="@/assets/images/coursewareManage/xlspic.png"
+                            />
                             <div v-else>
-                              <img v-if="item.name.indexOf('ppt') !== -1"
+                              <img
-                                   style="width: 27px;height: 32px;margin-right: 40px;"
+                                v-if="item.name.indexOf('ppt') !== -1"
-                                   src="@/assets/images/coursewareManage/pptpic.png"/>
+                                style="
+                                  width: 27px;
+                                  height: 32px;
+                                  margin-right: 40px;
+                                "
+                                src="@/assets/images/coursewareManage/pptpic.png"
+                              />
                               <div v-else>
-                                <img v-if="item.name.indexOf('pdf') !== -1"
+                                <img
-                                     style="width: 27px;height: 32px;margin-right: 40px;"
+                                  v-if="item.name.indexOf('pdf') !== -1"
-                                     src="@/assets/images/coursewareManage/pdfpic.png"/>
+                                  style="
+                                    width: 27px;
+                                    height: 32px;
+                                    margin-right: 40px;
+                                  "
+                                  src="@/assets/images/coursewareManage/pdfpic.png"
+                                />
                                 <div v-else>
-                                  <img v-if="item.name.indexOf('zip') !== -1"
+                                  <img
-                                       style="width: 27px;height: 32px;margin-right: 40px;"
+                                    v-if="item.name.indexOf('zip') !== -1"
-                                       src="@/assets/images/coursewareManage/zippic.png"/>
+                                    style="
-                                  <img v-else style="width: 27px;height: 32px;margin-right: 40px;"
+                                      width: 27px;
-                                       src="@/assets/images/coursewareManage/docpic.png"/>
+                                      height: 32px;
+                                      margin-right: 40px;
+                                    "
+                                    src="@/assets/images/coursewareManage/zippic.png"
+                                  />
+                                  <img
+                                    v-else
+                                    style="
+                                      width: 27px;
+                                      height: 32px;
+                                      margin-right: 40px;
+                                    "
+                                    src="@/assets/images/coursewareManage/docpic.png"
+                                  />
                                 </div>
                               </div>
                             </div>
@@ -698,13 +721,26 @@
                         </div>
 
                         <span
-                            style="font: oblique bold 16px Sans-serif;width:300px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{
+                          style="
-                            item.name
+                            font: oblique bold 16px Sans-serif;
-                          }}</span>
+                            width: 300px;
+                            display: block;
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis;
+                          "
+                          >{{ item.name }}</span
+                        >
                         <a
                           href="javascript:void(0);"
-                            @click="downloadFile(item.response ? item.response.data : '')"
+                          @click="
-                            style="margin-left: 5px">下载</a>
+                            downloadFile(
+                              item.response ? item.response.data : ''
+                            )
+                          "
+                          style="margin-left: 5px"
+                          >下载</a
+                        >
                         <span
                           style="color: #4ea6ff; cursor: pointer"
                           @click="deFile(item.uid)"
@@ -716,8 +752,6 @@
                 </div>
               </div>
             </a-tab-pane>
-
-
           </a-tabs>
         </a-tab-pane>
       </a-tabs>
@@ -756,8 +790,7 @@
             </div>
           </div>
         </div>
-      </a-modal
+      </a-modal>
-      >
     </div>
   </div>
 </template>
@@ -944,7 +977,9 @@ export default defineComponent({
     const value = ref("");
     const textnum = "150";
     const routered = useRouter();
-    const {query: {projectTemplateId}} = useRoute();
+    const {
+      query: { projectTemplateId },
+    } = useRoute();
     const changeopclo = () => {
       state.projectInfo.noticeFlag = state.checked ? 1 : 0;
       api
@@ -1017,7 +1052,7 @@ export default defineComponent({
     // 获取详情
     const getDetail = () => {
       api.templateEditDetail(projectTemplateId).then((res) => {
-            state.templateInfo = res.data.data
+        state.templateInfo = res.data.data;
         state.taskSyllabus = [];
         state.projectInfo = res.data.data.projectTemplateInfo;
         state.noticeContent = state.projectInfo.notice;
@@ -1027,13 +1062,12 @@ export default defineComponent({
           res.data.data.projectTemplateInfo
         );
         try {
-              state.fileList = JSON.parse(
+          state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach);
-                  res.data.data.projectTemplateInfo.attach
-              );
         } catch {
           state.fileList = [];
         }
-            state.attachSwitch = res.data.data.projectTemplateInfo.attachSwitch == 1;
+        state.attachSwitch =
+          res.data.data.projectTemplateInfo.attachSwitch == 1;
         let data = res.data.data.stageList;
         console.log("data=====", data);
         for (let i in data) {
@@ -1060,7 +1094,7 @@ export default defineComponent({
             });
           }
         }
-          })
+      });
     };
 
     // 发布公告
@@ -1148,7 +1182,7 @@ export default defineComponent({
         projectTaskId: 0,
         projectTemplateId: localStorage.getItem("projectTemplateId"),
         stageId: 0,
-        type: 0
+        type: 0,
       };
       api
         .editTask(obj)
@@ -1169,7 +1203,15 @@ export default defineComponent({
           let result = res.data.data;
           //Write operation failed: computed value is readonly 总积分
 
-            state.scoresum = Number(result[0].pointsCount) + Number(result[1].pointsCount) + Number(result[2].pointsCount) + Number(result[3].pointsCount) + Number(result[4].pointsCount) + Number(result[5].pointsCount) + Number(result[6].pointsCount) + Number(result[7].pointsCount)
+          state.scoresum =
+            Number(result[0].pointsCount) +
+            Number(result[1].pointsCount) +
+            Number(result[2].pointsCount) +
+            Number(result[3].pointsCount) +
+            Number(result[4].pointsCount) +
+            Number(result[5].pointsCount) +
+            Number(result[6].pointsCount) +
+            Number(result[7].pointsCount);
 
           state.score1 = result[0].pointsCount;
 
@@ -1179,8 +1221,13 @@ export default defineComponent({
           state.four1 = result[2].typeDescConfig;
           state.four2 = result[2].pointsCount;
 
-            state.four3 = result[3].typeDescConfig.slice(0,result[3].typeDescConfig.indexOf(';'));
+          state.four3 = result[3].typeDescConfig.slice(
-            state.four4 = result[3].typeDescConfig.slice(result[3].typeDescConfig.indexOf(';')+1);
+            0,
+            result[3].typeDescConfig.indexOf(";")
+          );
+          state.four4 = result[3].typeDescConfig.slice(
+            result[3].typeDescConfig.indexOf(";") + 1
+          );
           state.four5 = result[3].pointsCount;
 
           state.five1 = result[4].typeDescConfig;
@@ -1191,7 +1238,6 @@ export default defineComponent({
           state.seven1 = result[6].pointsCount;
 
           state.seven2 = result[7].pointsCount;
-
         })
         .catch((err) => {
           console.log("获取项目积分规则失败了", err);
@@ -1276,16 +1322,16 @@ export default defineComponent({
           attach: str,
         })
         .then((res) => {
-            console.log(res)
+          console.log(res);
           message.destroy();
           message.success("删除成功");
-            return
+          return;
         })
         .catch((err) => {
-            console.log(err)
+          console.log(err);
           message.destroy();
           message.warning("删除失败");
-            return
+          return;
         });
     };
 
@@ -1293,7 +1339,9 @@ export default defineComponent({
     const checkedClose = (data, a) => {
       console.log(data, a);
       console.log("模板id：" + projectTemplateId);
-      console.log("开关数据：" + JSON.stringify(data) + "====" + JSON.stringify(a))
+      console.log(
+        "开关数据：" + JSON.stringify(data) + "====" + JSON.stringify(a)
+      );
       state.attachSwitch = data;
 
       // 更新开关状态
@@ -1317,54 +1365,54 @@ export default defineComponent({
         projectId: projectTemplateId,
         datas: [
           {
-              "type": 1,
+            type: 1,
-              "pointsCount": Number(state.score1),
+            pointsCount: Number(state.score1),
-              "typeDesc": "完成【必修/选修】获得%p积分",
+            typeDesc: "完成【必修/选修】获得%p积分",
-              "typeDescConfig": ""
+            typeDescConfig: "",
           },
           {
-              "type": 2,
+            type: 2,
-              "pointsCount": Number(state.done3),
+            pointsCount: Number(state.done3),
-              "typeDesc": "完成作业成绩不低于%d分获得%p积分",
+            typeDesc: "完成作业成绩不低于%d分获得%p积分",
-              "typeDescConfig": state.done2
+            typeDescConfig: state.done2,
           },
           {
-              "type": 3,
+            type: 3,
-              "pointsCount": Number(state.four2),
+            pointsCount: Number(state.four2),
-              "typeDesc": "前%d名学完在线课程获得%p积分",
+            typeDesc: "前%d名学完在线课程获得%p积分",
-              "typeDescConfig": state.four1
+            typeDescConfig: state.four1,
           },
           {
-              "type": 4,
+            type: 4,
-              "pointsCount": Number(state.four5),
+            pointsCount: Number(state.four5),
-              "typeDesc": "前%d名提交作业且成绩不低于%d分获得%p积分",
+            typeDesc: "前%d名提交作业且成绩不低于%d分获得%p积分",
-              "typeDescConfig":  state.four3 + ';' + state.four4
+            typeDescConfig: state.four3 + ";" + state.four4,
           },
           {
-              "type": 5,
+            type: 5,
-              "pointsCount": Number(state.five2),
+            pointsCount: Number(state.five2),
-              "typeDesc": "考试成绩高于%d分获得%p积分",
+            typeDesc: "考试成绩高于%d分获得%p积分",
-              "typeDescConfig": state.five1
+            typeDescConfig: state.five1,
           },
           {
-              "type": 6,
+            type: 6,
-              "pointsCount": Number(state.six1),
+            pointsCount: Number(state.six1),
-              "typeDesc": "考勤正常学员获得%p积分",
+            typeDesc: "考勤正常学员获得%p积分",
-              "typeDescConfig": ""
+            typeDescConfig: "",
           },
           {
-              "type": 7,
+            type: 7,
-              "pointsCount": Number(state.seven1),
+            pointsCount: Number(state.seven1),
-              "typeDesc": "成为小组长获得%p积分",
+            typeDesc: "成为小组长获得%p积分",
-              "typeDescConfig": ""
+            typeDescConfig: "",
           },
           {
-              "type": 8,
+            type: 8,
-              "pointsCount": Number(state.seven2),
+            pointsCount: Number(state.seven2),
-              "typeDesc": "优秀学员可获得%p积分",
+            typeDesc: "优秀学员可获得%p积分",
-              "typeDescConfig": ""
+            typeDescConfig: "",
-          }
+          },
-        ]
+        ],
       };
       console.log(obj);
       setScoreRule(obj)
@@ -1387,11 +1435,20 @@ export default defineComponent({
 
     // 共享文档文件下载
     const downloadFile = (url) => {
-      console.log(url)
+      console.log(url);
-      if (url) {
+      let urlNew = url.slice(1);
-        window.open(url)
+      if (urlNew) {
+        window.open(
+          window.location.protocol +
+            process.env.VUE_APP_BOE_API_URL +
+            process.env.VUE_APP_FILE_PATH +
+            urlNew
+        );
       }
       // if (url) {
+      //   window.open(url)
+      // }
+      // if(url){
       //   const filename = '操作指南'
       //   const x = new XMLHttpRequest()
       //   x.open('GET', url, true)
@@ -1406,7 +1463,7 @@ export default defineComponent({
       //   }
       //   x.send()
       // }
-    }
+    };
 
     return {
       ...toRefs(state),
@@ -1431,7 +1488,7 @@ export default defineComponent({
       checkedClose,
       editNotice,
       deFile,
-      downloadFile
+      downloadFile,
     };
   },
 });

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: "",
@@ -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());