Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-stu into develop

.env.prod

@@ -1,8 +1,15 @@
 VITE_BASE=/fe-student
 VITE_BASE_API=/manageApi
+VITE_BASE_LOGIN_URL=https://u.boe.com/web/
+
 
 VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
 VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid=
 VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc/exam/test?id=
+VITE_BOE_PATH_DETAIL_URL=https://u.boe.com/pc/forward?to=/fe-student
+
+VITE_BOE_API_URL=https://u.boe.com
+
+VITE_TASK_WHITE_TYPE=-8-,-12-,-13-

src/App.vue

@@ -36,7 +36,7 @@ import { useStore } from "vuex";
 import { onMounted } from "vue";
 import router from "@/router";
 
-console.log("版本1.0.9------------");
+console.log("版本2.0.2------------");
 const store = useStore();
 onMounted(() => {
 	getUserInfo();

src/views/faceteach/FaceTeach.vue

@@ -96,8 +96,8 @@
 								<div v-for="(el, index) in formateArr(data.planDto?.attach)" :key="index" class="enclosure"
 									:style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
 									<div class="enclosureL">
-										<FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{width: '22px',height: '26px',marginLeft: '10px',}"></FileTypeImg>
+										<FileTypeImg :v-model="el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.'))" :style="{width: '22px',height: '26px',marginLeft: '10px',}"></FileTypeImg>
-										<div style="margin-left: 20px">{{ el.slice(el.indexOf('-') + 1) }}</div>
+										<div style="margin-left: 20px">{{ el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.')) }}</div>
 									</div>
 									<div v-if="projectStatus !=='3' && new Date(projectEndTime).getTime() > new Date().getTime()" >
 										<div v-if="new Date(data.planDto.beginTime).getTime() > new Date().getTime()" class="download">

src/views/faceteach/FaceTeachSignUp.vue

@@ -75,12 +75,12 @@
                 <div v-for="(el, index) in formateArr(data.offcourseDto.attach)" :key="index" class="enclosure"
                      :style="{ borderBottom: '1px solid rgba(56, 125, 247, 0.2)' }">
                   <div class="enclosureL">
-                    <FileTypeImg :v-model="el.slice(el.indexOf('-') + 1)" :style="{
+                    <FileTypeImg :v-model="el.slice(el.lastIndexOf('/')+1,el.indexOf('-')) + el.slice(el.lastIndexOf('.'))" :style="{
 											width: '22px',
 											height: '26px',
 											marginLeft: '10px',
 										}"></FileTypeImg>
-                    <div style="margin-left: 20px">{{ el.slice(el.indexOf('-') + 1) }}</div>
+                    <div style="margin-left: 20px">{{ el.slice(el.lastIndexOf('/')+1,el.indexOf('-'))  + el.slice(el.lastIndexOf('.')) }}</div>
                   </div>
                   <div class="download">
                     <img style="width: 16px; height: 15px" src="../../assets/image/download.png"/>

src/views/project/ProjectDetails.vue

@@ -354,17 +354,14 @@ const types = ref({
 		4: "/homeworkpage",
 		5: import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试
 		6: "/livebroadcast",
-		7: ({ courseId }) =>
+    7: ({ targetId }) => window.open(targetId, '_top'),
-			request(LINK_DETAILS(courseId), {}).then(({ data: { linkAddress } }) =>
-				window.open(linkAddress,'_top')
-			), //外联
 		8: "/discusspage",
 		9: "/moreactive",
 		10: ({ evaType, targetId }) =>
 			window.open(
-				(evaType == 0
+				evaType == 0
-					? import.meta.env.VITE_BOE_TEST_DETAIL_URL
+					? import.meta.env.VITE_BOE_TEST_DETAIL_URL+ targetId
-					: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
+					: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL+targetId+`&quizTaskKid=${projectId}&channelCode=project`
           ,'_top'), //测评
 		11: "/surveydetail",
 		12: "/ballotpage",
@@ -404,6 +401,7 @@ function judgeTaskIsEnd(type, endTimes, status) {
 
 function toFinish(d, sName, chapterOrStageId) {
 	console.log("dddddd", d, sName, chapterOrStageId);
+
 	if(judgeTaskIsEnd(d.type ,data.value.endTime, data.value.status)){
 		ElMessage.error("当前任务已结束")
 		return
@@ -491,7 +489,7 @@ function toFinish(d, sName, chapterOrStageId) {
 		return;
 	}
 	if (d.type == 3 || d.type == 7) {
-		d.status || request(STUDY_RECORD, {
+		d.status!==1 && request(STUDY_RECORD, {
 			studentId: data.value.userInfoBo.userId,
 			targetId: data.value.routerId,
 			logo: 2,
@@ -499,6 +497,7 @@ function toFinish(d, sName, chapterOrStageId) {
 			taskId: d.projectTaskId,
 		});
 	}
+
 	if (typeof types.value.path[d.type] === "string") {
 		types.value.path[d.type] &&
 			types.value.path[d.type].startsWith("http") &&

src/views/roadmap/PathDetails.vue

@@ -341,17 +341,14 @@ const types = ref({
 		4: "/homeworkpage",
 		5: import.meta.env.VITE_BOE_EXAM_DETAIL_URL, //考试
 		6: "/livebroadcast",
-		7: ({ courseId }) =>
+		7: ({ targetId }) => window.open(targetId, '_top'), //外联
-			request(LINK_DETAILS(courseId), {}).then(({ data: { linkAddress } }) =>
-				window.open(linkAddress, '_top')
-			), //外联
 		8: "/discusspage",
 		9: "/moreactive",
 		10: ({ evaType, targetId }) =>
 			window.open(
-				(evaType == 0
+				evaType == 0
-					? import.meta.env.VITE_BOE_TEST_DETAIL_URL
+					? import.meta.env.VITE_BOE_TEST_DETAIL_URL+targetId
-					: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL) + targetId
+					: import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL + targetId+`&quizTaskKid=${routerId}&channelCode=learningpath`
 			,'_top'), //测评
 		11: "/surveydetail",
 		12: "/ballotpage",
@@ -443,7 +440,7 @@ function toFinish(d) {
 		}
 	}
 	if (d.type === 3 || d.type === 7) {
-		d.status || request(STUDY_RECORD, {
+		d.status!==1 && request(STUDY_RECORD, {
 			studentId: userInfo.value.id,
 			targetId: data.value.routerId,
 			logo: 1,