From 6141ff9c79781d9f533f9707c8a5fc910bacacc1 Mon Sep 17 00:00:00 2001 From: xuesinan <1404152492@qq.com> Date: Wed, 2 Mar 2022 19:58:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E8=BD=B4tab=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + hooks/project/useGetTasks.js | 7 +++++-- pages/project/project.vue | 14 ++++++++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e828e4..6b06c66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -126,6 +126,7 @@ - | 上个提交导致的bug | [7524b24](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7524b24) - | 时间轴方案 | [0d465a2](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0d465a2) - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6) + - | 时间轴数据错乱 | [c1e12bc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c1e12bc) - | 退出登录 | [6922f24](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/6922f24) - | 向上查向下查 | [1933e1b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1933e1b) - | 项目列表排序 | [ad0ce75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ad0ce75) diff --git a/hooks/project/useGetTasks.js b/hooks/project/useGetTasks.js index be9906f..027959f 100644 --- a/hooks/project/useGetTasks.js +++ b/hooks/project/useGetTasks.js @@ -64,6 +64,7 @@ export default function useGetTasks() { store.commit('task/setShowSkeleton', false); const params = generateGetTaskParam(query); + console.log('111111',params) uni.$catchReq.getTaskByNum(params, (err, data) => { store.commit('task/setShowSkeleton', false); if (err) { @@ -73,14 +74,16 @@ export default function useGetTasks() { store.commit('task/setShowScrollTo', true); params.queryType === 0 ? store.commit('task/setUpRealTasks', data.list) : store.commit('task/setDownRealTasks', data.list); - params.queryType === 0 ? store.commit('task/setUpNextPage', data.nextPage) : store.commit('task/setDownNextPage', data.nextPage); // 下一页 const index = visibleRoles.value.findIndex(role => role.id === roleId.value); const arr = [...allTasks.value]; arr[index].realTasks = [...realTasks.value]; + arr[index].upNextPage = params.queryType === 0 ? data.nextPage : 1; + arr[index].downNextPage = params.queryType === 1 ? data.nextPage : 1; store.commit('task/setAllTasks', arr); - store.commit('task/setCurrRoleShowTasks', arr[index].tasks); // 设置当前角色的展示任务数据 + // store.commit('task/setCurrRoleShowTasks', arr[index].tasks); // 设置当前角色的展示任务数据 store.commit('task/setCurrRoleRealTasks', arr[index].realTasks); // 设置当前角色的真实任务数据 + params.queryType === 0 ? store.commit('task/setUpNextPage', arr[index].upNextPage) : store.commit('task/setDownNextPage', arr[index].downNextPage); // 下一页 // 如果第一次渲染但没有空数据则加载空数据 if (!tasks.value || !tasks.value.length && timeLineType.value === 1) { diff --git a/pages/project/project.vue b/pages/project/project.vue index 7f13b62..0ce001e 100644 --- a/pages/project/project.vue +++ b/pages/project/project.vue @@ -103,19 +103,19 @@ watch([allTasks, remindData], () => { if (item.task) { item.task.forEach(task => { task.remindNum = 0; - + if (task.plugins) { task.plugins.forEach(pluginArr => { pluginArr.forEach(plugin => { plugin.remindNum = 0; remindData.value.forEach(remind => { const remind_data = JSON.parse(remind.data); - + if (item.role.id === remind_data.data.roleId) { if (remind_data.data.taskId === task.id) { task.remindNum++; } - + if (remind_data.data.taskId === task.id && remind_data.data.pluginId === plugin.pluginTaskId) { plugin.remindNum++; } @@ -124,7 +124,7 @@ watch([allTasks, remindData], () => { }) }) } - + }) } }) @@ -262,6 +262,12 @@ function tabsChange(e) { const { id } = visibleRoles.value[e.detail.current]; store.commit('role/setRoleIndex', e.detail.current); store.commit('role/setRoleId', id); + + const index = visibleRoles.value.findIndex(role => role.id === id); + const arr = [...allTasks.value]; + store.commit('task/setCurrRoleRealTasks', arr[index].realTasks); // 设置当前角色的真实任务数据 + store.commit('task/setUpNextPage', arr[index].upNextPage || 1); // 设置当前角色的真实任务数据的向上查询页数 + store.commit('task/setDownNextPage', arr[index].downNextPage || 1); // 设置当前角色的真实任务数据向下查询页数 } // 设置自动滚动位置