diff --git a/app/Models/Project.php b/app/Models/Project.php
index 19d8d1da..6f852090 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -288,7 +288,6 @@ class Project extends AbstractModel
     public function deleteProject()
     {
         AbstractModel::transaction(function () {
-            WebSocketDialog::whereId($this->dialog_id)->delete();
             $columns = ProjectColumn::whereProjectId($this->id)->get();
             foreach ($columns as $column) {
                 $column->deleteColumn(false);
diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index 0e6bdd8c..86fdeeaf 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -609,9 +609,6 @@ class ProjectTask extends AbstractModel
     public function deleteTask($pushMsg = true)
     {
         AbstractModel::transaction(function () {
-            if ($this->dialog_id) {
-                WebSocketDialog::whereId($this->dialog_id)->delete();
-            }
             $this->delete();
             $this->addLog("删除{任务}：" . $this->name);
         });
diff --git a/app/Models/User.php b/app/Models/User.php
index c0e88a2a..42b3335d 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -262,7 +262,7 @@ class User extends AbstractModel
         if (!$user) {
             $authorization = Base::getToken();
             if ($authorization) {
-                throw new ApiException('身份已失效,请重新登录', $user, -1);
+                throw new ApiException('身份已失效,请重新登录', [], -1);
             } else {
                 throw new ApiException('请登录后继续...', [], -1);
             }
diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php
index 70972eea..53f28af1 100644
--- a/app/Models/WebSocketDialog.php
+++ b/app/Models/WebSocketDialog.php
@@ -3,7 +3,7 @@
 namespace App\Models;
 
 use App\Exceptions\ApiException;
-use App\Module\Base;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * Class WebSocketDialog
@@ -21,6 +21,7 @@ use App\Module\Base;
  * @property-read int|null $dialog_user_count
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog newQuery()
+ * @method static \Illuminate\Database\Query\Builder|WebSocketDialog onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog query()
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereDeletedAt($value)
@@ -30,10 +31,14 @@ use App\Module\Base;
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereName($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|WebSocketDialog whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Query\Builder|WebSocketDialog withTrashed()
+ * @method static \Illuminate\Database\Query\Builder|WebSocketDialog withoutTrashed()
  * @mixin \Eloquent
  */
 class WebSocketDialog extends AbstractModel
 {
+    use SoftDeletes;
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
@@ -100,10 +105,10 @@ class WebSocketDialog extends AbstractModel
                 break;
             case "group":
                 if ($dialog->group_type === 'project') {
-                    $dialog->group_info = Project::select(['id', 'name'])->whereDialogId($dialog->id)->first();
+                    $dialog->group_info = Project::withTrashed()->select(['id', 'name'])->whereDialogId($dialog->id)->first();
                     $dialog->name = $dialog->group_info ? $dialog->group_info->name : '';
                 } elseif ($dialog->group_type === 'task') {
-                    $dialog->group_info = ProjectTask::select(['id', 'name'])->whereDialogId($dialog->id)->first();
+                    $dialog->group_info = ProjectTask::withTrashed()->select(['id', 'name'])->whereDialogId($dialog->id)->first();
                     $dialog->name = $dialog->group_info ? $dialog->group_info->name : '';
                 }
                 break;
diff --git a/resources/assets/js/pages/manage/dashboard.vue b/resources/assets/js/pages/manage/dashboard.vue
index eecab462..a5c09d31 100644
--- a/resources/assets/js/pages/manage/dashboard.vue
+++ b/resources/assets/js/pages/manage/dashboard.vue
@@ -8,14 +8,14 @@
                 <li @click="dashboard='today'">
                     <div class="block-title">{{$L('今日待完成')}}</div>
                     <div class="block-data">
-                        <div class="block-num">{{projectStatistics.today || '...'}}</div>
+                        <div class="block-num">{{projectStatistics.today || 0}}</div>
                         <i class="iconfont">&#xe6f4;</i>
                     </div>
                 </li>
                 <li @click="dashboard='overdue'">
                     <div class="block-title">{{$L('超期未完成')}}</div>
                     <div class="block-data">
-                        <div class="block-num">{{projectStatistics.overdue || '...'}}</div>
+                        <div class="block-num">{{projectStatistics.overdue || 0}}</div>
                         <i class="iconfont">&#xe603;</i>
                     </div>
                 </li>
@@ -27,55 +27,57 @@
                     </div>
                 </li>
             </ul>
-            <div class="dashboard-title">{{title}}</div>
-            <ul class="dashboard-list overlay-y">
-                <li v-for="item in list" :key="item.id" :style="item.color ? {backgroundColor: item.color} : {}">
-                    <EDropdown
-                        trigger="click"
-                        size="small"
-                        placement="bottom"
-                        @command="dropTask(item, $event)">
-                        <div class="drop-icon">
-                            <i class="iconfont">&#xe625;</i>
-                        </div>
-                        <EDropdownMenu slot="dropdown" class="project-list-more-dropdown-menu">
-                            <EDropdownItem v-if="item.complete_at" command="uncomplete">
-                                <div class="item red">
-                                    <Icon type="md-checkmark-circle-outline" />{{$L('标记未完成')}}
-                                </div>
-                            </EDropdownItem>
-                            <EDropdownItem v-else command="complete">
-                                <div class="item">
-                                    <Icon type="md-radio-button-off" />{{$L('完成')}}
-                                </div>
-                            </EDropdownItem>
-                            <EDropdownItem v-if="item.parent_id === 0" command="archived">
-                                <div class="item">
-                                    <Icon type="ios-filing" />{{$L('归档')}}
-                                </div>
-                            </EDropdownItem>
-                            <EDropdownItem command="remove">
-                                <div class="item">
-                                    <Icon type="md-trash" />{{$L('删除')}}
-                                </div>
-                            </EDropdownItem>
-                            <template v-if="item.parent_id === 0">
-                                <EDropdownItem v-if="item.parent_id === 0" divided disabled>{{$L('背景色')}}</EDropdownItem>
-                                <EDropdownItem v-for="(c, k) in $store.state.taskColorList" :key="k" :command="c">
-                                    <div class="item">
-                                        <i class="iconfont" :style="{color:c.color||'#f9f9f9'}" v-html="c.color == item.color ? '&#xe61d;' : '&#xe61c;'"></i>{{$L(c.name)}}
+            <template v-if="list.length > 0">
+                <div class="dashboard-title">{{title}}</div>
+                <ul class="dashboard-list overlay-y">
+                    <li v-for="item in list" :key="item.id" :style="item.color ? {backgroundColor: item.color} : {}">
+                        <EDropdown
+                            trigger="click"
+                            size="small"
+                            placement="bottom"
+                            @command="dropTask(item, $event)">
+                            <div class="drop-icon">
+                                <i class="iconfont">&#xe625;</i>
+                            </div>
+                            <EDropdownMenu slot="dropdown" class="project-list-more-dropdown-menu">
+                                <EDropdownItem v-if="item.complete_at" command="uncomplete">
+                                    <div class="item red">
+                                        <Icon type="md-checkmark-circle-outline" />{{$L('标记未完成')}}
                                     </div>
                                 </EDropdownItem>
-                            </template>
-                        </EDropdownMenu>
-                    </EDropdown>
-                    <div class="item-title" @click="$store.dispatch('openTask', item.id)">{{item.name}}</div>
-                    <div :class="['item-time', item.today ? 'today' : '', item.overdue ? 'overdue' : '']">
-                        <Icon type="ios-time-outline"/>
-                        {{expiresFormat(item.end_at)}}
-                    </div>
-                </li>
-            </ul>
+                                <EDropdownItem v-else command="complete">
+                                    <div class="item">
+                                        <Icon type="md-radio-button-off" />{{$L('完成')}}
+                                    </div>
+                                </EDropdownItem>
+                                <EDropdownItem v-if="item.parent_id === 0" command="archived">
+                                    <div class="item">
+                                        <Icon type="ios-filing" />{{$L('归档')}}
+                                    </div>
+                                </EDropdownItem>
+                                <EDropdownItem command="remove">
+                                    <div class="item">
+                                        <Icon type="md-trash" />{{$L('删除')}}
+                                    </div>
+                                </EDropdownItem>
+                                <template v-if="item.parent_id === 0">
+                                    <EDropdownItem v-if="item.parent_id === 0" divided disabled>{{$L('背景色')}}</EDropdownItem>
+                                    <EDropdownItem v-for="(c, k) in $store.state.taskColorList" :key="k" :command="c">
+                                        <div class="item">
+                                            <i class="iconfont" :style="{color:c.color||'#f9f9f9'}" v-html="c.color == item.color ? '&#xe61d;' : '&#xe61c;'"></i>{{$L(c.name)}}
+                                        </div>
+                                    </EDropdownItem>
+                                </template>
+                            </EDropdownMenu>
+                        </EDropdown>
+                        <div class="item-title" @click="$store.dispatch('openTask', item.id)">{{item.name}}</div>
+                        <div :class="['item-time', item.today ? 'today' : '', item.overdue ? 'overdue' : '']">
+                            <Icon type="ios-time-outline"/>
+                            {{expiresFormat(item.end_at)}}
+                        </div>
+                    </li>
+                </ul>
+            </template>
         </div>
     </div>
 </template>
diff --git a/resources/assets/sass/pages/page-dashboard.scss b/resources/assets/sass/pages/page-dashboard.scss
index 1219acfb..65a8a40c 100644
--- a/resources/assets/sass/pages/page-dashboard.scss
+++ b/resources/assets/sass/pages/page-dashboard.scss
@@ -9,6 +9,7 @@
         width: 664px;
         max-width: 80%;
         max-height: 80%;
+        margin-bottom: 2%;
         display: flex;
         flex-direction: column;
         .dashboard-hello {