diff --git a/CHANGELOG.md b/CHANGELOG.md index c95178d..6e828e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -106,6 +106,7 @@ - | 查询插件 | [542d714](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/542d714) - | 查询查件详情 | [5935a3d](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5935a3d) - | 登录页验证码获取 | [108e322](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/108e322) + - | 顶部状态栏不显示问题 | [a63dfa4](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a63dfa4) - | 工作台图片app端不显示 | [f267c72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/f267c72) - | 广告页、引导页 | [b63ade5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b63ade5) - | 广告页不显示 | [d749dfb](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/d749dfb) diff --git a/components/Roles/Roles.vue b/components/Roles/Roles.vue index 354622e..17d8474 100644 --- a/components/Roles/Roles.vue +++ b/components/Roles/Roles.vue @@ -103,11 +103,9 @@ function scroll(e) { // 设置滚动位置 function setCurrentRole(index) { const query = uni.createSelectorQuery().in(this); - console.log('ppppppp', query); query .selectAll('.tab-children') .boundingClientRect(res => { - console.log('oooooooooo', res); res.forEach(item => { data.tabList.push({ width: item.width }); }); diff --git a/hooks/project/useGetTasks.js b/hooks/project/useGetTasks.js index dd4b386..be9906f 100644 --- a/hooks/project/useGetTasks.js +++ b/hooks/project/useGetTasks.js @@ -25,6 +25,7 @@ export default function useGetTasks() { const remindData = computed(() => store.state.socket.remindData); // 小红点 const currRoleRealTasks = computed(() => store.state.task.currRoleRealTasks); // 当前角色的真实任务数据 + const currRoleShowTasks = computed(() => store.state.task.currRoleShowTasks); // 当前角色的展示任务数据 const currLocationTaskId = computed(() => store.state.socket.currLocationTaskId); // 初始化 定期任务 @@ -78,6 +79,7 @@ export default function useGetTasks() { const arr = [...allTasks.value]; arr[index].realTasks = [...realTasks.value]; store.commit('task/setAllTasks', arr); + store.commit('task/setCurrRoleShowTasks', arr[index].tasks); // 设置当前角色的展示任务数据 store.commit('task/setCurrRoleRealTasks', arr[index].realTasks); // 设置当前角色的真实任务数据 // 如果第一次渲染但没有空数据则加载空数据 @@ -113,6 +115,7 @@ export default function useGetTasks() { // 初始值 // 显示任务中没有真实任务数据 + // let centerData = params.queryType === 1 ? realTasks.slice(0, params.pageSize) : realTasks.slice(realTasks.length - 1 - params.pageSize); let centerData = realTasks.slice(0, params.pageSize); const firstDetailIndex = showTasks.findIndex(task => task.detailId); if (firstDetailIndex > -1) { @@ -223,9 +226,9 @@ export default function useGetTasks() { } } - if (showTasks.length > 80) { - showTasks = params.queryType === 0 ? showTasks.slice(0, 80) : showTasks.slice(showTasks.length - 80); - } + // if (showTasks.length > 80) { + // showTasks = params.queryType === 0 ? showTasks.slice(0, 80) : showTasks.slice(showTasks.length - 80); + // } store.commit('task/clearTasks'); params.queryType === 0 ? store.commit('task/setUpTasks', showTasks) : store.commit('task/setDownTasks', showTasks); @@ -306,6 +309,7 @@ export default function useGetTasks() { const arr = [...allTasks.value]; arr[index].task = [...newValue]; store.commit('task/setAllTasks', arr); + store.commit('task/setCurrRoleShowTasks', arr[index].tasks); // 设置当前角色的展示任务数据 }); return { diff --git a/pages/project/project.vue b/pages/project/project.vue index 0b87da1..7f13b62 100644 --- a/pages/project/project.vue +++ b/pages/project/project.vue @@ -151,12 +151,14 @@ watch(roleId, () => { store.commit('task/setTimeNode', Date.now()); - let currRoleRealTasks = []; + let currRoleRealTasks = [], currRoleShowTasks = []; if (allTasks.value.length) { const index = visibleRoles.value.findIndex(role => role.id === roleId.value); - currRoleRealTasks = allTasks.value[index].realTasks || []; + currRoleRealTasks = allTasks.value[index].realTasks || []; + currRoleShowTasks = allTasks.value[index].tasks || []; } - store.commit('task/setCurrRoleRealTasks', currRoleRealTasks); // 设置当前角色的真实任务数据 + store.commit('task/setCurrRoleRealTasks', currRoleRealTasks); // 设置当前角色的真实任务数据 + store.commit('task/setCurrRoleShowTasks', currRoleShowTasks); // 设置当前角色的真实任务数据 } }); diff --git a/store/task/mutations.js b/store/task/mutations.js index dd2bd9a..633adf4 100644 --- a/store/task/mutations.js +++ b/store/task/mutations.js @@ -344,6 +344,10 @@ const mutations = { setCurrRoleRealTasks(state, data) { state.currRoleRealTasks = data || []; }, + + setCurrRoleShowTasks(state, data) { + state.currRoleShowTasks = data || []; + } }; export default mutations; diff --git a/store/task/state.js b/store/task/state.js index e297ad7..3bc360a 100644 --- a/store/task/state.js +++ b/store/task/state.js @@ -32,6 +32,9 @@ const state = { allTasks: [], // 所有任务 hasPermanent: false, // 永久的日常任务是否加载过 + + currRoleRealTasks: [], // 当前角色真实任务 + currRoleShowTasks: [], // 当前角色展示任务 }; export default state;