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 {