From 92b32547202bf89acfc877dd1f642b5482570b4a Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Fri, 23 Jul 2021 16:59:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9A=E6=9C=9F=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 src/components/Plugin/Plugin.vue              |  4 +--
 src/components/TimeLine/component/TimeBox.vue | 27 ++++++++++++++-----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f06893e..fca70e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@
  - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/aa4981c)
  - | 骨架屏替换 | [e9fdd71](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e9fdd71)
  - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/19228d6)
+ - | 解决时间轴报错 | [da1eece](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/da1eece)
  - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/d533a01)
  - | 上下滑动加载定期任务 | [4090d89](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4090d89)
  - | 时间轴插件 | [225d3cc](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/225d3cc)
diff --git a/src/components/Plugin/Plugin.vue b/src/components/Plugin/Plugin.vue
index c70d838..83d5f1c 100644
--- a/src/components/Plugin/Plugin.vue
+++ b/src/components/Plugin/Plugin.vue
@@ -56,9 +56,9 @@ export default {
         pluginId,
         styleType,
       });
-      this.$emit('changeLoading', false);
       this.pluginContent = res;
-      console.log(this.pluginContent);
+      this.$emit('changeLoading', false);
+      console.log('+++++++++', this.pluginContent);
     },
   },
 };
diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue
index a3ca9a7..8f3b40a 100644
--- a/src/components/TimeLine/component/TimeBox.vue
+++ b/src/components/TimeLine/component/TimeBox.vue
@@ -25,11 +25,11 @@
             @click="changeTimeNode(item.planStart)"
             class="h-16"
             margin="0"
-            v-if="item.plugins && item.plugins.length"
+            v-if="showCard(item.plugins)"
           >
             <!-- 任务面板插件 -->
             <view slot="body">
-              <view v-if="!item.plugins && !item.plugins.length && taskLoading">
+              <view v-if="taskLoading">
                 <skeleton :banner="false" :loading="true" :row="4" animate class="mt-2 u-line-2 skeleton"></skeleton>
               </view>
               <view class="p-0 u-col-between" v-else>
@@ -38,11 +38,12 @@
                     <Plugin
                       :class="getClass(plugin.colspan, plugin.rowspan)"
                       :item="item"
-                      :key="pluginIndex"
+                      :key="plugin.pluginTaskId"
                       :pluginId="plugin.pluginId"
-                      :styleType="styleType"
-                      @changeLoading="taskLoading = false"
-                      v-for="(plugin, pluginIndex) in p"
+                      :pluginTaskId="plugin.pluginTaskId"
+                      :styleType="styleType || 0"
+                      @changeLoading="changeLoading"
+                      v-for="plugin in p"
                     />
                   </view>
                 </view>
@@ -93,6 +94,20 @@ export default {
     getClass(col, row) {
       return [`row-span-${row}`, `col-span-${col}`];
     },
+
+    changeLoading(show) {
+      console.log('show: ', show);
+      this.taskLoading = show;
+    },
+
+    showCard(arr) {
+      console.log('arr: ', arr);
+      if (!arr) {
+        return false;
+      } else {
+        return true;
+      }
+    },
   },
 };
 </script>