From 7a5531594ae34d635d32d16a5f960281a24fc3bc Mon Sep 17 00:00:00 2001
From: song <srf428110@163.com>
Date: Fri, 13 Aug 2021 11:29:46 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 src/components/TimeLine/component/TimeBox.vue |  1 -
 .../TimeLine/component/TimeStatus.vue         | 24 ++++---------------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c7f484..0303d86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,6 +103,7 @@
  - | 提示信息显示bug及日常任务收缩问题 | [f2f06c5](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/f2f06c5)
  - | 插件bug解决 | [41257eb](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/41257eb)
  - | 收到消息修改任务状态 | [c378063](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/c378063)
+ - | 日历无任务时添加小绿点,时间轴刻度无任务不显示时分 | [0f90868](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0f90868)
  - | 日常任务html数据查验 | [880ce5c](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/880ce5c)
  - | 日常任务插件遍历时的key值修改 | [cd26285](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/cd26285)
  - | 日常任务插件面板高度修改 | [249f9e4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/249f9e4)
diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue
index 4889bdb..fb72904 100644
--- a/src/components/TimeLine/component/TimeBox.vue
+++ b/src/components/TimeLine/component/TimeBox.vue
@@ -25,7 +25,6 @@
               v-if="showSkeleton"
             >
               <view slot="body">
-                <!-- TODO: 逻辑不完善 -->
                 <view>
                   <skeleton :banner="false" :loading="true" :row="4" animate class="mt-2 u-line-2 skeleton"></skeleton>
                 </view>
diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue
index 8a566d6..3143810 100644
--- a/src/components/TimeLine/component/TimeStatus.vue
+++ b/src/components/TimeLine/component/TimeStatus.vue
@@ -10,33 +10,19 @@
         :active-color="orderStyle.color"
         bg-color="rgba(255,255,255,0)"
         border-width="4"
-        width="66"
-        v-if="task.process !== 4"
+        :width="task.process !== 4 ? 66 : 50"
       >
         <view class="u-progress-content">
           <view class="u-progress-dot"></view>
           <view class="u-progress-info">
-            <u-icon :name="orderStyle.icon" v-if="orderStyle.icon" size="15px"></u-icon>
+            <span v-if="orderStyle.icon">
+              <u-icon :name="orderStyle.icon" v-if="task.process !== 4" size="15px"></u-icon>
+              <u-icon :name="orderStyle.icon" v-else size="15px"></u-icon>
+            </span>
             <template v-else>{{ computeDurationText() }}</template>
           </view>
         </view>
       </u-circle-progress>
-      <!-- 新增任务 -->
-      <u-circle-progress
-        :percent="+orderStyle.persent"
-        :active-color="orderStyle.color"
-        bg-color="rgba(255,255,255,0)"
-        border-width="4"
-        width="50"
-        v-else
-      >
-        <view class="u-progress-content">
-          <view class="u-progress-dot"></view>
-          <view class="u-progress-info">
-            <u-icon :name="orderStyle.icon" size="15px"></u-icon>
-          </view>
-        </view>
-      </u-circle-progress>
     </view>
   </view>
 </template>