kuaifan пре 5 година
родитељ
комит
d4b509a4bb

+ 1 - 0
app/Http/Controllers/Api/ProjectController.php

@@ -1215,6 +1215,7 @@ class ProjectController extends Controller
         $whereArray = [];
         $whereArray[] = ['project_task.delete', '=', 0];
         $whereArray[] = ['project_task.username', '=', $user['username']];
+        $whereArray[] = ['project_task.archived', '=', 0];
         $array = [
             'level_1' => 0,
             'level_2' => 0,

+ 15 - 13
resources/assets/js/main/components/project/task/logs.vue

@@ -222,20 +222,22 @@
                             if (resetLoad === true) {
                                 this.lists = {};
                             }
-                            res.data.lists.forEach((item) => {
-                                timeData = item.timeData;
-                                key = timeData.ymd + " " + timeData.week;
-                                if (typeof this.lists[key] !== "object") {
-                                    this.$set(this.lists, key, {
-                                        key: key,
-                                        ymd: timeData.ymd,
-                                        lists: [],
-                                    });
-                                }
-                                this.lists[key].lists.push(item);
+                            this.$nextTick(() => {
+                                res.data.lists.forEach((item) => {
+                                    timeData = item.timeData;
+                                    key = timeData.ymd + " " + timeData.week;
+                                    if (typeof this.lists[key] !== "object") {
+                                        this.$set(this.lists, key, {
+                                            key: key,
+                                            ymd: timeData.ymd,
+                                            lists: [],
+                                        });
+                                    }
+                                    this.lists[key].lists.push(item);
+                                });
+                                this.hasMorePages = res.data.hasMorePages;
+                                this.totalNum = res.data.total;
                             });
-                            this.hasMorePages = res.data.hasMorePages;
-                            this.totalNum = res.data.total;
                         } else {
                             this.lists = {};
                             this.hasMorePages = false;