diff --git a/src/api/utils.js b/src/api/utils.js index a0938ce..7ee58e6 100644 --- a/src/api/utils.js +++ b/src/api/utils.js @@ -21,7 +21,7 @@ export function useUserInfo(id) { watch(id, () => { id.value && boeRequest(GET_USER_LIST, {id: id.value}).then(res => { userInfo.value = res.result.userInfoList[0] - userInfo.value.avatar = userInfo.value.avatar?userInfo.value.avatar:'/800e23f7-b58c-4192-820d-0c6a2b7544cc.png' + userInfo.value.avatar = userInfo.value.avatar?userInfo.value.avatar.includes('upload')?userInfo.value.avatar:'/upload'+userInfo.value.avatar:'/800e23f7-b58c-4192-820d-0c6a2b7544cc.png' }) }) return userInfo diff --git a/src/components/PathDetailImage.vue b/src/components/PathDetailImage.vue index d8c63e1..f8eb8ce 100644 --- a/src/components/PathDetailImage.vue +++ b/src/components/PathDetailImage.vue @@ -6,7 +6,7 @@ background:`url('${imgAttr.backurl}') no-repeat`, backgroundSize: 'contain' }"> -
+ height:`${current===i?imgAttr.cheightC:imgAttr.cheight}px`, + lineHeight:'50px',color: current===i?imgAttr.ccolors:imgAttr.colors}"> {{ item.name }}
@@ -49,52 +49,64 @@ const imageAttrs = { '路径图背景': { width: 1437, height: 594, + cheight:70, + cheightC:80, backurl: back, currentBack: currentBack, nameBack: nameBack, + ccolors: '#FFF', + colors: '#FFF', positions: [ - {left: 100, top: 645}, - {left: 670, top: 645}, - {left: 870, top: 515}, - {left: 535, top: 370}, - {left: 1050, top: 330}, - {left: 1180, top: 200}, - {left: 980, top: 95}, - {left: 1490, top: 60}, + {left: 50, top: 425}, + {left: 440, top: 425}, + {left: 400, top: 315}, + {left: 515, top: 220}, + {left: 800, top: 200}, + {left: 660, top: 115}, + {left: 760, top: 35}, + {left: 1000, top: 25}, ] }, '路径图2': { width: 1437, height: 594, + cheight:100, + cheightC:106, backurl: back2, currentBack: currentBack2, nameBack: nameBack2, + ccolors: '#FFF3E5', + colors: '#FFF', positions: [ - {left: 100, top: 590}, - {left: 260, top: 465}, - {left: 530, top: 445}, - {left: 745, top: 300}, - {left: 980, top: 290}, - {left: 1190, top: 230}, - {left: 1310, top: 130}, - {left: 1570, top: 95}, + {left: 40, top: 380}, + {left: 160, top: 290}, + {left: 330, top: 270}, + {left: 440, top: 200}, + {left: 610, top: 170}, + {left: 780, top: 130}, + {left: 890, top: 60}, + {left: 1060, top: 30}, ] }, '路径图3': { width: 1437, height: 594, + cheight:70, + cheightC:80, backurl: back1, currentBack: currentBack1, nameBack: nameBack1, + ccolors: '#FFF', + colors: '#A06438', positions: [ - {left: 60, top: 605}, - {left: 260, top: 600}, - {left: 450, top: 495}, - {left: 720, top: 420}, - {left: 970, top: 370}, - {left: 1200, top: 295}, - {left: 1460, top: 210}, - {left: 1555, top: 110}, + {left: 20, top: 390}, + {left: 210, top: 380}, + {left: 320, top: 275}, + {left: 485, top: 265}, + {left: 645, top: 220}, + {left: 820, top: 180}, + {left: 960, top: 150}, + {left: 1050, top:60}, ] } } @@ -129,9 +141,9 @@ function close() { diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index d1defe4..e757533 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -459,20 +459,6 @@ import {useTaskPage} from "@/api/useCommon"; import {ElLoading} from "element-plus"; //import AlertSuccess from "@/components/alert/AlertSuccess.vue"; -const loading = ref(false); -const fileList = ref([]); -const fielPath = ref(import.meta.env.VITE_FILE_PATH); -const uploadRef = ref(); -const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() -const centerDialogVisible = ref(false); -const sbValue = ref({ - content: "", - attach: "", -}); -const router = useRouter(); -const returnclick = () => { - router.back(); -}; const { query: { courseId: workId, @@ -485,22 +471,40 @@ const { infoId, }, } = useRoute(); + +const loading = ref(false); +const fileList = ref([]); +const fielPath = ref(import.meta.env.VITE_FILE_PATH); +const uploadRef = ref(); +const {nextPage,prevPage,hasPrev, hasNext} = type==3 ? '' : useTaskPage() +const centerDialogVisible = ref(false); +const sbValue = ref({ + content: "", + attach: "", +}); +const router = useRouter(); +const returnclick = () => { + router.back(); +}; + const { data } = taskId && taskId !== "undefined" - ? useRequest(TASK_WORK_DETAIL, { workId, taskId }) - : useRequest(TASK_WORK_DETAIL, { workId }); + ? useRequest(TASK_WORK_DETAIL, { workId, taskId, type }) + : useRequest(TASK_WORK_DETAIL, { workId, type }); console.log("data==----->", data); const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, { workerId: workId, + type }); console.log("submitList==----->", submitList); // 判断是否已经提交过成绩 const submitScore = ref(false); request(WhetherImportHomeWorkScore,{ - "workId": workId + "workId": workId, + type }).then(res=>{ console.log('学员端是否导入过成绩查询', res) if(res.data){ diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index e4473b7..05797f4 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -209,7 +209,7 @@ const returnclick = () => { router.back(); }; -const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId}); +const {data} = useRequest(TASK_BROADCAST_DETAIL, {liveId,type}); console.log('直播信息', data) const teacherInfo = useUserInfo( computed(() => data.value?.userInfoBo?.userId) diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index 5bc8ef6..2d31f25 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -188,7 +188,7 @@ const state = reactive({ const { isAllowSign } = toRefs(state); const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() -const { data } = useRequest(ACTIVITY, { activityId }); +const { data } = useRequest(ACTIVITY, { activityId, type }); console.log('data', data) const signClick = (tab, event) => { if (data.value.signFlag) { diff --git a/src/views/testscore/Evaluation.vue b/src/views/testscore/Evaluation.vue index 49bd072..13703df 100644 --- a/src/views/testscore/Evaluation.vue +++ b/src/views/testscore/Evaluation.vue @@ -87,7 +87,7 @@ import {useTaskPage} from "@/api/useCommon"; const { - query: {courseId, pName, sName, chapterOrStageId, infoId, id, exname, btype}, + query: {courseId, pName, sName, chapterOrStageId, infoId, id, exname, btype, type}, } = useRoute(); const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() const router = useRouter(); @@ -100,7 +100,7 @@ }) //获取测评基本信息 - useRequest(QueryEvaluationDetailById(courseId), {}, (e)=>{ + useRequest(QueryEvaluationDetailById(courseId), {type}, (e)=>{ console.log(e) state.datainfo = e.data console.log('我是获取的外链基本信息12', state.dataInfo) diff --git a/src/views/testscore/ExternalExamination.vue b/src/views/testscore/ExternalExamination.vue index c4fdbfb..a1b1561 100644 --- a/src/views/testscore/ExternalExamination.vue +++ b/src/views/testscore/ExternalExamination.vue @@ -82,9 +82,9 @@ import {useTaskPage} from "@/api/useCommon"; const { - query: {courseId, pName, sName, chapterOrStageId, infoId, id, exname}, + query: {courseId, pName, sName, chapterOrStageId, infoId, id, exname, type}, } = useRoute(); - const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() + const {nextPage,prevPage,hasPrev, hasNext} = type==3 ? '' : useTaskPage() const router = useRouter(); const returnclick = () => { router.back(); @@ -95,7 +95,7 @@ }) //获取基本信息 - request(EXTERNALEXAM, {externalId:courseId}).then(res=>{ + request(EXTERNALEXAM, {externalId:courseId, type}).then(res=>{ console.log(res) state.datainfo = res.data }).catch(err=>{ diff --git a/src/views/testscore/OuterChain.vue b/src/views/testscore/OuterChain.vue index 2e07bc1..7228cce 100644 --- a/src/views/testscore/OuterChain.vue +++ b/src/views/testscore/OuterChain.vue @@ -85,7 +85,7 @@ import {useTaskPage} from "@/api/useCommon"; const { - query: {courseId, pName, sName, chapterOrStageId, infoId, id, exname}, + query: {courseId, pName, sName, chapterOrStageId, infoId, id, exname, type}, } = useRoute(); const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() const router = useRouter(); @@ -96,7 +96,7 @@ const datainfo = ref({}); //获取基本信息 - request(LINKGETONE, {linkId:courseId}).then(res=>{ + request(LINKGETONE, {linkId:courseId,type}).then(res=>{ console.log("我是获取的外链基本信息1",res) datainfo.value = res.data; console.log("我是获取的外链基本信息2",datainfo.value)