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

Merge branch 'develop' into manage-release

Browse Source
This commit is contained in:
wyx
2023-03-06 08:44:34 +08:00
parent 94a0331a15 d3cff6d1d5
commit 0f84e000da
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/store/index.js
View File

@@ -28,7 +28,7 @@ export default createStore({
if (state.projectInfo.unlockMode === 1) {
state.projectInfo.stageProcessList.forEach((t) => {
t.statusName = "进行中";
t.taskProcessList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : TASK_TYPES.toName[s.type]);
t.taskProcessList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : s.status === 2 ? (s.statusName = "进行中") : TASK_TYPES.toName[s.type]);
t.taskProcessList?.every((s) => s.status === 1) && (t.statusName = "已完成");
});
return;
@@ -57,7 +57,7 @@ export default createStore({
}
state.routerInfo.statusName = "进行中";
if (state.routerInfo.unlockMode === 1) {
state.routerInfo.taskBoList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : TASK_TYPES.toName[s.type]);
state.routerInfo.taskBoList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : s.status === 2 ? (s.statusName = "进行中") : TASK_TYPES.toName[s.type]);
state.routerInfo.taskBoList?.every((s) => s.status === 1) && (state.routerInfo.statusName = "已完成");
return;
}

6
src/views/faceteach/FaceTeach.vue
View File

@@ -467,10 +467,10 @@ function toSurvery() {
router.push({
path: "/surveydetail",
query: {
id: taskId,
courseId: data.value.planDto.evaluateId,
id: data.value.planDto.id,
courseId: data.value.planDto.assessmentId,
pName: "面授课",
infoId: data.value.planDto.offcoursePlanId,
infoId: data.value.planDto.id,
chapterOrStageId: 0,
sName: data.value.planDto.name,
type: 3,

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

@@ -473,6 +473,7 @@ async function toFinish(d) {
targetId: data.value.id,
logo: ROUTER,
type: ROUTER,
taskType: d.type,
stageOrChapterId: data.value.currentStageId,
taskId: d.id,
});

2
src/views/survey/SurveyDetail.vue
View File

@@ -348,7 +348,7 @@ const returnclick = () => {
clearInterval(timers)
router.back();
};
const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage()
const {nextPage,prevPage,hasPrev, hasNext} = type==3 ? '' : useTaskPage()
const fielPath = ref(import.meta.env.VITE_FILE_PATH);
const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 });
console.log(data)