|
|
@ -1,7 +1,8 @@ |
|
|
import { computed, nextTick, watch } from 'vue'; |
|
|
import { computed, nextTick, watch } from 'vue'; |
|
|
import { useStore } from 'vuex'; |
|
|
|
|
|
import { flatten } from 'lodash'; |
|
|
|
|
|
import dayjs from 'dayjs'; |
|
|
import dayjs from 'dayjs'; |
|
|
|
|
|
import { flatten } from 'lodash'; |
|
|
|
|
|
import { useStore } from 'vuex'; |
|
|
|
|
|
|
|
|
export default function useGetTasks() { |
|
|
export default function useGetTasks() { |
|
|
const store = useStore(); |
|
|
const store = useStore(); |
|
|
@ -139,7 +140,7 @@ export default function useGetTasks() { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const arr = showTasks.filter(item => item.detailId); // 所有的真实数据
|
|
|
const arr = showTasks.filter(item => item.detailId); // 所有的真实数据
|
|
|
|
|
|
|
|
|
// 显示任务中有真实任务数据
|
|
|
// 显示任务中有真实任务数据
|
|
|
if (arr.length > 0) { |
|
|
if (arr.length > 0) { |
|
|
realTasks.forEach((item, index) => { |
|
|
realTasks.forEach((item, index) => { |
|
|
@ -301,7 +302,7 @@ export default function useGetTasks() { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
arr[index].task = [...tasks.value]; |
|
|
arr[index].task = [...tasks.value]; |
|
|
store.commit('task/setCurrRoleShowTasks', arr[index].task); // 设置当前角色的展示任务数据
|
|
|
// store.commit('task/setCurrRoleShowTasks', arr[index].task); // 设置当前角色的展示任务数据
|
|
|
} |
|
|
} |
|
|
store.commit('task/setAllTasks', arr); |
|
|
store.commit('task/setAllTasks', arr); |
|
|
}); |
|
|
}); |
|
|
|