From 080e805cfb95bf495530120d709ae374832ecdc0 Mon Sep 17 00:00:00 2001
From: Pang <aipaw@live.cn>
Date: Wed, 16 Jun 2021 08:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/ProjectController.php     |  2 +-
 resources/assets/js/pages/manage/calendar.vue | 73 ++++++++++++++++++-
 resources/assets/js/store/state.js            | 11 ++-
 .../assets/sass/pages/page-calendar.scss      | 43 ++++++-----
 4 files changed, 101 insertions(+), 28 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index 2e88cb46..27f7f9ee 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -484,7 +484,7 @@ class ProjectController extends AbstractController
         //
         $task = ProjectTask::userTask($task_id, ['taskUser', 'taskTag']);
         //
-        $task->project_name = ProjectColumn::whereId($task->project_id)->value('name');
+        $task->project_name = Project::whereId($task->project_id)->value('name');
         $task->column_name = ProjectColumn::whereId($task->column_id)->value('name');
         //
         return Base::retSuccess('success', $task);
diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue
index fe18ee9e..7f01b7a1 100644
--- a/resources/assets/js/pages/manage/calendar.vue
+++ b/resources/assets/js/pages/manage/calendar.vue
@@ -1,20 +1,85 @@
 <template>
     <div class="page-calendar">
         <PageTitle>{{$L('日历')}}</PageTitle>
-        <div class="nopage">
-            <div class="nopage-icon"><Icon type="md-calendar" /></div>
-            <div class="nopage-text">{{$L('日历')}}</div>
+        <div class="calendar-head">
+            <div class="calendar-titbox">
+                <div class="calendar-title">
+                    <h1>{{$L('日历')}}</h1>
+                </div>
+            </div>
+        </div>
+        <div class="calendar-box">
+            <ul>
+                <li>MON</li>
+                <li>TUE</li>
+                <li>WED</li>
+                <li>THU</li>
+                <li>FRI</li>
+                <li>SAT</li>
+                <li>SUN</li>
+            </ul>
+            {{days}}
+            <ul>
+                <li v-for="n in 5"></li>
+            </ul>
         </div>
     </div>
 </template>
 
 <script>
+import {mapState} from "vuex";
+
 export default {
     data() {
-        return {}
+        return {
+            days: []
+
+        }
     },
     mounted() {
+        this.days = this.generateMonthCalendar('2020-09-19');
+    },
+    computed: {
+        ...mapState(['userInfo']),
+    },
+    watch: {
 
     },
+    methods: {
+        generateMonthCalendar(dates, line = 6) {
+            var date = new Date(dates);                          // 初始时间格式
+            var y = date.getFullYear();
+            var m = date.getMonth();
+            var days = new Date(y, m + 1, 0).getDate();          // 获取这个月共有多少天
+            var firstDayWeek = new Date(y, m, 1).getDay();       // 月份第一天星期几
+            var arr = [];     // 存储日历格式的数组
+            var n = [];       // 日历格式中的一行
+            var d = 1;        // 日历格式中的天数
+            // 先根据这个月第一天排星期几
+            // 把上个月剩下几天留在这个月的'奸细'放在最前头
+            for(let i = 0; i < firstDayWeek; i++) {
+                // new Date(2020, 8, 0)   --> 9月没有0号 === 8月3127     n.unshift(getDate(y, m, 0 - i).getDate());
+            }
+            // 开启循环
+            // 一星期占一行，一行一个外循环
+            // 这里我默认想要6行
+            for (let j = 0; j < line; j++) {
+                // 一天占一个格子，最多一星期7个格子
+                // 这里我想要7个格子
+                for (let i = 0; i < 7; i++) {
+                    if(d > days) {
+                        // 这个月都放完了，该放什么？
+                        // new Date(2020, 8, 31)  --> 9月没有31 === 10月1　　　　　　 n.push(new Date(y, m, d++).getDate());
+                    } else {
+                        // 放置这个月的天数　　　　　　 n.push(d++);
+                    }51
+                    if (n.length == 7) break;    // 放了7个格子该结束了
+                }
+                arr.push(n);
+                n = [];           // 这一行放完了，清空ba
+            }
+            return arr;
+        }
+    }
 }
 </script>
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index 15691be9..3ad64648 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -226,15 +226,20 @@ const state = { method };
 
 // 变量缓存
 [
-    'projectChatShow',      // 项目聊天显示
     'projectTablePanel',    // 项目面板显示类型
-    'projectCompleteHide',  // 项目面板显示已完成列表
     'taskMyShow',           // 项目面板显示我的任务
     'taskUndoneShow',       // 项目面板显示未完成任务
     'taskCompletedShow'     // 项目面板显示已完成任务
 ].forEach((key) => {
     state[key] = state.method.getStorageBoolean("boolean:" + key, true)
-})
+});
+
+[
+    'projectChatShow',      // 项目聊天显示
+    'projectCompleteHide'   // 项目面板显示已完成列表
+].forEach((key) => {
+    state[key] = state.method.getStorageBoolean("boolean:" + key, false)
+});
 
 // ajax
 state.ajaxLoadNum = 0;
diff --git a/resources/assets/sass/pages/page-calendar.scss b/resources/assets/sass/pages/page-calendar.scss
index b8b0ea91..476b5d84 100644
--- a/resources/assets/sass/pages/page-calendar.scss
+++ b/resources/assets/sass/pages/page-calendar.scss
@@ -1,26 +1,29 @@
 .page-calendar {
-    .nopage {
-        width: 100%;
-        height: 100%;
+    display: flex;
+    flex-direction: column;
+    .calendar-head {
         display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        .nopage-icon {
-            background-color: #f4f5f7;
-            padding: 20px;
-            border-radius: 50%;
-            .ivu-icon {
-                color: #d1d8dd;
-                font-size: 46px;
+        align-items: flex-start;
+        margin: 32px 32px 16px;
+        border-bottom: 1px solid #F4F4F5;
+        .calendar-titbox {
+            flex: 1;
+            margin-bottom: 16px;
+            .calendar-title {
+                display: flex;
+                align-items: center;
+                > h1 {
+                    color: #333333;
+                    font-size: 28px;
+                    font-weight: 600;
+                }
             }
         }
-        .nopage-text {
-            margin-top: 16px;
-            color: #bec6cc;
-            background-color: #f4f5f7;
-            padding: 4px 15px;
-            border-radius: 14px;
-        }
+    }
+    .calendar-box {
+        flex: 1;
+        height: 0;
+        display: flex;
+        margin-bottom: 16px;
     }
 }