gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复我的任务数据

Browse Source
This commit is contained in:
kuaifan 2022-01-01 15:03:33 +08:00
parent a1c7efeb85
commit f1f1d784ff
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/js/pages/manage/calendar.vue
View File

@ -79,7 +79,9 @@ export default {
...mapGetters(['ownerTask']), ...mapGetters(['ownerTask']),
list() { list() {
const datas = $A.cloneJSON(this.ownerTask); const datas = $A.cloneJSON(this.ownerTask.filter(({end_at}) => {
return end_at;
}));
return datas.map(data => { return datas.map(data => {
let isAllday = $A.rightExists(data.start_at, "00:00:00") && $A.rightExists(data.end_at, "23:59:59") let isAllday = $A.rightExists(data.start_at, "00:00:00") && $A.rightExists(data.end_at, "23:59:59")
let task = { let task = {

10
resources/assets/js/store/getters.js vendored
View File

@ -74,7 +74,6 @@ export default {
} }
}, },
ownerTask(state) { ownerTask(state) {
return state.tasks.filter(({complete_at, parent_id, end_at, owner}) => { return state.tasks.filter(({complete_at, parent_id, end_at, owner}) => {
if (parent_id > 0) { if (parent_id > 0) {
@ -97,9 +96,6 @@ export default {
if (complete_at) { if (complete_at) {
return false; return false;
} }
if (!end_at) {
return false;
}
return owner; return owner;
}).map(task => { }).map(task => {
if (task.parent_id > 0) { if (task.parent_id > 0) {
@ -125,11 +121,17 @@ export default {
todayEnd = $A.Date($A.formatDate("Y-m-d 23:59:59")), todayEnd = $A.Date($A.formatDate("Y-m-d 23:59:59")),
todayNow = $A.Date($A.formatDate("Y-m-d H:i:s")); todayNow = $A.Date($A.formatDate("Y-m-d H:i:s"));
const todayTasks = getters.ownerTask.filter(task => { const todayTasks = getters.ownerTask.filter(task => {
if (!task.end_at) {
return false;
}
const start = $A.Date(task.start_at), const start = $A.Date(task.start_at),
end = $A.Date(task.end_at); end = $A.Date(task.end_at);
return (start <= todayStart && todayStart <= end) || (start <= todayEnd && todayEnd <= end) || (start > todayStart && todayEnd > end); return (start <= todayStart && todayStart <= end) || (start <= todayEnd && todayEnd <= end) || (start > todayStart && todayEnd > end);
}) })
const overdueTasks = getters.ownerTask.filter(task => { const overdueTasks = getters.ownerTask.filter(task => {
if (!task.end_at) {
return false;
}
return $A.Date(task.end_at) <= todayNow; return $A.Date(task.end_at) <= todayNow;
}) })
return { return {