diff --git a/resources/assets/js/pages/manage/components/TaskDashboard.vue b/resources/assets/js/pages/manage/components/TaskDashboard.vue
new file mode 100644
index 000000000..1f4fbe138
--- /dev/null
+++ b/resources/assets/js/pages/manage/components/TaskDashboard.vue
@@ -0,0 +1,104 @@
+<template>
+    <ul class="dashboard-list overlay-y">
+        <li
+            v-for="(item, index) in list"
+            :key="index"
+            :class="{complete: item.complete_at}"
+            :style="item.color ? {backgroundColor: item.color} : {}"
+            @click="openTask(item)">
+            <em
+                v-if="item.p_name"
+                class="priority-color"
+                :style="{backgroundColor:item.p_color}"></em>
+            <TaskMenu :ref="`taskMenu_${item.id}`" :task="item">
+                <div slot="icon" class="drop-icon" @click.stop="">
+                    <i class="taskfont" v-html="item.complete_at ? '&#xe627;' : '&#xe625;'"></i>
+                </div>
+            </TaskMenu>
+            <div class="item-title">
+                <!--工作流状态-->
+                <span v-if="item.flow_item_name" :class="item.flow_item_status"
+                      @click.stop="openMenu(item)">{{ item.flow_item_name }}</span>
+                <!--是否子任务-->
+                <span v-if="item.sub_top === true">{{ $L('子任务') }}</span>
+                <!--有多少个子任务-->
+                <span v-if="item.sub_my && item.sub_my.length > 0">+{{ item.sub_my.length }}</span>
+                <!--任务描述-->
+                {{ item.name }}
+            </div>
+            <div v-if="item.desc" class="item-icon">
+                <i class="taskfont">&#xe71a;</i>
+            </div>
+            <div v-if="item.sub_num > 0" class="item-icon">
+                <i class="taskfont">&#xe71f;</i>
+                <em>{{ item.sub_complete }}/{{ item.sub_num }}</em>
+            </div>
+            <ETooltip v-if="item.end_at" :content="item.end_at" placement="right">
+                <div :class="['item-icon', item.today ? 'today' : '', item.overdue ? 'overdue' : '']">
+                    <i class="taskfont">&#xe71d;</i>
+                    <em>{{ expiresFormat(item.end_at) }}</em>
+                </div>
+            </ETooltip>
+        </li>
+    </ul>
+</template>
+
+<script>
+import TaskMenu from "../components/TaskMenu";
+import {mapGetters, mapState} from "vuex";
+
+export default {
+    components: {TaskMenu},
+    name: "TaskDashboard",
+    props: {
+        list: {
+            default: {}
+        },
+        title: {
+            default: null
+        },
+    },
+    data() {
+        return {
+            nowTime: $A.Time(),
+            nowInterval: null,
+        }
+    },
+    mounted() {
+        this.nowInterval = setInterval(() => {
+            this.nowTime = $A.Time();
+        }, 1000)
+    },
+    destroyed() {
+        clearInterval(this.nowInterval)
+    },
+
+    activated() {
+        this.$store.dispatch("getTaskForDashboard");
+    },
+
+    deactivated() {
+        this.$store.dispatch("forgetTaskCompleteTemp", true);
+    },
+    methods: {
+        openTask(task) {
+            this.$store.dispatch("openTask", task)
+        },
+
+        openMenu(task) {
+            const el = this.$refs[`taskMenu_${task.id}`];
+            if (el) {
+                el[0].handleClick()
+            }
+        },
+
+        expiresFormat(date) {
+            return $A.countDownFormat(date, this.nowTime)
+        },
+    }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/resources/assets/js/pages/manage/dashboard.vue b/resources/assets/js/pages/manage/dashboard.vue
index 8aa97ca82..b4c26ab6b 100644
--- a/resources/assets/js/pages/manage/dashboard.vue
+++ b/resources/assets/js/pages/manage/dashboard.vue
@@ -27,60 +27,27 @@
                     </div>
                 </li>
             </ul>
-            <template v-if="list.length > 0">
-                <div class="dashboard-title">{{title}}</div>
-                <ul class="dashboard-list overlay-y">
-                    <li
-                        v-for="(item, index) in list"
-                        :key="index"
-                        :class="{complete: item.complete_at}"
-                        :style="item.color ? {backgroundColor: item.color} : {}"
-                        @click="openTask(item)">
-                        <em
-                            v-if="item.p_name"
-                            class="priority-color"
-                            :style="{backgroundColor:item.p_color}"></em>
-                        <TaskMenu :ref="`taskMenu_${item.id}`" :task="item">
-                            <div slot="icon" class="drop-icon" @click.stop="">
-                                <i class="taskfont" v-html="item.complete_at ? '&#xe627;' : '&#xe625;'"></i>
-                            </div>
-                        </TaskMenu>
-                        <div class="item-title">
-                            <!--工作流状态-->
-                            <span v-if="item.flow_item_name" :class="item.flow_item_status" @click.stop="openMenu(item)">{{item.flow_item_name}}</span>
-                            <!--是否子任务-->
-                            <span v-if="item.sub_top === true">{{$L('子任务')}}</span>
-                            <!--有多少个子任务-->
-                            <span v-if="item.sub_my && item.sub_my.length > 0">+{{item.sub_my.length}}</span>
-                            <!--任务描述-->
-                            {{item.name}}
-                        </div>
-                        <div v-if="item.desc" class="item-icon">
-                            <i class="taskfont">&#xe71a;</i>
-                        </div>
-                        <div v-if="item.sub_num > 0" class="item-icon">
-                            <i class="taskfont">&#xe71f;</i>
-                            <em>{{item.sub_complete}}/{{item.sub_num}}</em>
-                        </div>
-                        <ETooltip v-if="item.end_at" :content="item.end_at" placement="right">
-                            <div :class="['item-icon', item.today ? 'today' : '', item.overdue ? 'overdue' : '']">
-                                <i class="taskfont">&#xe71d;</i>
-                                <em>{{expiresFormat(item.end_at)}}</em>
-                            </div>
-                        </ETooltip>
-                    </li>
-                </ul>
-            </template>
+            <Tabs v-model="dashboard" style="margin-top: 50px;">
+                <TabPane  :label="$L('今日待完成')" name="today" @click="dashboard='today'">
+                    <TaskDashboard :list="list" />
+                </TabPane>
+                <TabPane :label="$L('超期未完成')" name="overdue" @click="dashboard='overdue'">
+                    <TaskDashboard :list="list" />
+                </TabPane>
+                <TabPane :label="$L('待完成任务')" name="all" @click="dashboard='all'">
+                    <TaskDashboard :list="list" />
+                </TabPane>
+            </Tabs>
         </div>
     </div>
 </template>
 
 <script>
 import {mapGetters, mapState} from "vuex";
-import TaskMenu from "./components/TaskMenu";
+import TaskDashboard from "./components/TaskDashboard";
 
 export default {
-    components: {TaskMenu},
+    components: {TaskDashboard},
     data() {
         return {
             nowTime: $A.Time(),
diff --git a/resources/assets/sass/pages/page-dashboard.scss b/resources/assets/sass/pages/page-dashboard.scss
index 18be428e5..f7e074c75 100644
--- a/resources/assets/sass/pages/page-dashboard.scss
+++ b/resources/assets/sass/pages/page-dashboard.scss
@@ -188,6 +188,15 @@
                 }
             }
         }
+
+        .ivu-tabs-tab {
+            font-size: 16px;
+        }
+
+        .ivu-tabs-bar {
+            border-bottom: none;
+            margin-bottom: 0;
+        }
     }
     .nopage {
         width: 100%;