github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 19:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 仪表盘任务数量、最近打开的任务

Browse Source
This commit is contained in:
kuaifan 2022-05-20 10:22:08 +08:00
parent 88163499fe
commit 74b1194398
5 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/assets/js/components/Mobile/Tabbar.vue
View File

@ -21,9 +21,9 @@
<i class="taskfont" v-html="item.icon"></i> <i class="taskfont" v-html="item.icon"></i>
<div class="tabbar-title">{{$L(item.label)}}</div> <div class="tabbar-title">{{$L(item.label)}}</div>
<template v-if="item.name === 'dashboard'"> <template v-if="item.name === 'dashboard'">
<Badge v-if="dashboardTask.overdue.length > 0" class="tabbar-badge" type="error" :count="dashboardTask.overdue.length"/> <Badge v-if="dashboardTask.overdue_count > 0" class="tabbar-badge" type="error" :count="dashboardTask.overdue_count"/>
<Badge v-else-if="dashboardTask.today.length > 0" class="tabbar-badge" type="info" :count="dashboardTask.today.length"/> <Badge v-else-if="dashboardTask.today_count > 0" class="tabbar-badge" type="info" :count="dashboardTask.today_count"/>
<Badge v-else-if="dashboardTask.all.length > 0" class="tabbar-badge" type="primary" :count="dashboardTask.all.length"/> <Badge v-else-if="dashboardTask.all_count > 0" class="tabbar-badge" type="primary" :count="dashboardTask.all_count"/>
</template> </template>
<template v-else-if="item.name === 'dialog'"> <template v-else-if="item.name === 'dialog'">
<Badge class="tabbar-badge" :text="msgUnreadMention"/> <Badge class="tabbar-badge" :text="msgUnreadMention"/>

15
resources/assets/js/pages/manage.vue
View File

@ -39,7 +39,10 @@
:key="key" :key="key"
class="task-title" class="task-title"
@click.native="openTask(item)" @click.native="openTask(item)"
:name="item.name">{{ item.name }}</DropdownItem> :name="item.name">
<span v-if="item.flow_item_name" :class="item.flow_item_status">{{item.flow_item_name}}</span>
<div class="task-title-text">{{ item.name }}</div>
</DropdownItem>
</DropdownMenu> </DropdownMenu>
<DropdownMenu v-else slot="list"> <DropdownMenu v-else slot="list">
<DropdownItem style="color:darkgrey">{{ $L('暂无打开记录') }}</DropdownItem> <DropdownItem style="color:darkgrey">{{ $L('暂无打开记录') }}</DropdownItem>
@ -136,9 +139,9 @@
<li @click="toggleRoute('dashboard')" :class="classNameRoute('dashboard')"> <li @click="toggleRoute('dashboard')" :class="classNameRoute('dashboard')">
<i class="taskfont">&#xe6fb;</i> <i class="taskfont">&#xe6fb;</i>
<div class="menu-title">{{$L('仪表盘')}}</div> <div class="menu-title">{{$L('仪表盘')}}</div>
<Badge v-if="dashboardTask.overdue.length > 0" class="menu-badge" type="error" :count="dashboardTask.overdue.length"/> <Badge v-if="dashboardTask.overdue_count > 0" class="menu-badge" type="error" :count="dashboardTask.overdue_count"/>
<Badge v-else-if="dashboardTask.today.length > 0" class="menu-badge" type="info" :count="dashboardTask.today.length"/> <Badge v-else-if="dashboardTask.today_count > 0" class="menu-badge" type="info" :count="dashboardTask.today_count"/>
<Badge v-else-if="dashboardTask.all.length > 0" class="menu-badge" type="primary" :count="dashboardTask.all.length"/> <Badge v-else-if="dashboardTask.all_count > 0" class="menu-badge" type="primary" :count="dashboardTask.all_count"/>
</li> </li>
<li @click="toggleRoute('calendar')" :class="classNameRoute('calendar')"> <li @click="toggleRoute('calendar')" :class="classNameRoute('calendar')">
<i class="taskfont">&#xe6f5;</i> <i class="taskfont">&#xe6f5;</i>
@ -374,9 +377,11 @@ import Report from "./manage/components/Report";
import notificationKoro from "notification-koro1"; import notificationKoro from "notification-koro1";
import {Store} from "le5le-store"; import {Store} from "le5le-store";
import MobileBack from "../components/Mobile/Back"; import MobileBack from "../components/Mobile/Back";
import TaskMenu from "./manage/components/TaskMenu";
export default { export default {
components: { components: {
TaskMenu,
MobileBack, MobileBack,
MobileTabbar, MobileTabbar,
UserInput, UserInput,
@ -539,7 +544,7 @@ export default {
unreadTotal() { unreadTotal() {
if (this.userId > 0) { if (this.userId > 0) {
return this.msgAllUnread + this.dashboardTask.overdue.length + this.reportUnreadNumber return this.msgAllUnread + this.dashboardTask.overdue_count + this.reportUnreadNumber
} else { } else {
return 0 return 0
} }

9
resources/assets/js/pages/manage/components/TaskMenu.vue
View File

@ -270,15 +270,17 @@ export default {
// //
Object.keys(updata).forEach(key => this.$set(this.task, key, updata[key])); Object.keys(updata).forEach(key => this.$set(this.task, key, updata[key]));
// //
this.$store.dispatch("taskUpdate", Object.assign(updata, { const updateData = Object.assign(updata, {
task_id: this.task.id, task_id: this.task.id,
})).then(({data, msg}) => { });
this.$store.dispatch("taskUpdate", updateData).then(({data, msg}) => {
$A.messageSuccess(msg); $A.messageSuccess(msg);
resolve() resolve()
this.$store.dispatch("saveTaskBrowse", updateData.task_id);
this.$emit("on-update", data) this.$emit("on-update", data)
}).catch(({msg}) => { }).catch(({msg}) => {
$A.modalError(msg); $A.modalError(msg);
this.$store.dispatch("getTaskOne", this.task.id).catch(() => {}) this.$store.dispatch("getTaskOne", updateData.task_id).catch(() => {})
reject() reject()
}); });
}) })
@ -311,6 +313,7 @@ export default {
} }
this.$store.dispatch(typeDispatch, typeData).then(({msg}) => { this.$store.dispatch(typeDispatch, typeData).then(({msg}) => {
$A.messageSuccess(msg); $A.messageSuccess(msg);
this.$store.dispatch("saveTaskBrowse", typeData.task_id);
}).catch(({msg}) => { }).catch(({msg}) => {
$A.modalError(msg, 301); $A.modalError(msg, 301);
}).finally(_ => { }).finally(_ => {

10
resources/assets/js/pages/manage/dashboard.vue
View File

@ -8,21 +8,21 @@
<li @click="scrollTo('today')"> <li @click="scrollTo('today')">
<div class="block-title">{{getTitle('today')}}</div> <div class="block-title">{{getTitle('today')}}</div>
<div class="block-data"> <div class="block-data">
<div class="block-num">{{dashboardTask.today.length}}</div> <div class="block-num">{{dashboardTask.today_count}}</div>
<i class="taskfont">&#xe6f4;</i> <i class="taskfont">&#xe6f4;</i>
</div> </div>
</li> </li>
<li @click="scrollTo('overdue')"> <li @click="scrollTo('overdue')">
<div class="block-title">{{getTitle('overdue')}}</div> <div class="block-title">{{getTitle('overdue')}}</div>
<div class="block-data"> <div class="block-data">
<div class="block-num">{{dashboardTask.overdue.length}}</div> <div class="block-num">{{dashboardTask.overdue_count}}</div>
<i class="taskfont">&#xe603;</i> <i class="taskfont">&#xe603;</i>
</div> </div>
</li> </li>
<li @click="scrollTo('all')"> <li @click="scrollTo('all')">
<div class="block-title">{{getTitle('all')}}</div> <div class="block-title">{{getTitle('all')}}</div>
<div class="block-data"> <div class="block-data">
<div class="block-num">{{dashboardTask.all.length}}</div> <div class="block-num">{{dashboardTask.all_count}}</div>
<i class="taskfont">&#xe6f9;</i> <i class="taskfont">&#xe6f9;</i>
</div> </div>
</li> </li>
@ -136,7 +136,7 @@ export default {
total() { total() {
const {dashboardTask} = this; const {dashboardTask} = this;
return dashboardTask.today.length + dashboardTask.overdue.length + dashboardTask.all.length; return dashboardTask.today_count + dashboardTask.overdue_count + dashboardTask.all_count;
}, },
}, },
@ -144,7 +144,7 @@ export default {
getTitle(type) { getTitle(type) {
switch (type) { switch (type) {
case 'today': case 'today':
return this.$L('今日任务'); return this.$L('今日到期');
case 'overdue': case 'overdue':
return this.$L('超期任务'); return this.$L('超期任务');
case 'all': case 'all':

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

@ -115,26 +115,37 @@ export default {
return task.owner; return task.owner;
} }
let array = state.cacheTasks.filter(task => filterTask(task)); let array = state.cacheTasks.filter(task => filterTask(task));
let tmpCount = 0;
if (state.taskCompleteTemps.length > 0) { if (state.taskCompleteTemps.length > 0) {
let tmps = state.cacheTasks.filter(task => state.taskCompleteTemps.includes(task.id) && filterTask(task, false)); let tmps = state.cacheTasks.filter(task => state.taskCompleteTemps.includes(task.id) && filterTask(task, false));
if (tmps.length > 0) { if (tmps.length > 0) {
tmpCount = tmps.length
array = $A.cloneJSON(array) array = $A.cloneJSON(array)
array.push(...tmps); array.push(...tmps);
} }
} }
const todayTasks = array.filter(task => { const todayTasks = array.filter(task => {
const start = $A.Date(task.start_at), const end = $A.Date(task.end_at);
end = $A.Date(task.end_at); return todayStart <= end && end <= todayEnd;
return (start <= todayStart && todayStart <= end) || (start <= todayEnd && todayEnd <= end) || (start > todayStart && todayEnd > end);
}) })
const overdueTasks = array.filter(task => { const overdueTasks = array.filter(task => {
return task.end_at && $A.Date(task.end_at) <= todayNow; return task.end_at && $A.Date(task.end_at) <= todayNow;
}) })
const result = {
return {
today: todayTasks, today: todayTasks,
today_count: todayTasks.length,
overdue: overdueTasks, overdue: overdueTasks,
all: array overdue_count: overdueTasks.length,
all: array,
all_count: array.length,
};
if (tmpCount > 0) {
result.today_count -= todayTasks.filter(task => state.taskCompleteTemps.includes(task.id)).length
result.overdue_count -= overdueTasks.filter(task => state.taskCompleteTemps.includes(task.id)).length
result.all_count -= tmpCount
} }
return result
}, },
} }