From 9e7aa381ed4416b343666af7e2956b18fc5311d2 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 11 Jan 2022 17:47:34 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=89=8B=E6=9C=BA=E7=89=88=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage/components/TaskDetail.vue | 2 ++
 resources/assets/sass/pages/common.scss                    | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index ec82edae..420e4073 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -569,6 +569,8 @@ export default {
             let string = "";
             if ($A.formatDate('Y/m/d', start_at) == $A.formatDate('Y/m/d', end_at)) {
                 string = $A.formatDate('Y/m/d H:i', start_at) + " ~ " + $A.formatDate('H:i', end_at)
+            } else if ($A.formatDate('Y', start_at) == $A.formatDate('Y', end_at)) {
+                string = $A.formatDate('Y/m/d H:i', start_at) + " ~ " + $A.formatDate('m/d H:i', end_at)
             } else {
                 string = $A.formatDate('Y/m/d H:i', start_at) + " ~ " + $A.formatDate('Y/m/d H:i', end_at)
             }
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index 3b4b1c7f..9c16a587 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -26,6 +26,10 @@ body {
                 }
             }
         }
+        &.ivu-date-picker-transfer {
+            max-width: 98%;
+            overflow: auto;
+        }
     }
     .ivu-tooltip-popper {
         .ivu-tooltip-inner {