no msg

resources/assets/js/main/components/project/complete.vue

@@ -19,7 +19,7 @@
 <script>
     import DrawerTabsContainer from "../DrawerTabsContainer";
     export default {
-        name: 'ProjectComplete',
+        name: 'ProjectArchived',
         components: {DrawerTabsContainer},
         props: {
             projectid: {

resources/assets/js/main/pages/project-panel.vue

@@ -19,7 +19,7 @@
                     <span class="ft hover" @click="openProjectDrawer('lists')"><i class="ft icon">&#xE89E;</i> 任务列表</span>
                     <span class="ft hover" @click="openProjectDrawer('files')"><i class="ft icon">&#xE701;</i> 文件列表</span>
                     <span class="ft hover" @click="openProjectDrawer('logs')"><i class="ft icon">&#xE753;</i> 项目动态</span>
-                    <span class="ft hover" @click="openProjectSettingDrawer('complete')"><i class="ft icon">&#xE7A7;</i> 设置</span>
+                    <span class="ft hover" @click="openProjectSettingDrawer('archived')"><i class="ft icon">&#xE7A7;</i> 设置</span>
                 </div>
             </div>
         </div>
@@ -104,8 +104,8 @@
 
         <Drawer v-model="projectSettingDrawerShow" width="75%">
             <Tabs v-if="projectSettingDrawerShow" v-model="projectSettingDrawerTab">
-                <TabPane :label="$L('已归档任务')" name="complete">
-                    <project-complete :canload="projectSettingDrawerShow && projectSettingDrawerTab == 'complete'" :projectid="projectid"></project-complete>
+                <TabPane :label="$L('已归档任务')" name="archived">
+                    <project-archived :canload="projectSettingDrawerShow && projectSettingDrawerTab == 'archived'" :projectid="projectid"></project-archived>
                 </TabPane>
                 <TabPane :label="$L('成员管理')" name="member">
                     <project-users :canload="projectSettingDrawerShow && projectSettingDrawerTab == 'member'" :projectid="projectid"></project-users>
@@ -346,7 +346,7 @@
     import ProjectTaskLists from "../components/project/task/lists";
     import ProjectTaskFiles from "../components/project/task/files";
     import ProjectTaskLogs from "../components/project/task/logs";
-    import ProjectComplete from "../components/project/complete";
+    import ProjectArchived from "../components/project/archived";
     import ProjectUsers from "../components/project/users";
     import ProjectStatistics from "../components/project/statistics";
 
@@ -354,7 +354,7 @@
         components: {
             ProjectStatistics,
             ProjectUsers,
-            ProjectComplete,
+            ProjectArchived,
             ProjectTaskLogs,
             ProjectTaskFiles, ProjectTaskLists, ProjectAddTask, draggable, WLoading, WContent, WHeader},
         data () {
@@ -373,7 +373,7 @@
                 projectDrawerTab: 'lists',
 
                 projectSettingDrawerShow: false,
-                projectSettingDrawerTab: 'complete',
+                projectSettingDrawerTab: 'archived',
             }
         },
         mounted() {

resources/assets/js/main/pages/project.vue

@@ -53,7 +53,7 @@
                             <div class="project-unfinished"><em>{{item.unfinished}}</em>未完成数</div>
                         </div>
                         <div class="project-bottom">
-                            <div class="project-iconbtn" @click.stop="handleProject('complete', item)">
+                            <div class="project-iconbtn" @click.stop="handleProject('archived', item)">
                                 <Icon class="project-iconbtn-icon1" type="md-checkmark-circle-outline" size="24" />
                                 <div class="project-iconbtn-text">已归档任务</div>
                             </div>
@@ -108,8 +108,8 @@
 
         <Drawer v-model="projectDrawerShow" width="75%">
             <Tabs v-if="projectDrawerShow" v-model="projectDrawerTab">
-                <TabPane :label="$L('已归档任务')" name="complete">
-                    <project-complete :canload="projectDrawerShow && projectDrawerTab == 'complete'" :projectid="handleProjectId"></project-complete>
+                <TabPane :label="$L('已归档任务')" name="archived">
+                    <project-archived :canload="projectDrawerShow && projectDrawerTab == 'archived'" :projectid="handleProjectId"></project-archived>
                 </TabPane>
                 <TabPane :label="$L('成员管理')" name="member">
                     <project-users :canload="projectDrawerShow && projectDrawerTab == 'member'" :projectid="handleProjectId"></project-users>
@@ -142,6 +142,7 @@
             display: flex;
             flex-direction: row;
             align-items: center;
+            min-width: 138px;
             &:hover {
                 .page-nav-refresh {
                     display: block;
@@ -300,7 +301,7 @@
     import WHeader from "../components/WHeader";
     import WContent from "../components/WContent";
     import WLoading from "../components/WLoading";
-    import ProjectComplete from "../components/project/complete";
+    import ProjectArchived from "../components/project/archived";
     import ProjectUsers from "../components/project/users";
     import ProjectStatistics from "../components/project/statistics";
     import ProjectMyFavor from "../components/project/my/favor";
@@ -311,7 +312,7 @@
         components: {
             ProjectMyManage,
             ProjectMyJoin,
-            ProjectMyFavor, ProjectStatistics, ProjectUsers, ProjectComplete, WLoading, WContent, WHeader},
+            ProjectMyFavor, ProjectStatistics, ProjectUsers, ProjectArchived, WLoading, WContent, WHeader},
         mixins: [
             Project
         ],
@@ -343,7 +344,7 @@
                 listTotal: 0,
 
                 projectDrawerShow: false,
-                projectDrawerTab: 'complete',
+                projectDrawerTab: 'archived',
 
                 projectListDrawerShow: false,
                 projectListDrawerTab: 'myjoin',
@@ -506,7 +507,7 @@
                         this.openProject(item.id, item);
                         break;
                     }
-                    case 'complete':
+                    case 'archived':
                     case 'member':
                     case 'statistics': {
                         this.projectDrawerShow = true;

resources/assets/js/main/pages/todo.vue

@@ -8,7 +8,11 @@
         <div class="w-nav">
             <div class="nav-row">
                 <div class="w-nav-left">
-                    <i class="ft icon">&#xE787;</i> {{$L('我的待办')}}
+                    <div class="page-nav-left">
+                        <div v-if="loadIng > 0" class="page-nav-loading"><w-loading></w-loading></div>
+                        <span><i class="ft icon">&#xE787;</i> {{$L('我的待办')}}</span>
+                        <div class="page-nav-refresh" @click="refreshTask">刷新</div>
+                    </div>
                 </div>
                 <div class="w-nav-flex"></div>
                 <div class="w-nav-right">
@@ -94,6 +98,32 @@
 </style>
 <style lang="scss" scoped>
     .todo {
+        .page-nav-left {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            min-width: 138px;
+            &:hover {
+                .page-nav-refresh {
+                    display: block;
+                }
+            }
+            .page-nav-loading {
+                width: 18px;
+                height: 18px;
+                margin-right: 6px;
+                display: flex;
+            }
+            .page-nav-refresh {
+                display: none;
+                padding-right: 12px;
+                color: #048be0;
+                cursor: pointer;
+                &:hover {
+                    text-decoration: underline;
+                }
+            }
+        }
         .todo-main {
             display: flex;
             flex-direction: column;
@@ -319,6 +349,8 @@
         ],
         data () {
             return {
+                loadIng: 0,
+
                 userInfo: {},
 
                 taskDatas: {
@@ -394,6 +426,7 @@
                 this.$set(taskData, 'hasMorePages', false);
                 this.$set(taskData, 'loadIng', $A.runNum(taskData.loadIng) + 1);
                 this.taskSortDisabled = true;
+                this.loadIng++;
                 $A.aAjax({
                     url: 'project/task/lists',
                     data: {
@@ -403,6 +436,7 @@
                         pagesize: pagesize,
                     },
                     complete: () => {
+                        this.loadIng--;
                         this.taskSortDisabled = false;
                         this.$set(taskData, 'loadIng', $A.runNum(taskData.loadIng) - 1);
                     },
@@ -514,6 +548,10 @@
                         this.todoDrawerTab = event;
                         break;
                     }
+                    case 'report': {
+                        this.$Message.info("敬请期待！");
+                        break;
+                    }
                 }
             },