From d6266471564c75c2305c25ae3febec03c3c37aea Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 24 Jun 2021 09:37:34 +0800
Subject: [PATCH] no message

---
 resources/assets/js/pages/manage.vue          |  2 +-
 .../pages/manage/components/ProjectList.vue   | 24 +++++++------------
 .../js/pages/manage/components/TaskDetail.vue |  4 ++--
 .../assets/js/pages/manage/dashboard.vue      |  7 ++----
 resources/assets/js/store/actions.js          | 21 ++++++++++++----
 5 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index b163f0da..6c83133d 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -24,7 +24,7 @@
             <ul>
                 <li @click="toggleRoute('dashboard')" :class="classNameRoute('dashboard')">
                     <i class="iconfont">&#xe6fb;</i>
-                    <div class="menu-title">{{$L('仪表板')}}</div>
+                    <div class="menu-title">{{$L('仪表盘')}}</div>
                 </li>
                 <li @click="toggleRoute('calendar')" :class="classNameRoute('calendar')">
                     <i class="iconfont">&#xe6f5;</i>
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index badd5994..c547c8c5 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -473,10 +473,9 @@ export default {
                 if (a.p_level != b.p_level) {
                     return a.p_level - b.p_level;
                 }
-                if (a.sort != b.sort) {
-                    return a.sort - b.sort;
-                }
-                return a.id - b.id;
+                let at1 = new Date(a.end_at),
+                    at2 = new Date(b.end_at);
+                return at1 - at2;
             });
         },
 
@@ -502,10 +501,9 @@ export default {
                 if (a.p_level != b.p_level) {
                     return a.p_level - b.p_level;
                 }
-                if (a.sort != b.sort) {
-                    return a.sort - b.sort;
-                }
-                return a.id - b.id;
+                let at1 = new Date(a.end_at),
+                    at2 = new Date(b.end_at);
+                return at1 - at2;
             });
         },
 
@@ -533,13 +531,9 @@ export default {
                 return task.complete_at;
             });
             return array.sort((a, b) => {
-                if (a.p_level != b.p_level) {
-                    return a.p_level - b.p_level;
-                }
-                if (a.sort != b.sort) {
-                    return a.sort - b.sort;
-                }
-                return a.id - b.id;
+                let at1 = new Date(a.complete_at),
+                    at2 = new Date(b.complete_at);
+                return at2 - at1;
             });
         },
 
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 1800f777..946813f4 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -663,8 +663,8 @@ export default {
             immediate: true,
             deep: true
         },
-        'openTask._show' (show) {
-            if (show) {
+        taskId (id) {
+            if (id > 0) {
                 this.$nextTick(() => {
                     this.$refs.input.focus()
                 });
diff --git a/resources/assets/js/pages/manage/dashboard.vue b/resources/assets/js/pages/manage/dashboard.vue
index f9c0c08c..625203ca 100644
--- a/resources/assets/js/pages/manage/dashboard.vue
+++ b/resources/assets/js/pages/manage/dashboard.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="page-dashboard">
-        <PageTitle>{{$L('仪表板')}}</PageTitle>
+        <PageTitle>{{$L('仪表盘')}}</PageTitle>
         <div class="dashboard-wrapper">
             <div class="dashboard-hello">{{$L('欢迎您，' + userInfo.nickname)}}</div>
             <div class="dashboard-desc">{{$L('以下是你当前的任务统计数据')}}</div>
@@ -162,10 +162,7 @@ export default {
                 }
             })
             return datas.sort((a, b) => {
-                if (a._end_time != b._end_time) {
-                    return a._end_time - b._end_time;
-                }
-                return a.id - b.id;
+                return a._end_time - b._end_time;
             });
         },
 
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 3a3e5e16..d2182e97 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -591,7 +591,7 @@ export default {
             }
             //
             setTimeout(() => {
-                if (data.parent_id > 0) {
+                if (key == 'taskSubs') {
                     state.method.setStorage("cacheTaskSubs", state.cacheTaskSubs = state[key]);
                 } else {
                     state.method.setStorage("cacheTasks", state.cacheTasks = state[key]);
@@ -608,16 +608,27 @@ export default {
      */
     forgetTask({state, dispatch}, task_id) {
         let index = state.tasks.findIndex(({id}) => id == task_id);
+        let key = 'tasks';
+        if (index === -1) {
+            index = state.taskSubs.findIndex(({id}) => id == task_id);
+            key = 'taskSubs';
+        }
         if (index > -1) {
-            dispatch("getTaskOne", state.tasks[index].parent_id)
-            dispatch('getProjectOne', state.tasks[index].project_id)
-            state.tasks.splice(index, 1);
+            dispatch("getTaskOne", state[key][index].parent_id)
+            if (key == 'tasks') {
+                dispatch('getProjectOne', state[key][index].project_id)
+            }
+            state[key].splice(index, 1);
         }
         if (state.taskId == task_id) {
             state.taskId = 0;
         }
         setTimeout(() => {
-            state.method.setStorage("cacheTasks", state.cacheTasks = state.tasks);
+            if (key == 'taskSubs') {
+                state.method.setStorage("cacheTaskSubs", state.cacheTaskSubs = state[key]);
+            } else {
+                state.method.setStorage("cacheTasks", state.cacheTasks = state[key]);
+            }
         })
     },