hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-12 04:16:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix -- bug

Browse Source
This commit is contained in:
yuping
2023-02-27 02:41:19 +08:00
parent 7c92d51409
commit 95e51b97a5
1 changed files with 108 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
src/views/roadmap/PathDetails.vue
View File

@@ -22,11 +22,12 @@
<img :src="data.currentChapterCnt ? circle : circle2"/>
<div class="titleRT"
:style="(data.statusName === '已完成' || data.statusName === '进行中') ? 'color:#0060ff' : 'color:#999'">
{{ data.statusName || (data.unlockMode === 1 ? '未开始' : '未解锁') }}
{{ data.statusName || (data.unlockMode === 1 ? "未开始" : "未解锁") }}
</div>
</div>
</div>
<div class="course" v-for="(value, index) in data.taskBoList?.filter((e) => !whiteTypes(e.type))" :key="index">
<div class="course" v-for="(value, index) in data.taskBoList?.filter((e) => !whiteTypes(e.type))"
:key="index">
<div style="width: 70%">
<div v-if="value.name.length > 50" class="coursename" :title="value.name">
<el-popover ref="popover" placement="right" trigger="hover" :width="300" :content="value.name">
@@ -61,7 +62,8 @@
<div>当前进度</div>
<div class="progress">
<div style="width: 291px">
<el-progress :percentage="parseInt(value.currentRatio)" :show-text="false" :stroke-width="8" :color="
<el-progress :percentage="parseInt(value.currentRatio)" :show-text="false" :stroke-width="8"
:color="
{
0: 'rgba(238, 112, 108, 1)',
1: 'rgba(255, 151, 38, 1)',
@@ -90,7 +92,7 @@
<div class="goclass"
:style="{ background: (value.statusName !== '已结束' && (value.statusName || data.unlockMode === 1)) ? '#2478ff' : '#999' }"
@click="toFinish(value)">
{{ value.statusName || (data.unlockMode === 1 ? TASK_TYPES.toName[value.type] : '未解锁') }}
{{ value.statusName || (data.unlockMode === 1 ? TASK_TYPES.toName[value.type] : "未解锁") }}
</div>
<!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
<!-- <div-->
@@ -184,7 +186,7 @@
<div class="progress">
<div style="width: 291px">
<el-progress
:percentage="parseInt((data.currentChapterCnt ? data.currentChapterCnt : 0 / data.totalChapterCnt ? data.totalChapterCn : 0) * 100)"
:percentage="parseInt((data.currentChapterCnt || 0) / (data.totalChapterCnt || 1) * 100)"
:show-text="false" :stroke-width="8" :color="
{
0: 'rgba(238, 112, 108, 1)',
@@ -193,7 +195,7 @@
3: 'rgba(59, 94, 251, 1)',
4: 'rgba(57, 219, 183, 1)',
5: 'rgba(57, 219, 183, 1)',
}[(parseInt(data.currentChapterCnt ? data.currentChapterCnt : 0 / data.totalChapterCnt ? data.totalChapterCnt : 0) * 100) / 20]
}[parseInt((data.currentChapterCnt || 0) / (data.totalChapterCnt || 1) * 100) / 20]
"/>
</div>
<div style="font-size: 14px; font-weight: 500; margin-left: 10px" :style="{
@@ -204,12 +206,9 @@
3: 'rgba(59, 94, 251, 1)',
4: 'rgba(57, 219, 183, 1)',
5: 'rgba(57, 219, 183, 1)',
}[parseInt(((data.currentChapterCnt ? data.currentChapterCnt : 0 / data.totalChapterCnt ? data.totalChapterCnt : 0) * 100) / 20)],
}[parseInt((data.currentChapterCnt || 0) / (data.totalChapterCnt || 1) * 100) / 20],
}">
{{ parseInt((data.currentChapterCnt ? data.currentChapterCnt : 0 /
data.totalChapterCnt ? data.totalChapterCnt : 0) > 1 ? 1 : (data.currentChapterCnt ?
data.currentChapterCnt : 0 /
data.totalChapterCnt ? data.totalChapterCnt : 0) * 100) }}%
{{ parseInt((data.currentChapterCnt || 0) / (data.totalChapterCnt || 1) * 100) }}%
</div>
</div>
</div>
@@ -220,7 +219,7 @@
<div class="progress">
<div style="width: 291px">
<el-progress
:percentage="parseInt((data.currentReqCnt ? data.currentReqCnt : 0 / data.totalReqCnt ? data.totalReqCnt : 0) * 100)"
:percentage="parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100) / 20)"
:show-text="false" :stroke-width="8" :color="
{
0: 'rgba(238, 112, 108, 1)',
@@ -229,7 +228,7 @@
3: 'rgba(59, 94, 251, 1)',
4: 'rgba(57, 219, 183, 1)',
5: 'rgba(57, 219, 183, 1)',
}[parseInt(((data.currentReqCnt ? data.currentReqCnt : 0 / data.totalReqCnt ? data.totalReqCnt : 0) * 100) / 20)]
}[parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100) / 20)]
"/>
</div>
<div style="
@@ -245,11 +244,9 @@
3: 'rgba(59, 94, 251, 1)',
4: 'rgba(57, 219, 183, 1)',
5: 'rgba(57, 219, 183, 1)',
}[parseInt(((data.currentReqCnt ? data.currentReqCnt : 0 / data.totalReqCnt ? data.totalReqCnt : 0) * 100) / 20)],
}[parseInt((((data.currentReqCnt || 0) / (data.totalReqCnt || 1)) * 100) / 20)],
}">
{{ parseInt((data.currentReqCnt ? data.currentReqCnt : 0 / data.totalReqCnt ? data.totalReqCnt :
0) > 1 ? 1 : (data.currentReqCnt ? data.currentReqCnt : 0 / data.totalReqCnt ? data.totalReqCnt : 0) *
100) }}%
{{ parseInt((data.currentReqCnt || 0) / (data.totalReqCnt || 1) * 100) }}%
</div>
</div>
</div>
@@ -275,10 +272,16 @@
<script setup>
import {computed, onMounted, ref} from "vue";
import circle from '@/assets/image/pathdetails/circle.png';
import circle2 from '@/assets/image/pathdetails/circle2.png';
import circle from "@/assets/image/pathdetails/circle.png";
import circle2 from "@/assets/image/pathdetails/circle2.png";
import {request} from "@/api/request";
import { STUDY_RECORD, UPDATE_CURRENT_TASK, QueryEvaluationTaskStatusOne, EvaluationToLearn, SubmitExternalExam } from "@/api/api";
import {
STUDY_RECORD,
UPDATE_CURRENT_TASK,
QueryEvaluationTaskStatusOne,
EvaluationToLearn,
SubmitExternalExam
} from "@/api/api";
import {useRoute, useRouter} from "vue-router";
import {ElMessage} from "element-plus";
import {ROUTER, TASK_TYPES} from "@/api/CONST";
@@ -293,15 +296,15 @@ const returnclick = () => {
router.back();
};
const { commit, dispatch, state } = useStore()
const userInfo = computed(() => state.userInfo)
const data = computed(() => state.routerInfo)
console.log(data)
const { commit, dispatch, state } = useStore();
const userInfo = computed(() => state.userInfo);
const data = computed(() => state.routerInfo);
console.log(data);
const activeName = ref("first");
onMounted(() => {
dispatch('getRouterInfo', { routerId })
})
dispatch("getRouterInfo", { routerId });
});
const handleClick = (tab, event) => {
console.log(tab, event);
@@ -309,7 +312,7 @@ const handleClick = (tab, event) => {
const path = { 1: "path" };
const dialogVisible = ref(false);
const dialogVisibleTip = ref('');
const dialogVisibleTip = ref("");
// 判断当前任务已结束及时间意义上的结束 提示用户
function judgeTaskIsEnd(type, endTimes, status) {
@@ -340,12 +343,12 @@ function judgeTaskIsEnd(type, endTimes, status) {
async function toFinish(d) {
if (data.value.unlockMode !== 1 && !d.statusName) {
ElMessage.warning("当前未解锁")
return
ElMessage.warning("当前未解锁");
return;
}
if (data.value.endTime && judgeTaskIsEnd(d.type, data.value.endTime, data.value.status)) {
ElMessage.error("当前任务已结束")
return
ElMessage.error("当前任务已结束");
return;
}
if (!TASK_TYPES.path[d.type]) {
@@ -356,7 +359,7 @@ async function toFinish(d) {
let date1 = new Date(d.endTime).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
dialogVisibleTip.value = '当前面授课已结束';
dialogVisibleTip.value = "当前面授课已结束";
dialogVisible.value = true;
//return
@@ -366,7 +369,7 @@ async function toFinish(d) {
let date1 = new Date(d.endTime).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
dialogVisibleTip.value = '当前作业已结束';
dialogVisibleTip.value = "当前作业已结束";
dialogVisible.value = true;
//return
@@ -377,7 +380,7 @@ async function toFinish(d) {
let date1 = new Date(d.endTime).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
dialogVisibleTip.value = '当前直播已结束';
dialogVisibleTip.value = "当前直播已结束";
dialogVisible.value = true;
//return
}
@@ -386,9 +389,9 @@ async function toFinish(d) {
if (d.type == 5) {
if (d.taskStatus == 1 || d.taskStatus == 2) {
// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
dialogVisibleTip.value = "该任务无法学习，请联系管理员进行替换！";
dialogVisible.value = true;
return
return;
}
// 此处判断外部考试跳转
@@ -403,13 +406,13 @@ async function toFinish(d) {
"targetId": routerId,
"studentNo": userInfo.value.userNo
}).then(res => {
console.log(res)
console.log(res);
}).catch(err => {
console.log(err)
})
console.log(err);
});
router.push({
path: '/externalexamination',
path: "/externalexamination",
query: {
id: d.id,
type: ROUTER,
@@ -421,16 +424,16 @@ async function toFinish(d) {
exname: d.name, // 考试名称
},
});
return
return;
}
}
// 评估 停用
if (d.type == 11) {
if (d.taskStatus == 1 || d.taskStatus == 2) {
// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
dialogVisibleTip.value = "该任务无法学习，请联系管理员进行替换！";
dialogVisible.value = true;
return
return;
}
}
// 其他活动 结束时间
@@ -438,7 +441,7 @@ async function toFinish(d) {
let date1 = new Date(d.endTime).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
dialogVisibleTip.value = '当前活动已结束';
dialogVisibleTip.value = "当前活动已结束";
dialogVisible.value = true;
//return
}
@@ -447,24 +450,24 @@ async function toFinish(d) {
if (d.type == 1) {
if (d.taskStatus == 1 || d.taskStatus == 2) {
// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
dialogVisibleTip.value = "该任务无法学习，请联系管理员进行替换！";
dialogVisible.value = true;
return
return;
}
}
// 面授课 停用
if (d.type == 2) {
if (d.taskStatus == 1 || d.taskStatus == 2) {
// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
dialogVisibleTip.value = "该任务无法学习，请联系管理员进行替换！";
dialogVisible.value = true;
return
return;
}
}
//更新学员当前任务
await request(UPDATE_CURRENT_TASK, { id: d.id, type: ROUTER, pid: routerId, name: d.name })
await request(UPDATE_CURRENT_TASK, { id: d.id, type: ROUTER, pid: routerId, name: d.name });
if (d.type === 3 || d.type === 7 || (d.type === 5 && d.examType === 2)) {
console.log(d, data.value)
console.log(d, data.value);
d.status !== 1 && await request(STUDY_RECORD, {
studentId: userInfo.value.id,
targetId: data.value.id,
@@ -480,7 +483,7 @@ async function toFinish(d) {
if (d.quizTaskId == null) {
// 肯定没有完成测评
// 调用接口 跳转页面
console.log('我是查询测评跳转链接所传递得参数', {
console.log("我是查询测评跳转链接所传递得参数", {
"businessType": "learningpath",
"chapterId": data.value.currentStageId,
"courseId": d.courseId,
@@ -488,7 +491,7 @@ async function toFinish(d) {
"routerOrProjectId": routerId,
"studentId": userInfo.value.id,
"studentName": userInfo.value.realName
})
});
request(EvaluationToLearn, {
"businessType": "learningpath",
"chapterId": data.value.currentStageId,
@@ -498,34 +501,34 @@ async function toFinish(d) {
"studentId": userInfo.value.id,
"studentName": userInfo.value.realName
}).then(res => {
console.log(res)
console.log(res);
if (res.code == 200) {
let jumpUrl = res.data.quizUrl
let jumpUrl = res.data.quizUrl;
// 此处写跳转url
window.open(jumpUrl, '_top')
window.open(jumpUrl, "_top");
}
}).catch(err => {
console.log(err)
})
return
console.log(err);
});
return;
} else {
// 进行中 或者 已完成
// 调用接口 判断当前测评状态 跳转页面
console.log('我是查询测评跳转链接所传递得参数', {
console.log("我是查询测评跳转链接所传递得参数", {
"quizTaskId": d.quizTaskId
})
});
request(QueryEvaluationTaskStatusOne, {
"quizTaskId": d.quizTaskId
}).then(res => {
console.log(res)
console.log(res);
if (res.code == 200) {
if (res.data.complete_status == 2) {
ElMessage.error("您已完成测评")
return
ElMessage.error("您已完成测评");
return;
} else {
// 重新查询跳转
// 调用接口 跳转页面
console.log('我是查询测评跳转链接所传递得参数', {
console.log("我是查询测评跳转链接所传递得参数", {
"businessType": "learningpath",
"chapterId": data.value.currentStageId,
"courseId": d.courseId,
@@ -533,7 +536,7 @@ async function toFinish(d) {
"routerOrProjectId": routerId,
"studentId": userInfo.value.id,
"studentName": userInfo.value.realName
})
});
request(EvaluationToLearn, {
"businessType": "learningpath",
"chapterId": data.value.currentStageId,
@@ -543,22 +546,22 @@ async function toFinish(d) {
"studentId": userInfo.value.id,
"studentName": userInfo.value.realName
}).then(res => {
console.log(res)
console.log(res);
if (res.code == 200) {
let jumpUrl = res.data.quizUrl
let jumpUrl = res.data.quizUrl;
// 此处写跳转url
window.open(jumpUrl, '_top')
window.open(jumpUrl, "_top");
}
}).catch(err => {
console.log(err)
})
return
console.log(err);
});
return;
}
}
}).catch(err => {
console.log(err)
})
return
console.log(err);
});
return;
}
}
@@ -566,15 +569,15 @@ async function toFinish(d) {
if (d.type == 13) {
// 此处判断跳转项目详情界面
router.push({
path: '/projectdetails',
path: "/projectdetails",
query: {
projectId: d.courseId
},
});
return
return;
}
const path = typeof TASK_TYPES.path[d.type] === "string" ? TASK_TYPES.path[d.type] : TASK_TYPES.path[d.type](d);
path && path.startsWith("http") ? window.open(path + d.targetId, '_top') : path.startsWith("/") ?
path && path.startsWith("http") ? window.open(path + d.targetId, "_top") : path.startsWith("/") ?
router.push({
path,
query: {
@@ -587,33 +590,32 @@ async function toFinish(d) {
chapterOrStageId: data.value.currentStageId,
btype: 2
},
}) : ''
}) : "";
}
function whiteTypes(type) {
return import.meta.env.VITE_TASK_WHITE_TYPE.includes("-" + type + "-");
}
// 共享文档下载
function downloadFile(url) {
console.log(import.meta.env.VITE_FILE_PATH + url)
console.log(import.meta.env.VITE_FILE_PATH + url);
window.open(import.meta.env.VITE_FILE_PATH + url);
}
// 继续学习
function continueLearn(taskname, datas) {
console.log('我是当前的列表展示信息', data)
console.log(datas)
let jumpinfo
console.log("我是当前的列表展示信息", data);
console.log(datas);
let jumpinfo;
for (let i = 0; i < datas.length; i++) {
if (datas[i].name == taskname) {
jumpinfo = datas[i]
jumpinfo = datas[i];
}
}
console.log(jumpinfo)
toFinish(jumpinfo)
console.log(jumpinfo);
toFinish(jumpinfo);
}
</script>