hz/student-h5
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/student-h5.git synced 2025-12-06 17:36:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy-zsx' into 'master'

Browse Source 
修改状态

See merge request !46
This commit is contained in:
joshen
2024-05-28 09:57:15 +08:00
parent 926a12cc94 889c2e330c
commit ffb967ac52
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/store/index.js
View File

@@ -37,12 +37,7 @@ export default createStore({
} }
if (state.projectInfo.unlockMode === 1) { if (state.projectInfo.unlockMode === 1) {
state.projectInfo.stageProcessList.forEach((t) => { state.projectInfo.stageProcessList.forEach((t) => {
if(t.studyModel == 0){ if(t.studyModel == 1){
t.statusName = "进行中";
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 = "已完成");
}
else{
state.projectInfo.stageProcessList?.forEach((t1) => { state.projectInfo.stageProcessList?.forEach((t1) => {
t1.statusName = "已完成"; t1.statusName = "已完成";
const stageState = t1.taskProcessList?.some((s) => { const stageState = t1.taskProcessList?.some((s) => {
@@ -55,26 +50,16 @@ export default createStore({
return stageState; return stageState;
}); });
} }
else{
t.statusName = "进行中";
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; return;
} }
state.projectInfo.stageProcessList.filter(i => i.id != 0).forEach((item,i)=>{ state.projectInfo.stageProcessList.forEach((item,i)=>{
if(item.studyModel == 0){ if(item.studyModel == 1){
if(i == 0){
item.statusName = "进行中";
item.taskProcessList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : s.status === 2 ? (s.statusName = "进行中") : TASK_TYPES.toName[s.type]);
item.taskProcessList?.every((s) => s.status === 1) && (item.statusName = "已完成");
}
if(i > 0){
if(state.projectInfo.stageProcessList.filter(i => i.id != 0)[i-1].statusName == "已完成"){
item.statusName = "进行中";
item.taskProcessList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : s.status === 2 ? (s.statusName = "进行中") : TASK_TYPES.toName[s.type]);
item.taskProcessList?.every((s) => s.status === 1) && (item.statusName = "已完成");
}else{
item.statusName = "未解锁";
}
}
}else{
state.projectInfo.stageProcessList?.some((t) => { state.projectInfo.stageProcessList?.some((t) => {
t.statusName = "已完成"; t.statusName = "已完成";
const stageState = t.taskProcessList?.some((s) => { const stageState = t.taskProcessList?.some((s) => {
@@ -86,6 +71,21 @@ export default createStore({
stageState && (t.statusName = "进行中"); stageState && (t.statusName = "进行中");
return stageState; return stageState;
}); });
}else{
if(i == 0){
item.statusName = "进行中";
item.taskProcessList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : s.status === 2 ? (s.statusName = "进行中") : TASK_TYPES.toName[s.type]);
item.taskProcessList?.every((s) => s.status === 1) && (item.statusName = "已完成");
}
if(i > 0){
if(state.projectInfo.stageProcessList[i-1].statusName == "已完成"){
item.statusName = "进行中";
item.taskProcessList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : s.status === 2 ? (s.statusName = "进行中") : TASK_TYPES.toName[s.type]);
item.taskProcessList?.every((s) => s.status === 1) && (item.statusName = "已完成");
}else{
item.statusName = "未解锁";
}
}
} }
}) })
}, },

2
src/views/projectdetails/projectDetails.vue
View File

@@ -251,7 +251,7 @@ const {
const router = useRouter(); const router = useRouter();
const { commit, dispatch, state } = useStore(); const { commit, dispatch, state } = useStore();
const data = computed(() => state.projectInfo); const data = computed(() => state.projectInfo);
useRequest(PROJECT_PROCESS, { projectId: projectId, type:1 }, (e) => { useRequest(PROJECT_PROCESS, { projectId: projectId, type }, (e) => {
useRequest( useRequest(
checkStudentExist, checkStudentExist,
{ {